Skip to content

Commit

Permalink
Merge branch 'dev' into burn-dex-fee-for-non-kmd
Browse files Browse the repository at this point in the history
* dev:
  docs(README): remove outdated information from the README (KomodoPlatform#2097)
  fix(sia): fix sia compilation after hd wallet PR merge (KomodoPlatform#2103)
  feat(hd_wallet): utxo and evm hd wallet and trezor (KomodoPlatform#1962)
  feat(sia): initial Sia integration (KomodoPlatform#2086)
  fix(BCH): deserialize BCH header that uses KAWPOW version correctly (KomodoPlatform#2099)
  fix(eth_tests): remove ETH_DEV_NODE from tests (KomodoPlatform#2101)
  • Loading branch information
dimxy committed Apr 29, 2024
2 parents d3f843d + 2462d9a commit bc5c005
Show file tree
Hide file tree
Showing 150 changed files with 10,807 additions and 4,422 deletions.
6 changes: 4 additions & 2 deletions .github/workflows/dev-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 5 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ members = [
"mm2src/mm2_p2p",
"mm2src/mm2_rpc",
"mm2src/mm2_state_machine",
"mm2src/mm2_test_helpers",
"mm2src/rpc_task",
"mm2src/trezor",
]
Expand All @@ -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
Expand Down
7 changes: 0 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
7 changes: 7 additions & 0 deletions mm2src/coins/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down Expand Up @@ -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" }
Expand Down
Loading

0 comments on commit bc5c005

Please sign in to comment.