Merge branch 'dev' of github.com:KomodoPlatform/komodo-defi-framework…

… into keplr-and-external-sign-swap

.docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM docker.io/debian:buster-slim
+FROM docker.io/debian:10
 
 MAINTAINER Onur Özkan <onur@komodoplatform.com>
 
@@ -10,6 +10,7 @@ RUN apt-get install -y 	\
     ca-certificates 	\
     curl             	\
     wget             	\
+    unzip             	\
     gnupg
 
 RUN ln -s /usr/bin/python3 /bin/python
@@ -26,11 +27,11 @@ RUN ./llvm.sh 16
 
 RUN rm ./llvm.sh
 
-RUN ln -s /usr/bin/clang-16 /usr/bin/clang
-
 ENV AR=/usr/bin/llvm-ar-16
 ENV CC=/usr/bin/clang-16
 
+RUN ln -s /usr/bin/clang-16 /usr/bin/clang
+
 RUN mkdir -m 0755 -p /etc/apt/keyrings
 
 RUN curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg
@@ -47,6 +48,9 @@ RUN apt-get install -y 	  \
 	containerd.io 		  \
 	docker-buildx-plugin
 
-RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- --profile minimal --default-toolchain nightly-2022-10-29 -y
+
+RUN wget https://github.com/protocolbuffers/protobuf/releases/download/v3.20.1/protoc-3.20.1-linux-x86_64.zip
+RUN unzip protoc-3.20.1-linux-x86_64.zip && mv ./include/google /usr/include/google
 
 ENV PATH="/root/.cargo/bin:$PATH"

.github/workflows/dev-build.yml

@@ -99,6 +99,7 @@ jobs:
         run: |
           rustup toolchain install nightly-2022-10-29 --no-self-update --profile=minimal
           rustup default nightly-2022-10-29
+          rustup target add x86_64-apple-darwin
 
       - name: Install build deps
         uses: ./.github/actions/deps-install
@@ -209,8 +210,9 @@ jobs:
       - uses: actions/checkout@v3
       - name: Install toolchain
         run: |
-          rustup toolchain install nightly-2022-10-29 --no-self-update --profile=minimal
-          rustup default nightly-2022-10-29
+          rustup toolchain install nightly-2022-10-29-x86_64-apple-darwin --no-self-update --profile=minimal
+          rustup default nightly-2022-10-29-x86_64-apple-darwin
+          rustup target add x86_64-apple-darwin
 
       - name: Install build deps
         uses: ./.github/actions/deps-install

.github/workflows/test.yml

@@ -253,4 +253,4 @@ jobs:
         uses: ./.github/actions/cargo-cache
 
       - name: Test
-        run: WASM_BINDGEN_TEST_TIMEOUT=360 GECKODRIVER=/bin/geckodriver wasm-pack test --firefox --headless mm2src/mm2_main
+        run: WASM_BINDGEN_TEST_TIMEOUT=480 GECKODRIVER=/bin/geckodriver wasm-pack test --firefox --headless mm2src/mm2_main

Cargo.toml

@@ -36,7 +36,6 @@ members = [
     "mm2src/mm2_p2p",
     "mm2src/mm2_rpc",
     "mm2src/mm2_state_machine",
-    "mm2src/mm2_test_helpers",
     "mm2src/rpc_task",
     "mm2src/trezor",
 ]
@@ -46,6 +45,7 @@ exclude = [
     "mm2src/floodsub",
     "mm2src/gossipsub",
     "mm2src/mm2_libp2p",
+    "mm2src/mm2_test_helpers",
 ]
 
 # https://doc.rust-lang.org/beta/cargo/reference/features.html#feature-resolver-version-2

README.md

@@ -64,13 +64,6 @@ For a curated list of Komodo DeFi Framework based projects and resources, check
 - Buy/sell from the orderbook, or create maker orders
 - Configure automated ["makerbot" trading](https://developers.komodoplatform.com/basic-docs/atomicdex-api-20/start_simple_market_maker_bot.html) with periodic price updates and optional [telegram](https://telegram.org/) alerts
 
-
-## System Requirements
-
-- 64-bit MacOS, Windows, or Linux operating system
-- 2GB of free RAM (or more)
-- User account with admin/root privileges
-
 ## Building from source
 
 ### On Host System:

mm2src/coins/Cargo.toml

@@ -15,8 +15,13 @@ enable-solana = [
 	"dep:spl-token",
 	"dep:spl-associated-token-account"
 ]
+enable-sia = [
+	"dep:reqwest",
+	"blake2b_simd"
+]
 default = []
 run-docker-tests = []
+for-tests = []
 
 [lib]
 name = "coins"
@@ -31,6 +36,7 @@ base58 = "0.2.0"
 bip32 = { version = "0.2.2", default-features = false, features = ["alloc", "secp256k1-ffi"] }
 bitcoin_hashes = "0.11"
 bitcrypto = { path = "../mm2_bitcoin/crypto" }
+blake2b_simd = { version = "0.5.10", optional = true }
 byteorder = "1.3"
 bytes = "0.4"
 cfg-if = "1.0"
@@ -81,6 +87,7 @@ prost = "0.11"
 protobuf = "2.20"
 rand = { version = "0.7", features = ["std", "small_rng"] }
 regex = "1"
+reqwest = { version = "0.11.9", default-features = false, features = ["json"], optional = true }
 rlp = { version = "0.5" }
 rmp-serde = "0.14.3"
 rpc = { path = "../mm2_bitcoin/rpc" }