diff --git a/.github/workflows/cont_integration.yml b/.github/workflows/cont_integration.yml index 22d0bae..440882a 100644 --- a/.github/workflows/cont_integration.yml +++ b/.github/workflows/cont_integration.yml @@ -10,15 +10,15 @@ jobs: strategy: matrix: rust: - - 1.75.0 # STABLE + - 1.81.0 # current - 1.63.0 # MSRV steps: - name: checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Generate cache key run: echo "${{ matrix.rust }} ${{ matrix.features }}" | tee .cache_key - name: cache - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: | ~/.cargo/registry @@ -38,9 +38,14 @@ jobs: - name: Pin dependencies for MSRV if: matrix.rust == '1.63.0' run: | - cargo update -p home:0.5.9 --precise 0.5.5 - cargo update -p tokio:1.40.0 --precise 1.38.1 + cargo update -p home --precise 0.5.5 + cargo update -p tokio --precise 1.38.1 + cargo update -p ring:0.17.14 --precise 0.17.8 cargo update -p cc --precise 1.0.105 + cargo update -p flate2 --precise 1.0.35 + cargo update -p once_cell --precise 1.20.3 + cargo update -p bzip2-sys --precise 0.1.11+1.0.8 + cargo update -p minreq --precise 2.12.0 - name: Build run: cargo build - name: Clippy @@ -48,39 +53,6 @@ jobs: - name: Test run: cargo test - check-wasm: - name: Check WASM - runs-on: ubuntu-20.04 - env: - CC: clang-10 - CFLAGS: -I/usr/include - steps: - - name: Checkout - uses: actions/checkout@v2 - - name: Cache - uses: actions/cache@v2 - with: - path: | - ~/.cargo/registry - ~/.cargo/git - target - key: ${{ runner.os }}-cargo-${{ github.job }}-${{ hashFiles('**/Cargo.toml','**/Cargo.lock') }} - # Install a recent version of clang that supports wasm32 - - run: wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add - || exit 1 - - run: sudo apt-add-repository "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-10 main" || exit 1 - - run: sudo apt-get update || exit 1 - - run: sudo apt-get install -y libclang-common-10-dev clang-10 libc6-dev-i386 || exit 1 - - name: Set default toolchain - run: rustup default 1.65.0 # STABLE - - name: Set profile - run: rustup set profile minimal - - name: Add target wasm32 - run: rustup target add wasm32-unknown-unknown - - name: Update toolchain - run: rustup update -# - name: Check -# run: cargo check --target wasm32-unknown-unknown - fmt: name: Rust fmt runs-on: ubuntu-latest diff --git a/Cargo.toml b/Cargo.toml index 630f529..55d0169 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "bdk-reserves" -version = "0.29.0" +version = "0.30.2" authors = ["Richard Ulrich "] edition = "2018" description = "Proof of reserves for bitcoin dev kit" @@ -10,12 +10,12 @@ license = "MIT OR Apache-2.0" repository = "https://github.com/bitcoindevkit/bdk-reserves" [dependencies] -bdk = { version = "0.29", default-features = false, features = ["std"] } +bdk = { version = "0.30.2", default-features = false, features = ["std"] } bitcoinconsensus = "0.19.0-3" log = "^0.4" [dev-dependencies] rstest = "^0.11" bdk-testutils = "^0.4" -bdk = { version = "0.29", default-features = true } +bdk = { version = "0.30.1", default-features = true } electrsd = { version = "0.24", features = ["bitcoind_22_0", "electrs_0_9_1"] } diff --git a/Dockerfile b/Dockerfile index e60c33c..fe398ae 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM rust:1.70-bookworm +FROM rust:1.81-bookworm ARG http_proxy ENV http_proxy=$http_proxy ENV https_proxy=$http_proxy diff --git a/Makefile b/Makefile index 121facb..d9197d8 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,5 @@ TAG := bdk-reserves -TAG_57 := bdk-reserves-57 -TAG_63 := bdk-reserves-61 +TAG_63 := bdk-reserves-63 http_proxy ?= http://172.17.0.1:3128 DOCKER_RUN := docker run --interactive --rm \ -v ${PWD}:/home/satoshi \ @@ -14,36 +13,17 @@ test_current: builder rm -f Cargo.lock $(DOCKER_RUN) ${TAG} cargo test -test_57: builder_57 - #rm -f Cargo.lock - #$(DOCKER_RUN) ${TAG_57} cargo update -p log:0.4.20 --precise 0.4.18 - #$(DOCKER_RUN) ${TAG_57} cargo update -p tempfile --precise 3.6.0 - #$(DOCKER_RUN) ${TAG_57} cargo update -p sct:0.7.1 --precise 0.7.0 - $(DOCKER_RUN) ${TAG_57} cargo update -p zip:0.6.6 --precise 0.6.3 || true - $(DOCKER_RUN) ${TAG_57} cargo update -p rustls:0.21.10 --precise 0.21.1 || true - $(DOCKER_RUN) ${TAG_57} cargo update -p rustls:0.21.7 --precise 0.21.1 || true - $(DOCKER_RUN) ${TAG_57} cargo update -p rustls:0.21.4 --precise 0.21.1 || true - $(DOCKER_RUN) ${TAG_57} cargo update -p rustls:0.21.2 --precise 0.21.1 || true - $(DOCKER_RUN) ${TAG_57} cargo update -p rustls:0.20.9 --precise 0.20.8 || true - $(DOCKER_RUN) ${TAG_57} cargo update -p rustls-webpki:0.100.3 --precise 0.100.1 || true - $(DOCKER_RUN) ${TAG_57} cargo update -p rustls-webpki:0.101.4 --precise 0.101.1 || true - $(DOCKER_RUN) ${TAG_57} cargo update -p rustls-webpki:0.101.7 --precise 0.101.1 || true - $(DOCKER_RUN) ${TAG_57} cargo update -p crossbeam-utils:0.8.18 --precise 0.8.16 || true - $(DOCKER_RUN) ${TAG_57} cargo update -p tokio:1.35.1 --precise 1.29.1 || true - $(DOCKER_RUN) ${TAG_57} cargo update -p rustix:0.38.9 --precise 0.38.3 || true - $(DOCKER_RUN) ${TAG_57} cargo update -p ring:0.17.7 --precise 0.16.20 || true - $(DOCKER_RUN) ${TAG_57} cargo update -p byteorder:1.5.0 --precise 0.4.3 || true - $(DOCKER_RUN) ${TAG_57} cargo update -p webpki:0.22.4 --precise 0.22.0 || true - $(DOCKER_RUN) ${TAG_57} cargo update -p crossbeam-epoch:0.9.17 --precise 0.9.15 || true - $(DOCKER_RUN) ${TAG_57} cargo update -p byteorder:1.5.0 --precise 0.4.3 || true - $(DOCKER_RUN) ${TAG_57} cargo test - test_63: builder_63 rm -f Cargo.lock $(DOCKER_RUN) ${TAG_63} cargo test || true - $(DOCKER_RUN) ${TAG_63} cargo update -p home:0.5.9 --precise 0.5.5 || true - $(DOCKER_RUN) ${TAG_63} cargo update -p tokio:1.40.0 --precise 1.38.1 || true + $(DOCKER_RUN) ${TAG_63} cargo update -p home --precise 0.5.5 || true + $(DOCKER_RUN) ${TAG_63} cargo update -p tokio --precise 1.38.1 || true + $(DOCKER_RUN) ${TAG_63} cargo update -p ring:0.17.14 --precise 0.17.8 || true $(DOCKER_RUN) ${TAG_63} cargo update -p cc --precise 1.0.105 || true + $(DOCKER_RUN) ${TAG_63} cargo update -p flate2 --precise 1.0.35 || true + $(DOCKER_RUN) ${TAG_63} cargo update -p once_cell --precise 1.20.3 || true + $(DOCKER_RUN) ${TAG_63} cargo update -p bzip2-sys --precise 0.1.11+1.0.8 || true + $(DOCKER_RUN) ${TAG_63} cargo update -p minreq --precise 2.12.0 || true $(DOCKER_RUN) ${TAG_63} cargo test run: builder @@ -67,13 +47,6 @@ builder: --build-arg UID="$(shell id -u)" \ . -builder_57: - docker build --tag ${TAG_57}\ - --build-arg http_proxy="${http_proxy}" \ - --build-arg UID="$(shell id -u)" \ - -f Dockerfile_57 \ - . - builder_63: docker build --tag ${TAG_63}\ --build-arg http_proxy="${http_proxy}" \