From 581b57dd6ac9197bbe0726cc86cc8e114d2c8260 Mon Sep 17 00:00:00 2001 From: Braqzen <103777923+Braqzen@users.noreply.github.com> Date: Wed, 10 Apr 2024 13:30:22 +0100 Subject: [PATCH 1/4] Workspace with packages plus CI --- .github/workflows/ci.yml | 124 ++ Cargo.lock | 1009 +++-------------- Cargo.toml | 27 +- Forc.toml | 2 - market-contract/Cargo.toml | 15 +- Forc.lock => market-contract/Forc.lock | 0 .../fuel-toolchain.toml | 0 .../src/data_structures/balance.sw | 10 +- market-contract/src/data_structures/order.sw | 2 +- market-contract/src/interface.sw | 15 +- market-contract/src/main.sw | 211 +++- market-contract/src/math.sw | 98 +- .../tests/functions/core/cancel_order.rs | 4 +- .../tests/functions/core/open_order.rs | 2 +- .../tests/functions/core/set_fee.rs | 2 +- market-contract/tests/utils/setup.rs | 17 +- spark-cli/Cargo.toml | 13 +- spark-cli/README.md | 25 +- spark-cli/src/main.rs | 3 + spark-market-sdk/Cargo.toml | 11 +- spark-market-sdk/src/lib.rs | 4 +- src/lib.rs | 0 22 files changed, 601 insertions(+), 993 deletions(-) create mode 100644 .github/workflows/ci.yml delete mode 100644 Forc.toml rename Forc.lock => market-contract/Forc.lock (100%) rename fuel-toolchain.toml => market-contract/fuel-toolchain.toml (100%) delete mode 100644 src/lib.rs diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..53e2bb8 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,124 @@ +name: CI + +on: + push: + branches: + - master + pull_request: + release: + types: [published] + +concurrency: + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + +env: + RUST_VERSION: 1.75.0 + +jobs: + lint-toml-files: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: dtolnay/rust-toolchain@master + with: + toolchain: ${{ env.RUST_VERSION }} + + - name: Install Cargo.toml linter + uses: baptiste0928/cargo-install@v2 + with: + crate: cargo-toml-lint + version: "0.1.1" + + - name: Run Cargo.toml linter + run: git ls-files | grep Cargo.toml$ | xargs --verbose -n 1 cargo-toml-lint + + market-contract: + runs-on: ubuntu-latest + + steps: + - name: Checkout repository + uses: actions/checkout@v3 + + - name: Install Rust toolchain + uses: dtolnay/rust-toolchain@master + with: + toolchain: ${{ env.RUST_VERSION }} + components: clippy, rustfmt + + - name: Init cache + uses: Swatinem/rust-cache@v2 + + - name: Install Fuel toolchain + uses: FuelLabs/action-fuel-toolchain@v0.6.0 + with: + toolchain: beta-5 + + - name: Check Sway formatting + run: forc fmt --check --path market-contract + + - name: Check Rust formatting + run: cargo fmt --verbose --check --manifest-path market-contract/Cargo.toml + + - name: Build Sway + run: | + cd "market-contract" + forc build --locked + + - name: Build Rust files + run: cargo build --locked --manifest-path market-contract/Cargo.toml + + - name: Check Clippy Linter + run: cargo clippy --manifest-path market-contract/Cargo.toml --all-features --all-targets -- -D warnings + + - name: Run Rust tests + run: cargo test --locked --manifest-path market-contract/Cargo.toml + + - name: Run Sway tests + run: | + cd "market-contract" + forc test + + CLI: + runs-on: ubuntu-latest + + steps: + - name: Checkout repository + uses: actions/checkout@v3 + + - name: Install Rust toolchain + uses: dtolnay/rust-toolchain@master + with: + toolchain: ${{ env.RUST_VERSION }} + components: clippy, rustfmt + + - name: Init cache + uses: Swatinem/rust-cache@v2 + + - name: Build Rust files + run: cargo build --locked --manifest-path spark-cli/Cargo.toml + + - name: Check Clippy Linter + run: cargo clippy --manifest-path spark-cli/Cargo.toml --all-features --all-targets -- -D warnings + + SDK: + runs-on: ubuntu-latest + + steps: + - name: Checkout repository + uses: actions/checkout@v3 + + - name: Install Rust toolchain + uses: dtolnay/rust-toolchain@master + with: + toolchain: ${{ env.RUST_VERSION }} + components: clippy, rustfmt + + - name: Init cache + uses: Swatinem/rust-cache@v2 + + - name: Build Rust files + run: cargo build --locked --manifest-path spark-market-sdk/Cargo.toml + + - name: Check Clippy Linter + run: cargo clippy --manifest-path spark-market-sdk/Cargo.toml --all-features --all-targets -- -D warnings diff --git a/Cargo.lock b/Cargo.lock index f6429fa..59940d8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -905,12 +905,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "diff" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" - [[package]] name = "digest" version = "0.10.7" @@ -1152,23 +1146,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "fuel-abi-types" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2351bb0b743c23ac13ac2559756b3929502cd6e29091f2e5302fb9a1bdddaf35" -dependencies = [ - "itertools 0.10.5", - "lazy_static", - "proc-macro2", - "quote", - "regex", - "serde", - "serde_json", - "syn 2.0.50", - "thiserror", -] - [[package]] name = "fuel-asm" version = "0.43.2" @@ -1176,28 +1153,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ea884860261efdc7300b63db7972cb0e08e8f5379495ad7cdd2bdb7c0cc4623" dependencies = [ "bitflags 2.4.2", - "fuel-types 0.43.2", - "serde", - "strum 0.24.1", -] - -[[package]] -name = "fuel-asm" -version = "0.47.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1b088ac4762d59736b90803db239f96c66f2a1a2c616715ef0a9c196b58edc9" -dependencies = [ - "bitflags 2.4.2", - "fuel-types 0.47.1", + "fuel-types", "serde", - "strum 0.24.1", + "strum", ] [[package]] name = "fuel-core" -version = "0.22.1" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec6c574639f6c2ea44e31ae9954189aeba45b7202dc3059a9355041e44c04c11" +checksum = "5212499e280344967732bf7dc31227f02460e8c2947e7965d5703ad33d80c9ea" dependencies = [ "anyhow", "async-graphql", @@ -1206,18 +1171,18 @@ dependencies = [ "clap", "derive_more", "enum-iterator", - "fuel-core-chain-config 0.22.1", - "fuel-core-consensus-module 0.22.1", - "fuel-core-database 0.22.1", - "fuel-core-executor 0.22.1", - "fuel-core-importer 0.22.1", - "fuel-core-metrics 0.22.1", - "fuel-core-poa 0.22.1", - "fuel-core-producer 0.22.1", - "fuel-core-services 0.22.1", - "fuel-core-storage 0.22.1", - "fuel-core-txpool 0.22.1", - "fuel-core-types 0.22.1", + "fuel-core-chain-config", + "fuel-core-consensus-module", + "fuel-core-database", + "fuel-core-executor", + "fuel-core-importer", + "fuel-core-metrics", + "fuel-core-poa", + "fuel-core-producer", + "fuel-core-services", + "fuel-core-storage", + "fuel-core-txpool", + "fuel-core-types", "futures", "hex", "hyper", @@ -1226,50 +1191,8 @@ dependencies = [ "rand", "serde", "serde_json", - "strum 0.24.1", - "strum_macros 0.24.3", - "thiserror", - "tokio", - "tokio-stream", - "tower-http", - "tracing", - "uuid 1.7.0", -] - -[[package]] -name = "fuel-core" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2a66b67d7733617be157290da963f58be8a3152eaba839ad437f488860b60de" -dependencies = [ - "anyhow", - "async-graphql", - "async-trait", - "axum", - "clap", - "derive_more", - "enum-iterator", - "fuel-core-chain-config 0.23.0", - "fuel-core-consensus-module 0.23.0", - "fuel-core-database 0.23.0", - "fuel-core-executor 0.23.0", - "fuel-core-importer 0.23.0", - "fuel-core-metrics 0.23.0", - "fuel-core-poa 0.23.0", - "fuel-core-producer 0.23.0", - "fuel-core-services 0.23.0", - "fuel-core-storage 0.23.0", - "fuel-core-txpool 0.23.0", - "fuel-core-types 0.23.0", - "futures", - "hex", - "hyper", - "itertools 0.10.5", - "rand", - "serde", - "serde_json", - "strum 0.25.0", - "strum_macros 0.25.3", + "strum", + "strum_macros", "thiserror", "tokio", "tokio-stream", @@ -1280,14 +1203,14 @@ dependencies = [ [[package]] name = "fuel-core-chain-config" -version = "0.22.1" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c4002461d438755868c4fd849b31c86ce96d8dbb8c3d2dc373fca2798807c9f" +checksum = "62ab93dc93c87c0c380e94a6a8d1b65e791151d2f6a567c4970fc8cf76faaa05" dependencies = [ "anyhow", "bech32", - "fuel-core-storage 0.22.1", - "fuel-core-types 0.22.1", + "fuel-core-storage", + "fuel-core-types", "hex", "itertools 0.10.5", "postcard", @@ -1297,60 +1220,17 @@ dependencies = [ "tracing", ] -[[package]] -name = "fuel-core-chain-config" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cc2032184b86cd7e54d0ca6f7c7db7419552048484e2cfa6d7dc346eefb4907" -dependencies = [ - "anyhow", - "bech32", - "fuel-core-storage 0.23.0", - "fuel-core-types 0.23.0", - "hex", - "itertools 0.10.5", - "postcard", - "serde", - "serde_json", - "serde_with 1.14.0", - "tracing", -] - -[[package]] -name = "fuel-core-client" -version = "0.22.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ad13a01a2f012cc96f2cf33033128f2fa0bd376489f2db76045eb3eb9035101" -dependencies = [ - "anyhow", - "cynic", - "derive_more", - "eventsource-client", - "fuel-core-types 0.22.1", - "futures", - "hex", - "hyper-rustls 0.24.2", - "itertools 0.10.5", - "reqwest", - "schemafy_lib", - "serde", - "serde_json", - "tai64", - "thiserror", - "tracing", -] - [[package]] name = "fuel-core-client" -version = "0.23.0" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a19e4fe4535372749e5b38d58c29a7904b3bc95e0429e6ae2544cfa8417a39c4" +checksum = "8a10b6a6e2dcc651f52961ef3c1bf44ab28434fdb437789bf17f4389d19041f4" dependencies = [ "anyhow", "cynic", "derive_more", "eventsource-client", - "fuel-core-types 0.23.0", + "fuel-core-types", "futures", "hex", "hyper-rustls 0.24.2", @@ -1366,121 +1246,64 @@ dependencies = [ [[package]] name = "fuel-core-consensus-module" -version = "0.22.1" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae7d7e15deb74b573a23446c25309b0e249bf9ba819911e4a3b805f738ad1c75" +checksum = "61adeb3c3afc83a38616850dd84a32ffd5047bcc60d32b1d2848922c936ab5ec" dependencies = [ "anyhow", - "fuel-core-chain-config 0.22.1", - "fuel-core-poa 0.22.1", - "fuel-core-types 0.22.1", + "fuel-core-chain-config", + "fuel-core-poa", + "fuel-core-types", "tokio", ] -[[package]] -name = "fuel-core-consensus-module" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8d697f23683e342c58e5caf1858a19a8d247d882da3d5eb46be4358def0e01" -dependencies = [ - "anyhow", - "fuel-core-chain-config 0.23.0", - "fuel-core-poa 0.23.0", - "fuel-core-storage 0.23.0", - "fuel-core-types 0.23.0", -] - -[[package]] -name = "fuel-core-database" -version = "0.22.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de6c935d61a94e982eaa5a1741ec33fa9a0287b99740c0e91896dea2b14fbf87" -dependencies = [ - "anyhow", - "derive_more", - "fuel-core-storage 0.22.1", - "fuel-core-types 0.22.1", -] - [[package]] name = "fuel-core-database" -version = "0.23.0" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b15c8836700abafd371d8cccc25139654e75d909fb1569eed9225fc435e8022" +checksum = "d8aa43ee5fbd0a5710c8cde4e405cff4d729e5c48b4ba15714c07dbe45c7ef31" dependencies = [ "anyhow", "derive_more", - "fuel-core-storage 0.23.0", - "fuel-core-types 0.23.0", + "fuel-core-storage", + "fuel-core-types", ] [[package]] name = "fuel-core-executor" -version = "0.22.1" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05e9fbe27d5e1e74fc9931d987d391af2112276e8dcf0395d26ecbcb496f90af" +checksum = "d7ffd6011ac5628aed96de774bb30d8918d4d0cde5d82dd3619874655a3b130c" dependencies = [ "anyhow", - "fuel-core-chain-config 0.22.1", - "fuel-core-storage 0.22.1", - "fuel-core-types 0.22.1", + "fuel-core-chain-config", + "fuel-core-storage", + "fuel-core-types", "hex", "parking_lot", "tracing", ] -[[package]] -name = "fuel-core-executor" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a995d40aee2a9799b73e59307628beb486e649e368ca1431fd35262276c7648" -dependencies = [ - "anyhow", - "fuel-core-chain-config 0.23.0", - "fuel-core-storage 0.23.0", - "fuel-core-types 0.23.0", - "hex", - "parking_lot", - "tracing", -] - -[[package]] -name = "fuel-core-importer" -version = "0.22.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "820a579cc9842536b82a85fa214c85d73bb947dc9833ff7c814f4f7995bfc696" -dependencies = [ - "anyhow", - "derive_more", - "fuel-core-metrics 0.22.1", - "fuel-core-storage 0.22.1", - "fuel-core-types 0.22.1", - "tokio", - "tracing", -] - [[package]] name = "fuel-core-importer" -version = "0.23.0" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c0dc2073d2dc420b82eb16bc2187b76daf2725bcccca3a40ebb3e443194897d" +checksum = "4f9bc11dd9a5a112dffc84554af45aeff35021eb90fbbaa3da8280e659c0e32d" dependencies = [ "anyhow", "derive_more", - "fuel-core-chain-config 0.23.0", - "fuel-core-metrics 0.23.0", - "fuel-core-storage 0.23.0", - "fuel-core-types 0.23.0", + "fuel-core-metrics", + "fuel-core-storage", + "fuel-core-types", "tokio", - "tokio-rayon", "tracing", ] [[package]] name = "fuel-core-metrics" -version = "0.22.1" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa597e5612ea29b82722d9dcaea8c7b536579125bc731aa8c2d49c211153dc56" +checksum = "a08d775335cdfee3717faa083714c75da294508a1244fe7b229748c9926d91c3" dependencies = [ "axum", "once_cell", @@ -1491,49 +1314,18 @@ dependencies = [ "tracing", ] -[[package]] -name = "fuel-core-metrics" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b5f5336984cdbb3f7f8b3cf2d3ac0928d4b058dcdca061c49563764a5366be4" -dependencies = [ - "axum", - "once_cell", - "pin-project-lite", - "prometheus-client 0.22.2", - "regex", - "tracing", -] - -[[package]] -name = "fuel-core-poa" -version = "0.22.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd1704cab002c336b345d8146aca54e5a1a02b603f0ece86090795c21ae797b1" -dependencies = [ - "anyhow", - "async-trait", - "fuel-core-chain-config 0.22.1", - "fuel-core-services 0.22.1", - "fuel-core-storage 0.22.1", - "fuel-core-types 0.22.1", - "tokio", - "tokio-stream", - "tracing", -] - [[package]] name = "fuel-core-poa" -version = "0.23.0" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17bb6af0c9289fc3273c5c45fa4d5894a914acbc175c0001f5b6bbb336546e1e" +checksum = "e99ef1eaab07450c327abb4809246f851cc0dc5d52650662a239bc66c26ded41" dependencies = [ "anyhow", "async-trait", - "fuel-core-chain-config 0.23.0", - "fuel-core-services 0.23.0", - "fuel-core-storage 0.23.0", - "fuel-core-types 0.23.0", + "fuel-core-chain-config", + "fuel-core-services", + "fuel-core-storage", + "fuel-core-types", "tokio", "tokio-stream", "tracing", @@ -1541,31 +1333,15 @@ dependencies = [ [[package]] name = "fuel-core-producer" -version = "0.22.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c8571cdd26b688a54ca273e73c83bba05e6c16f0d3910013115bf35d3ad38e9" -dependencies = [ - "anyhow", - "async-trait", - "derive_more", - "fuel-core-storage 0.22.1", - "fuel-core-types 0.22.1", - "tokio", - "tokio-rayon", - "tracing", -] - -[[package]] -name = "fuel-core-producer" -version = "0.23.0" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9195aaa56e2880ffb1ad88d92bfc40e0b6685994a8a584016b984b88f037b6e" +checksum = "9c38073316314824e1865c269c6663f678003d48ae0a135397087fc1ebdd303e" dependencies = [ "anyhow", "async-trait", "derive_more", - "fuel-core-storage 0.23.0", - "fuel-core-types 0.23.0", + "fuel-core-storage", + "fuel-core-types", "tokio", "tokio-rayon", "tracing", @@ -1573,28 +1349,13 @@ dependencies = [ [[package]] name = "fuel-core-services" -version = "0.22.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4111fb590d80e761163612f2af67e9992c70a736e65414f355dac46d4926f6ba" -dependencies = [ - "anyhow", - "async-trait", - "fuel-core-metrics 0.22.1", - "futures", - "parking_lot", - "tokio", - "tracing", -] - -[[package]] -name = "fuel-core-services" -version = "0.23.0" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a66cbc7c3958d00f28578a7f8343b1344fe7e866643f16cdfe280e5d90bc4541" +checksum = "e8a42f05bc2ab4a91afd2db6556521002119e29de49744bd29c8f43b5f561d89" dependencies = [ "anyhow", "async-trait", - "fuel-core-metrics 0.23.0", + "fuel-core-metrics", "futures", "parking_lot", "tokio", @@ -1603,72 +1364,30 @@ dependencies = [ [[package]] name = "fuel-core-storage" -version = "0.22.1" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3a98d3f35a3714556cd484b49e63510086fd99630caf558a1ac583594476b0a" +checksum = "95d4d9ede89f97c779433e389739410a946e8b94f379a0048a49670bef73e602" dependencies = [ "anyhow", "derive_more", - "fuel-core-types 0.22.1", - "fuel-vm 0.43.2", + "fuel-core-types", + "fuel-vm", "primitive-types", ] -[[package]] -name = "fuel-core-storage" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "481343e6501f5205f742fae3b745402dc7f7c3a5038e64c598ba5217dcf17033" -dependencies = [ - "anyhow", - "derive_more", - "enum-iterator", - "fuel-core-types 0.23.0", - "fuel-vm 0.47.1", - "impl-tools", - "itertools 0.10.5", - "paste", - "postcard", - "primitive-types", - "serde", - "strum 0.25.0", - "strum_macros 0.25.3", -] - -[[package]] -name = "fuel-core-txpool" -version = "0.22.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b08cbcd7c8843a8bb5ee9eca4fd204455e4cefff498d6ce4e2be9a463f57e93c" -dependencies = [ - "anyhow", - "async-trait", - "fuel-core-chain-config 0.22.1", - "fuel-core-metrics 0.22.1", - "fuel-core-services 0.22.1", - "fuel-core-storage 0.22.1", - "fuel-core-types 0.22.1", - "futures", - "parking_lot", - "tokio", - "tokio-rayon", - "tokio-stream", - "tracing", -] - [[package]] name = "fuel-core-txpool" -version = "0.23.0" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "285ed2582d5a8bdc5419a5cc4d6198a78a9f0a7a9ba57441633de2973c814f74" +checksum = "0d353895abdbb02f1e2b4b3ccbeadf3258d352d9150787fb7ca04933ea05834f" dependencies = [ "anyhow", "async-trait", - "fuel-core-chain-config 0.23.0", - "fuel-core-metrics 0.23.0", - "fuel-core-services 0.23.0", - "fuel-core-storage 0.23.0", - "fuel-core-types 0.23.0", + "fuel-core-chain-config", + "fuel-core-metrics", + "fuel-core-services", + "fuel-core-storage", + "fuel-core-types", "futures", "parking_lot", "tokio", @@ -1679,32 +1398,14 @@ dependencies = [ [[package]] name = "fuel-core-types" -version = "0.22.1" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a118f93a711e9a2555767235a37566754d265fdb295490abbfd9b93f38ebb640" +checksum = "b75785b3a26f7c2c05e73e5cef2f59912751c4821b40225e089199c7fb8712d7" dependencies = [ "anyhow", "bs58", "derive_more", - "fuel-vm 0.43.2", - "secrecy", - "serde", - "tai64", - "thiserror", - "zeroize", -] - -[[package]] -name = "fuel-core-types" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50e855f688cf9a6f61f60663f03e217d821c4ade7a08d15ce21b54348612c873" -dependencies = [ - "anyhow", - "bs58", - "derivative", - "derive_more", - "fuel-vm 0.47.1", + "fuel-vm", "secrecy", "serde", "tai64", @@ -1722,28 +1423,7 @@ dependencies = [ "coins-bip39", "ecdsa", "ed25519-dalek", - "fuel-types 0.43.2", - "k256", - "lazy_static", - "p256", - "rand", - "secp256k1", - "serde", - "sha2", - "zeroize", -] - -[[package]] -name = "fuel-crypto" -version = "0.47.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f00ba92f0e13a0dd06a7ad4e9a61221dc43d665519b50bfdb18755aebfdcf0" -dependencies = [ - "coins-bip32", - "coins-bip39", - "ecdsa", - "ed25519-dalek", - "fuel-types 0.47.1", + "fuel-types", "k256", "lazy_static", "p256", @@ -1766,18 +1446,6 @@ dependencies = [ "synstructure", ] -[[package]] -name = "fuel-derive" -version = "0.47.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b9b265467fe9d3d613a5bae9b8d3005d558d3e830dc416c9836bc16609a000f" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.50", - "synstructure", -] - [[package]] name = "fuel-merkle" version = "0.43.2" @@ -1786,22 +1454,7 @@ checksum = "89143dd80b29dda305fbb033bc7f868834445ef6b361bf920f0077938fb6c0bc" dependencies = [ "derive_more", "digest", - "fuel-storage 0.43.2", - "hashbrown 0.13.2", - "hex", - "serde", - "sha2", -] - -[[package]] -name = "fuel-merkle" -version = "0.47.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b21ea035ff06a28791c862496c3b03cfb2d87778476c419724796e945e282ad" -dependencies = [ - "derive_more", - "digest", - "fuel-storage 0.47.1", + "fuel-storage", "hashbrown 0.13.2", "hex", "serde", @@ -1814,12 +1467,6 @@ version = "0.43.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "901aee4b46684e483d2c04d40e5ac1b8ccda737ac5a363507b44b9eb23b0fdaa" -[[package]] -name = "fuel-storage" -version = "0.47.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1048957b744e448840eb9a09cb58c4647dec32e1cf49c0029e5445cbdc86f6d2" - [[package]] name = "fuel-tx" version = "0.43.2" @@ -1829,39 +1476,17 @@ dependencies = [ "bitflags 2.4.2", "derivative", "derive_more", - "fuel-asm 0.43.2", - "fuel-crypto 0.43.2", - "fuel-merkle 0.43.2", - "fuel-types 0.43.2", - "hashbrown 0.14.3", - "itertools 0.10.5", - "rand", - "serde", - "serde_json", - "strum 0.24.1", - "strum_macros 0.24.3", -] - -[[package]] -name = "fuel-tx" -version = "0.47.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8dc917bb2d1892ef6792624782bed7cee5670f3f836b344f06c4233bb1124aff" -dependencies = [ - "bitflags 2.4.2", - "derivative", - "derive_more", - "fuel-asm 0.47.1", - "fuel-crypto 0.47.1", - "fuel-merkle 0.47.1", - "fuel-types 0.47.1", + "fuel-asm", + "fuel-crypto", + "fuel-merkle", + "fuel-types", "hashbrown 0.14.3", "itertools 0.10.5", "rand", "serde", "serde_json", - "strum 0.24.1", - "strum_macros 0.24.3", + "strum", + "strum_macros", ] [[package]] @@ -1870,19 +1495,7 @@ version = "0.43.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "148b59be5c54bafff692310663cbce3f097a2a7ff5533224dcfdf387578a72b0" dependencies = [ - "fuel-derive 0.43.2", - "hex", - "rand", - "serde", -] - -[[package]] -name = "fuel-types" -version = "0.47.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2444c92791b02016aa1cbab6cfa38e34920e61ec61d564f7bdb3ad8ddfae35de" -dependencies = [ - "fuel-derive 0.47.1", + "fuel-derive", "hex", "rand", "serde", @@ -1900,43 +1513,12 @@ dependencies = [ "derivative", "derive_more", "ethnum", - "fuel-asm 0.43.2", - "fuel-crypto 0.43.2", - "fuel-merkle 0.43.2", - "fuel-storage 0.43.2", - "fuel-tx 0.43.2", - "fuel-types 0.43.2", - "hashbrown 0.14.3", - "itertools 0.10.5", - "libm", - "paste", - "percent-encoding", - "primitive-types", - "serde", - "sha3", - "static_assertions", - "strum 0.24.1", - "tai64", -] - -[[package]] -name = "fuel-vm" -version = "0.47.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e29c2333edbf3c55906b92a5f3dfb9639e2b0eabc7fd754e7a8e18d67ded3c2" -dependencies = [ - "async-trait", - "backtrace", - "bitflags 2.4.2", - "derivative", - "derive_more", - "ethnum", - "fuel-asm 0.47.1", - "fuel-crypto 0.47.1", - "fuel-merkle 0.47.1", - "fuel-storage 0.47.1", - "fuel-tx 0.47.1", - "fuel-types 0.47.1", + "fuel-asm", + "fuel-crypto", + "fuel-merkle", + "fuel-storage", + "fuel-tx", + "fuel-types", "hashbrown 0.14.3", "itertools 0.10.5", "libm", @@ -1946,59 +1528,42 @@ dependencies = [ "serde", "sha3", "static_assertions", - "strum 0.24.1", + "strum", "tai64", ] [[package]] name = "fuels" -version = "0.55.0" +version = "0.55.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d0761be35fa13d61c0220aa4535d3cc990542032abfc006bef709121a402637" +checksum = "38897acad45f2d7a89a00cb8937982176e622881cd200a3482673ddce26cb906" dependencies = [ - "fuel-core 0.22.1", - "fuel-core-client 0.22.1", - "fuel-crypto 0.43.2", - "fuel-tx 0.43.2", - "fuels-accounts 0.55.0", - "fuels-core 0.55.0", - "fuels-macros 0.55.0", - "fuels-programs 0.55.0", - "fuels-test-helpers 0.55.0", -] - -[[package]] -name = "fuels" -version = "0.56.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b21f3e84f5aa46e69a6415daf717e572dfacaf1540243e6458d033d35a6f9fe0" -dependencies = [ - "fuel-core 0.23.0", - "fuel-core-client 0.23.0", - "fuel-crypto 0.47.1", - "fuel-tx 0.47.1", - "fuels-accounts 0.56.0", - "fuels-core 0.56.0", - "fuels-macros 0.56.0", - "fuels-programs 0.56.0", - "fuels-test-helpers 0.56.0", + "fuel-core", + "fuel-core-client", + "fuel-crypto", + "fuel-tx", + "fuels-accounts", + "fuels-core", + "fuels-macros", + "fuels-programs", + "fuels-test-helpers", ] [[package]] name = "fuels-accounts" -version = "0.55.0" +version = "0.55.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04ddc69fefff879a914aa06b2d7e5396a596399e6db4383015a3d222699f4b31" +checksum = "05228cc135d39665a33eca3bfa440e595f4038e89f6401d265ace1ebf07ad897" dependencies = [ "async-trait", "chrono", "elliptic-curve", "eth-keystore", - "fuel-core-client 0.22.1", - "fuel-crypto 0.43.2", - "fuel-tx 0.43.2", - "fuel-types 0.43.2", - "fuels-core 0.55.0", + "fuel-core-client", + "fuel-crypto", + "fuel-tx", + "fuel-types", + "fuels-core", "hex", "rand", "semver", @@ -2009,55 +1574,14 @@ dependencies = [ "zeroize", ] -[[package]] -name = "fuels-accounts" -version = "0.56.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07e3eff2a1756fa81aa7e218b8ecefe4c70d44b38011db73d3181c99f3388259" -dependencies = [ - "async-trait", - "chrono", - "elliptic-curve", - "eth-keystore", - "fuel-core-client 0.23.0", - "fuel-core-types 0.23.0", - "fuel-crypto 0.47.1", - "fuel-tx 0.47.1", - "fuel-types 0.47.1", - "fuels-core 0.56.0", - "rand", - "semver", - "tai64", - "thiserror", - "tokio", - "tracing", - "zeroize", -] - [[package]] name = "fuels-code-gen" -version = "0.55.0" +version = "0.55.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19daefd4e70d4b6998b6650dea23d982360650f8710e5c7bc6e8a5b91228814d" +checksum = "84609f3a2ecf5d6ab843a2ac5eed7910276b1f965e9b53b4c08db65d05b2ea23" dependencies = [ "Inflector", - "fuel-abi-types 0.3.0", - "itertools 0.12.1", - "proc-macro2", - "quote", - "regex", - "serde_json", - "syn 2.0.50", -] - -[[package]] -name = "fuels-code-gen" -version = "0.56.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20cf2c8670901a44f89a983a27b2fa831e1af19f6788cea1186c9b48514cc2a4" -dependencies = [ - "Inflector", - "fuel-abi-types 0.4.0", + "fuel-abi-types", "itertools 0.12.1", "proc-macro2", "quote", @@ -2068,49 +1592,22 @@ dependencies = [ [[package]] name = "fuels-core" -version = "0.55.0" +version = "0.55.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0389e16906fbb1119006e5c09ce789aeb6d0d8e344372c077ac8484bab8a12b9" +checksum = "3bc9e186d686c0baecc63db3faa7690f96fe0b45544a9fc10351226872109117" dependencies = [ "async-trait", "bech32", "chrono", - "fuel-abi-types 0.3.0", - "fuel-asm 0.43.2", - "fuel-core-chain-config 0.22.1", - "fuel-core-client 0.22.1", - "fuel-crypto 0.43.2", - "fuel-tx 0.43.2", - "fuel-types 0.43.2", - "fuel-vm 0.43.2", - "fuels-macros 0.55.0", - "hex", - "itertools 0.12.1", - "serde", - "serde_json", - "sha2", - "thiserror", - "uint", -] - -[[package]] -name = "fuels-core" -version = "0.56.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5af00939974c1796cc05f44f20b0e31b8d6a03e9aeb1195fb2a9b68cef59920" -dependencies = [ - "async-trait", - "bech32", - "chrono", - "fuel-abi-types 0.4.0", - "fuel-asm 0.47.1", - "fuel-core-chain-config 0.23.0", - "fuel-core-client 0.23.0", - "fuel-crypto 0.47.1", - "fuel-tx 0.47.1", - "fuel-types 0.47.1", - "fuel-vm 0.47.1", - "fuels-macros 0.56.0", + "fuel-abi-types", + "fuel-asm", + "fuel-core-chain-config", + "fuel-core-client", + "fuel-crypto", + "fuel-tx", + "fuel-types", + "fuel-vm", + "fuels-macros", "hex", "itertools 0.12.1", "serde", @@ -2122,11 +1619,11 @@ dependencies = [ [[package]] name = "fuels-macros" -version = "0.55.0" +version = "0.55.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ce17afcb07246c221da0d5a55d4ffc748d4b49a0fd7058a90b1ad1c6f0023a7" +checksum = "022f92bd0309e4929b87f9ca6f6731843c3056da7a1b8028ce6cced96e239b47" dependencies = [ - "fuels-code-gen 0.55.0", + "fuels-code-gen", "itertools 0.12.1", "proc-macro2", "quote", @@ -2134,54 +1631,20 @@ dependencies = [ "syn 2.0.50", ] -[[package]] -name = "fuels-macros" -version = "0.56.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "652003ee5a73e3674c818d9175e61c17311593e40d8281e00f08e64d7d29a076" -dependencies = [ - "fuels-code-gen 0.56.0", - "itertools 0.12.1", - "proc-macro2", - "quote", - "rand", - "syn 2.0.50", -] - -[[package]] -name = "fuels-programs" -version = "0.55.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7898f4e9f3b438de60b55644806bf2718e1c09e0605180c19fb44a8ca0a1165" -dependencies = [ - "async-trait", - "bytes", - "fuel-abi-types 0.3.0", - "fuel-asm 0.43.2", - "fuel-tx 0.43.2", - "fuel-types 0.43.2", - "fuels-accounts 0.55.0", - "fuels-core 0.55.0", - "itertools 0.12.1", - "rand", - "serde_json", - "tokio", -] - [[package]] name = "fuels-programs" -version = "0.56.0" +version = "0.55.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1d779783fc8c194864a596bfca82fda107a425398b49ad330de7b41f2622fd4" +checksum = "2f941848fcf536be82abc2ab1bb73e3acfa9830ae93c1f911f853e149e58bce2" dependencies = [ "async-trait", "bytes", - "fuel-abi-types 0.4.0", - "fuel-asm 0.47.1", - "fuel-tx 0.47.1", - "fuel-types 0.47.1", - "fuels-accounts 0.56.0", - "fuels-core 0.56.0", + "fuel-abi-types", + "fuel-asm", + "fuel-tx", + "fuel-types", + "fuels-accounts", + "fuels-core", "itertools 0.12.1", "rand", "serde_json", @@ -2190,48 +1653,20 @@ dependencies = [ [[package]] name = "fuels-test-helpers" -version = "0.55.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7620c418f9501713c2cd976f216b9d46ff847a4d681af56e36af17ad26dac14e" -dependencies = [ - "fuel-core 0.22.1", - "fuel-core-chain-config 0.22.1", - "fuel-core-client 0.22.1", - "fuel-core-poa 0.22.1", - "fuel-core-services 0.22.1", - "fuel-crypto 0.43.2", - "fuel-tx 0.43.2", - "fuel-types 0.43.2", - "fuels-accounts 0.55.0", - "fuels-core 0.55.0", - "futures", - "hex", - "portpicker", - "rand", - "serde", - "serde_json", - "serde_with 3.6.1", - "tempfile", - "tokio", - "which 5.0.0", -] - -[[package]] -name = "fuels-test-helpers" -version = "0.56.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99e1a8ed34d466df259afb3c210270fca59c8d66be77c00f428c49e61f35baeb" -dependencies = [ - "fuel-core 0.23.0", - "fuel-core-chain-config 0.23.0", - "fuel-core-client 0.23.0", - "fuel-core-poa 0.23.0", - "fuel-core-services 0.23.0", - "fuel-crypto 0.47.1", - "fuel-tx 0.47.1", - "fuel-types 0.47.1", - "fuels-accounts 0.56.0", - "fuels-core 0.56.0", +version = "0.55.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63d03455eb05d3fd9a102ecba9cc769cd84f8d4f64b00b29e74cab961b3a4997" +dependencies = [ + "fuel-core", + "fuel-core-chain-config", + "fuel-core-client", + "fuel-core-poa", + "fuel-core-services", + "fuel-crypto", + "fuel-tx", + "fuel-types", + "fuels-accounts", + "fuels-core", "futures", "hex", "portpicker", @@ -2241,7 +1676,7 @@ dependencies = [ "serde_with 3.6.1", "tempfile", "tokio", - "which 6.0.1", + "which", ] [[package]] @@ -2660,30 +2095,6 @@ dependencies = [ "unicode-normalization", ] -[[package]] -name = "impl-tools" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d82c305b1081f1a99fda262883c788e50ab57d36c00830bdd7e0a82894ad965c" -dependencies = [ - "autocfg", - "impl-tools-lib", - "proc-macro-error", - "syn 2.0.50", -] - -[[package]] -name = "impl-tools-lib" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85d3946d886eaab0702fa0c6585adcced581513223fa9df7ccfabbd9fa331a88" -dependencies = [ - "proc-macro-error", - "proc-macro2", - "quote", - "syn 2.0.50", -] - [[package]] name = "indexmap" version = "1.9.3" @@ -2818,9 +2229,9 @@ checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "market-contract" -version = "0.0.0" +version = "0.1.0" dependencies = [ - "fuels 0.56.0", + "fuels", "tokio", ] @@ -3084,16 +2495,6 @@ version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" -[[package]] -name = "pretty_assertions" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66" -dependencies = [ - "diff", - "yansi", -] - [[package]] name = "primeorder" version = "0.13.6" @@ -3123,29 +2524,6 @@ dependencies = [ "toml_edit", ] -[[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.78" @@ -3179,18 +2557,6 @@ dependencies = [ "prometheus-client-derive-encode", ] -[[package]] -name = "prometheus-client" -version = "0.22.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1ca959da22a332509f2a73ae9e5f23f9dcfc31fd3a54d71f159495bd5909baa" -dependencies = [ - "dtoa", - "itoa", - "parking_lot", - "prometheus-client-derive-encode", -] - [[package]] name = "prometheus-client-derive-encode" version = "0.4.2" @@ -3832,30 +3198,17 @@ dependencies = [ "anyhow", "clap", "dotenv", - "fuels 0.55.0", + "fuels", "spark-market-sdk", "tokio", ] -[[package]] -name = "spark-clob" -version = "0.1.0" -dependencies = [ - "anyhow", - "dotenv", - "fuels 0.55.0", - "pretty_assertions", - "rand", - "src20_sdk", - "tokio", -] - [[package]] name = "spark-market-sdk" version = "0.1.0" dependencies = [ "anyhow", - "fuels 0.55.0", + "fuels", "rand", "tokio", ] @@ -3885,21 +3238,6 @@ dependencies = [ "der", ] -[[package]] -name = "src20_sdk" -version = "0.0.3" -source = "git+https://github.com/compolabs/src-20.git?branch=master#d05776384daab572e16f54038db1d266ba908883" -dependencies = [ - "dotenv", - "fuels 0.55.0", - "rand", - "serde", - "serde_json", - "sha2", - "tai64", - "tokio", -] - [[package]] name = "stable_deref_trait" version = "1.2.0" @@ -3930,15 +3268,9 @@ version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f" dependencies = [ - "strum_macros 0.24.3", + "strum_macros", ] -[[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.24.3" @@ -3952,19 +3284,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "strum_macros" -version = "0.25.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" -dependencies = [ - "heck 0.4.1", - "proc-macro2", - "quote", - "rustversion", - "syn 2.0.50", -] - [[package]] name = "subtle" version = "2.5.0" @@ -4571,18 +3890,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "which" -version = "6.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8211e4f58a2b2805adfbefbc07bab82958fc91e3836339b1ab7ae32465dce0d7" -dependencies = [ - "either", - "home", - "rustix", - "winsafe", -] - [[package]] name = "winapi" version = "0.3.9" @@ -4765,12 +4072,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "winsafe" -version = "0.0.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d135d17ab770252ad95e9a872d365cf3090e3be864a34ab46f48555993efc904" - [[package]] name = "wyz" version = "0.5.1" @@ -4780,12 +4081,6 @@ dependencies = [ "tap", ] -[[package]] -name = "yansi" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" - [[package]] name = "zerocopy" version = "0.7.32" diff --git a/Cargo.toml b/Cargo.toml index 4e984af..f20176e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,20 +1,23 @@ -# TODO: this has to be changed into a workspace -workspace = { members = ["spark-cli", "spark-market-sdk", "market-contract"] } -[package] -name = "spark-clob" -description = "A cargo-generate template for Rust + Sway integration testing." +[workspace] +resolver = "1" +members = [ + "spark-cli", + "spark-market-sdk", + "market-contract" +] + +[workspace.package] +authors = ["alexey "] version = "0.1.0" edition = "2021" -authors = ["alexey "] license = "Apache-2.0" +rust-version = "1.75.0" -[dependencies] +[workspace.dependencies] +anyhow = "1.0.81" +# TODO: version 0.56.0 seems to not support beta-5 testnet deployments while 0.55.0 does fuels = { version = "0.55.0", features = ["fuel-core-lib"] } -rand = "0.8.5" tokio = { version = "1.12", features = ["rt", "macros"] } +# TODO: remove src20_sdk from repo entirely src20_sdk = { git = "https://github.com/compolabs/src-20.git", branch = "master" } -dotenv = "0.15.0" -anyhow = "1.0.81" -[dev-dependencies] -pretty_assertions = "1" diff --git a/Forc.toml b/Forc.toml deleted file mode 100644 index cf2cda2..0000000 --- a/Forc.toml +++ /dev/null @@ -1,2 +0,0 @@ -[workspace] -members = ["market-contract"] diff --git a/market-contract/Cargo.toml b/market-contract/Cargo.toml index 580083c..b12eba9 100644 --- a/market-contract/Cargo.toml +++ b/market-contract/Cargo.toml @@ -1,15 +1,16 @@ [package] name = "market-contract" -version = "0.0.0" -authors = ["Compo Labs"] -edition = "2021" -license = "Apache-2.0" +version = "0.1.0" +authors = { workspace = true } +edition = { workspace = true } +license = { workspace = true } +rust-version = { workspace = true } [dependencies] -fuels = { version = "0.56.0", features = ["fuel-core-lib"] } -tokio = { version = "1.12", features = ["rt", "macros"] } +fuels = { workspace = true } +tokio = { workspace = true } [[test]] harness = true name = "integration_tests" -path = "tests/harness.rs" \ No newline at end of file +path = "tests/harness.rs" diff --git a/Forc.lock b/market-contract/Forc.lock similarity index 100% rename from Forc.lock rename to market-contract/Forc.lock diff --git a/fuel-toolchain.toml b/market-contract/fuel-toolchain.toml similarity index 100% rename from fuel-toolchain.toml rename to market-contract/fuel-toolchain.toml diff --git a/market-contract/src/data_structures/balance.sw b/market-contract/src/data_structures/balance.sw index 6b08287..da47bac 100644 --- a/market-contract/src/data_structures/balance.sw +++ b/market-contract/src/data_structures/balance.sw @@ -26,11 +26,17 @@ impl Balance { pub fn debit(ref mut self, amount: u64, asset: AssetType) { match asset { AssetType::Base => { - require(amount <= self.base, AccountError::InsufficientBalance((self.base, amount))); + require( + amount <= self.base, + AccountError::InsufficientBalance((self.base, amount)), + ); self.base -= amount; }, AssetType::Quote => { - require(amount <= self.quote, AccountError::InsufficientBalance((self.quote, amount))); + require( + amount <= self.quote, + AccountError::InsufficientBalance((self.quote, amount)), + ); self.quote -= amount; } }; diff --git a/market-contract/src/data_structures/order.sw b/market-contract/src/data_structures/order.sw index ac302fc..3372b9d 100644 --- a/market-contract/src/data_structures/order.sw +++ b/market-contract/src/data_structures/order.sw @@ -3,7 +3,7 @@ library; use ::data_structures::asset_type::AssetType; use ::data_structures::order_type::OrderType; use ::errors::OrderError; -use std::hash::{sha256, Hash}; +use std::hash::{Hash, sha256}; pub struct Order { amount: u64, diff --git a/market-contract/src/interface.sw b/market-contract/src/interface.sw index 5653174..505422c 100644 --- a/market-contract/src/interface.sw +++ b/market-contract/src/interface.sw @@ -11,7 +11,12 @@ abi Market { fn withdraw(amount: u64, asset: AssetId); #[storage(read, write)] - fn open_order(amount: u64, asset: AssetId, order_type: OrderType, price: u64) -> b256; + fn open_order( + amount: u64, + asset: AssetId, + order_type: OrderType, + price: u64, + ) -> b256; #[storage(read, write)] fn cancel_order(order_id: b256); @@ -41,5 +46,11 @@ abi Info { fn config() -> (Address, AssetId, u32, AssetId, u32, u32); - fn order_id(amount: u64, asset: AssetId, order_type: OrderType, owner: Identity, price: u64) -> b256; + fn order_id( + amount: u64, + asset: AssetId, + order_type: OrderType, + owner: Identity, + price: u64, + ) -> b256; } diff --git a/market-contract/src/main.sw b/market-contract/src/main.sw index 86770f8..f1172fe 100644 --- a/market-contract/src/main.sw +++ b/market-contract/src/main.sw @@ -9,19 +9,19 @@ mod math; use ::data_structures::{ account::Account, - asset_type::AssetType, - balance::Balance, + asset_type::AssetType, + balance::Balance, + order::Order, order_type::OrderType, - order::Order }; use ::errors::{AccountError, AssetError, AuthError, OrderError}; use ::events::{ CancelOrderEvent, - DepositEvent, - OpenOrderEvent, - SetFeeEvent, - TradeEvent, - WithdrawEvent + DepositEvent, + OpenOrderEvent, + SetFeeEvent, + TradeEvent, + WithdrawEvent, }; use ::interface::{Info, Market}; use ::math::*; @@ -29,13 +29,15 @@ use ::math::*; use std::{ asset::transfer, call_frames::msg_asset_id, - constants::{BASE_ASSET_ID, ZERO_B256}, + constants::{ + BASE_ASSET_ID, + ZERO_B256, + }, context::msg_amount, hash::{ Hash, sha256, }, - // TODO: glob import because compiler will not import impl block otherwise storage::storage_vec::*, }; @@ -51,20 +53,15 @@ configurable { storage { // Balance of each user account: StorageMap = StorageMap {}, - // Global fee for regular users fee: u64 = 0, - // All of the currently open orders orders: StorageMap = StorageMap {}, - // Internal handling of indexes for user_orders user_order_indexes: StorageMap> = StorageMap {}, - // Fee for premium users which ought to be smaller than the global fee // Map(user => fee) premium_user: StorageMap = StorageMap {}, - // Indexing orders by user user_orders: StorageMap> = StorageMap {}, } @@ -73,7 +70,10 @@ impl Market for Contract { #[payable] #[storage(read, write)] fn deposit() { - require(msg_asset_id() == BASE_ASSET || msg_asset_id() == QUOTE_ASSET, AssetError::InvalidAsset); + require( + msg_asset_id() == BASE_ASSET || msg_asset_id() == QUOTE_ASSET, + AssetError::InvalidAsset, + ); let user = msg_sender().unwrap(); let (amount, asset_type) = match msg_asset_id() == BASE_ASSET { @@ -89,18 +89,25 @@ impl Market for Contract { account.liquid.credit(msg_amount(), asset_type); storage.account.insert(user, account); - log(DepositEvent { amount: msg_amount(), asset: msg_asset_id(), user }); + log(DepositEvent { + amount: msg_amount(), + asset: msg_asset_id(), + user, + }); } #[storage(read, write)] fn withdraw(amount: u64, asset: AssetId) { - require(asset == BASE_ASSET || asset == QUOTE_ASSET, AssetError::InvalidAsset); - + require( + asset == BASE_ASSET || asset == QUOTE_ASSET, + AssetError::InvalidAsset, + ); + let user = msg_sender().unwrap(); let account = storage.account.get(user).try_read(); require(account.is_some(), AccountError::InvalidUser); - + let mut account = account.unwrap(); // TODO: Is this division correct? @@ -113,14 +120,26 @@ impl Market for Contract { storage.account.insert(user, account); transfer(user, asset, internal_amount); - - log(WithdrawEvent { amount: internal_amount, asset, user }); + + log(WithdrawEvent { + amount: internal_amount, + asset, + user, + }); } #[storage(read, write)] // TODO: what types should amount, price be? - fn open_order(amount: u64, asset: AssetId, order_type: OrderType, price: u64) -> b256 { - require(asset == BASE_ASSET || asset == QUOTE_ASSET, AssetError::InvalidAsset); + fn open_order( + amount: u64, + asset: AssetId, + order_type: OrderType, + price: u64, + ) -> b256 { + require( + asset == BASE_ASSET || asset == QUOTE_ASSET, + AssetError::InvalidAsset, + ); let user = msg_sender().unwrap(); let account = storage.account.get(user).try_read(); @@ -129,7 +148,11 @@ impl Market for Contract { require(account.is_some(), AccountError::InvalidUser); let mut account = account.unwrap(); - let asset_type = if asset == BASE_ASSET { AssetType::Base } else { AssetType::Quote }; + let asset_type = if asset == BASE_ASSET { + AssetType::Base + } else { + AssetType::Quote + }; match order_type { OrderType::Sell => { @@ -151,15 +174,25 @@ impl Market for Contract { // TODO: these "amounts" do not return expected values let (amount, asset_type) = match asset == BASE_ASSET { true => { - let amount = base_to_quote_amount(amount, BASE_ASSET_DECIMALS, price, PRICE_DECIMALS, QUOTE_ASSET_DECIMALS); + let amount = base_to_quote_amount( + amount, + BASE_ASSET_DECIMALS, + price, + PRICE_DECIMALS, + QUOTE_ASSET_DECIMALS, + ); let asset_type = AssetType::Quote; - (amount, asset_type) }, false => { - let amount = quote_to_base_amount(amount, BASE_ASSET_DECIMALS, price, PRICE_DECIMALS, QUOTE_ASSET_DECIMALS); + let amount = quote_to_base_amount( + amount, + BASE_ASSET_DECIMALS, + price, + PRICE_DECIMALS, + QUOTE_ASSET_DECIMALS, + ); let asset_type = AssetType::Base; - (amount, asset_type) }, }; @@ -183,7 +216,7 @@ impl Market for Contract { .is_none(), OrderError::DuplicateOrder, ); - + // Store the new order and update the state of the user's account storage.orders.insert(order_id, order); storage.account.insert(user, account); @@ -238,12 +271,28 @@ impl Market for Contract { OrderType::Buy => { // TODO: these "amounts" do not return expected values let amount = match order.asset == BASE_ASSET { - true => quote_to_base_amount(order.amount, BASE_ASSET_DECIMALS, order.price, PRICE_DECIMALS, QUOTE_ASSET_DECIMALS), - false => base_to_quote_amount(order.amount, BASE_ASSET_DECIMALS, order.price, PRICE_DECIMALS, QUOTE_ASSET_DECIMALS), + true => quote_to_base_amount( + order.amount, + BASE_ASSET_DECIMALS, + order.price, + PRICE_DECIMALS, + QUOTE_ASSET_DECIMALS, + ), + false => base_to_quote_amount( + order.amount, + BASE_ASSET_DECIMALS, + order.price, + PRICE_DECIMALS, + QUOTE_ASSET_DECIMALS, + ), }; - + // Swap the asset types because you've payed with what you have when you were buying the other asset - let asset_type = if order.asset == BASE_ASSET { AssetType::Quote } else { AssetType::Base }; + let asset_type = if order.asset == BASE_ASSET { + AssetType::Quote + } else { + AssetType::Base + }; account.locked.credit(amount, asset_type); account.liquid.debit(amount, asset_type); @@ -255,20 +304,41 @@ impl Market for Contract { let index = storage.user_order_indexes.get(user).get(order_id).read(); let order_count = storage.user_orders.get(user).len(); - require(storage.user_order_indexes.get(user).remove(order_id), OrderError::FailedToRemove); // TODO: Different error - + require( + storage + .user_order_indexes + .get(user) + .remove(order_id), + OrderError::FailedToRemove, + ); // TODO: Different error if order_count == 1 { // There's only 1 element so no swapping. Pop it from the end - require(storage.user_orders.get(user).pop().unwrap() == order_id, OrderError::FailedToRemove); + require( + storage + .user_orders + .get(user) + .pop() + .unwrap() == order_id, + OrderError::FailedToRemove, + ); } else { // The order ID at the end is about to have its index changed via swap_remove() let last_element = storage.user_orders.get(user).last().unwrap().read(); // Remove the current order by replacing it with the order at the end of storage vec - require(storage.user_orders.get(user).swap_remove(index) == order_id, OrderError::FailedToRemove); + require( + storage + .user_orders + .get(user) + .swap_remove(index) == order_id, + OrderError::FailedToRemove, + ); // Last element has been shifted so update its index - storage.user_order_indexes.get(user).insert(last_element, index); + storage + .user_order_indexes + .get(user) + .insert(last_element, index); } storage.account.insert(user, account); @@ -303,7 +373,9 @@ impl Market for Contract { // Order types must be different in order to trade (buy against sell) // Asset types must be the same you trade asset A for asset A instead of B - if alice.order_type == bob.order_type || alice.asset != bob.asset { + if alice.order_type == bob.order_type + || alice.asset != bob.asset + { continue; } @@ -311,7 +383,13 @@ impl Market for Contract { let bob_id = bob.id(); // Attempt to trade orders, figure out amounts that can be traded - let trade = attempt_trade(alice, bob, BASE_ASSET_DECIMALS, QUOTE_ASSET_DECIMALS, PRICE_DECIMALS); + let trade = attempt_trade( + alice, + bob, + BASE_ASSET_DECIMALS, + QUOTE_ASSET_DECIMALS, + PRICE_DECIMALS, + ); // Failed to trade ex. insufficient price or remaining amount if trade.is_err() { @@ -319,7 +397,12 @@ impl Market for Contract { } // Retrieve the amount of each asset that can be traded - let (alice_order_amount_decrease, alice_account_delta, bob_order_amount_decrease, bob_account_delta) = trade.unwrap(); + let ( + alice_order_amount_decrease, + alice_account_delta, + bob_order_amount_decrease, + bob_account_delta, + ) = trade.unwrap(); // Update the order quantities with the amounts that can be traded alice.amount -= alice_order_amount_decrease; @@ -327,12 +410,18 @@ impl Market for Contract { // Update the accounts for bob and alice based on the traded assets let mut bob_account = storage.account.get(bob.owner).read(); - - alice_account.locked.debit(alice_account_delta, alice.asset_type); - alice_account.liquid.credit(bob_account_delta, bob.asset_type); + + alice_account + .locked + .debit(alice_account_delta, alice.asset_type); + alice_account + .liquid + .credit(bob_account_delta, bob.asset_type); bob_account.locked.debit(bob_account_delta, bob.asset_type); - bob_account.liquid.credit(alice_account_delta, alice.asset_type); + bob_account + .liquid + .credit(alice_account_delta, alice.asset_type); // Save bob's account because his order is finished // For optimization save alice at the end of the batch @@ -401,7 +490,13 @@ impl Market for Contract { #[storage(write)] fn set_fee(amount: u64, user: Option) { - require(msg_sender().unwrap().as_address().unwrap() == OWNER, AuthError::Unauthorized); + require( + msg_sender() + .unwrap() + .as_address() + .unwrap() == OWNER, + AuthError::Unauthorized, + ); match user { Some(identity) => storage.premium_user.insert(identity, amount), @@ -437,11 +532,27 @@ impl Info for Contract { } fn config() -> (Address, AssetId, u32, AssetId, u32, u32) { - (OWNER, BASE_ASSET, BASE_ASSET_DECIMALS, QUOTE_ASSET, QUOTE_ASSET_DECIMALS, PRICE_DECIMALS) + ( + OWNER, + BASE_ASSET, + BASE_ASSET_DECIMALS, + QUOTE_ASSET, + QUOTE_ASSET_DECIMALS, + PRICE_DECIMALS, + ) } - fn order_id(amount: u64, asset: AssetId, order_type: OrderType, owner: Identity, price: u64) -> b256 { - require(asset == BASE_ASSET || asset == QUOTE_ASSET, AssetError::InvalidAsset); + fn order_id( + amount: u64, + asset: AssetId, + order_type: OrderType, + owner: Identity, + price: u64, + ) -> b256 { + require( + asset == BASE_ASSET || asset == QUOTE_ASSET, + AssetError::InvalidAsset, + ); let asset_type = if asset == BASE_ASSET { AssetType::Base } else { diff --git a/market-contract/src/math.sw b/market-contract/src/math.sw index a40c133..7bb6e15 100644 --- a/market-contract/src/math.sw +++ b/market-contract/src/math.sw @@ -1,6 +1,6 @@ library; -use ::data_structures::{order_type::OrderType, order::Order, asset_type::AssetType}; +use ::data_structures::{asset_type::AssetType, order::Order, order_type::OrderType}; use ::errors::TradeError; use std::u128::U128; @@ -32,18 +32,25 @@ fn calc_amount(buy_amount: u64, buy_price: u64, sell_price: u64) -> u64 { } pub fn attempt_trade( - alice: Order, - bob: Order, - base_asset_decimals: u32, - quote_asset_decimals: u32, - price_decimals: u32 -) -> Result<(u64, u64, u64, u64), TradeError> { + alice: Order, + bob: Order, + base_asset_decimals: u32, + quote_asset_decimals: u32, + price_decimals: u32, +) -> Result<(u64, u64, u64, u64), TradeError> { // In this function: // Decrease the order size for alice and bob until they are 0 == their orders are fulfilled // Track the amount that each account has to transfer for their trade // To keep the code DRY (do not repeat yourself) force the seller to be left side, buyer right - let (seller, buyer, mut seller_order_amount_decrease, mut seller_account_delta, mut buyer_order_amount_decrease, mut buyer_account_delta) = match alice.order_type { + let ( + seller, + buyer, + mut seller_order_amount_decrease, + mut seller_account_delta, + mut buyer_order_amount_decrease, + mut buyer_account_delta, + ) = match alice.order_type { OrderType::Sell => (alice, bob, 0, 0, 0, 0), OrderType::Buy => (bob, alice, 0, 0, 0, 0), }; @@ -58,15 +65,34 @@ pub fn attempt_trade( if seller.amount < buyer_buy_amount { seller_order_amount_decrease = seller.amount; buyer_order_amount_decrease = seller.amount; - buyer_account_delta = base_to_quote_amount(buyer_order_amount_decrease, base_asset_decimals, seller.price, price_decimals, quote_asset_decimals) * quote_asset_decimals.as_u64(); + buyer_account_delta = base_to_quote_amount( + buyer_order_amount_decrease, + base_asset_decimals, + seller + .price, + price_decimals, + quote_asset_decimals, + ) * quote_asset_decimals.as_u64(); } else if buyer_buy_amount < seller.amount { seller_order_amount_decrease = buyer_buy_amount; buyer_order_amount_decrease = buyer_buy_amount; - buyer_account_delta = base_to_quote_amount(buyer_order_amount_decrease, base_asset_decimals, buyer.price, price_decimals, quote_asset_decimals) * quote_asset_decimals.as_u64(); + buyer_account_delta = base_to_quote_amount( + buyer_order_amount_decrease, + base_asset_decimals, + buyer.price, + price_decimals, + quote_asset_decimals, + ) * quote_asset_decimals.as_u64(); } else { seller_order_amount_decrease = buyer_buy_amount; buyer_order_amount_decrease = buyer_buy_amount; - buyer_account_delta = base_to_quote_amount(buyer_order_amount_decrease, base_asset_decimals, buyer.price, price_decimals, quote_asset_decimals) * quote_asset_decimals.as_u64(); + buyer_account_delta = base_to_quote_amount( + buyer_order_amount_decrease, + base_asset_decimals, + buyer.price, + price_decimals, + quote_asset_decimals, + ) * quote_asset_decimals.as_u64(); } seller_account_delta = seller_order_amount_decrease * base_asset_decimals.as_u64(); @@ -76,15 +102,34 @@ pub fn attempt_trade( if seller.amount < buyer_buy_amount { seller_order_amount_decrease = seller.amount; buyer_order_amount_decrease = seller.amount; - buyer_account_delta = quote_to_base_amount(buyer_order_amount_decrease, base_asset_decimals, seller.price, price_decimals, quote_asset_decimals) * base_asset_decimals.as_u64(); + buyer_account_delta = quote_to_base_amount( + buyer_order_amount_decrease, + base_asset_decimals, + seller + .price, + price_decimals, + quote_asset_decimals, + ) * base_asset_decimals.as_u64(); } else if buyer_buy_amount < seller.amount { seller_order_amount_decrease = buyer_buy_amount; buyer_order_amount_decrease = buyer_buy_amount; - buyer_account_delta = quote_to_base_amount(buyer_order_amount_decrease, base_asset_decimals, buyer.price, price_decimals, quote_asset_decimals) * base_asset_decimals.as_u64(); + buyer_account_delta = quote_to_base_amount( + buyer_order_amount_decrease, + base_asset_decimals, + buyer.price, + price_decimals, + quote_asset_decimals, + ) * base_asset_decimals.as_u64(); } else { seller_order_amount_decrease = buyer_buy_amount; buyer_order_amount_decrease = buyer_buy_amount; - buyer_account_delta = quote_to_base_amount(buyer_order_amount_decrease, base_asset_decimals, buyer.price, price_decimals, quote_asset_decimals) * base_asset_decimals.as_u64(); + buyer_account_delta = quote_to_base_amount( + buyer_order_amount_decrease, + base_asset_decimals, + buyer.price, + price_decimals, + quote_asset_decimals, + ) * base_asset_decimals.as_u64(); } seller_account_delta = seller_order_amount_decrease * quote_asset_decimals.as_u64(); @@ -93,14 +138,24 @@ pub fn attempt_trade( // Alice must be returned first (left side arguments) then bob after for caller logic to work match alice.order_type { - OrderType::Sell => Result::Ok((seller_order_amount_decrease, seller_account_delta, buyer_order_amount_decrease, buyer_account_delta)), - OrderType::Buy => Result::Ok((buyer_order_amount_decrease, buyer_account_delta, seller_order_amount_decrease, seller_account_delta)), + OrderType::Sell => Result::Ok(( + seller_order_amount_decrease, + seller_account_delta, + buyer_order_amount_decrease, + buyer_account_delta, + )), + OrderType::Buy => Result::Ok(( + buyer_order_amount_decrease, + buyer_account_delta, + seller_order_amount_decrease, + seller_account_delta, + )), } } pub fn base_to_quote_amount( - amount: u64, - base_asset_decimals: u32, + amount: u64, + base_asset_decimals: u32, base_price: u64, price_decimals: u32, quote_asset_decimals: u32, @@ -113,14 +168,15 @@ pub fn base_to_quote_amount( } pub fn quote_to_base_amount( - amount: u64, - base_asset_decimals: u32, + amount: u64, + base_asset_decimals: u32, base_price: u64, price_decimals: u32, quote_asset_decimals: u32, ) -> u64 { amount.mul_div( - 10_u64.pow(base_asset_decimals + price_decimals - quote_asset_decimals), + 10_u64 + .pow(base_asset_decimals + price_decimals - quote_asset_decimals), base_price, ) } diff --git a/market-contract/tests/functions/core/cancel_order.rs b/market-contract/tests/functions/core/cancel_order.rs index f62a5c8..d110d7d 100644 --- a/market-contract/tests/functions/core/cancel_order.rs +++ b/market-contract/tests/functions/core/cancel_order.rs @@ -2,7 +2,7 @@ use crate::utils::{ interface::core::{cancel_order, deposit, open_order}, setup::{setup, Defaults, OrderType}, }; - + mod success { use super::*; @@ -253,6 +253,6 @@ mod revert { .value; // Revert - cancel_order(&contract.with_account(user.wallet), id).await; + cancel_order(&contract.with_account(user.wallet).unwrap(), id).await; } } diff --git a/market-contract/tests/functions/core/open_order.rs b/market-contract/tests/functions/core/open_order.rs index 02f3572..e74c3cd 100644 --- a/market-contract/tests/functions/core/open_order.rs +++ b/market-contract/tests/functions/core/open_order.rs @@ -382,7 +382,7 @@ mod revert { // Revert open_order( - &contract.with_account(user.wallet), + &contract.with_account(user.wallet).unwrap(), order_amount, asset, order_type, diff --git a/market-contract/tests/functions/core/set_fee.rs b/market-contract/tests/functions/core/set_fee.rs index 37cc0f1..bb2207d 100644 --- a/market-contract/tests/functions/core/set_fee.rs +++ b/market-contract/tests/functions/core/set_fee.rs @@ -100,7 +100,7 @@ mod revert { // Reverts set_fee( - &contract.with_account(user.wallet.clone()), + &contract.with_account(user.wallet.clone()).unwrap(), new_fee, Some(user.identity()), ) diff --git a/market-contract/tests/utils/setup.rs b/market-contract/tests/utils/setup.rs index 445f2f0..08d2314 100644 --- a/market-contract/tests/utils/setup.rs +++ b/market-contract/tests/utils/setup.rs @@ -7,15 +7,16 @@ use fuels::{ types::Identity, }; -// PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("market-contract/out/debug/market-contract.bin"); -const MARKET_CONTRACT_BINARY_PATH: &str = "../market-contract/out/debug/market-contract.bin"; -const MARKET_CONTRACT_STORAGE_PATH: &str = - "../market-contract/out/debug/market-contract-storage_slots.json"; abigen!(Contract( name = "Market", abi = "./market-contract/out/debug/market-contract-abi.json" )); +// PathBuf::from(env!("CARGO_MANIFEST_DIR")).join("market-contract/out/debug/market-contract.bin"); +const MARKET_CONTRACT_BINARY_PATH: &str = "../market-contract/out/debug/market-contract.bin"; +const MARKET_CONTRACT_STORAGE_PATH: &str = + "../market-contract/out/debug/market-contract-storage_slots.json"; + pub(crate) struct Assets { pub(crate) base: Asset, pub(crate) quote: Asset, @@ -137,17 +138,11 @@ pub(crate) async fn setup( let configurables = MarketConfigurables::default() .with_BASE_ASSET(assets.base.id.clone()) - .unwrap() .with_BASE_ASSET_DECIMALS(assets.base.decimals) - .unwrap() .with_QUOTE_ASSET(assets.quote.id.clone()) - .unwrap() .with_QUOTE_ASSET_DECIMALS(assets.quote.decimals) - .unwrap() .with_PRICE_DECIMALS(price_decimals) - .unwrap() - .with_OWNER(owner.address().into()) - .unwrap(); + .with_OWNER(owner.address().into()); let contract_configuration = LoadConfiguration::default() .with_storage_configuration(storage_configuration.unwrap()) diff --git a/spark-cli/Cargo.toml b/spark-cli/Cargo.toml index 1fa3b9f..7f08eec 100644 --- a/spark-cli/Cargo.toml +++ b/spark-cli/Cargo.toml @@ -1,14 +1,17 @@ [package] name = "spark-cli" version = "0.1.0" -edition = "2021" +authors = { workspace = true } +edition = { workspace = true } +license = { workspace = true } +rust-version = { workspace = true } # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -anyhow = "1.0.81" +anyhow = { workspace = true } clap = { version = "4.5.4", features = ["derive"] } -spark-market-sdk = { path = "../spark-market-sdk" } -fuels = { version = "0.55.0", features = ["fuel-core-lib"] } dotenv = "0.15.0" -tokio = { version = "1.12", features = ["rt", "macros"] } +fuels = { workspace = true } +spark-market-sdk = { path = "../spark-market-sdk" } +tokio = { workspace = true } diff --git a/spark-cli/README.md b/spark-cli/README.md index f1988de..91d20eb 100644 --- a/spark-cli/README.md +++ b/spark-cli/README.md @@ -1,4 +1,5 @@ Note: Work in progress, incomplete, use as guide only, only tested in beta-5 +Note: Fuels SDK version 0.56.0 does not currently work with Beta-5 so the repo is using 0.55.0 Inside the spark project (CLI) run the following commands @@ -8,7 +9,7 @@ These contract calls change the state of the market contract so they require the ## Deploy -../target/debug/spark core deploy \ +../target/debug/spark-cli core deploy \ --base-asset 0x0000000000000000000000000000000000000000000000000000000000000000 \ --base-decimals 9 \ --quote-asset 0x593b117a05f5ea64b39ba1f9bc3fb7e7a791c9be130e28376ad552eacdb3b746 \ @@ -18,7 +19,7 @@ These contract calls change the state of the market contract so they require the ## Deposit -../target/debug/spark core deposit \ +../target/debug/spark-cli core deposit \ --asset 0x0000000000000000000000000000000000000000000000000000000000000000 \ --amount 10 \ --rpc "beta-5.fuel.network" \ @@ -26,7 +27,7 @@ These contract calls change the state of the market contract so they require the ## Withdraw (bugged) -../target/debug/spark core withdraw \ +../target/debug/spark-cli core withdraw \ --asset 0x0000000000000000000000000000000000000000000000000000000000000000 \ --amount 10 \ --rpc "beta-5.fuel.network" \ @@ -42,7 +43,7 @@ These contract calls change the state of the market contract so they require the Sets a fee for a user -../target/debug/spark core set-fee \ +../target/debug/spark-cli core set-fee \ --amount 2 \ --account-type address \ --account-id \ @@ -51,7 +52,7 @@ Sets a fee for a user Set fee for entire market -../target/debug/spark core set-fee \ +../target/debug/spark-cli core set-fee \ --amount 2 \ --rpc "beta-5.fuel.network" \ --contract-id @@ -62,7 +63,7 @@ These functions return the state of the contract. They simulate calls and theref ## Account -../target/debug/spark info account \ +../target/debug/spark-cli info account \ --account-type address \ --account-id \ --rpc "beta-5.fuel.network" \ @@ -70,7 +71,7 @@ These functions return the state of the contract. They simulate calls and theref ## Config -../target/debug/spark info config \ +../target/debug/spark-cli info config \ --rpc "beta-5.fuel.network" \ --contract-id @@ -78,7 +79,7 @@ These functions return the state of the contract. They simulate calls and theref Fee for a specific user -../target/debug/spark info fee \ +../target/debug/spark-cli info fee \ --account-type address \ --account-id \ --rpc "beta-5.fuel.network" \ @@ -86,13 +87,13 @@ Fee for a specific user Fee for entire market contract -../target/debug/spark info fee \ +../target/debug/spark-cli info fee \ --rpc "beta-5.fuel.network" \ --contract-id ## Order ID -../target/debug/spark info order-id \ +../target/debug/spark-cli info order-id \ --amount 10 \ --asset 0x0000000000000000000000000000000000000000000000000000000000000000 \ --order-type buy \ @@ -104,14 +105,14 @@ Fee for entire market contract ## Order -../target/debug/spark info order \ +../target/debug/spark-cli info order \ --order-id \ --rpc "beta-5.fuel.network" \ --contract-id ## User Orders -../target/debug/spark info user-orders \ +../target/debug/spark-cli info user-orders \ --account-type address \ --account-id \ --rpc "beta-5.fuel.network" \ diff --git a/spark-cli/src/main.rs b/spark-cli/src/main.rs index b1fb2a2..adfba1f 100644 --- a/spark-cli/src/main.rs +++ b/spark-cli/src/main.rs @@ -13,6 +13,9 @@ use dotenv::dotenv; async fn main() -> anyhow::Result<()> { dotenv().ok(); // TODO: check this works against std::env + // TODO: document local provider rpc in each command + // Provider::connect(format!("127.0.0.1:{port}")).await?; + let cli = Cli::parse(); match cli.command { diff --git a/spark-market-sdk/Cargo.toml b/spark-market-sdk/Cargo.toml index 632e28d..8b00175 100644 --- a/spark-market-sdk/Cargo.toml +++ b/spark-market-sdk/Cargo.toml @@ -1,12 +1,15 @@ [package] name = "spark-market-sdk" version = "0.1.0" -edition = "2021" +authors = { workspace = true } +edition = { workspace = true } +license = { workspace = true } +rust-version = { workspace = true } # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -fuels = { version = "0.55.0", features = ["fuel-core-lib"] } -tokio = { version = "1.12", features = ["rt", "macros"] } +anyhow = { workspace = true } +fuels = { workspace = true } rand = "0.8.5" -anyhow = "1.0.81" +tokio = { workspace = true } diff --git a/spark-market-sdk/src/lib.rs b/spark-market-sdk/src/lib.rs index c771c21..955dac8 100644 --- a/spark-market-sdk/src/lib.rs +++ b/spark-market-sdk/src/lib.rs @@ -14,7 +14,6 @@ abigen!(Contract( abi = "./market-contract/out/debug/market-contract-abi.json" )); -// TODO: check if paths work in testing (works in spark CLI) const MARKET_CONTRACT_BINARY_PATH: &str = "../market-contract/out/debug/market-contract.bin"; const MARKET_CONTRACT_STORAGE_PATH: &str = "../market-contract/out/debug/market-contract-storage_slots.json"; @@ -81,7 +80,6 @@ impl MarketContract { amount: u64, asset: AssetId, ) -> anyhow::Result> { - // TODO: custom? let call_params = CallParameters::new(amount, asset, 1_000_000); Ok(self @@ -98,7 +96,7 @@ impl MarketContract { amount: u64, asset: AssetId, ) -> anyhow::Result> { - // TODO: CLI seems broken here for some reason + // TODO: Spark CLI seems broken here for some reason Ok(self .instance .methods() diff --git a/src/lib.rs b/src/lib.rs deleted file mode 100644 index e69de29..0000000 From 51cc5fdb67718b5d3e40bb772b40985c3a3012bf Mon Sep 17 00:00:00 2001 From: Braqzen <103777923+Braqzen@users.noreply.github.com> Date: Wed, 10 Apr 2024 13:38:29 +0100 Subject: [PATCH 2/4] Testing yml formatting --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 53e2bb8..56e58e5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,7 +28,7 @@ jobs: uses: baptiste0928/cargo-install@v2 with: crate: cargo-toml-lint - version: "0.1.1" + version: '0.1.1' - name: Run Cargo.toml linter run: git ls-files | grep Cargo.toml$ | xargs --verbose -n 1 cargo-toml-lint @@ -111,8 +111,8 @@ jobs: - name: Install Rust toolchain uses: dtolnay/rust-toolchain@master with: - toolchain: ${{ env.RUST_VERSION }} - components: clippy, rustfmt + toolchain: ${{ env.RUST_VERSION }} + components: clippy, rustfmt - name: Init cache uses: Swatinem/rust-cache@v2 From 2fc70f669ba8fb634855d686ccc118a3e20eeae6 Mon Sep 17 00:00:00 2001 From: Braqzen <103777923+Braqzen@users.noreply.github.com> Date: Wed, 10 Apr 2024 13:57:58 +0100 Subject: [PATCH 3/4] CI, clippy and ignore broken tests --- .github/workflows/ci.yml | 25 ++++++++++++++++++- .../tests/functions/core/cancel_order.rs | 5 ++-- .../tests/functions/core/deposit.rs | 5 ++-- .../tests/functions/core/open_order.rs | 10 +++++--- .../tests/functions/core/set_fee.rs | 4 +-- .../tests/functions/core/withdraw.rs | 7 ++++-- market-contract/tests/utils/interface/core.rs | 1 + market-contract/tests/utils/setup.rs | 4 +-- spark-cli/src/commands/core/deploy.rs | 2 +- spark-cli/src/commands/core/set_fee.rs | 4 +-- spark-cli/src/commands/info/fee.rs | 4 +-- spark-cli/src/commands/info/user_orders.rs | 2 +- spark-cli/src/utils.rs | 2 +- 13 files changed, 53 insertions(+), 22 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 56e58e5..4c4022b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -52,7 +52,8 @@ jobs: - name: Install Fuel toolchain uses: FuelLabs/action-fuel-toolchain@v0.6.0 with: - toolchain: beta-5 + toolchain: nightly + date: 2024-02-07 - name: Check Sway formatting run: forc fmt --check --path market-contract @@ -95,6 +96,17 @@ jobs: - name: Init cache uses: Swatinem/rust-cache@v2 + - name: Install Fuel toolchain + uses: FuelLabs/action-fuel-toolchain@v0.6.0 + with: + toolchain: nightly + date: 2024-02-07 + + - name: Build Sway + run: | + cd "market-contract" + forc build --locked + - name: Build Rust files run: cargo build --locked --manifest-path spark-cli/Cargo.toml @@ -117,6 +129,17 @@ jobs: - name: Init cache uses: Swatinem/rust-cache@v2 + - name: Install Fuel toolchain + uses: FuelLabs/action-fuel-toolchain@v0.6.0 + with: + toolchain: nightly + date: 2024-02-07 + + - name: Build Sway + run: | + cd "market-contract" + forc build --locked + - name: Build Rust files run: cargo build --locked --manifest-path spark-market-sdk/Cargo.toml diff --git a/market-contract/tests/functions/core/cancel_order.rs b/market-contract/tests/functions/core/cancel_order.rs index d110d7d..a451b5a 100644 --- a/market-contract/tests/functions/core/cancel_order.rs +++ b/market-contract/tests/functions/core/cancel_order.rs @@ -44,7 +44,7 @@ mod success { let log = response .decode_logs_with_type::() .unwrap(); - let event = log.get(0).unwrap(); + let event = log.first().unwrap(); assert_eq!(*event, CancelOrderEvent { order_id: id }); let user_account = account(&contract, owner.identity()).await.value.unwrap(); @@ -56,6 +56,7 @@ mod success { } #[tokio::test] + #[ignore] async fn sell_quote() { let defaults = Defaults::default(); let (contract, owner, _user, assets) = setup( @@ -88,7 +89,7 @@ mod success { let log = response .decode_logs_with_type::() .unwrap(); - let event = log.get(0).unwrap(); + let event = log.first().unwrap(); assert_eq!(*event, CancelOrderEvent { order_id: id }); let user_account = account(&contract, owner.identity()).await.value.unwrap(); diff --git a/market-contract/tests/functions/core/deposit.rs b/market-contract/tests/functions/core/deposit.rs index 6a57355..4eb1d9c 100644 --- a/market-contract/tests/functions/core/deposit.rs +++ b/market-contract/tests/functions/core/deposit.rs @@ -29,7 +29,7 @@ mod success { let response = deposit(&contract, deposit_amount, assets.base.id).await; let log = response.decode_logs_with_type::().unwrap(); - let event = log.get(0).unwrap(); + let event = log.first().unwrap(); assert_eq!( *event, DepositEvent { @@ -44,6 +44,7 @@ mod success { assert_eq!(user_account, expected_account); } + #[ignore] #[tokio::test] async fn quote_asset() { let defaults = Defaults::default(); @@ -62,7 +63,7 @@ mod success { let response = deposit(&contract, deposit_amount, assets.quote.id).await; let log = response.decode_logs_with_type::().unwrap(); - let event = log.get(0).unwrap(); + let event = log.first().unwrap(); assert_eq!( *event, DepositEvent { diff --git a/market-contract/tests/functions/core/open_order.rs b/market-contract/tests/functions/core/open_order.rs index e74c3cd..d428645 100644 --- a/market-contract/tests/functions/core/open_order.rs +++ b/market-contract/tests/functions/core/open_order.rs @@ -66,7 +66,7 @@ mod success { .value; let log = response.decode_logs_with_type::().unwrap(); - let event = log.get(0).unwrap(); + let event = log.first().unwrap(); assert_eq!( *event, OpenOrderEvent { @@ -87,6 +87,7 @@ mod success { assert_eq!(stored_id, expected_id); } + #[ignore] #[tokio::test] async fn sell_quote() { let defaults = Defaults::default(); @@ -142,7 +143,7 @@ mod success { .value; let log = response.decode_logs_with_type::().unwrap(); - let event = log.get(0).unwrap(); + let event = log.first().unwrap(); assert_eq!( *event, OpenOrderEvent { @@ -227,7 +228,7 @@ mod success { .value; let log = response.decode_logs_with_type::().unwrap(); - let event = log.get(0).unwrap(); + let event = log.first().unwrap(); assert_eq!( *event, OpenOrderEvent { @@ -315,7 +316,7 @@ mod success { .value; let log = response.decode_logs_with_type::().unwrap(); - let event = log.get(0).unwrap(); + let event = log.first().unwrap(); assert_eq!( *event, OpenOrderEvent { @@ -414,6 +415,7 @@ mod revert { open_order(&contract, order_amount, asset, order_type.clone(), price).await; } + #[ignore] #[tokio::test] #[should_panic(expected = "InsufficientBalance")] async fn when_insufficient_quote_balance_to_sell() { diff --git a/market-contract/tests/functions/core/set_fee.rs b/market-contract/tests/functions/core/set_fee.rs index bb2207d..0dc01c9 100644 --- a/market-contract/tests/functions/core/set_fee.rs +++ b/market-contract/tests/functions/core/set_fee.rs @@ -30,7 +30,7 @@ mod success { // Log should be emitted when fee is changed let log = response.decode_logs_with_type::().unwrap(); - let event = log.get(0).unwrap(); + let event = log.first().unwrap(); assert_eq!( *event, SetFeeEvent { @@ -66,7 +66,7 @@ mod success { // Log should be emitted when fee is changed let log = response.decode_logs_with_type::().unwrap(); - let event = log.get(0).unwrap(); + let event = log.first().unwrap(); assert_eq!( *event, SetFeeEvent { diff --git a/market-contract/tests/functions/core/withdraw.rs b/market-contract/tests/functions/core/withdraw.rs index c4eca77..ead0b88 100644 --- a/market-contract/tests/functions/core/withdraw.rs +++ b/market-contract/tests/functions/core/withdraw.rs @@ -11,6 +11,7 @@ mod success { setup::{create_account, WithdrawEvent}, }; + #[ignore] #[tokio::test] async fn base_asset() { let defaults = Defaults::default(); @@ -35,7 +36,7 @@ mod success { let response = withdraw(&contract, deposit_amount, assets.base.id).await; let log = response.decode_logs_with_type::().unwrap(); - let event = log.get(0).unwrap(); + let event = log.first().unwrap(); assert_eq!( *event, WithdrawEvent { @@ -53,6 +54,7 @@ mod success { assert_eq!(user_account, expected_account); } + #[ignore] #[tokio::test] async fn quote_asset() { let defaults = Defaults::default(); @@ -77,7 +79,7 @@ mod success { let response = withdraw(&contract, deposit_amount, assets.quote.id).await; let log = response.decode_logs_with_type::().unwrap(); - let event = log.get(0).unwrap(); + let event = log.first().unwrap(); assert_eq!( *event, WithdrawEvent { @@ -155,6 +157,7 @@ mod revert { withdraw(&contract, deposit_amount + 1, assets.base.id).await; } + #[ignore] #[tokio::test] #[should_panic(expected = "InsufficientBalance")] async fn when_quote_amount_greater_than_available() { diff --git a/market-contract/tests/utils/interface/core.rs b/market-contract/tests/utils/interface/core.rs index 95028ba..9b2472f 100644 --- a/market-contract/tests/utils/interface/core.rs +++ b/market-contract/tests/utils/interface/core.rs @@ -66,6 +66,7 @@ pub(crate) async fn cancel_order( .unwrap() } +#[allow(dead_code)] pub(crate) async fn batch_fulfill( contract: &Market, order_id: Bits256, diff --git a/market-contract/tests/utils/setup.rs b/market-contract/tests/utils/setup.rs index 08d2314..698375e 100644 --- a/market-contract/tests/utils/setup.rs +++ b/market-contract/tests/utils/setup.rs @@ -137,9 +137,9 @@ pub(crate) async fn setup( StorageConfiguration::default().add_slot_overrides_from_file(MARKET_CONTRACT_STORAGE_PATH); let configurables = MarketConfigurables::default() - .with_BASE_ASSET(assets.base.id.clone()) + .with_BASE_ASSET(assets.base.id) .with_BASE_ASSET_DECIMALS(assets.base.decimals) - .with_QUOTE_ASSET(assets.quote.id.clone()) + .with_QUOTE_ASSET(assets.quote.id) .with_QUOTE_ASSET_DECIMALS(assets.quote.decimals) .with_PRICE_DECIMALS(price_decimals) .with_OWNER(owner.address().into()); diff --git a/spark-cli/src/commands/core/deploy.rs b/spark-cli/src/commands/core/deploy.rs index 0583f84..bbac29c 100644 --- a/spark-cli/src/commands/core/deploy.rs +++ b/spark-cli/src/commands/core/deploy.rs @@ -68,7 +68,7 @@ impl DeployCommand { // TODO: replace println with tracing println!("\nMarket deployed to: 0x{}", contract.id()); println!("Deployment cost: {}", balance - new_balance); - println!("Owner address: {}", wallet.address().to_string()); + println!("Owner address: {}", wallet.address()); println!(" 0x{}", wallet.address().hash()); Ok(()) diff --git a/spark-cli/src/commands/core/set_fee.rs b/spark-cli/src/commands/core/set_fee.rs index e7678bc..c59e071 100644 --- a/spark-cli/src/commands/core/set_fee.rs +++ b/spark-cli/src/commands/core/set_fee.rs @@ -47,12 +47,12 @@ impl SetFeeCommand { let account = match &self.account_type { Some(account) => match account { AccountType::Address => { - let address = Address::from_str(&self.account_id.as_ref().unwrap()) + let address = Address::from_str(self.account_id.as_ref().unwrap()) .expect("Invalid address"); Some(Identity::Address(address)) } AccountType::Contract => { - let address = ContractId::from_str(&self.account_id.as_ref().unwrap()) + let address = ContractId::from_str(self.account_id.as_ref().unwrap()) .expect("Invalid contract id"); Some(Identity::ContractId(address)) } diff --git a/spark-cli/src/commands/info/fee.rs b/spark-cli/src/commands/info/fee.rs index 9a20cfc..ee3f1ba 100644 --- a/spark-cli/src/commands/info/fee.rs +++ b/spark-cli/src/commands/info/fee.rs @@ -37,12 +37,12 @@ impl FeeCommand { let account = match &self.account_type { Some(account) => match account { AccountType::Address => { - let address = Address::from_str(&self.account_id.as_ref().unwrap()) + let address = Address::from_str(self.account_id.as_ref().unwrap()) .expect("Invalid address"); Some(Identity::Address(address)) } AccountType::Contract => { - let address = ContractId::from_str(&self.account_id.as_ref().unwrap()) + let address = ContractId::from_str(self.account_id.as_ref().unwrap()) .expect("Invalid contract id"); Some(Identity::ContractId(address)) } diff --git a/spark-cli/src/commands/info/user_orders.rs b/spark-cli/src/commands/info/user_orders.rs index 5b3d03b..85c72b6 100644 --- a/spark-cli/src/commands/info/user_orders.rs +++ b/spark-cli/src/commands/info/user_orders.rs @@ -46,7 +46,7 @@ impl UserOrdersCommand { let orders = contract.user_orders(account).await?.value; - if orders.len() == 0 { + if orders.is_empty() { anyhow::bail!("User has no open orders"); } diff --git a/spark-cli/src/utils.rs b/spark-cli/src/utils.rs index 9b31cdc..876393a 100644 --- a/spark-cli/src/utils.rs +++ b/spark-cli/src/utils.rs @@ -15,7 +15,7 @@ pub(crate) fn validate_contract_id(contract_id: &str) -> anyhow::Result Date: Wed, 10 Apr 2024 14:04:14 +0100 Subject: [PATCH 4/4] Remove sway tests from CI --- .github/workflows/ci.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4c4022b..14a22ac 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -75,11 +75,6 @@ jobs: - name: Run Rust tests run: cargo test --locked --manifest-path market-contract/Cargo.toml - - name: Run Sway tests - run: | - cd "market-contract" - forc test - CLI: runs-on: ubuntu-latest