clippy: fix for new rust stable 1.85

.github/workflows/rust.yml

@@ -1,41 +1,124 @@
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - master
+  pull_request: {}
 
 name: Continuous integration
 
 jobs:
-  Tests:
-    name: Tests
+  Stable:
+    name: Test - stable toolchain
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
-      matrix:
-        include:
-          - rust: 1.58.0
-            env:
-              DO_FUZZ: true
-          - rust: stable
-            env:
-              DO_INTEGRATION: true
-          - rust: beta
-            env:
-              DUMMY: true
-          - rust: nightly
-            env:
-              DUMMY: true
-          - rust: 1.41.1
-            env:
-              PIN_VERSIONS: true
     steps:
+      - name: Checkout Crate
+        uses: actions/checkout@v3
+      - name: Checkout Toolchain
+        # https://github.com/dtolnay/rust-toolchain
+        uses: dtolnay/rust-toolchain@stable
+      - name: Running test script
+        env:
+          DO_DOCS: true
+          DO_DOCSRS: false
+          DO_FUZZ: false
+          DO_INTEGRATION: false
+          DO_LINT: true
+          DO_FEATURE_MATRIX: true
+        run: ./contrib/test.sh
+
+  Nightly:
+    name: Test - nightly toolchain
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+    steps:
+      - name: Checkout Crate
+        uses: actions/checkout@v3
+      - name: Checkout Toolchain
+        uses: dtolnay/rust-toolchain@nightly
+      - name: Running test script
+        env:
+          DO_DOCS: true
+          DO_DOCSRS: true
+          DO_FUZZ: false
+          DO_INTEGRATION: false
+          DO_LINT: false
+          DO_FEATURE_MATRIX: true
+        run: ./contrib/test.sh
+
+  MSRV:
+    name: Test - 1.56.1 toolchain
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+    steps:
+      - name: Checkout Crate
+        uses: actions/checkout@v3
+      - name: Checkout Toolchain
+        uses: dtolnay/rust-toolchain@1.56.1
+      - name: Running test script
+        env:
+          DO_DOCS: false
+          DO_DOCSRS: false
+          DO_FUZZ: false
+          DO_INTEGRATION: false
+          DO_LINT: false
+          DO_FEATURE_MATRIX: true
+        run: ./contrib/test.sh
+
+  Fuzz:
+    name: Fuzztests - 1.63.0 toolchain
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+    steps:
+      - name: Checkout Crate
+        uses: actions/checkout@v3
+      - name: Checkout Toolchain
+        uses: dtolnay/rust-toolchain@1.63.0
       - name: Install test dependencies
-        run: sudo apt-get install -y binutils-dev libunwind8-dev
+        run: sudo apt-get update -y && sudo apt-get install -y binutils-dev libunwind8-dev libcurl4-openssl-dev libelf-dev libdw-dev cmake gcc libiberty-dev
+      - name: Running test script
+        env:
+          DO_DOCS: false
+          DO_DOCSRS: false
+          DO_FUZZ: true
+          DO_INTEGRATION: false
+          DO_LINT: false
+          DO_FEATURE_MATRIX: false
+        run: ./contrib/test.sh
+
+  Integration:
+    name: Integration tests - stable
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+    steps:
       - name: Checkout Crate
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Checkout Toolchain
-        uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: ${{ matrix.rust }}
-          override: true
+        uses: dtolnay/rust-toolchain@stable
       - name: Running test script
-        env: ${{ matrix.env }}
+        env:
+          DO_DOCS: false
+          DO_DOCSRS: false
+          DO_FUZZ: false
+          DO_INTEGRATION: true
+          DO_LINT: false
+          DO_FEATURE_MATRIX: false
         run: ./contrib/test.sh
+
+  Wasm:
+    name: Check WASM
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+    steps:
+      - name: Checkout Crate
+        uses: actions/checkout@v3
+      - name: Checkout Toolchain
+        uses: dtolnay/rust-toolchain@stable
+      - run: rustup target add wasm32-unknown-unknown
+      - run: cargo check --target wasm32-unknown-unknown

CHANGELOG.md

@@ -1,4 +1,56 @@
 
+# 0.25.1 - 2024-10-24
+
+* [https://github.com/ElementsProject/rust-elements/pull/218](discount: fix weight calculation)
+
+# 0.25.0 - 2024-09-23
+
+* [https://github.com/ElementsProject/rust-elements/pull/216](add Address::is_liquid)
+* [https://github.com/ElementsProject/rust-elements/pull/215](docs: add a bunch of paragraph breaks.)
+* [https://github.com/ElementsProject/rust-elements/pull/213](ELIP-0101: rename from LiquiDEX )
+* [https://github.com/ElementsProject/rust-elements/pull/212](Stop implementing elements::Encodable with bitcoin::Encodable)
+* [https://github.com/ElementsProject/rust-elements/pull/210](Address err refactor)
+* [https://github.com/ElementsProject/rust-elements/pull/209](upgrade to bitcoin 0.32)
+* [https://github.com/ElementsProject/rust-elements/pull/207](Add elip_liquidex module)
+* [https://github.com/ElementsProject/rust-elements/pull/206](pset: elip100: add and get token metadata)
+* [https://github.com/ElementsProject/rust-elements/pull/204](tx: add discount_weight and discount_vsize)
+* [https://github.com/ElementsProject/rust-elements/pull/203](transaction: range-check pegin data when parsing)
+* [https://github.com/ElementsProject/rust-elements/pull/201](pset: add optional asset blinding factor to input and output)
+* [https://github.com/ElementsProject/rust-elements/pull/200](pset: input: add blinded issuance flag)
+* [https://github.com/ElementsProject/rust-elements/pull/199](pset: input: add explicit amount and asset, and their proofs)
+
+# 0.24.1 - 2024-01-30
+
+* [https://github.com/ElementsProject/rust-elements/pull/196](Add constructor to `FullParams`)
+
+# 0.24.0 - 2024-01-12
+
+* [https://github.com/ElementsProject/rust-elements/pull/188](Update rust-bitcoin to 0.31.0, and associated dependencies)
+* [https://github.com/ElementsProject/rust-elements/pull/186](Updated doc for impl Value blind method - returns blinded value*)
+* [https://github.com/ElementsProject/rust-elements/pull/185](Exposed RangeProofMessage publically)
+* [https://github.com/ElementsProject/rust-elements/pull/183](elip100: add missing AssetMetadata::new method)
+* [https://github.com/ElementsProject/rust-elements/pull/182](ELIP-0100 implementation)
+* [https://github.com/ElementsProject/rust-elements/pull/178](pset: fix remove_output)
+* [https://github.com/ElementsProject/rust-elements/pull/177](rename pset::str::Error to ParseError and expose it)
+* [https://github.com/ElementsProject/rust-elements/pull/176](Remove slip77)
+* [https://github.com/ElementsProject/rust-elements/pull/175](Add to and from base64 string to pset)
+* [https://github.com/ElementsProject/rust-elements/pull/173](Fix examples)
+* [https://github.com/ElementsProject/rust-elements/pull/171](Create explicit empty and null values for some types)
+
+# 0.23.0 - 2023-06-18
+
+* https://github.com/ElementsProject/rust-elements/pull/167 Implement Ord for Transaction
+* https://github.com/ElementsProject/rust-elements/pull/168 add Height::ZERO associated constant
+* https://github.com/ElementsProject/rust-elements/pull/169 rename all Sighash types downcasing the middle "h", for example: SigHash -> Sighash
+
+# 0.22.0 - 2023-06-08
+
+* [https://github.com/ElementsProject/rust-elements/pull/159](Update `TapTweak`, and `schnorr` module generally, to match rust-bitcoin)
+* [https://github.com/ElementsProject/rust-elements/pull/160](Make `Prevouts` generic over type of `TxOut`)
+* [https://github.com/ElementsProject/rust-elements/pull/161](Add `Transaction::vsize` method)
+* [https://github.com/ElementsProject/rust-elements/pull/157](dynafed: extract `FullParams` from `Params`)
+* [https://github.com/ElementsProject/rust-elements/pull/166](**Update bitcoin dependency to 0.30.0 and secp256k1-zkp dependency to 0.9.1**)
+
 # 0.21.1 - 2022-10-21
 
 - Add `PeginData::parse_tx`
@@ -22,7 +74,7 @@
 - `Block`, `BlockHeader`, `PeginData`, `PegoutData` loose the Default impl
 - update rust-bitcoin to 0.29.1
 - update secp256k1-zkp to 0.7.0
-- update bitcoin_hases to 0.11.0
+- update bitcoin_hashes to 0.11.0
 
 # 0.19.2 - 2022-06-16
 

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "elements"
-version = "0.21.1"
+version = "0.25.1"
 authors = ["Andrew Poelstra <apoelstra@blockstream.com>"]
 description = "Library with support for de/serialization, parsing and executing on data structures and network messages related to Elements"
 license = "CC0-1.0"
@@ -10,45 +10,40 @@ documentation = "https://docs.rs/elements/"
 edition = "2018"
 
 [features]
-default = [ "json-contract" ]
-integration = [ "elementsd" ]
+default = ["json-contract"]
 
-json-contract = [ "serde_json" ]
+json-contract = ["serde_json"]
 "serde" = [
     "bitcoin/serde",
-    "secp256k1-zkp/use-serde",
-    "actual-serde"
+    "bitcoin/serde",
+    "secp256k1-zkp/serde",
+    "actual-serde",
 ]
-"fuzztarget" = []
+base64 = ["bitcoin/base64"]
 
 [dependencies]
-bitcoin = "0.29.1"
-secp256k1-zkp = { version = "0.7.0", features = [ "global-context", "bitcoin_hashes" ] }
-slip21 = "0.2.0"
-
-# While this dependency is included in bitcoin, we need this to use the macros.
-# We should probably try keep this one in sync with the bitcoin version,
-# to avoid requiring two version of bitcoin_hashes.
-bitcoin_hashes = "0.11.0"
+bech32 = "0.11.0"
+bitcoin = "0.32.2"
+secp256k1-zkp = { version = "0.11.0", features = ["global-context", "hashes"] }
 
 # Used for ContractHash::from_json_contract.
 serde_json = { version = "1.0", optional = true }
 
-actual-serde = { package="serde", version = "1.0", features=["derive"], optional = true }
+actual-serde = { package = "serde", version = "1.0.103", features = [
+    "derive",
+], optional = true }
 
-# This should be an optional dev-dependency (only needed for integration tests),
-# but dev-dependency cannot be optional, and without optionality older toolchain try to compile it and fails
-elementsd = {version = "0.6.0", features=["0_21_0","bitcoind_22_0"], optional = true }
+
+[target.wasm32-unknown-unknown.dev-dependencies]
+getrandom = { version = "0.2", features = ["js"] }
 
 [dev-dependencies]
 rand = "0.8"
 rand_chacha = "0.3"
-serde_test = "1.0"
+serde_test = "1.0.19"
 serde_json = "1.0"
-serde_cbor = "0.8"   # older than latest version to support 1.41.1
-ryu = "<1.0.5"
+serde_cbor = "0.8"    # older than latest version to support 1.41.1
 bincode = "1.3"
-base64 = "0.13.0"
 
 [[example]]
 name = "pset_blind_coinjoin"
@@ -58,3 +53,7 @@ name = "raw_blind"
 
 [[example]]
 name = "tx"
+
+[workspace]
+members = ["elementsd-tests"]
+exclude = ["fuzz"]

README.md

@@ -10,4 +10,4 @@ structures and network messages related to Elements
 
 ## Minimum Supported Rust Version (MSRV)
 
-This library should always compile with any combination of features on **Rust 1.41.1**.
+This library should always compile with any combination of features on **Rust 1.48.0**.

clippy.toml

@@ -0,0 +1 @@
+msrv = "1.56.1"