diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f79f3f30..664863c4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,11 +1,11 @@ -name: Build Check +name: Build on: push: branches: - master - - develop - - 'v[0-9]+.[0-9]+' + tags: + - 'v[0-9]+\.*' pull_request: branches: - master @@ -20,62 +20,48 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - # NOTE: Dont use nix here everything should be based on the ubuntu-latest - - name: Install rust stable - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - override: true - - name: Latest Ubuntu build check - uses: actions-rs/cargo@v1 - with: - command: check - args: --workspace + - uses: dtolnay/rust-toolchain@stable + - run: cargo check --workspace + no-default: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: dtolnay/rust-toolchain@stable + - run: cargo check --workspace --no-default-features features: runs-on: ubuntu-latest strategy: fail-fast: false matrix: - feature: - - stl - - serde + feature: [ stl, serde ] steps: - uses: actions/checkout@v4 - - name: Install Nix - uses: cachix/install-nix-action@V27 - - name: Check feature ${{ matrix.feature }} only - run: nix develop .#stable -c cargo check --no-default-features --features=${{ matrix.feature }} - - name: Check feature ${{ matrix.feature }} with defaults - run: nix develop .#stable -c cargo check --features=${{ matrix.feature }} + - uses: dtolnay/rust-toolchain@stable + - name: Feature ${{matrix.feature}} + run: cargo check --workspace --no-default-features --features=${{matrix.feature}} + - name: Feature ${{matrix.feature}} + run: cargo check --workspace --features=${{matrix.feature}} platforms: runs-on: ${{ matrix.os }} strategy: fail-fast: false matrix: - os: [ ubuntu-20.04, ubuntu-22.04, macos-12, macos-13, windows-2019, windows-2022 ] + os: [ ubuntu-22.04, ubuntu-latest, macos-13, macos-latest, windows-2019, windows-latest ] steps: - uses: actions/checkout@v4 - # NOTE: Dont use nix in platform checks everything should based on the host system - - name: Install rust stable - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - override: true - - name: Build check with all features - uses: actions-rs/cargo@v1 - with: - command: check - args: --workspace --all-targets --all-features + - uses: dtolnay/rust-toolchain@stable + - name: Platform ${{matrix.os}} + run: cargo check --workspace --all-features # we skip test targets here to be sure that the main library can be built toolchains: runs-on: ubuntu-latest strategy: fail-fast: false matrix: - toolchain: [ nightly, beta, stable, msrv ] + toolchain: [ nightly, beta, stable, 1.75.0 ] steps: - - name: checkout - uses: actions/checkout@v4 - - name: Install Nix - uses: cachix/install-nix-action@V27 - - name: Check rgb-core - run: nix develop ".#${{ matrix.toolchain }}" -c cargo check --workspace --all-targets --all-features + - uses: actions/checkout@v4 + - uses: dtolnay/rust-toolchain@master + with: + toolchain: ${{matrix.toolchain}} + - name: Toolchain ${{matrix.toolchain}} + run: cargo +${{matrix.toolchain}} check --workspace --all-targets --all-features diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml index 83635911..3711d7ad 100644 --- a/.github/workflows/codecov.yml +++ b/.github/workflows/codecov.yml @@ -4,8 +4,8 @@ on: push: branches: - master - - develop - - 'v[0-9]+.[0-9]+' + tags: + - 'v[0-9]+\.*' pull_request: branches: - master @@ -19,23 +19,22 @@ jobs: codecov: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - name: Install Nix - uses: cachix/install-nix-action@V27 - - name: Build - run: nix develop .#codecov -c cargo build --release - - name: Test - run: nix develop .#codecov -c cargo test --all-features --no-fail-fast - - name: Install grcov - run: nix develop .#codecov -c cargo install grcov - - name: Generate coverage - run: nix develop .#codecov -c grcov . --binary-path target/debug/deps/ -s . -t lcov --branch --ignore-not-existing --ignore '../**' --ignore '/*' -o coverage.lcov - - name: Upload coverage + - uses: actions/checkout@v4 + - uses: dtolnay/rust-toolchain@nightly + with: + components: llvm-tools-preview + - uses: taiki-e/install-action@cargo-llvm-cov + - uses: taiki-e/install-action@nextest + - name: Collect coverage data (including doctests) + run: | + cargo +nightly llvm-cov --no-report nextest --workspace --all-features + cargo +nightly llvm-cov --no-report --doc --workspace --all-features + cargo +nightly llvm-cov report --doctests --lcov --output-path lcov.info + - name: Upload coverage data to codecov uses: codecov/codecov-action@v4 with: - files: ./coverage.lcov flags: rust - # TODO: set true when CODECOV_TOKEN is set - fail_ci_if_error: false - env: - CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} + files: lcov.info + fail_ci_if_error: true + token: ${{ secrets.CODECOV_TOKEN }} + verbose: true diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index d0c3d11e..ab5249d1 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -1,11 +1,6 @@ name: Lints on: - push: - branches: - - master - - develop - - 'v[0-9]+.[0-9]+' pull_request: branches: - master @@ -20,26 +15,29 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - name: Install Nix - uses: cachix/install-nix-action@V27 + - uses: dtolnay/rust-toolchain@nightly + with: + components: rustfmt - name: Formatting - run: nix develop .#nightly -c cargo fmt --all -- --check + run: cargo +nightly fmt --all -- --check clippy: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - name: Install Nix - uses: cachix/install-nix-action@V27 - - name: Clippy - run: nix develop .#stable -c cargo clippy --workspace --all-features --all-targets -- -D warnings + - uses: dtolnay/rust-toolchain@stable + with: + components: clippy + - name: Formatting + run: cargo clippy --workspace --all-features --all-targets -- -D warnings doc: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - name: Install Nix - uses: cachix/install-nix-action@V27 - - name: Doc - run: nix develop .#stable -c cargo doc --workspace --all-features + - uses: dtolnay/rust-toolchain@nightly + with: + components: rust-docs + - name: Formatting + run: cargo +nightly doc --workspace --all-features typos: runs-on: ubuntu-latest steps: diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e5bff4d7..9821d00e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -4,8 +4,8 @@ on: push: branches: - master - - develop - - 'v[0-9]+.[0-9]+' + tags: + - 'v[0-9]+\.*' pull_request: branches: - master @@ -17,18 +17,23 @@ env: jobs: testing: - runs-on: ubuntu-latest + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + os: [ ubuntu-latest, macos-13, macos-latest, windows-latest ] steps: - uses: actions/checkout@v4 - - name: Install Nix - uses: cachix/install-nix-action@V27 - - name: Build & test - run: nix develop .#stable -c cargo test --workspace --all-features --no-fail-fast + - uses: dtolnay/rust-toolchain@stable + - name: Test ${{matrix.os}} + run: cargo test --workspace --all-features --no-fail-fast wasm-testing: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - name: Install Nix - uses: cachix/install-nix-action@V27 + - uses: dtolnay/rust-toolchain@nightly + - uses: jetli/wasm-pack-action@v0.4.0 + - name: Add wasm32 target + run: rustup target add wasm32-unknown-unknown - name: Test in headless Chrome - run: nix develop .#wasm -c wasm-pack test --headless --chrome + run: wasm-pack test --headless --chrome diff --git a/.rustfmt.toml b/.rustfmt.toml index de9c4d68..9017cd7d 100644 --- a/.rustfmt.toml +++ b/.rustfmt.toml @@ -4,10 +4,12 @@ version = "Two" max_width = 100 array_width = 100 attr_fn_like_width = 100 +comment_width = 100 fn_call_width = 100 +single_line_if_else_max_width = 100 -format_code_in_doc_comments = true fn_single_line = true +format_code_in_doc_comments = true format_macro_matchers = true format_macro_bodies = true format_strings = true @@ -19,9 +21,6 @@ use_try_shorthand = true wrap_comments = true where_single_line = true unstable_features = true -empty_item_single_line = true - -binop_separator = "Back" imports_granularity = "Module" group_imports = "StdExternalCrate" diff --git a/Cargo.lock b/Cargo.lock index ee0adc5c..829373ed 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "aluvm" -version = "0.11.0-beta.6" +version = "0.11.0-beta.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97a05798f882593a692d1e05d2b650d8d19f6dd8b04a9a8d31f09fcf0d44d90a" +checksum = "1aaa9bf6c54f2d232adc6a9e748f359f1b4570d0a498f92e7823321ae7c656b5" dependencies = [ "amplify", "ascii-armor", @@ -25,9 +25,9 @@ dependencies = [ [[package]] name = "amplify" -version = "4.6.0" +version = "4.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e711289a6cb28171b4f0e6c8019c69ff9476050508dc082167575d458ff74d0" +checksum = "7147b742325842988dd6c793d55f58df3ae36bccf7d9b6e07db10ab035be343d" dependencies = [ "amplify_apfloat", "amplify_derive", @@ -42,9 +42,9 @@ dependencies = [ [[package]] name = "amplify_apfloat" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72e23f5ede99065fa6957a633498d2728d51016d61dae23b69c866112b7c61ee" +checksum = "695e433882668b55b3d7fb0ba22bf9be66a91abe30d7ca1f1a774f8b90b4db4c" dependencies = [ "amplify_num", "bitflags", @@ -53,9 +53,9 @@ dependencies = [ [[package]] name = "amplify_derive" -version = "4.0.0" +version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "759dcbfaf94d838367a86d493ec34ccc8aa6fe365cb7880d6bf89006de24d9c1" +checksum = "2a6309e6b8d89b36b9f959b7a8fa093583b94922a0f6438a24fb08936de4d428" dependencies = [ "amplify_syn", "proc-macro2", @@ -65,9 +65,9 @@ dependencies = [ [[package]] name = "amplify_num" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04c009c5c4de814911b177e2ea59e4930bb918978ed3cce4900d846a6ceb0838" +checksum = "99bcb75a2982047f733547042fc3968c0f460dfcf7d90b90dea3b2744580e9ad" dependencies = [ "serde", "wasm-bindgen", @@ -101,15 +101,15 @@ dependencies = [ [[package]] name = "arrayref" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" +checksum = "9d151e35f61089500b617991b791fc8bfd237ae50cd5950803758a179b41e67a" [[package]] name = "arrayvec" -version = "0.7.4" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" +checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" [[package]] name = "ascii" @@ -122,9 +122,9 @@ dependencies = [ [[package]] name = "ascii-armor" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f834c431d27e0e6bedf95c9ee4dbea02fa4e4cd5bc26a61e5a418427178c5495" +checksum = "9ad861dfcd5f348ac79e0df2e70494641c62d3ac37587af68c52a16ab355afdb" dependencies = [ "amplify", "baid64", @@ -141,9 +141,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "baid64" -version = "0.2.0" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd5e666513565d0a35116973541fbcb35700619316e1865cb27c7dba5de98668" +checksum = "95dabc2759e01e2c382968639868a701f384a18890934f9e75d4feb4d6623794" dependencies = [ "amplify", "base64", @@ -174,15 +174,15 @@ checksum = "73290177011694f38ec25e165d0387ab7ea749a4b81cd4c80dae5988229f7a57" [[package]] name = "bitflags" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" [[package]] name = "blake3" -version = "1.5.1" +version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30cca6d3674597c30ddf2c587bf8d9d65c9a84d2326d941cc79c9842dfe0ef52" +checksum = "e9ec96fe9a81b5e365f9db71fe00edc4fe4ca2cc7dcb7861f0603012a7caa210" dependencies = [ "arrayref", "arrayvec", @@ -202,14 +202,14 @@ dependencies = [ [[package]] name = "bp-consensus" -version = "0.11.0-beta.6" +version = "0.11.0-beta.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f126ed462c6b054ccd027d3ed59fdc0eed5d720cbada79e4d8b7ef8e4779d9b8" +checksum = "d23ea438647522d1f1a8fc8fa1420cc56321433d5d5964636294991f18f9e0c9" dependencies = [ "amplify", "chrono", "commit_verify", - "secp256k1 0.29.0", + "secp256k1", "serde", "strict_encoding", "strict_types", @@ -217,9 +217,9 @@ dependencies = [ [[package]] name = "bp-core" -version = "0.11.0-beta.6" +version = "0.11.0-beta.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ea9b90b2e6cfafc0e45dc0a856e9b45e933ab4147c576ca8c26f038ba8c97bb" +checksum = "b43a6b5389fd99298fca47f4566dda754fa10bdb41200b5cdfc16147400f5951" dependencies = [ "amplify", "bp-consensus", @@ -236,24 +236,24 @@ dependencies = [ [[package]] name = "bp-dbc" -version = "0.11.0-beta.6" +version = "0.11.0-beta.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec406f105bf1e421ead00b47e309901028d10de7033fe918445b089cf7505669" +checksum = "f0f70bd407dfcbeadfbc012959e04decbe63e7dc6f30a4f705b804b699b37a0a" dependencies = [ "amplify", "base85", "bp-consensus", "commit_verify", - "secp256k1 0.29.0", + "secp256k1", "serde", "strict_encoding", ] [[package]] name = "bp-seals" -version = "0.11.0-beta.6" +version = "0.11.0-beta.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4f81b41d82e4138d4bcac17afbb421099c887e406947430131c14ba22abe45d" +checksum = "497bb5989b9b549cd8e4ebfabc50a5d57cf318ab56affd3d4d7b7749fcd780da" dependencies = [ "amplify", "baid64", @@ -272,11 +272,20 @@ version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + [[package]] name = "cc" -version = "1.0.98" +version = "1.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f" +checksum = "72db2f7947ecee9b03b510377e8bb9077afa27176fdbff55c51027e976fdcc48" +dependencies = [ + "shlex", +] [[package]] name = "cfg-if" @@ -300,9 +309,9 @@ dependencies = [ [[package]] name = "commit_encoding_derive" -version = "0.11.0-beta.5" +version = "0.11.0-beta.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d660fdac917fb67edd1707bc9481e51ed9062ab4ba1c4e56ed7856977fff9f3" +checksum = "ca41bd14a6c400486463a5b0e7e8916b1c7bad554a382f62c3b11bd58dea5934" dependencies = [ "amplify", "amplify_syn", @@ -313,9 +322,9 @@ dependencies = [ [[package]] name = "commit_verify" -version = "0.11.0-beta.6" +version = "0.11.0-beta.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b350bc4d1c5992571e3323810921d0eb4a65a3171cbf06fd1b9d1249cf1c3339" +checksum = "538b69bbb2f7259c1d07334fa8adae0006c8b559efbdb6daafacb6df249b897b" dependencies = [ "amplify", "commit_encoding_derive", @@ -346,15 +355,15 @@ checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" [[package]] name = "core-foundation-sys" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "cpufeatures" -version = "0.2.12" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad" dependencies = [ "libc", ] @@ -432,9 +441,9 @@ checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "heck" -version = "0.4.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "iana-time-zone" @@ -461,9 +470,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.2.6" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +checksum = "93ead53efc7ea8ed3cfb0c79fc8023fbb782a5432b52830b6518941cebe6505c" dependencies = [ "equivalent", "hashbrown", @@ -477,30 +486,30 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "js-sys" -version = "0.3.69" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" dependencies = [ "wasm-bindgen", ] [[package]] name = "libc" -version = "0.2.155" +version = "0.2.156" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" +checksum = "a5f43f184355eefb8d17fc948dbecf6c13be3c141f20d834ae842193a448c72a" [[package]] name = "log" -version = "0.4.21" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "memchr" -version = "2.7.2" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "mime" @@ -508,6 +517,16 @@ version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" +[[package]] +name = "minicov" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c71e683cd655513b99affab7d317deb690528255a0d5f717f1024093c12b169" +dependencies = [ + "cc", + "walkdir", +] + [[package]] name = "mnemonic" version = "1.1.1" @@ -537,15 +556,18 @@ checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "ppv-lite86" -version = "0.2.17" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] [[package]] name = "proc-macro2" -version = "1.0.83" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b33eb56c327dec362a9e55b3ad14f9d2f0904fb5a5b03b513ab5465399e9f43" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] @@ -591,7 +613,7 @@ dependencies = [ [[package]] name = "rgb-core" -version = "0.11.0-beta.6" +version = "0.11.0-beta.7" dependencies = [ "aluvm", "amplify", @@ -627,21 +649,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] -name = "scoped-tls" -version = "1.0.1" +name = "same-file" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] [[package]] -name = "secp256k1" -version = "0.28.2" +name = "scoped-tls" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d24b59d129cdadea20aea4fb2352fa053712e5d713eee47d700cd4b2bc002f10" -dependencies = [ - "rand", - "secp256k1-sys 0.9.2", - "serde", -] +checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" [[package]] name = "secp256k1" @@ -650,19 +670,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0e0cc0f1cf93f4969faf3ea1c7d8a9faed25918d96affa959720823dfe86d4f3" dependencies = [ "rand", - "secp256k1-sys 0.10.0", + "secp256k1-sys", "serde", ] -[[package]] -name = "secp256k1-sys" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d1746aae42c19d583c3c1a8c646bfad910498e2051c551a7f2e3c0c9fbb7eb" -dependencies = [ - "cc", -] - [[package]] name = "secp256k1-sys" version = "0.10.0" @@ -674,63 +685,64 @@ dependencies = [ [[package]] name = "secp256k1-zkp" -version = "0.10.1" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4e48ef9c98bfbcb98bd15693ffa19676cb3e29426b75eda8b73c05cdd7959f8" +checksum = "52a44aed3002b5ae975f8624c5df3a949cfbf00479e18778b6058fcd213b76e3" dependencies = [ "bitcoin-private", "rand", - "secp256k1 0.28.2", + "secp256k1", "secp256k1-zkp-sys", "serde", ] [[package]] name = "secp256k1-zkp-sys" -version = "0.9.1" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4ead52f43074bae2ddbd1e0e66e6b170135e76117f5ea9916f33d7bd0b36e29" +checksum = "8c6eea7919e0cab992510edfbf40bd9342c0a3c2bb910f2c51355c2cb2d69839" dependencies = [ "cc", - "secp256k1-sys 0.9.2", + "secp256k1-sys", ] [[package]] name = "serde" -version = "1.0.202" +version = "1.0.208" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "226b61a0d411b2ba5ff6d7f73a476ac4f8bb900373459cd00fab8512828ba395" +checksum = "cff085d2cb684faa248efb494c39b68e522822ac0de72ccf08109abde717cfb2" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.202" +version = "1.0.208" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6048858004bcff69094cd972ed40a32500f153bd3be9f716b2eed2e8217c4838" +checksum = "24008e81ff7613ed8e5ba0cfaf24e2c2f1e5b8a0495711e44fcd4882fca62bcf" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.74", ] [[package]] name = "serde_json" -version = "1.0.117" +version = "1.0.125" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" +checksum = "83c8e735a073ccf5be70aa8066aa984eaf2fa000db6c8d0100ae605b366d31ed" dependencies = [ "itoa", + "memchr", "ryu", "serde", ] [[package]] name = "serde_spanned" -version = "0.6.6" +version = "0.6.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" +checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" dependencies = [ "serde", ] @@ -769,32 +781,39 @@ dependencies = [ "digest", ] +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + [[package]] name = "single_use_seals" -version = "0.11.0-beta.6" +version = "0.11.0-beta.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55367b3a0d642ee289fec6781fda0b527a35d45511a04bb4cd19fa315c441b77" +checksum = "66c34b7d0a73e5b821f2647331b1303463ce58c51b32f54b006f0e7bb3edcd8a" dependencies = [ "amplify_derive", ] [[package]] name = "strict_encoding" -version = "2.7.0-beta.4" +version = "2.7.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2854135bbecf01fac5bae609ec3408e130259670424e2cd755660556d239c92" +checksum = "662b8c3ff360ff33370e6875dd5bdcbf3cecc992241f30e5f7071227ef693451" dependencies = [ "amplify", "half", "serde", "strict_encoding_derive", + "wasm-bindgen", ] [[package]] name = "strict_encoding_derive" -version = "2.7.0-beta.3" +version = "2.7.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "475fa6f1fdde6e0555422b5111ad34bde30a1459af3599f920c3af9829772c0e" +checksum = "0ad171ee0ac09497f5f87d90bb36acc21992fb58f3565ad8c2663160c07c306d" dependencies = [ "amplify_syn", "heck", @@ -805,9 +824,9 @@ dependencies = [ [[package]] name = "strict_types" -version = "2.7.0-beta.4" +version = "2.7.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7a5479921604482fd8775ec07fbb9075c92e12649358d1f70dc9552783d0d1e" +checksum = "e6e182f593e9c4f02ccfcea7929bef866cff12a3f8e213338ce48a706bb263c1" dependencies = [ "amplify", "ascii-armor", @@ -821,6 +840,7 @@ dependencies = [ "strict_encoding", "toml", "vesper-lang", + "wasm-bindgen", ] [[package]] @@ -846,9 +866,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.66" +version = "2.0.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" +checksum = "1fceb41e3d546d0bd83421d3409b1460cc7444cd389341a4c880fe7a042cb3d7" dependencies = [ "proc-macro2", "quote", @@ -857,29 +877,29 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.61" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.61" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.74", ] [[package]] name = "toml" -version = "0.8.13" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4e43f8cc456c9704c851ae29c67e17ef65d2c30017c17a9765b89c382dc8bba" +checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" dependencies = [ "serde", "serde_spanned", @@ -889,18 +909,18 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.6" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.22.13" +version = "0.22.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c127785850e8c20836d49732ae6abfa47616e60bf9d9f57c43c250361a9db96c" +checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" dependencies = [ "indexmap", "serde", @@ -929,9 +949,9 @@ checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" [[package]] name = "version_check" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "vesper-lang" @@ -943,6 +963,16 @@ dependencies = [ "strict_encoding", ] +[[package]] +name = "walkdir" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" +dependencies = [ + "same-file", + "winapi-util", +] + [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" @@ -951,34 +981,35 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" dependencies = [ "cfg-if", + "once_cell", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.74", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.42" +version = "0.4.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" +checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed" dependencies = [ "cfg-if", "js-sys", @@ -988,9 +1019,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -998,31 +1029,32 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.74", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" +checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" [[package]] name = "wasm-bindgen-test" -version = "0.3.42" +version = "0.3.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9bf62a58e0780af3e852044583deee40983e5886da43a271dd772379987667b" +checksum = "68497a05fb21143a08a7d24fc81763384a3072ee43c44e86aad1744d6adef9d9" dependencies = [ "console_error_panic_hook", "js-sys", + "minicov", "scoped-tls", "wasm-bindgen", "wasm-bindgen-futures", @@ -1031,25 +1063,34 @@ dependencies = [ [[package]] name = "wasm-bindgen-test-macro" -version = "0.3.42" +version = "0.3.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7f89739351a2e03cb94beb799d47fb2cac01759b40ec441f7de39b00cbf7ef0" +checksum = "4b8220be1fa9e4c889b30fd207d4906657e7e90b12e0e6b0c8b8d8709f5de021" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.74", ] [[package]] name = "web-sys" -version = "0.3.69" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" +checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" dependencies = [ "js-sys", "wasm-bindgen", ] +[[package]] +name = "winapi-util" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" +dependencies = [ + "windows-sys", +] + [[package]] name = "windows-core" version = "0.52.0" @@ -1059,11 +1100,20 @@ dependencies = [ "windows-targets", ] +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets", +] + [[package]] name = "windows-targets" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ "windows_aarch64_gnullvm", "windows_aarch64_msvc", @@ -1077,57 +1127,78 @@ dependencies = [ [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" [[package]] name = "windows_i686_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "0.6.8" +version = "0.6.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3c52e9c97a68071b23e836c9380edae937f17b9c4667bd021973efc689f618d" +checksum = "68a9bda4691f099d435ad181000724da8e5899daa10713c2d432552b9ccd3a6f" dependencies = [ "memchr", ] + +[[package]] +name = "zerocopy" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +dependencies = [ + "byteorder", + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.74", +] diff --git a/Cargo.toml b/Cargo.toml index 43419873..ebfee8b4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "rgb-core" -version = "0.11.0-beta.6" +version = "0.11.0-beta.7" authors = ["Dr Maxim Orlovsky "] description = "RGB Core Library: confidential & scalable smart contracts on Bitcoin & Lightning (consensus layer)" repository = "https://github.com/RGB-WG/rgb-core" @@ -22,15 +22,15 @@ name = "rgbcore-stl" required-features = ["stl"] [dependencies] -amplify = { version = "~4.6.0", features = ["rand"] } -baid64 = "~0.2.0" -strict_encoding = "~2.7.0-beta.4" -strict_types = { version = "~2.7.0-beta.4", features = ["armor"] } -aluvm = { version = "~0.11.0-beta.6", features = ["std", "ascii-armor"] } -commit_verify = { version = "~0.11.0-beta.6", features = ["rand", "derive"] } -single_use_seals = "~0.11.0-beta.6" -bp-core = { version = "~0.11.0-beta.6" } -secp256k1-zkp = { version = "0.10.1", features = ["rand", "rand-std", "global-context"] } # TODO: Update version before the release +amplify = { version = "~4.7.0", features = ["rand"] } +baid64 = "~0.2.2" +strict_encoding = "~2.7.0-rc.1" +strict_types = { version = "~2.7.0-rc.1", features = ["armor"] } +aluvm = { version = "~0.11.0-beta.7", features = ["std", "ascii-armor"] } +commit_verify = { version = "~0.11.0-beta.7", features = ["rand", "derive"] } +single_use_seals = "~0.11.0-beta.7" +bp-core = { version = "~0.11.0-beta.7" } +secp256k1-zkp = { version = "0.11.0", features = ["rand", "rand-std", "global-context"] } # TODO: Update version before the release mime = "~0.3.17" serde_crate = { package = "serde", version = "1", features = ["derive"], optional = true } chrono = "0.4.38" diff --git a/MANIFEST.yml b/MANIFEST.yml index b82216cd..0da7b4e3 100644 --- a/MANIFEST.yml +++ b/MANIFEST.yml @@ -1,4 +1,4 @@ -Name: strict_encoding +Name: rgb-core Type: Library Kind: Free software License: Apache-2.0 diff --git a/flake.lock b/flake.lock deleted file mode 100644 index 6894ac04..00000000 --- a/flake.lock +++ /dev/null @@ -1,85 +0,0 @@ -{ - "nodes": { - "flake-utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "nixpkgs": { - "locked": { - "lastModified": 1712439257, - "narHash": "sha256-aSpiNepFOMk9932HOax0XwNxbA38GOUVOiXfUVPOrck=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "ff0dbd94265ac470dda06a657d5fe49de93b4599", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "root": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs", - "rust-overlay": "rust-overlay" - } - }, - "rust-overlay": { - "inputs": { - "flake-utils": [ - "flake-utils" - ], - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1712542394, - "narHash": "sha256-UZebDBECRSrJqw4K+LxZ6qFdYnScu6q1XCwqtsu1cas=", - "owner": "oxalica", - "repo": "rust-overlay", - "rev": "ece8bdb3c3b58def25f204b9a1261dee55d7c9c0", - "type": "github" - }, - "original": { - "owner": "oxalica", - "repo": "rust-overlay", - "type": "github" - } - }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - } - }, - "root": "root", - "version": 7 -} diff --git a/flake.nix b/flake.nix deleted file mode 100644 index 9b5dd319..00000000 --- a/flake.nix +++ /dev/null @@ -1,81 +0,0 @@ -{ - inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - rust-overlay = { - url = "github:oxalica/rust-overlay"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.flake-utils.follows = "flake-utils"; - }; - - flake-utils.url = "github:numtide/flake-utils"; - }; - - outputs = { self, rust-overlay, nixpkgs, flake-utils }: - flake-utils.lib.eachDefaultSystem (system: - let - overlays = [ (import rust-overlay) ]; - pkgs = import nixpkgs { - inherit system overlays; - }; - - cargoToml = builtins.fromTOML (builtins.readFile ./Cargo.toml); - - nightlyWithWasm = pkgs.rust-bin.nightly.latest.default.override { - extensions = [ ]; - targets = [ "wasm32-unknown-unknown" ]; - }; - - stableWithLlvm = pkgs.rust-bin.nightly.latest.default.override { - extensions = [ "rustfmt" "llvm-tools-preview" ]; - targets = [ ]; - }; - in - with pkgs; - { - devShells = rec { - default = msrv; - - msrv = mkShell { - buildInputs = [ - rust-bin.stable."${cargoToml.package."rust-version"}".default - ]; - }; - - stable = mkShell { - buildInputs = [ - rust-bin.stable.latest.default - ]; - }; - - beta = mkShell { - buildInputs = [ - rust-bin.beta.latest.default - ]; - }; - - nightly = mkShell { - buildInputs = [ - rust-bin.nightly.latest.default - ]; - }; - - wasm = mkShell { - buildInputs = [ - nightlyWithWasm - chromedriver - wasm-pack - ]; - }; - - codecov = mkShell { - buildInputs = [ - stableWithLlvm - ]; - CARGO_INCREMENTAL = "0"; - RUSTFLAGS = "-Cinstrument-coverage"; - RUSTDOCFLAGS = "-Cinstrument-coverage"; - }; - }; - } - ); -} diff --git a/src/lib.rs b/src/lib.rs index abef3430..22194544 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -21,15 +21,6 @@ // limitations under the License. #![allow(unused_braces)] // Rust compiler can't properly parse derivation macros -#![deny( - non_upper_case_globals, - non_camel_case_types, - non_snake_case, - unused_mut, - unused_imports, - dead_code, - // TODO: Uncomment missing_docs -)] #![cfg_attr(docsrs, feature(doc_auto_cfg))] #[macro_use] diff --git a/src/operation/assignments.rs b/src/operation/assignments.rs index 9682e35b..7e719423 100644 --- a/src/operation/assignments.rs +++ b/src/operation/assignments.rs @@ -112,8 +112,8 @@ impl Ord for Assign { impl PartialEq for Assign { fn eq(&self, other: &Self) -> bool { - self.to_confidential_seal() == other.to_confidential_seal() && - self.to_confidential_state() == other.to_confidential_state() + self.to_confidential_seal() == other.to_confidential_seal() + && self.to_confidential_state() == other.to_confidential_state() } } @@ -134,8 +134,8 @@ impl Assign { seal: _, state, lock, - } | - Assign::ConfidentialState { + } + | Assign::ConfidentialState { seal: _, state, lock, @@ -148,8 +148,8 @@ impl Assign { seal: _, state, lock, - } | - Assign::Revealed { + } + | Assign::Revealed { seal: _, state, lock, @@ -522,10 +522,7 @@ impl TypedAssigns { if index as usize >= vec.len() { return Err(UnknownDataError); } - Ok(vec - .into_inner() - .remove(index as usize) - .into_revealed_state()) + Ok(vec.release().remove(index as usize).into_revealed_state()) } _ => Err(UnknownDataError), } @@ -540,10 +537,7 @@ impl TypedAssigns { if index as usize >= vec.len() { return Err(UnknownDataError); } - Ok(vec - .into_inner() - .remove(index as usize) - .into_revealed_state()) + Ok(vec.release().remove(index as usize).into_revealed_state()) } _ => Err(UnknownDataError), } diff --git a/src/operation/bundle.rs b/src/operation/bundle.rs index afca21df..6a69d4f1 100644 --- a/src/operation/bundle.rs +++ b/src/operation/bundle.rs @@ -79,7 +79,7 @@ impl From for BundleId { pub struct InputMap(Confined, 1, U16MAX>); impl StrictDumb for InputMap { - fn strict_dumb() -> Self { Self(confined_bmap!(strict_dumb!() => strict_dumb!())) } + fn strict_dumb() -> Self { Self(Confined::with_key_value(strict_dumb!(), strict_dumb!())) } } impl InputMap { @@ -128,7 +128,7 @@ impl StrictDumb for TransitionBundle { Self { close_method: strict_dumb!(), input_map: strict_dumb!(), - known_transitions: confined_bmap! { strict_dumb!() => strict_dumb!() }, + known_transitions: Confined::with_key_value(strict_dumb!(), strict_dumb!()), } } } diff --git a/src/operation/commit.rs b/src/operation/commit.rs index 14fdd85a..30f88b4a 100644 --- a/src/operation/commit.rs +++ b/src/operation/commit.rs @@ -208,7 +208,7 @@ impl StrictDumb for BundleDisclosure { fn strict_dumb() -> Self { Self { id: strict_dumb!(), - known_transitions: confined_bset! { strict_dumb!() }, + known_transitions: Confined::with(strict_dumb!()), } } } @@ -218,7 +218,7 @@ impl TransitionBundle { pub fn disclose(&self) -> BundleDisclosure { BundleDisclosure { id: self.bundle_id(), - known_transitions: Confined::from_iter_unsafe( + known_transitions: Confined::from_iter_checked( self.known_transitions.values().map(|t| t.disclose_hash()), ), } diff --git a/src/operation/fungible.rs b/src/operation/fungible.rs index 4219572d..1af77801 100644 --- a/src/operation/fungible.rs +++ b/src/operation/fungible.rs @@ -232,10 +232,8 @@ impl BlindingFactor { /// # Errors /// /// * if negatives are empty set; - /// * if any subset of the negatives or positives are inverses of other - /// negatives or positives, - /// * if the balancing factor is zero (sum of negatives already equal to the - /// sum of positives). + /// * if any subset of the negatives or positives are inverses of other negatives or positives, + /// * if the balancing factor is zero (sum of negatives already equal to the sum of positives). pub fn zero_balanced( negative: impl IntoIterator, positive: impl IntoIterator, diff --git a/src/operation/global.rs b/src/operation/global.rs index dbcc9672..25dadc12 100644 --- a/src/operation/global.rs +++ b/src/operation/global.rs @@ -42,7 +42,7 @@ use crate::{schema, DataState, LIB_NAME_RGB_COMMIT}; pub struct GlobalValues(Confined, 1, U16>); impl StrictDumb for GlobalValues { - fn strict_dumb() -> Self { Self(confined_vec!(DataState::strict_dumb())) } + fn strict_dumb() -> Self { Self(Confined::with(DataState::strict_dumb())) } } impl GlobalValues { diff --git a/src/operation/operations.rs b/src/operation/operations.rs index 42f2e3da..c7087c6c 100644 --- a/src/operation/operations.rs +++ b/src/operation/operations.rs @@ -298,12 +298,12 @@ pub trait Operation { OpDisclose { id: self.id(), - seals: Confined::from_collection_unsafe(seals), - fungible: Confined::from_iter_unsafe( + seals: Confined::from_checked(seals), + fungible: Confined::from_iter_checked( fungible.into_iter().map(|(k, s)| (k, s.commitment)), ), - data: Confined::from_collection_unsafe(data), - attach: Confined::from_collection_unsafe(attach), + data: Confined::from_checked(data), + attach: Confined::from_checked(attach), } } diff --git a/src/schema/state.rs b/src/schema/state.rs index 27db9a15..f74a79de 100644 --- a/src/schema/state.rs +++ b/src/schema/state.rs @@ -80,11 +80,7 @@ impl OwnedStateSchema { } pub fn sem_id(&self) -> Option { - if let Self::Structured(id) = self { - Some(*id) - } else { - None - } + if let Self::Structured(id) = self { Some(*id) } else { None } } } diff --git a/src/stl.rs b/src/stl.rs index 747c81b0..d798097c 100644 --- a/src/stl.rs +++ b/src/stl.rs @@ -37,10 +37,10 @@ use crate::{ /// Strict types id for the library providing data types for RGB consensus. pub const LIB_ID_RGB_COMMIT: &str = - "stl:4WY0kCd1-qKjYuh5-4GgHKme-XIsmv98-W5Z9$8D-vMjFt!Y#miranda-blue-promise"; + "stl:eKthGp7I-52YYwm!-nkAFB7$-0X9zHac-f5pAUKf-V01EhSc#pretend-carpet-caesar"; /// Strict types id for the library providing data types for RGB consensus. pub const LIB_ID_RGB_LOGIC: &str = - "stl:Yd7koRpf-hs7nsKX-TOLAnZl-hIfJ9wQ-M8J58hj-n60RcaA#pioneer-gong-smoke"; + "stl:Pyd01gNn-B3o3lfj-4y6pZ5a-qSgCE1x-0J7gL!C-raacTJs#memphis-martin-jump"; fn _rgb_commit_stl() -> Result { LibBuilder::new(libname!(LIB_NAME_RGB_COMMIT), tiny_bset! { diff --git a/src/validation/logic.rs b/src/validation/logic.rs index ed7c3732..0afd7f93 100644 --- a/src/validation/logic.rs +++ b/src/validation/logic.rs @@ -76,8 +76,8 @@ impl Schema { } } for (id, ss) in &self.owned_types { - if ss.state_type() == StateType::Fungible && - !genesis.asset_tags.contains_key(id) + if ss.state_type() == StateType::Fungible + && !genesis.asset_tags.contains_key(id) { status.add_failure(validation::Failure::FungibleStateNoTag(*id)); } @@ -258,7 +258,7 @@ impl Schema { .keys() .copied() .collect::>() - .difference(metadata_schema.as_inner()) + .difference(metadata_schema.as_unconfined()) .for_each(|type_id| { status.add_failure(validation::Failure::SchemaUnknownMetaType(opid, *type_id)); }); @@ -309,7 +309,7 @@ impl Schema { .get(type_id) .cloned() .map(GlobalValues::into_inner) - .map(Confined::unbox) + .map(Confined::release) .unwrap_or_default(); let GlobalStateSchema { diff --git a/src/validation/validator.rs b/src/validation/validator.rs index 0306cdcb..38908243 100644 --- a/src/validation/validator.rs +++ b/src/validation/validator.rs @@ -324,8 +324,8 @@ impl< .add_failure(Failure::ContractMismatch(opid, operation.contract_id())); } - if !self.validated_op_seals.borrow().contains(&opid) && - operation.op_type() == OpType::StateTransition + if !self.validated_op_seals.borrow().contains(&opid) + && operation.op_type() == OpType::StateTransition { self.status .borrow_mut() diff --git a/src/vm/contract.rs b/src/vm/contract.rs index d08885fc..508bc8e3 100644 --- a/src/vm/contract.rs +++ b/src/vm/contract.rs @@ -347,13 +347,12 @@ pub enum WitnessOrd { /// Witness transaction must be excluded from the state processing. /// /// Cases for the exclusion: - /// - transaction was removed from blockchain after a re-org and its inputs - /// were spent by other transaction; - /// - previous transaction(s) after RBF replacement, once it is excluded - /// from the mempool and replaced by RBFed successors; - /// - past state channel transactions once a new channel state is signed - /// (and until they may become valid once again due to an uncooperative - /// channel closing). + /// - transaction was removed from blockchain after a re-org and its inputs were spent by other + /// transaction; + /// - previous transaction(s) after RBF replacement, once it is excluded from the mempool and + /// replaced by RBFed successors; + /// - past state channel transactions once a new channel state is signed (and until they may + /// become valid once again due to an uncooperative channel closing). #[strict_type(dumb)] Archived, @@ -376,11 +375,11 @@ pub enum WitnessOrd { /// status; all offchain cases which fall under [`Self::Archived`] must be /// excluded. Valid cases for assigning [`Self::Tentative`] status are: /// - transaction is present in the memepool; - /// - transaction is a part of transaction graph inside a state channel - /// (only actual channel state is accounted for; all previous channel - /// state must have corresponding transactions set to [`Self::Archived`]); - /// - transaction is an RBF replacement prepared to be broadcast (with the - /// previous transaction set to [`Self::Archived`] at the same moment). + /// - transaction is a part of transaction graph inside a state channel (only actual channel + /// state is accounted for; all previous channel state must have corresponding transactions + /// set to [`Self::Archived`]); + /// - transaction is an RBF replacement prepared to be broadcast (with the previous transaction + /// set to [`Self::Archived`] at the same moment). Tentative, } @@ -394,14 +393,12 @@ impl WitnessOrd { /// /// The ordering is the following: /// - Genesis is processed first. -/// - Other operations are ordered according to their witness transactions (see -/// [`WitnessOrd`] for the details). -/// - Extensions share witness transaction with the state transition which first -/// to close one of the seals defined in the extension, but are processed -/// before that state transition. -/// - If two or more operations share the same witness transaction ordering, -/// they are first ordered basing on their `nonce` value, and if it is also -/// the same, basing on their operation id value. +/// - Other operations are ordered according to their witness transactions (see [`WitnessOrd`] for +/// the details). +/// - Extensions share witness transaction with the state transition which first to close one of the +/// seals defined in the extension, but are processed before that state transition. +/// - If two or more operations share the same witness transaction ordering, they are first ordered +/// basing on their `nonce` value, and if it is also the same, basing on their operation id value. /// /// [RCP-240731A]: https://github.com/RGB-WG/RFC/issues/10 #[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Hash, Debug)] diff --git a/src/vm/op_contract.rs b/src/vm/op_contract.rs index 44de93f6..5d971ff9 100644 --- a/src/vm/op_contract.rs +++ b/src/vm/op_contract.rs @@ -189,17 +189,17 @@ impl InstructionSet for ContractOp { fn src_regs(&self) -> BTreeSet { match self { - ContractOp::LdP(_, reg, _) | - ContractOp::LdF(_, reg, _) | - ContractOp::LdS(_, reg, _) => bset![Reg::A(RegA::A16, (*reg).into())], + ContractOp::LdP(_, reg, _) + | ContractOp::LdF(_, reg, _) + | ContractOp::LdS(_, reg, _) => bset![Reg::A(RegA::A16, (*reg).into())], ContractOp::LdG(_, reg, _) => bset![Reg::A(RegA::A8, (*reg).into())], ContractOp::LdC(_, reg, _) => bset![Reg::A(RegA::A32, (*reg).into())], - ContractOp::CnP(_, _) | - ContractOp::CnS(_, _) | - ContractOp::CnG(_, _) | - ContractOp::CnC(_, _) | - ContractOp::LdM(_, _) => bset![], + ContractOp::CnP(_, _) + | ContractOp::CnS(_, _) + | ContractOp::CnG(_, _) + | ContractOp::CnC(_, _) + | ContractOp::LdM(_, _) => bset![], ContractOp::Pcvs(_) => bset![], ContractOp::Pcas(_) | ContractOp::Pcps(_) => bset![Reg::A(RegA::A64, Reg32::Reg0)], ContractOp::Fail(_, _) => bset![], @@ -217,11 +217,11 @@ impl InstructionSet for ContractOp { ContractOp::LdF(_, _, reg) => { bset![Reg::A(RegA::A64, (*reg).into())] } - ContractOp::LdG(_, _, reg) | - ContractOp::LdS(_, _, reg) | - ContractOp::LdP(_, _, reg) | - ContractOp::LdC(_, _, reg) | - ContractOp::LdM(_, reg) => { + ContractOp::LdG(_, _, reg) + | ContractOp::LdS(_, _, reg) + | ContractOp::LdP(_, _, reg) + | ContractOp::LdC(_, _, reg) + | ContractOp::LdM(_, reg) => { bset![Reg::S(*reg)] } ContractOp::Pcvs(_) | ContractOp::Pcas(_) | ContractOp::Pcps(_) => { @@ -233,15 +233,15 @@ impl InstructionSet for ContractOp { fn complexity(&self) -> u64 { match self { - ContractOp::CnP(_, _) | - ContractOp::CnS(_, _) | - ContractOp::CnG(_, _) | - ContractOp::CnC(_, _) => 2, - ContractOp::LdP(_, _, _) | - ContractOp::LdS(_, _, _) | - ContractOp::LdF(_, _, _) | - ContractOp::LdG(_, _, _) | - ContractOp::LdC(_, _, _) => 8, + ContractOp::CnP(_, _) + | ContractOp::CnS(_, _) + | ContractOp::CnG(_, _) + | ContractOp::CnC(_, _) => 2, + ContractOp::LdP(_, _, _) + | ContractOp::LdS(_, _, _) + | ContractOp::LdF(_, _, _) + | ContractOp::LdG(_, _, _) + | ContractOp::LdC(_, _, _) => 8, ContractOp::LdM(_, _) => 6, ContractOp::Pcvs(_) => 1024, ContractOp::Pcas(_) | ContractOp::Pcps(_) => 512, diff --git a/stl/RGBCommit@0.1.0.sta b/stl/RGBCommit@0.1.0.sta index 9b2b888c..2d4f2908 100644 --- a/stl/RGBCommit@0.1.0.sta +++ b/stl/RGBCommit@0.1.0.sta @@ -1,19 +1,19 @@ -----BEGIN STRICT TYPE LIB----- -Id: stl:4WY0kCd1-qKjYuh5-4GgHKme-XIsmv98-W5Z9$8D-vMjFt!Y#miranda-blue-promise +Id: stl:eKthGp7I-52YYwm!-nkAFB7$-0X9zHac-f5pAUKf-V01EhSc#pretend-carpet-caesar Name: RGBCommit Dependencies: StrictTypes#century-comrade-chess, AluVM#congo-archive-folio, - BPCore#garbo-radius-peru, + CommitVerify#miller-pancake-elastic, + BPCore#totem-holiday-helena, Std#ralph-blue-lucky, - CommitVerify#tennis-peace-olympic, Bitcoin#signal-color-cipher -Check-SHA256: f92eee8c46b1d13a82140f1bc301abf4f112a700ff58dd49c0da0572d89f6747 +Check-SHA256: 8447a453dc6b4effc5ed991125084965c4e0b44a09b757502765c9ab2909be75 2~tNwLvL+uX>Z4!V_T!KNI`QJ|h6;Zj^jB$MPK+?7Lu3>C`4HI)Q*?4^V{}w`aAk91a5aA+<>R2X -hQO_4{AcS-HH^7AVzASV8M4NYxyCjHL2PwaO>Z8S`G>t*&Lor=XWH@ulIpd#VR%e3()@~+=qs(Ia|S|C -LvM0r$}AplgPGkh3_fq3Q7_j=2#kPT_9!;lWR>~GYywm#154E? +M+l67UG^w8*<_XZ#%uyqCj(P-Wc6$lVk7oBr%DNv+($;q`HHK!gIHa)*%m(-e#9sm3I{@IbYpL6ZUzNG Y;{&m0sw9Ap(f$Hb>aU=OZ$bvG|>z)+>9PT;Au-7)~D;-++hbyX<}1pbY-V7RRS&fT*&Z=qeY@Wmfle* z!SF)@h8|JkU^FEQwjx4X<|ua20~CnZ*pY?04}!>CAn^87TS9h9ibhaZ&^Bcn*B*;w|~I;-PD|t>jq6_ bZBp6MklB)P_)|`Y=H7dO_e!^G2i>0SdC0NppV!6v|_i_4nk~cZe&wsVQf@*P;_!=8SA{&vly$FvzVnz @@ -33,104 +33,104 @@ By!~v3=AX`3Ri0000000000{{R3000000B0+O=X=iRyWp-s@Y-MCYbaY{3XhLjhZe&wsVQf@*P;_zx1ONKtpQ8M_qJyiO1VIUJ=H=)@ii_1#@&^bY%hjG)3KC -&kYOztQDksx&yAAHY;R+00^!l!96CYQxM)es+421}!Q~o5fc_fP)zyAAHY;R+00(t`--)Viz@~C%8KNS}Z0aQ3s^SOqbBwN-D{wl@O +Cd;@jJLYKfb7gWS-+`&{Sr=ykNJ#YFTr_BQwWqKF0Ra(XZ*FF3WMyu2X<=+rbYXO500sjDb7f&{0gt=F =tr7PLxBDo)YaDXjV8yEYGuo~Ej#9D^K)f#Cf|Xn@L3mU0Z2&n +E$faw1Z;0(YXW)$9p7nv%krpqNJW4?*h+3X!X@fjr@d0IimUQ-Q1Z;0(YXafX-5feW*SKg&%h~b$ -G{NN>LxBDo)YaDXjV8yEYGuo~Ej#9D^K)f#Cf|Xn@L3mU0Z2&n-dr?jcD1Ll0RaODa%Fa9VQgh&00sjD +zSe2A1O;<+VRU5y=Ov5&mq(eSq^TM>JW4?*h+3X!X@fjr@d0IimUQ-Q1Z;0(YXW)$9p7nv%krpqNJW4?*h+3X! -X@fjr@d0IimUQ-Q1Z;0(YXafX-5feW*SKg&%h~b$G{NN>LxBDo)YaDXjV8yEYGuo~Ej#9D^K)f#Cf|Xn +X@fjr@d0IimUQ-Q1Z;0(YXW)$9p7nv%krpqNLxBDo)YaDXjV8yEYGuo~Ej#9D +db$N7;9H9;8!%;3hl7uME$faw1Z;0(YXW)$9p7nv%krpqNc;WdH^P1aoC!YypA{4XEgn0epQk*PX+nL>xOm%pK>soMo}bYXO50sJ&Y-CxfQ3;(PYq10COKearHwcS=7M7YzYaI8*bvhMOc?)(rkC#nUFsxGg*8X!CPrawgw_sqk4BX8}k^^xj-FXm+)y umJ%A5Mys{W@%()Zggp3Y*S@nYybuW1aoC!YysPfS{i~B5OpZ>_>4e9YQ#rfba;u!+d5tm#=h2RwFCuo -bYXO50p}%){+CCYqok=CI6O*0D2Q5~XK8~xVetWFewK9hZ3Jv@V`~E8(cK(6LD#rwNz2*s{WQVl8bg5o -8r0R+^o=IRl4@nkxGg*8X!CPrawgw_sqk4BX8}k^^xj-FXm+)yumJ%B2y$h1WnpY(WB>*O1aoC!YypA{ +bYXO50p}%){+CCYqok=CI6O*0D2Q5~XK8~xVetWFewK9hZ3Jv@V`~C>10COKearHwcS=7M7YzYaI8*bv +hMOc?)(rkC#nUFsxGg*8X!CPrawgw_sqk4BX8}k^^xj-FXm+)yumJ%B2y$h1WnpY(WB>*O1aoC!YypA{ 4XEgn0epQk*PX+nL>xOm%pK>soMo}bYXO50p}%){+CCYqok=CI6O*0D2Q5~XK8~xVetWF -ewK9hZ3Jv@V`~E8(cK(6LD#rwNz2*s{WQVl8bg5o8r0R+^o=IRl4@nkxGg*8X!CPrawgw_sqk4BX8}k^ +ewK9hZ3Jv@V`~C>10COKearHwcS=7M7YzYaI8*bvhMOc?)(rkC#nUFsxGg*8X!CPrawgw_sqk4BX8}k^ ^xj-FXm+)yumJ%eL349yXKqquc4c8~Wn@HQbYVhlX>MdwWnpYocu;h51OxyKV{dL|X=G(?bZKF100sjD b7f&{0o#gN8iEuMbtv-qj6g$b#7A9pc!|f`I$jaRzSe2A1O;<+VRU5ya1CV;vVwtcAGbZ_5@VACR|ut2 -VXXq-)V^B9&!_4M1Z;0(YXafX-5feW*SKg&%h~b$G{NN>LxBDo)YaDXjV8yEYGuo~Ej#9D^K)f#Cf|Xn +VXXq-)V^B9&!_4M1Z;0(YXW)$9p7nv%krpqNc;WdH^P1aoC!YypqE!sthuPUKDEU2%WC`V+X+ -(UG)mk--2W1{>juaWw^VbYXO50dNgv5VC@SZy&ckjuaWw^VbYXO50dNgv5VC@SZy&ck10COK +earHwcS=7M7YzYaI8*bvhMOc?)(rkC#nUFsxGg*8X!CPrawgw_sqk4BX8}k^^xj-FXm+)yumJ%A5Mys{ W@%()Zggp3Y*S@nYybuW1aoC!YysPfS{i~B5OpZ>_>4e9YQ#rfba;u!+d5tm#=h2RwFCuobYXO50sm-Y -z<5%CY59k^g5#W{6D&GDo53%OaP0&iRq*O1aoC!YypqE!sthuPUKDE +z<5%CY59k^g5#W{6D&GDo53%OaP0&iRq10COKearHwcS=7M7YzYaI8*bvhMOc?)(rkC +#nUFsxGg*8X!CPrawgw_sqk4BX8}k^^xj-FXm+)yumJ%B2y$h1WnpY(WB>*O1aoC!YypqE!sthuPUKDE U2%WC`V+X+(UG)mk--2W1{>juaWw^VbYXO50sm-Yz<5%CY59k^g5#W{6D&GDo53%OaP0&iRq10COKearHwcS=7M7YzYaI8*bvhMOc?)(rkC#nUFsxGg*8X!CPrawgw_sqk4BX8}k^^xj-FXm+)y umJ%dL349yXKqquc4c8~Wn@HQbYVhlX>MdwWnpYocxhw=1ONKtpQ8M_qJyiO1VIUJ=H=)@ii_1#@&^bY%f>4P_9rf`M-zw>{+&W0M0{2&GbCtpecGzFNi4 -r|Jm=Y;R+00^!l!96CYQxM)es+421}!Q~o5fc_fP)zLxBDo)YaDXjV8yEYGuo~Ej#9D^K)f#Cf|Xn@L3mU0Z2&n-dr?jcD1Ll0RaLKV{dL|X=G(?bZKF1 +zoDn8+XZuUVRU5ya1CV;vVwtcAGbZ_5@VACR|ut2VXXq-)V^B9&!_4M1Z;0(YXW)$9p7nv%krpqNfI -LxBDo)YaDXjV8yEYGuo~Ej#9D +fILxBDo)YaDXjV8yEYGuo~Ej#9D^K)f#Cf|Xn@L3mU0Z2&n-dr?jcD1Ll0RbUFb8~5D +sXBX^LWi`MzoDn8+XZuUVRU5y|7c^tcv66A`G>fIMdwWnpYocu;h51OxyKV{dL|X=G(?bZKF100sjDb7f&{0o#gN8iEuMbtv-q j6g$b#7A9pc!|f`I$jaRzSe2A1O;<+VRU5yN@#iqkT|?l*=bx{^0c**fmF&H)l(b`S3$sb4!MK-1Z;0( -YXafX-5feW*SKg&%h~b$G{NN>LxBDo)YaDXjV8yEYGuo~Ej#9D^K)f#Cf|Xn@L3mU0Z2&n-dr?jcD1Ll +YXW)$9p7nv%krpqNc;WdH^P1aoC!YypqE!sthuPUKDEU2%WC`V+X+(UG)mk--2W1{>juaWw^V -bYXO50ZM3k2aq_tRM}}10COKearHwcS=7M7YzYaI8*bv +hMOc?)(rkC#nUFsxGg*8X!CPrawgw_sqk4BX8}k^^xj-FXm+)yumJ%A5Mys{W@%()Zggp3Y*S@nYybuW 1aoC!YysPfS{i~B5OpZ>_>4e9YQ#rfba;u!+d5tm#=h2RwFCuobYXO50c}La^e<`!Iztr?rsl#d#OQkE -ER^^L)C{HEhxT=ipag7hV`~E8(cK(6LD#rwNz2*s{WQVl8bg5o8r0R+^o=IRl4@nkxGg*8X!CPrawgw_ +ER^^L)C{HEhxT=ipag7hV`~C>10COKearHwcS=7M7YzYaI8*bvhMOc?)(rkC#nUFsxGg*8X!CPrawgw_ sqk4BX8}k^^xj-FXm+)yumJ%B2y$h1WnpY(WB>*O1aoC!YypqE!sthuPUKDEU2%WC`V+X+(UG)mk--2W -1{>juaWw^VbYXO50c}La^e<`!Iztr?rsl#d#OQkEER^^L)C{HEhxT=ipag7hV`~E8(cK(6LD#rwNz2*s -{WQVl8bg5o8r0R+^o=IRl4@nkxGg*8X!CPrawgw_sqk4BX8}k^^xj-FXm+)yumJ%eL349yXKqquc4c8~ +1{>juaWw^VbYXO50c}La^e<`!Iztr?rsl#d#OQkEER^^L)C{HEhxT=ipag7hV`~C>10COKearHwcS=7M +7YzYaI8*bvhMOc?)(rkC#nUFsxGg*8X!CPrawgw_sqk4BX8}k^^xj-FXm+)yumJ%eL349yXKqquc4c8~ Wn@-iY;|QqY-w&}Q)OXnRCsA*1OxyKV{dL|X=G(?bZKF100sjDb7f&{0o#gN8iEuMbtv-qj6g$b#7A9p -c!|f`I$jaRzSe2A1O;<+VRU5yN@#iqkT|?l*=bx{^0c**fmF&H)l(b`S3$sb4!MK-1Z;0(YXafX-5feW -*SKg&%h~b$G{NN>LxBDo)YaDXjV8yEYGuo~Ej#9D^K)f#Cf|Xn@L3mU0Z2&n-dr?jcD1Ll0RaIKV{dL| +c!|f`I$jaRzSe2A1O;<+VRU5yN@#iqkT|?l*=bx{^0c**fmF&H)l(b`S3$sb4!MK-1Z;0(YXW)$9p7nv +%krpqNc;WdH^P1aoC!YypA{4XEgn0epQk*PX+nL>xOm%pK>soMo}bYXO50ZM3k -2aq_tRM}}10COKearHwcS=7M7YzYaI8*bvhMOc?)(rkC +#nUFsxGg*8X!CPrawgw_sqk4BX8}k^^xj-FXm+)yumJ%A5Mys{W@%()Zggp3Y*S@nYybuW1aoC!YysPf S{i~B5OpZ>_>4e9YQ#rfba;u!+d5tm#=h2RwFCuobYXO50c}La^e<`!Iztr?rsl#d#OQkEER^^L)C{HE -hxT=ipag7hV`~E8(cK(6LD#rwNz2*s{WQVl8bg5o8r0R+^o=IRl4@nkxGg*8X!CPrawgw_sqk4BX8}k^ +hxT=ipag7hV`~C>10COKearHwcS=7M7YzYaI8*bvhMOc?)(rkC#nUFsxGg*8X!CPrawgw_sqk4BX8}k^ ^xj-FXm+)yumJ%B2y$h1WnpY(WB>*O1aoC!YypA{4XEgn0epQk*PX+nL>xOm%pK>soMo} -bYXO50c}La^e<`!Iztr?rsl#d#OQkEER^^L)C{HEhxT=ipag7hV`~E8(cK(6LD#rwNz2*s{WQVl8bg5o -8r0R+^o=IRl4@nkxGg*8X!CPrawgw_sqk4BX8}k^^xj-FXm+)yumJ%bL349yXKq$+X=GD$VRU6eY-w&} +bYXO50c}La^e<`!Iztr?rsl#d#OQkEER^^L)C{HEhxT=ipag7hV`~C>10COKearHwcS=7M7YzYaI8*bv +hMOc?)(rkC#nUFsxGg*8X!CPrawgw_sqk4BX8}k^^xj-FXm+)yumJ%bL349yXKq$+X=GD$VRU6eY-w&} Q)OXnRCrKyas&hb3}bI@W@%()Zggp3YybuW1aoC!YysPfS{i~B5OpZ>_>4e9YQ#rfba;u!+d5tm#=h2R -wFCuobYXO50WPwo{ujV7L@=1(T$>wOY}Ov_b`4?P%YY`+Wb+o`y98`+V`~E8(cK(6LD#rwNz2*s{WQVl -8bg5o8r0R+^o=IRl4@nkxGg*8X!CPrawgw_sqk4BX8}k^^xj-FXm+)yumJ%95o2#|W@%()Zggp3Y*Tb$ +wFCuobYXO50WPwo{ujV7L@=1(T$>wOY}Ov_b`4?P%YY`+Wb+o`y98`+V`~C>10COKearHwcS=7M7YzYa +I8*bvhMOc?)(rkC#nUFsxGg*8X!CPrawgw_sqk4BX8}k^^xj-FXm+)yumJ%95o2#|W@%()Zggp3Y*Tb$ bY%br0|awrVQc}9yTa&4noi_R;$3lnz4{Zl)X|Z&ZIQtMA_g1big7gsb97;JWdSa-rT!PdFhnqz;9Q#< -T5Q%H?RE`e-pha{(`54&;kyKEZ)0l$;nCe3IziXCXi3Z2@%=Qx_>4e9YQ#rfba;u!+d5tm#=h2RwFCuobYXO50WPwo -{ujV7L@=1(T$>wOY}Ov_b`4?P%YY`+Wb+o`y98`+V`~E8(cK(6LD#rwNz2*s{WQVl8bg5o8r0R+^o=IR -l4@nkxGg*8X!CPrawgw_sqk4BX8}k^^xj-FXm+)yumJ%95o2#|W@%()Zggp3Y*Tb$bY%br0|awrVQc|{ +{ujV7L@=1(T$>wOY}Ov_b`4?P%YY`+Wb+o`y98`+V`~C>10COKearHwcS=7M7YzYaI8*bvhMOc?)(rkC +#nUFsxGg*8X!CPrawgw_sqk4BX8}k^^xj-FXm+)yumJ%95o2#|W@%()Zggp3Y*Tb$bY%br0|awrVQc|{ 3=OYq{WJl0D5$WZob97;JWdSa-rT!PdFhnqz;9Q#WZob97;JWdSa-rT!PdFhnqz;9Q#<~nFGwl#> J&iiT&+eT*0000000000{{R30000007(sJ$X=iS2Wo~qHLTqVnWK(5fY*ct@WCZ~L3IT`y;$>KfZ0H=m hJ>?uVc;Wd;HQX=DL}aSf9!PV~dK2uo>;u!nFdemP_$ e?^hl+JkM;eY!XaZDnL>VN`i=WdTAkVTFju)TLxBDo)YaDXjV8yEYGsr6V0dsu5sjwLjgQcrOsaG1 +bZupBbOr|nW^7?+a{_t;9p7nv%krpqN~Wpi|4 -ZEyepNCs(hb9H5M0^!l!96CYQxM)es+421}!Q~o5fc_fP)zLxBDo)YaDXjV8yE -YGrM&t;O}HAO^^zqT0%g+nC0;-MWK<)&Ge4`aq}l(*_A)b8}^MRAFax0^!l!96CYQxM)es+421}!Q~o5 -fc_fP)zMd`Zf8beV{~tF1pxpD +=XJ?|;InIPy66cFfOYp#JM2r7_Du?5Y;;Uvd1Z2QF#>u69p7nv%krpqNMd`Zf8beV{~tF1pxpD 002NB01rcNZewL(Y-MCYbaY{3XaxZP2LJ#-AOHD 0Z6?XZWsH8I~II?C0;dW+k!*yDqgzlqQwf$39g<|8VW;iZgg^CV{}Pm1pxpD002NB00~54bYW9;VRU5$ @@ -140,8 +140,8 @@ Wo~n6Z*Ek1aAg5xbsj>g6`?#s5rWnKhSeO?L~x^!;Y#eFP|P}0Z%EzBpbEf7FA*KKfDWJ b8~5DZf#|5baMe=>KFFSbgda38zdDXQ0-0pHK5k@bh=O+>c= 6_h5K%L=laq&yA1JoJ^{7>oKLk -F4~iax8KK|47hp+cWHEPWpi@^;nCe3IziXCXi3Z2@%=QxoKLk +F4~iax8KK|47hp+cWHEPWpi@^dIKHbX?@G`sCP;~6&DQwR5(-fxrUo0Thxis%Ku=2wF+7z(Wqt=tdZk`V^s(Ana000000093000000000Ma @@ -152,15 +152,15 @@ smk?aU=OZ$bvG|>z)+>9PT;Au-7)~D;-++htxcywiMb7^mG RC#b^1pxp60s}^7b_D?d00Iq0b#7;AVr*qobYXO51OW&JVrg`9HZ%YQ0RR993`TWsXK7+=WmI`^Wdi{X b#8NMXKrO=HZ($MbO;AWWo~72X>$e*17>D+0ot2U6Id2jc94hrndMfLayEe1ISdA&%p{mB1!VWk)d+KA -Xk~3-Nn`<(Qq$W5tE;F{pQrXd&=l*`O?@#x{Qdy?T_k!`1dtE~W^7?+a{}Sf-5feW*SKg&%h~b$G{NN> -LxBDo)YaDXjV8yEYGsr6V0dsu5sjwLjgQcrOsaG1F{QvR+LMR3-^ZN{xOxe6X>Db5bYX39002k^X>)UR +Xk~3-Nn`<(Qq$W5tE;F{pQrXd&=l*`O?@#x{Qdy?T_k!`1dtE~W^7?+a{_t;9p7nv%krpqNDb5bYX39002k^X>)UR WpV+w=zxYCD0L!x4tB5Hm3vFbl?lapNXe%XU~*fKJ0+Y4bY*jNZe?@=$}AplgPGkh3_fq3Q7_j=2#kPT _9!;lWR>~GYywm#VTK~nd#>BpbEf7FA*KKfDWJb8~5DZf#|5baMe=>KFFSbgda38zdDXQa{=9jW&m$tWDykZj`7#3_zANbB(SO{shhGe=&H{tM@a{=9jW&m$tWDykZj`7#3_zANbB(SO{shhGe=&H{tM@n+a000000RI300000001IJrb7^O8ZDnqBa{vkfhyLPaScq)s9KMExvw34D @@ -169,15 +169,15 @@ b5mnzWo=;w1qf|rbYWy+bYTDq0d?d}_}|Wp0vpvv$c&#PW69R$ltr%da5t5w^x+8!q5uE@000000RI30 VQgt+VRUbD00aU61a5C`WdHyG0R(ezZDjxj0Rm!hHGd)HaU=OZ$bvG|>z)+>9PT;Au-7)~D;-++hnxY;R&=Y*Tb$bY%qr015%s?vf5kh_h+&YE#h%O8d1V _{UOl9{V;uR#^q%$8ES^HwOl>wiJLxBDo)YaDXjV8yEYGsr6 +5l3uqVqt7kbYXO5Q)6glZD9rj2y$g}WpZ|9WCD5v9p7nv%krpqNc;WmI`^ Wd#8M00In0Y;R&=Y*t}xb!Bq}0RRXAGM-jZ2Kh}DE2o;HYydTtf}Q!WH{}bI!u)W*#(e~Z0RR9100000 |Nj60000002uWmRZggpMc?AIg1p)%fEFN!zncXl9K5w2;FV{y1jDTJCC^p$-mHEbO0#qkRz9SbZ=!8X@ =Yuq$20sb<4l#S`iz7Vef}@Ca=a#qt2m;D19&dx0-7pM3Z=O*v*GCA9fL-<|HrZsA`NnJlR3}KjBNr;@ ghiU?gEXK9KMDE{F?;HZBRuDVqlk6qmbd@_000000093F00000000F^Zg6#U1_B3ga%FZ;b#wuf5WIk~ -G+K)5%bR49t5yk`^qQ9la%FR6a&~280^!l!96CYQxM)es+421}!Q~o5fc_fP)zWj015*2Y!hN5_Bp3Y36tDM +G+K)5%bR49t5yk`^qQ9la%FR6a&~280(t`--)Viz@~C%8KNS}Z0aQ3s^SOqbBwN-D +{wl@OCd;@jJLYKfb7gWS-+`&{Sr=ykNJ#YFTr_BQwWqKF0SHNMaCLM|VQ>Wj015*2Y!hN5_Bp3Y36tDM M#=e#tGI($UA5U3KNx<*C>jbO<32;hs$B9ZCsU(1!DsC|W1LOd&b_IRG-(&Q$wPGkmB{9L9(7`0)Rt93 YLV-HLXe?vTA1;^Q1`ZqBog<<0RR9100000|Nj600000021#ykb#!wD0RRaB)s0^W44ZlVPs)+VFdvI3ITQGP59r=ivkR6Lh9EroO>_;0000000030000000000B Ph(?sa&l#EV`Xy&0t0PnZU6uR18re=0006EPjEwTZEb0EZDnqB1`7jbW_AJEn^6;37FKqUhx?i3R+Mr! fY&(;2BFL(m@EZk_srD=Zf|a5WdHyH25)dwd2nR`=kby$tK%HuPpRtMKe5+wDRP}k(QuARKUbDjTz^bE -2yJC_VPs)+VFKaN-5feW*SKg&%h~b$G{NN>LxBDo)YaDXjV8yEYGrM&t;O}HAO^^zqT0%g+nC0;-MWK< -)&Ge4`aq}l(*_4;Y;R&=Y;ywP(cK(6LD#rwNz2*s{WQVl8bg5o8r0R+^o=IRl4@l*oM?JbaMjX(cK(6LD#rwNz2*s{WQVl8bg5o8r0R+^o=IRl4@l*oClv)aMjKgwAH@`bu1x<7g|G$};xvA~n-$_S2y$g)Wo2z;WCG#Q-5feW*SKg&%h~b$ -G{NN>LxBDo)YaDXjV8yEYGrM&t;O}HAO^^zqT0%g+nC0;-MWK<)&Ge4`aq}l(*_B4VQgh?V`*h`0^!l! -96CYQxM)es+421}!Q~o5fc_fP)zLxBDo)YaDXjV8yEYGpW{Lxv|61vo|M?JbaMiF10COKearHwcS=7M7YzYaI8*bvhMOc?)(rkC#nUD@oClv)aMjKgwAH@`bu1x<7g|G$};xvA~n-$_S2y$g)Wo2z;WCD5v9p7nv%krpqNR000000RI3000000 3{quwWnpY(WJFD+0ot2U6Id2jc94hrndMfLayEe1ISdA&%p{mB1!VWk)dgm3VP|s!;nCe3 -IziXCXi3Z2@%=QxD+0ot2U6Id2jc94hrndMfLayEe1ISdA&%p{mB1!VWk)dgm3VP|s!dIKHb +X?@G`sCP;~6&DQwR5(-fxrUo0ThOi(W05|TJ%PM*ricn_Pm Xk-a=X>Db5bYX39002k{WMy_`Y;SO7asjsJfQB3>bs~EXcCXx(drQcb3B`Fx$)^%va$Ar)C7cOuWprUw d2nTO015$h9R0ZFSEMRj;Km4qfBYZ5UUs>0bg9bqiCNA700000000300000000007XJu|>b7^w{ 7)aIA#9XnshcC})U)TI#r3b0kyqD7}ejM+$yUGm(3T1e7Wo~n6Z*Fq{3ISww9zv-Vp*%wog4O?q)g04A aHEjnO6;Ie%sNwVNZtVhXadZr-SPY!h`6Z9%SYt5l1;p3@00000000300000000008a%FR6a&~280^!l!96CYQxM)es+421}!Q~o5fc_fP -)zPY!h`6Z9%SYt5l1;p3@00000000300000000008a%FR6a&~280(t`--)Viz@~C%8KNS}Z0aQ3s^SOqb +BwN-D{wl@OCjNpJN#A(BKKz&v`r;e6DUv<<*U}cD+0ot2U6Id2jc94hrndMfLayEe1ISdA&%p{mB1!VWk)e2*8Zgg^CV{}Pm0iOsgNjk^^ qPoT1+zTRnAg`3vXv9d*8d@RXy~6c6G6imLZewKt009nka$#@6CZd7@2WdSr&53UoI8eY9A{1GER g--GiI0S#x1is&)M%fmnGH3{GWprU=VRT^u^?FS>S$_F2)vN@Mb6UJ-F(lri_dqerx4lR4>iBsz2WM<= Vqt7^0p25#Yo@G%*b#-tU^&3KX?w7l?~*Sh8@1jRRblZzyas7*aCLNZ0jZ*TSChz_$|Xx}eRkFNAr%^e Ll(1e@}~9=0-ijXfD2)Bb7^O8ZDnqBa{)s3lIz?v1U>x&T2C;PAKlCCveQ{N4udSh#@3Dqj&%ukVQgh? -V`*h`0o{dW0B>Pr5ftu@@z<*O39}j`u&O7io3b$Is?RA$O$l~kY-wa+bZ>G3;nCe3IziXCXi3Z2@%=Qx -t*&Lor=XWH@ulIpd#VR%e3()@~+=qs(Ib1t_KCAn^8 +V`*h`0o{dW0B>Pr5ftu@@z<*O39}j`u&O7io3b$Is?RA$O$l~kY-wa+bZ>G3dIKHbX?@G`sCP;~6&DQw +R5(-fxrUo0Th*%N~j&hfyEy&@Q(SCAn^8 7TS9h9ibhaZ&^Bcn*B*;w|~I;-PD|t>j-IXaCLM|VQ>KznP+6nwW~k}RP!NmuV?G015$>$mV(;bz)!CmQ_M(k?Vd!kfCo{nDM?)_qK{868FUcln*p#G+NdC Gjy~AR_gVLaFF}DZ0SlZTU?PU0ls0E0RR9100000|Nj60000005L9wuZgXjLX>V>*V`yb&L00;qEk8=qnO(R<<%JIK< 1B78x*e6}1oxDzJ3ElvocGBqp0000000030{{R30000303So3~VPj}*Wo~o;1pxpE0aMUzRzj^*Tk1C) pGbjYG7000000RR600000000~xMY-Mg^X=QT-0RRaBM(yUq2ps*m=2xUD T;RqCgn#@WzFu~@adfH5^@&-|0000000000{{R30000003szxlWo~16RC#b^1pxp60tr@cX=GD$VRU5$ -0RR916j(!OVQFqcY-w&}Q)OXnRCrKyas&bZ2V!Y-V{d7000jX8ZyuKUhrL_QB$OCu+VTUE>b16EcuX?V -{EC+7E3Kt-MklB)P_)|`Y=H7dO_e!^G2i>0SdC0NppV!6v|_i_0S0Voadl~A00jX8ZyuKUhrL_QB$OCu -+VTUE>b16EcuX?V{EC+7E3Kt-MklB)P_)|`Y=H7dO_e!^G2i>0SdC0NppV!6v|_i_6IerNVQFqcY-w&} -Q)OXnRCsA*1OfmDVrg_^Z)t7-1pxwY9+vrsy<5&Clo)5)@&l6UwYFh+Ofu5^ik9drt)+9Y#&NEOd)wn+ -n#11fGQ~$X901P7x>0daZB@{PThHqO25f0@b!lV(1pxwY9+vrsy<5&Clo)5)@&l6UwYFh+Ofu5^ik9dr -t)+9Y#&NEOd)wn+n#11fGQ~$X901P7x>0daZB@{PThHqdSVL%GX>L0SdC0NppV!6v|_i_0S0Voadl~A00jX8rdhI3FM~0|p{<6( +sS&)~H{Xkb4j+}v9*QG}Q6KKmMklB)P_)|`Y=H7dO_e!^G2i>0SdC0NppV!6v|_i_6IerNVQFqcY-w&} +Q)OXnRCsA*1OfmDVrg_^Z)t7-1pxx4S+Y5xm?t-;06{AC=10daZB@{PThHqO25f0@b!lV(1pxx4S+Y5xm?t-;06{AC=10daZB@{PThHqdSVL%GX>L5xm?t-;06{AC=15xm?t-;06{AC=1L?_X=DTf00&}ebYpL6ZU6-V0`+VYVk7oBr%DNv+($;q`HHK!gIHa) *%m(-e#9sm3ZsHT^UK%K(4i9Ajp1M~R@C@!4#dQE#lUD;OiKi1RsjZVX>oOFWB>&L0`+VYVk7oBr%DNv +($;q`HHK!gIHa)*%m(-e#9sm3ZsHT^UK%K(4i9Ajp1M~R@C@!4#dQE#lUD;OiKi1Rs diff --git a/stl/RGBCommit@0.1.0.stl b/stl/RGBCommit@0.1.0.stl index b6024ead..1a5f499f 100644 Binary files a/stl/RGBCommit@0.1.0.stl and b/stl/RGBCommit@0.1.0.stl differ diff --git a/stl/RGBCommit@0.1.0.sty b/stl/RGBCommit@0.1.0.sty index 6d9bbaae..e27705ff 100644 --- a/stl/RGBCommit@0.1.0.sty +++ b/stl/RGBCommit@0.1.0.sty @@ -1,5 +1,5 @@ {- - Id: stl:4WY0kCd1-qKjYuh5-4GgHKme-XIsmv98-W5Z9$8D-vMjFt!Y#miranda-blue-promise + Id: stl:eKthGp7I-52YYwm!-nkAFB7$-0X9zHac-f5pAUKf-V01EhSc#pretend-carpet-caesar Name: RGBCommit Version: 0.1.0 Description: Consensus commitment layer for RGB smart contracts @@ -19,7 +19,14 @@ import AluVM#congo-archive-folio use LibSite#ultra-grace-message use LibId#germany-culture-olivia -import BPCore#garbo-radius-peru +import CommitVerify#miller-pancake-elastic + use MerkleHash#horse-popcorn-bundle + use StrictHash#pizza-sherman-sound + use ReservedBytes1#origin-roger-relax + use ReservedBytes2#florida-libra-circus + use ReservedBytes8#rudolf-tape-adrian + +import BPCore#totem-holiday-helena use Method#bali-boris-plasma use BlindSealTxPtr#fortune-iron-salmon use SecretSeal#dollar-iris-wizard @@ -32,13 +39,6 @@ import Std#ralph-blue-lucky use AlphaNumLodash#percent-bingo-caesar use AlphaCapsLodash#duet-hammer-labor -import CommitVerify#tennis-peace-olympic - use MerkleHash#horse-popcorn-bundle - use StrictHash#pizza-sherman-sound - use ReservedBytes1#origin-roger-relax - use ReservedBytes2#florida-libra-circus - use ReservedBytes8#rudolf-tape-adrian - import Bitcoin#signal-color-cipher use Vout#brush-gloria-heroic use Txid#shallow-light-reverse diff --git a/stl/RGBLogic@0.1.0.sta b/stl/RGBLogic@0.1.0.sta index 5ede3f96..e4f9de4f 100644 --- a/stl/RGBLogic@0.1.0.sta +++ b/stl/RGBLogic@0.1.0.sta @@ -1,14 +1,14 @@ -----BEGIN STRICT TYPE LIB----- -Id: stl:Yd7koRpf-hs7nsKX-TOLAnZl-hIfJ9wQ-M8J58hj-n60RcaA#pioneer-gong-smoke +Id: stl:Pyd01gNn-B3o3lfj-4y6pZ5a-qSgCE1x-0J7gL!C-raacTJs#memphis-martin-jump Name: RGBLogic Dependencies: - BPCore#garbo-radius-peru, - RGBCommit#miranda-blue-promise, + RGBCommit#pretend-carpet-caesar, + BPCore#totem-holiday-helena, Bitcoin#signal-color-cipher -Check-SHA256: 6fb771ff6ce021d9af5e52a9614976e810066cc05e2177d98c99947c78139aa5 +Check-SHA256: 2e22050f901819f9ce12a582e13f6119579e01693ebf5921521cd1ca7529137d -2vSEvOmAmtV*_s;CP(yEWW#MKtkSBGhsMxw5cp3r9 -ndQi`YyI(VS@-_~yvW73<_S_qLPKwDZE1A%Y!hN5_Bp3Y36tDMM#=e#tGI($UA5U3KNx<*C>ja}LTPkk +2vSEvOmAmtV*_}rVH%#u=VlnfZ>Nv}LGS$+_c7XW{%HY1pI1#pg(nG8M?ynyZEb0ErdhI3FM~0|p{<6( +sS&)~H{Xkb4j+}v9*QG}Q6KKm20~CnZ*pbzY!hN5_Bp3Y36tDMM#=e#tGI($UA5U3KNx<*C>ja}LTPkk Z)t7=20~CnZ*pY?00DdlT>wB!7L}MA7sFvK#<=RP4S#T1Vv-hhTICs&5fM~jaB^jIPH$voP+@X(Ze?;0 wjY>38tto&d&=eG4cRAF#( @@ -18,14 +18,14 @@ DJ{*3f84s>#k$1lf7uIEVQ@}wWMxQUb7)_z*=^-NPQ?`2v5jYd+6t@dEhY>7H!Y*UdZb-BpG^u(WnpGh V{&P5bg6}ecT=8d`>?<6$C@F;S3|*6`1-v+nBdcqJ?FPKcnV2wbY*gGVQf%qwlfK-7{9iX4Q|L-q$GzU Mp|h#f#{Gz8SzLEaTf~c{WkYggkPIjuQHS#3Ua|L6d7%qre2Ut&TYD1OfpD -bYXCEWpn@q0RnFxmidRhTh1hu7-!n@1Cr{swqbZoGSd8tmgp<3rE?FqADBNH?W>M^%H|xc>sh|Dn*!v8 -^Ea7rh?dzC2n+%RZ*X#DbN~eb0&gCc`G>t*&Lor=XWH@ulIpd#VR%e3()@~+=qs(Ib4O0kT+rxDK6vW; +bYXCEWpn@q0RpC3vQRIBF~gy)hQg^4yxce6i-HaxmCGKABZpBR?$8gmADBNH?W>M^%H|xc>sh|Dn*!v8 +^Ea7rh?dzC2n+%RZ*X#DbN~eb0;XBAP%ncq!=bH)!l@Cw+&ABgf({>*%N~j&hfyEy&__Ok18HP<00067PjF9iWCQ~M2WMq&WpinB0000131xV6Wo~n6Z*Bkv0|$3$bZ%vHa{=}XBbpbB -LK#dEwxUFHJ){RjtgLvL_X>0rou@Knb#Vo5Z*F5{00035Z*Xa30^w#fkSBGhsMxw5cp3r9ndQi`YyI(V -S@-_~yvW73=9S3idLDIRU(}XWLTZugenOC;Z(5k~zEJnJiX;;E#s3O)a$#@6CZU6=Y2X|?7Ze??G -0rm?cniq>g8B7tjqC|5&qz6Q-tazCB3Um~mr!r)9aRqK~ZewKt009JVaA{-$;bt_DCv~W(*t#Bg8Uf0g -<;b#Y{qb&D_x}UD$i=tjmB{9L9(7`0)Rt93YLV-HLXe?vTA1;^Q1`ZqBog<<3Rh`#Ze??GPjX}g0{{qN +LK#dEwxUFHJ){RjtgLvL_X>0rou@Knb#Vo5Z*F5{00035Z*Xa30(h%o8lK4KW*EY6r;q_b@BJ6|G1_td +X#ql?S4~8PCzZ(NdLDIRU(}XWLTZugenOC;Z(5k~zEJnJiX;;E#s3O)a$#@6CZU6=Y2X|?7Ze??G +0rm?cniq>g8B7tjqC|5&qz6Q-tazCB3Um~mr!r)9aRqK~ZewKt009JVaA{-$c&lL=p2+8B7{YI-kO4vO +{TKH!+HwAA0YaZwO+&L0S>>o?Kom?q=ULN^A!11b?H{wM>P}NCm0qyW47Umu>uKnWo~p~bZK^F 0000AS7~%^Wpi^-Z*v9$254nzXJ~W)00aqiX>Db5bYX39002k diff --git a/stl/RGBLogic@0.1.0.stl b/stl/RGBLogic@0.1.0.stl index cd7d9362..d5f211b9 100644 Binary files a/stl/RGBLogic@0.1.0.stl and b/stl/RGBLogic@0.1.0.stl differ diff --git a/stl/RGBLogic@0.1.0.sty b/stl/RGBLogic@0.1.0.sty index 5a827c31..dea21734 100644 --- a/stl/RGBLogic@0.1.0.sty +++ b/stl/RGBLogic@0.1.0.sty @@ -1,5 +1,5 @@ {- - Id: stl:Yd7koRpf-hs7nsKX-TOLAnZl-hIfJ9wQ-M8J58hj-n60RcaA#pioneer-gong-smoke + Id: stl:Pyd01gNn-B3o3lfj-4y6pZ5a-qSgCE1x-0J7gL!C-raacTJs#memphis-martin-jump Name: RGBLogic Version: 0.1.0 Description: Consensus logic layer for RGB smart contracts @@ -11,16 +11,16 @@ @context typelib RGBLogic -import BPCore#garbo-radius-peru +import RGBCommit#pretend-carpet-caesar + use OpId#picnic-single-gloria + +import BPCore#totem-holiday-helena use TapretNodePartner#roger-member-educate use TapretProof#marco-border-sample use TapretPathProof#kiwi-mirror-paris use TapretRightBranch#miracle-patriot-touch use OpretProof#good-village-flex -import RGBCommit#miranda-blue-promise - use OpId#picnic-single-gloria - import Bitcoin#signal-color-cipher use ScriptBytes#equator-cockpit-gong use TapNodeHash#paprika-amanda-hunter