From a440159c30d873bdf40a54e2ac39f4fdd210c8e7 Mon Sep 17 00:00:00 2001 From: Dr Maxim Orlovsky Date: Sat, 10 Aug 2024 15:45:10 +0200 Subject: [PATCH] chore: repo maintainence work --- .github/workflows/build.yml | 76 +++++++++++--------------------- .github/workflows/codecov.yml | 47 +++++++------------- .github/workflows/lint.yml | 42 +++++------------- .github/workflows/test.yml | 29 +++++++----- Cargo.lock | 2 +- Cargo.toml | 8 ++++ LICENSE | 3 +- MAINTAINERS.md | 4 +- MANIFEST.yml | 7 ++- README.md | 9 ++-- codecov.yml | 2 +- rust/README.md | 22 +++++---- rust/derive/README.md | 14 +++--- rust/derive/src/derive_decode.rs | 2 +- rust/derive/src/derive_dumb.rs | 2 +- rust/derive/src/derive_encode.rs | 2 +- rust/derive/src/derive_type.rs | 2 +- rust/derive/src/lib.rs | 2 +- rust/derive/src/params.rs | 2 +- rust/derive/tests/base.rs | 2 +- rust/derive/tests/common/mod.rs | 2 +- rust/derive/tests/dumb.rs | 2 +- rust/derive/tests/type.rs | 2 +- rust/src/embedded.rs | 2 +- rust/src/error.rs | 2 +- rust/src/ident.rs | 2 +- rust/src/lib.rs | 2 +- rust/src/macros.rs | 2 +- rust/src/primitives.rs | 2 +- rust/src/reader.rs | 2 +- rust/src/stl.rs | 2 +- rust/src/test.rs | 2 +- rust/src/traits.rs | 2 +- rust/src/types.rs | 2 +- rust/src/util.rs | 2 +- rust/src/writer.rs | 2 +- rust/test_helpers/Cargo.toml | 4 +- rust/test_helpers/src/lib.rs | 2 +- 38 files changed, 135 insertions(+), 182 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a1c97ef..85788a6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,17 +13,15 @@ jobs: default: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - name: Install rust stable - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - override: true - - name: Default build - uses: actions-rs/cargo@v1 - with: - command: check - args: --workspace + - uses: actions/checkout@v4 + - uses: dtolnay/rust-toolchain@stable + - run: cargo check + no-default: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: dtolnay/rust-toolchain@stable + - run: cargo check --no-default-features features: runs-on: ubuntu-latest strategy: @@ -34,55 +32,33 @@ jobs: - derive - serde steps: - - uses: actions/checkout@v2 - - name: Install rust stable - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - override: true - - name: Feature ${{ matrix.feature }} - uses: actions-rs/cargo@v1 - with: - command: check - args: --no-default-features --features=${{ matrix.feature }} - - name: Defaults + ${{ matrix.feature }} - uses: actions-rs/cargo@v1 - with: - command: check - args: --features=${{ matrix.feature }} + - uses: actions/checkout@v4 + - uses: dtolnay/rust-toolchain@stable + - name: Feature ${{matrix.feature}} + run: cargo check --no-default-features --features=${{matrix.feature}} + - name: Feature ${{matrix.feature}} + run: cargo check --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@v2 - - name: Install rust stable - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - override: true - - name: Build with all features - uses: actions-rs/cargo@v1 - with: - command: check - args: --workspace --all-targets --all-features + - uses: actions/checkout@v4 + - 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, 1.70.0 ] + toolchain: [ nightly, beta, stable, 1.75.0 ] steps: - - uses: actions/checkout@v2 - - name: Install rust ${{ matrix.toolchain }} - uses: actions-rs/toolchain@v1 - with: - toolchain: ${{ matrix.toolchain }} - override: true - - name: All features - uses: actions-rs/cargo@v1 + - uses: actions/checkout@v4 + - uses: dtolnay/rust-toolchain@master with: - command: check - args: --workspace --all-targets --all-features + 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 2077319..544c313 100644 --- a/.github/workflows/codecov.yml +++ b/.github/workflows/codecov.yml @@ -13,39 +13,22 @@ jobs: codecov: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - name: Set up toolchain - uses: actions-rs/toolchain@v1 + - uses: actions/checkout@v4 + - uses: dtolnay/rust-toolchain@nightly with: - profile: minimal - toolchain: stable - override: true - components: rustfmt, llvm-tools-preview - - name: Build - uses: actions-rs/cargo@v1 + 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: - command: build - args: --release - env: - CARGO_INCREMENTAL: "0" - RUSTFLAGS: "-Cinstrument-coverage" - RUSTDOCFLAGS: "-Cinstrument-coverage" - - name: Test - uses: actions-rs/cargo@v1 - with: - command: test - args: --all-features --no-fail-fast - env: - CARGO_INCREMENTAL: "0" - RUSTFLAGS: "-Cinstrument-coverage" - RUSTDOCFLAGS: "-Cinstrument-coverage" - - name: Install grcov - run: if [[ ! -e ~/.cargo/bin/grcov ]]; then cargo install grcov; fi - - name: Generate coverage - run: grcov . --binary-path target/debug/deps/ -s . -t lcov --branch --ignore-not-existing --ignore '../**' --ignore '/*' -o coverage.lcov - - name: Upload coverage to Codecov - uses: codecov/codecov-action@v3 - with: - files: ./coverage.lcov flags: rust + 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 3f51bde..80b09bc 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -13,45 +13,27 @@ jobs: fmt: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - name: Install rustc nightly - uses: actions-rs/toolchain@v1 + - uses: actions/checkout@v4 + - uses: dtolnay/rust-toolchain@nightly with: - toolchain: nightly - override: true components: rustfmt - - uses: actions-rs/cargo@v1 - name: Formatting - with: - command: fmt - args: --all -- --check + - name: Formatting + run: cargo +nightly fmt --all -- --check clippy: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - name: Install rustc stable - uses: actions-rs/toolchain@v1 + - uses: actions/checkout@v4 + - uses: dtolnay/rust-toolchain@stable with: - toolchain: stable - override: true components: clippy - - uses: actions-rs/cargo@v1 - name: Clippy - with: - command: clippy - args: --workspace --all-features --all-targets -- -D warnings + - name: Formatting + run: cargo clippy --workspace --all-features --all-targets -- -D warnings doc: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - name: Install rustc nightly - uses: actions-rs/toolchain@v1 + - uses: actions/checkout@v4 + - uses: dtolnay/rust-toolchain@nightly with: - toolchain: nightly - override: true components: rust-docs - - uses: actions-rs/cargo@v1 - name: Doc - with: - command: doc - args: --workspace --all-features + - name: Formatting + run: cargo +nightly doc --workspace --all-features diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3705ca1..f758f63 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,16 +11,23 @@ env: jobs: testing: + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + os: [ ubuntu-latest, macos-13, macos-latest, windows-latest ] + steps: + - uses: actions/checkout@v4 + - 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@v2 - - name: Install latest stable - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - override: true - - name: Build & test - uses: actions-rs/cargo@v1 - with: - command: test - args: --workspace --all-features --no-fail-fast + - uses: actions/checkout@v4 + - 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: wasm-pack test --headless --chrome diff --git a/Cargo.lock b/Cargo.lock index 0fbf96a..d978c9e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -492,7 +492,7 @@ dependencies = [ [[package]] name = "strict_encoding_test" -version = "2.7.0-beta.1" +version = "2.7.0-rc.1" dependencies = [ "amplify", "strict_encoding", diff --git a/Cargo.toml b/Cargo.toml index ed44caa..37309fa 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,3 +15,11 @@ license = "Apache-2.0" [workspace.dependencies] amplify = { version = "4.7.0" } serde_crate = { package = "serde", version = "1", features = ["derive"] } + +[target.'cfg(target_arch = "wasm32")'.dependencies] +wasm-bindgen = "0.2" +rand = { version = "0.8.4", optional = true } +getrandom = { version = "0.2", features = ["js"], optional = true } + +[target.'cfg(target_arch = "wasm32")'.dev-dependencies] +wasm-bindgen-test = "0.3" diff --git a/LICENSE b/LICENSE index f4a75e2..f3e21f9 100644 --- a/LICENSE +++ b/LICENSE @@ -186,7 +186,8 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2022-2024 UBIDECO Institute, Switzerland + Copyright 2022-2024 UBIDECO Labs, + Institute for Distributed and Cognitive Systems, Switzerland Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/MAINTAINERS.md b/MAINTAINERS.md index a3af1e0..cf7a0d9 100644 --- a/MAINTAINERS.md +++ b/MAINTAINERS.md @@ -1,6 +1,6 @@ Maxim Orlovsky --------------- + - GitHub: [@dr-orlovsky](https://github.com/dr-orlovsky) - GPG: `EAE730CEC0C663763F028A5860094BAF18A26EC9` -- SSH: `BoSGFzbyOKC7Jm28MJElFboGepihCpHop60nS8OoG/A` -- EMail: [dr@orlovsky.ch](mailto:dr@orlovsky.ch) +- EMail: [orlovsky@ubideco.org](mailto:orlovsky@ubideco.org) diff --git a/MANIFEST.yml b/MANIFEST.yml index 1303676..7fec554 100644 --- a/MANIFEST.yml +++ b/MANIFEST.yml @@ -3,12 +3,11 @@ Type: Library Kind: Free software License: Apache-2.0 Language: Rust -Compiler: 1.70 +Compiler: 1.75 Author: Maxim Orlovsky -Maintained: UBIDECO Institute, Switzerland +Maintained: UBIDECO Labs, Institute for Distributed and Cognitive Computing, Switzerland Maintainers: Maxim Orlovsky: GitHub: @dr-orlovsky GPG: EAE730CEC0C663763F028A5860094BAF18A26EC9 - SSH: BoSGFzbyOKC7Jm28MJElFboGepihCpHop60nS8OoG/A - EMail: dr@orlovsky.ch + EMail: orlovsky@ubideco.org diff --git a/README.md b/README.md index 2d4a63f..cba4622 100644 --- a/README.md +++ b/README.md @@ -6,11 +6,11 @@ This is a set of libraries for deterministic binary serialization using [strict types] – type system made with category theory which ensures -provable properties and bounds for the in-memory and serialized type +provable properties and bounds for the in-memory and serialized type representation. -The development of the libraries is performed by -[UBIDECO Institute](https://ubideco.org). +The development of the libraries is performed by +[UBIDECO Labs](https://ubideco.org). ## Overview @@ -19,6 +19,7 @@ Strict types is a formal notation for defining and serializing and confined way. It is developed with [type theory] in mind. Strict Types are: + * __schema-based__ (with the schema being strict encoding notation), * __semantic__, i.e. defines types not just as they are layed out in memory, but also depending on their meaning, @@ -53,5 +54,7 @@ types in binary formats. The libraries are distributed on the terms of [Apache 2.0 license](LICENSE). [strict types]: https://strict-types.org + [gadt]: https://en.wikipedia.org/wiki/Algebraic_data_type + [type theory]: https://en.wikipedia.org/wiki/Type_theory diff --git a/codecov.yml b/codecov.yml index 240d731..be5b52d 100644 --- a/codecov.yml +++ b/codecov.yml @@ -1,5 +1,5 @@ codecov: - require_ci_to_pass: no + require_ci_to_pass: false coverage: precision: 1 diff --git a/rust/README.md b/rust/README.md index 457ad7d..bcfa744 100644 --- a/rust/README.md +++ b/rust/README.md @@ -7,7 +7,7 @@ [![crates.io](https://img.shields.io/crates/v/strict_encoding)](https://crates.io/crates/strict_encoding) [![Docs](https://docs.rs/strict_encoding/badge.svg)](https://docs.rs/strict_encoding) -[![Apache-2 licensed](https://img.shields.io/crates/l/strict_encoding)](./LICENSE) +[![Apache-2 licensed](https://img.shields.io/crates/l/strict_encoding)](../LICENSE) Deterministic binary serialization for client-side-validation. @@ -29,15 +29,14 @@ Client-side-validation is a paradigm for distributed computing, based on top of proof-of-publication/commitment medium layer, which may be a bitcoin blockchain or other type of distributed consensus system. -The development of the library is supported by +The development of the library is supported by [LNP/BP Standards Association](https://lnp-bp.org). -The library is designed after Peter Todd concepts of proofmarshall and -serialization principles for client-side-validated data and Dr Maxim Orlovsky -idea of universal network encodings. Both were shaped into the standards and +The library is designed after Peter Todd concepts of proofmarshall and +serialization principles for client-side-validated data and Dr Maxim Orlovsky +idea of universal network encodings. Both were shaped into the standards and implemented as a part of this library by Dr Maxim Orlovsky. - ## Documentation Detailed developer & API documentation for the library can be accessed @@ -47,7 +46,6 @@ To learn about the technologies enabled by the library please check [slides from our tech presentations](https://github.com/LNP-BP/FAQ/blob/master/Presentation%20slides/) and [LNP/BP tech talks videos](https://www.youtube.com/channel/UCK_Q3xcQ-H3ERwArGaMKsxg) - ## Usage To use the library, you just need to reference a latest version, in @@ -63,14 +61,15 @@ including the current one. Library defines two main traits, [`StrictEncode`] and [`StrictDecode`], which should be implemented on each type that requires to be represented -for client-side-validation. +for client-side-validation. -Library exports derivation macros `#[derive(StrictEncode, StrictDecode)]`, -which are a part of [`strict_encoding_derive`] sub-crate and controlled by a +Library exports derivation macros `#[derive(StrictEncode, StrictDecode)]`, +which are a part of [`strict_encoding_derive`] sub-crate and controlled by a default feature `derive`. Finally, it implements strict encoding traits for main data types defined by rust standard library and frequently used crates; the latter increases the number of dependencies and thus can be controlled with feature flags: + - `chrono` (used by default): date & time types from `chrono` crate - `miniscript`: types defined in bitcoin Miniscript - `crypto`: non-bitcoin cryptographic primitives, which include Ed25519 @@ -83,16 +82,15 @@ This crate requires `bitcoin` as an upstream dependency since many of strict-encoded formats are standardized as using *bitcoin consensus encoding*. - ## Contributing Contribution guidelines can be found in [CONTRIBUTING](../CONTRIBUTING.md) - ## Licensing The libraries are distributed on the terms of Apache 2.0 opensource license. See [LICENCE](LICENSE) file for the license details. [`client_side_validation`]: https://crates.io/crates/client_side_validation + [`strict_encoding_derive`]: https://crates.io/crates/strict_encoding_derive diff --git a/rust/derive/README.md b/rust/derive/README.md index dcea1d5..0a73845 100644 --- a/rust/derive/README.md +++ b/rust/derive/README.md @@ -14,35 +14,31 @@ Derivation macros for strict encoding. To learn more about the strict encoding please check [`strict_encoding`] crate. The development of the library is supported by -[UBIDECO Institute](https://ubideco.org). - +[UBIDECO Labs](https://ubideco.org). ## Documentation Detailed developer & API documentation for the library can be accessed at - ## Usage -To use the library, you need to reference the latest version of the -[`strict_encoding`] crate in`[dependencies]` section of your project -`Cargo.toml`. This crate includes derivation macros from the present library by +To use the library, you need to reference the latest version of the +[`strict_encoding`] crate in`[dependencies]` section of your project +`Cargo.toml`. This crate includes derivation macros from the present library by default. ```toml strict_encoding = "2.0" ``` -Library exports derivation macros `StrictType`, `StrictDumb`, `StrictEncode`, +Library exports derivation macros `StrictType`, `StrictDumb`, `StrictEncode`, `StrictDecode`. - ## Contributing Contribution guidelines can be found in [CONTRIBUTING](../../CONTRIBUTING.md) - ## Licensing The libraries are distributed on the terms of Apache 2.0 opensource license. diff --git a/rust/derive/src/derive_decode.rs b/rust/derive/src/derive_decode.rs index cb51045..4de9a51 100644 --- a/rust/derive/src/derive_decode.rs +++ b/rust/derive/src/derive_decode.rs @@ -5,7 +5,7 @@ // Written in 2019-2024 by // Dr. Maxim Orlovsky // -// Copyright 2022-2024 UBIDECO Institute +// Copyright 2022-2024 UBIDECO Labs // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/rust/derive/src/derive_dumb.rs b/rust/derive/src/derive_dumb.rs index a08d2e8..4d78b18 100644 --- a/rust/derive/src/derive_dumb.rs +++ b/rust/derive/src/derive_dumb.rs @@ -5,7 +5,7 @@ // Written in 2019-2024 by // Dr. Maxim Orlovsky // -// Copyright 2022-2024 UBIDECO Institute +// Copyright 2022-2024 UBIDECO Labs // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/rust/derive/src/derive_encode.rs b/rust/derive/src/derive_encode.rs index 0a64ca8..bb1e803 100644 --- a/rust/derive/src/derive_encode.rs +++ b/rust/derive/src/derive_encode.rs @@ -5,7 +5,7 @@ // Written in 2019-2024 by // Dr. Maxim Orlovsky // -// Copyright 2022-2024 UBIDECO Institute +// Copyright 2022-2024 UBIDECO Labs // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/rust/derive/src/derive_type.rs b/rust/derive/src/derive_type.rs index 2640fe3..8ddd98e 100644 --- a/rust/derive/src/derive_type.rs +++ b/rust/derive/src/derive_type.rs @@ -5,7 +5,7 @@ // Written in 2019-2024 by // Dr. Maxim Orlovsky // -// Copyright 2022-2024 UBIDECO Institute +// Copyright 2022-2024 UBIDECO Labs // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/rust/derive/src/lib.rs b/rust/derive/src/lib.rs index 7ddc621..1a83fc4 100644 --- a/rust/derive/src/lib.rs +++ b/rust/derive/src/lib.rs @@ -5,7 +5,7 @@ // Written in 2019-2024 by // Dr. Maxim Orlovsky // -// Copyright 2022-2024 UBIDECO Institute +// Copyright 2022-2024 UBIDECO Labs // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/rust/derive/src/params.rs b/rust/derive/src/params.rs index f6845e2..08f685a 100644 --- a/rust/derive/src/params.rs +++ b/rust/derive/src/params.rs @@ -5,7 +5,7 @@ // Written in 2019-2024 by // Dr. Maxim Orlovsky // -// Copyright 2022-2024 UBIDECO Institute +// Copyright 2022-2024 UBIDECO Labs // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/rust/derive/tests/base.rs b/rust/derive/tests/base.rs index 6417ddf..1d1db83 100644 --- a/rust/derive/tests/base.rs +++ b/rust/derive/tests/base.rs @@ -5,7 +5,7 @@ // Written in 2019-2024 by // Dr. Maxim Orlovsky // -// Copyright 2022-2024 UBIDECO Institute +// Copyright 2022-2024 UBIDECO Labs // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/rust/derive/tests/common/mod.rs b/rust/derive/tests/common/mod.rs index 3eaf392..f822ab5 100644 --- a/rust/derive/tests/common/mod.rs +++ b/rust/derive/tests/common/mod.rs @@ -5,7 +5,7 @@ // Written in 2019-2024 by // Dr. Maxim Orlovsky // -// Copyright 2022-2024 UBIDECO Institute +// Copyright 2022-2024 UBIDECO Labs // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/rust/derive/tests/dumb.rs b/rust/derive/tests/dumb.rs index bae2d9d..670571d 100644 --- a/rust/derive/tests/dumb.rs +++ b/rust/derive/tests/dumb.rs @@ -5,7 +5,7 @@ // Written in 2019-2024 by // Dr. Maxim Orlovsky // -// Copyright 2022-2024 UBIDECO Institute +// Copyright 2022-2024 UBIDECO Labs // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/rust/derive/tests/type.rs b/rust/derive/tests/type.rs index e37df12..ce13447 100644 --- a/rust/derive/tests/type.rs +++ b/rust/derive/tests/type.rs @@ -5,7 +5,7 @@ // Written in 2019-2024 by // Dr. Maxim Orlovsky // -// Copyright 2022-2024 UBIDECO Institute +// Copyright 2022-2024 UBIDECO Labs // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/rust/src/embedded.rs b/rust/src/embedded.rs index e350382..4a8f509 100644 --- a/rust/src/embedded.rs +++ b/rust/src/embedded.rs @@ -5,7 +5,7 @@ // Written in 2019-2024 by // Dr. Maxim Orlovsky // -// Copyright 2022-2024 UBIDECO Institute +// Copyright 2022-2024 UBIDECO Labs // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/rust/src/error.rs b/rust/src/error.rs index 4b20be3..e695e02 100644 --- a/rust/src/error.rs +++ b/rust/src/error.rs @@ -5,7 +5,7 @@ // Written in 2019-2024 by // Dr. Maxim Orlovsky // -// Copyright 2022-2024 UBIDECO Institute +// Copyright 2022-2024 UBIDECO Labs // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/rust/src/ident.rs b/rust/src/ident.rs index fbacf60..f974d81 100644 --- a/rust/src/ident.rs +++ b/rust/src/ident.rs @@ -5,7 +5,7 @@ // Written in 2019-2024 by // Dr. Maxim Orlovsky // -// Copyright 2022-2024 UBIDECO Institute +// Copyright 2022-2024 UBIDECO Labs // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/rust/src/lib.rs b/rust/src/lib.rs index a246981..40f9f65 100644 --- a/rust/src/lib.rs +++ b/rust/src/lib.rs @@ -5,7 +5,7 @@ // Written in 2019-2024 by // Dr. Maxim Orlovsky // -// Copyright 2022-2024 UBIDECO Institute +// Copyright 2022-2024 UBIDECO Labs // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/rust/src/macros.rs b/rust/src/macros.rs index 77ad71a..b9ade44 100644 --- a/rust/src/macros.rs +++ b/rust/src/macros.rs @@ -5,7 +5,7 @@ // Written in 2019-2024 by // Dr. Maxim Orlovsky // -// Copyright 2022-2024 UBIDECO Institute +// Copyright 2022-2024 UBIDECO Labs // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/rust/src/primitives.rs b/rust/src/primitives.rs index 4ae2c4f..fb7e323 100644 --- a/rust/src/primitives.rs +++ b/rust/src/primitives.rs @@ -5,7 +5,7 @@ // Written in 2019-2024 by // Dr. Maxim Orlovsky // -// Copyright 2022-2024 UBIDECO Institute +// Copyright 2022-2024 UBIDECO Labs // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/rust/src/reader.rs b/rust/src/reader.rs index cb13736..5f67c24 100644 --- a/rust/src/reader.rs +++ b/rust/src/reader.rs @@ -5,7 +5,7 @@ // Written in 2019-2024 by // Dr. Maxim Orlovsky // -// Copyright 2022-2024 UBIDECO Institute +// Copyright 2022-2024 UBIDECO Labs // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/rust/src/stl.rs b/rust/src/stl.rs index 4b7d82c..6edd335 100644 --- a/rust/src/stl.rs +++ b/rust/src/stl.rs @@ -5,7 +5,7 @@ // Written in 2019-2024 by // Dr. Maxim Orlovsky // -// Copyright 2022-2024 UBIDECO Institute +// Copyright 2022-2024 UBIDECO Labs // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/rust/src/test.rs b/rust/src/test.rs index fb49219..8e18df4 100644 --- a/rust/src/test.rs +++ b/rust/src/test.rs @@ -5,7 +5,7 @@ // Written in 2019-2024 by // Dr. Maxim Orlovsky // -// Copyright 2022-2024 UBIDECO Institute +// Copyright 2022-2024 UBIDECO Labs // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/rust/src/traits.rs b/rust/src/traits.rs index 7994aee..d53d8b2 100644 --- a/rust/src/traits.rs +++ b/rust/src/traits.rs @@ -5,7 +5,7 @@ // Written in 2019-2024 by // Dr. Maxim Orlovsky // -// Copyright 2022-2024 UBIDECO Institute +// Copyright 2022-2024 UBIDECO Labs // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/rust/src/types.rs b/rust/src/types.rs index 1bab123..da15d18 100644 --- a/rust/src/types.rs +++ b/rust/src/types.rs @@ -5,7 +5,7 @@ // Written in 2019-2024 by // Dr. Maxim Orlovsky // -// Copyright 2022-2024 UBIDECO Institute +// Copyright 2022-2024 UBIDECO Labs // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/rust/src/util.rs b/rust/src/util.rs index d1188ea..4daa095 100644 --- a/rust/src/util.rs +++ b/rust/src/util.rs @@ -5,7 +5,7 @@ // Written in 2019-2024 by // Dr. Maxim Orlovsky // -// Copyright 2022-2024 UBIDECO Institute +// Copyright 2022-2024 UBIDECO Labs // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/rust/src/writer.rs b/rust/src/writer.rs index 9c7f364..3e4b701 100644 --- a/rust/src/writer.rs +++ b/rust/src/writer.rs @@ -5,7 +5,7 @@ // Written in 2019-2024 by // Dr. Maxim Orlovsky // -// Copyright 2022-2024 UBIDECO Institute +// Copyright 2022-2024 UBIDECO Labs // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/rust/test_helpers/Cargo.toml b/rust/test_helpers/Cargo.toml index 7b83c29..7ea47e3 100644 --- a/rust/test_helpers/Cargo.toml +++ b/rust/test_helpers/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "strict_encoding_test" -version = "2.7.0-beta.1" +version = { workspace = true } description = "Helper functions for testing strict encodings" keywords = ["strict-encoding", "test-helpers"] categories = ["encoding", "parsing", "development-tools"] @@ -16,4 +16,4 @@ readme = "../README.md" [dependencies] amplify = { workspace = true } -strict_encoding = { version = "2.7.0-beta.1", path = ".." } +strict_encoding = { version = "2.7.0-rc.1", path = ".." } diff --git a/rust/test_helpers/src/lib.rs b/rust/test_helpers/src/lib.rs index def308d..f4f033e 100644 --- a/rust/test_helpers/src/lib.rs +++ b/rust/test_helpers/src/lib.rs @@ -5,7 +5,7 @@ // Written in 2019-2024 by // Dr. Maxim Orlovsky // -// Copyright 2022-2024 UBIDECO Institute +// Copyright 2022-2024 UBIDECO Labs // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License.