diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 05152e4..9448a00 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -64,7 +64,7 @@ jobs: strategy: fail-fast: false matrix: - toolchain: [ nightly, beta, stable, 1.69.0 ] + toolchain: [ nightly, beta, stable, 1.70.0 ] steps: - uses: actions/checkout@v2 - name: Install rust ${{ matrix.toolchain }} diff --git a/Cargo.lock b/Cargo.lock index 12870db..b711af9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,14 +4,14 @@ version = 3 [[package]] name = "aluvm" -version = "0.11.0-beta.5" +version = "0.11.0-beta.6" dependencies = [ "amplify", "ascii-armor", "baid64", "blake3", "curve25519-dalek", - "getrandom 0.2.14", + "getrandom 0.2.15", "half", "paste", "rand", @@ -108,9 +108,9 @@ dependencies = [ [[package]] name = "ascii-armor" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "673486110323d50d9f33d99f0f526726b4721b1b596284351e75d3692225abe8" +checksum = "f834c431d27e0e6bedf95c9ee4dbea02fa4e4cd5bc26a61e5a418427178c5495" dependencies = [ "amplify", "baid64", @@ -121,9 +121,9 @@ dependencies = [ [[package]] name = "baid64" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b8b80494235048845f856b267a4a1d97df59fd14ed7ca92652f834ce93becc6" +checksum = "dd5e666513565d0a35116973541fbcb35700619316e1865cb27c7dba5de98668" dependencies = [ "amplify", "base64", @@ -133,9 +133,9 @@ dependencies = [ [[package]] name = "base64" -version = "0.22.0" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "base85" @@ -188,9 +188,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "cc" -version = "1.0.95" +version = "1.0.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d32a725bc159af97c3e629873bb9f88fb8cf8a4867175f76dc987815ea07c83b" +checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f" [[package]] name = "cfg-if" @@ -300,9 +300,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if", "js-sys", @@ -313,10 +313,11 @@ dependencies = [ [[package]] name = "half" -version = "2.2.1" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02b4af3693f1b705df946e9fe5631932443781d0aabb423b62fcd4d73f6d2fd0" +checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" dependencies = [ + "cfg-if", "crunchy", ] @@ -353,9 +354,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.153" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "log" @@ -377,9 +378,9 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "paste" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "ppv-lite86" @@ -389,9 +390,9 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "proc-macro2" -version = "1.0.81" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" +checksum = "0b33eb56c327dec362a9e55b3ad14f9d2f0904fb5a5b03b513ab5465399e9f43" dependencies = [ "unicode-ident", ] @@ -441,7 +442,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.14", + "getrandom 0.2.15", ] [[package]] @@ -461,40 +462,40 @@ checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" [[package]] name = "secp256k1" -version = "0.28.2" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d24b59d129cdadea20aea4fb2352fa053712e5d713eee47d700cd4b2bc002f10" +checksum = "0e0cc0f1cf93f4969faf3ea1c7d8a9faed25918d96affa959720823dfe86d4f3" dependencies = [ "secp256k1-sys", ] [[package]] name = "secp256k1-sys" -version = "0.9.2" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d1746aae42c19d583c3c1a8c646bfad910498e2051c551a7f2e3c0c9fbb7eb" +checksum = "1433bd67156263443f14d603720b082dd3121779323fce20cba2aa07b874bc1b" dependencies = [ "cc", ] [[package]] name = "serde" -version = "1.0.199" +version = "1.0.202" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c9f6e76df036c77cd94996771fb40db98187f096dd0b9af39c6c6e452ba966a" +checksum = "226b61a0d411b2ba5ff6d7f73a476ac4f8bb900373459cd00fab8512828ba395" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.199" +version = "1.0.202" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11bd257a6541e141e42ca6d24ae26f7714887b47e89aa739099104c7e4d3b7fc" +checksum = "6048858004bcff69094cd972ed40a32500f153bd3be9f716b2eed2e8217c4838" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -520,8 +521,9 @@ dependencies = [ [[package]] name = "strict_encoding" -version = "2.7.0-beta.3" -source = "git+https://github.com/strict-types/strict-encoding?branch=develop#901e26ee8b01b3bcff4d7ac76acff2fcc633634b" +version = "2.7.0-beta.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2854135bbecf01fac5bae609ec3408e130259670424e2cd755660556d239c92" dependencies = [ "amplify", "half", @@ -532,7 +534,8 @@ dependencies = [ [[package]] name = "strict_encoding_derive" version = "2.7.0-beta.3" -source = "git+https://github.com/strict-types/strict-encoding?branch=develop#901e26ee8b01b3bcff4d7ac76acff2fcc633634b" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "475fa6f1fdde6e0555422b5111ad34bde30a1459af3599f920c3af9829772c0e" dependencies = [ "amplify_syn", "heck", @@ -543,8 +546,9 @@ dependencies = [ [[package]] name = "strict_types" -version = "2.7.0-beta.3" -source = "git+https://github.com/strict-types/strict-types?branch=develop#4effa0b28804f7798a17f5dc6b4411ce6515f2f5" +version = "2.7.0-beta.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7a5479921604482fd8775ec07fbb9075c92e12649358d1f70dc9552783d0d1e" dependencies = [ "amplify", "ascii-armor", @@ -585,9 +589,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.60" +version = "2.0.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3" +checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" dependencies = [ "proc-macro2", "quote", @@ -596,22 +600,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.59" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0126ad08bff79f29fc3ae6a55cc72352056dfff61e3ff8bb7129476d44b23aa" +checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.59" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66" +checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] @@ -675,7 +679,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.66", "wasm-bindgen-shared", ] @@ -709,7 +713,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.66", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -742,7 +746,7 @@ checksum = "b7f89739351a2e03cb94beb799d47fb2cac01759b40ec441f7de39b00cbf7ef0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.60", + "syn 2.0.66", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 22b0b40..ec70dbf 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,13 +1,13 @@ [package] name = "aluvm" description = "Functional registry-based RISC virtual machine" -version = "0.11.0-beta.5" +version = "0.11.0-beta.6" authors = ["Dr Maxim Orlovsky "] repository = "https://github.com/aluvm/rust-aluvm" homepage = "https://aluvm.org" keywords = ["virtual-machine", "emulator", "functional", "risc", "edge-computing"] categories = ["no-std", "embedded", "compilers", "cryptography", "emulators"] -rust-version = "1.69.0" # Due to TOML dependency of amplify crate +rust-version = "1.70.0" # Due to strict encoding edition = "2018" license = "Apache-2.0" readme = "README.md" @@ -22,17 +22,17 @@ required-features = ["stl"] [dependencies] amplify = { version = "4.6.0", default-features = false, features = ["apfloat", "derive", "hex"] } -ascii-armor = { version = "0.6.0", optional = true } -baid64 = "0.1.0" +ascii-armor = { version = "0.7.0", optional = true } +baid64 = "0.2.0" paste = "1" -strict_encoding = { version = "2.7.0-beta.3", default-features = false, features = ["float", "derive"] } -strict_types = { version = "2.7.0-beta.3", optional = true } +strict_encoding = { version = "2.7.0-beta.4", default-features = false, features = ["float", "derive"] } +strict_types = { version = "2.7.0-beta.4", optional = true } sha2 = "0.10.8" blake3 = "1.5.1" ripemd = "0.1.3" -secp256k1 = { version = "0.28.2", optional = true, features = ["global-context"] } -curve25519-dalek = { version = "3.2", optional = true } -half = "~2.2.0" # Required to maintain MSRV +secp256k1 = { version = "0.29.0", optional = true, features = ["global-context"] } +curve25519-dalek = { version = "3.2.1", optional = true } +half = "2.4.1" # Required to maintain MSRV serde_crate = { package = "serde", version = "1", optional = true } [features] @@ -55,7 +55,3 @@ wasm-bindgen-test = "0.3" [package.metadata.docs.rs] features = ["all"] - -[patch.crates-io] -strict_encoding = { git = "https://github.com/strict-types/strict-encoding", branch = "develop" } -strict_types = { git = "https://github.com/strict-types/strict-types", branch = "develop" } diff --git a/MANIFEST.yml b/MANIFEST.yml index 522e8c1..1303676 100644 --- a/MANIFEST.yml +++ b/MANIFEST.yml @@ -3,7 +3,7 @@ Type: Library Kind: Free software License: Apache-2.0 Language: Rust -Compiler: 1.69 +Compiler: 1.70 Author: Maxim Orlovsky Maintained: UBIDECO Institute, Switzerland Maintainers: diff --git a/src/stl.rs b/src/stl.rs index fca9490..9ae5aa9 100644 --- a/src/stl.rs +++ b/src/stl.rs @@ -33,7 +33,7 @@ use crate::LIB_NAME_ALUVM; /// Strict type id for the library providing data types from this crate. pub const LIB_ID_ALUVM: &str = - "stl:YnA1fyHl-46C2hsC-tZPxn60-w1jLk5Y-rDTjRmy-xo@5xjY#congo-archive-folio"; + "stl:YnA1fyHl-46C2hsC-tZPxn60-w1jLk5Y-rDTjRmy-xo!5xjY#congo-archive-folio"; fn _aluvm_stl() -> Result { LibBuilder::new(libname!(LIB_NAME_ALUVM), tiny_bset! { diff --git a/stl/AluVM@0.1.0.sta b/stl/AluVM@0.1.0.sta index cc75a77..689ac94 100644 --- a/stl/AluVM@0.1.0.sta +++ b/stl/AluVM@0.1.0.sta @@ -1,5 +1,5 @@ -----BEGIN STRICT TYPE LIB----- -Id: stl:YnA1fyHl-46C2hsC-tZPxn60-w1jLk5Y-rDTjRmy-xo@5xjY#congo-archive-folio +Id: stl:YnA1fyHl-46C2hsC-tZPxn60-w1jLk5Y-rDTjRmy-xo!5xjY#congo-archive-folio Name: AluVM Dependencies: Std#ralph-blue-lucky Check-SHA256: 33bd3f759d49fd0e46f3179acda055dcc81082b29db36d949482f9e168b6781c diff --git a/stl/AluVM@0.1.0.sty b/stl/AluVM@0.1.0.sty index 69081d5..88c4962 100644 --- a/stl/AluVM@0.1.0.sty +++ b/stl/AluVM@0.1.0.sty @@ -1,5 +1,5 @@ {- - Id: stl:YnA1fyHl-46C2hsC-tZPxn60-w1jLk5Y-rDTjRmy-xo@5xjY#congo-archive-folio + Id: stl:YnA1fyHl-46C2hsC-tZPxn60-w1jLk5Y-rDTjRmy-xo!5xjY#congo-archive-folio Name: AluVM Version: 0.1.0 Description: AluVM data type library