Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/v2.0-dev' into fix/sdk-invalid-q…
Browse files Browse the repository at this point in the history
…uorum
  • Loading branch information
lklimek committed Feb 24, 2025
2 parents 50a5267 + bcf1785 commit ee83d83
Show file tree
Hide file tree
Showing 1,365 changed files with 201,899 additions and 44,214 deletions.
8 changes: 7 additions & 1 deletion .cargo/config-release.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,13 @@
rustflags = ["-C", "target-feature=-crt-static"]

[target.x86_64-unknown-linux-musl]
rustflags = ["-C", "target-feature=-crt-static"]
rustflags = ["-C", "target-feature=-crt-static", "-C", "target-cpu=x86-64-v3"]

[target.x86_64-unknown-linux-gnu]
rustflags = ["-C", "target-feature=-crt-static", "-C", "target-cpu=x86-64-v3"]

[target.aarch64-unknown-linux-gnu]
linker = "aarch64-linux-gnu-gcc"

[target.wasm32-unknown-unknown]
rustflags = ['--cfg', 'getrandom_backend="wasm_js"']
22 changes: 21 additions & 1 deletion .cargo/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,30 @@
rustflags = ["-C", "target-feature=-crt-static", "--cfg", "tokio_unstable"]

[target.x86_64-unknown-linux-musl]
rustflags = ["-C", "target-feature=-crt-static", "--cfg", "tokio_unstable"]
rustflags = [
"-C",
"target-feature=-crt-static",
"--cfg",
"tokio_unstable",
"-C",
"target-cpu=x86-64",
]

[target.x86_64-unknown-linux-gnu]
rustflags = [
"-C",
"target-feature=-crt-static",
"--cfg",
"tokio_unstable",
"-C",
"target-cpu=x86-64",
]

[target.aarch64-unknown-linux-gnu]
linker = "aarch64-linux-gnu-gcc"

[target.wasm32-unknown-unknown]
rustflags = ['--cfg', 'getrandom_backend="wasm_js"']

[build]
rustflags = ["--cfg", "tokio_unstable"]
2 changes: 1 addition & 1 deletion .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ RUN set -ex; \
rm /tmp/cargo-binstall; \
cargo binstall -V
RUN cargo binstall [email protected].86 --locked \
RUN cargo binstall [email protected].99 --locked \
--no-discover-github-token \
--disable-telemetry \
--no-track \
Expand Down
4 changes: 2 additions & 2 deletions .github/actions/librocksdb/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ name: "librocksdb"
description: "Build and install librocksdb"
inputs:
version:
description: RocksDB version, eg. "8.10.2"
description: RocksDB version, eg. "9.9.3"
required: false
default: "8.10.2"
default: "9.9.3"
force:
description: Force rebuild
required: false
Expand Down
6 changes: 6 additions & 0 deletions .github/package-filters/js-packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
- .github/workflows/tests*
- packages/wallet-utils-contract/**

'@dashevo/token-history-contract': &token-history-contract
- .github/workflows/tests*
- packages/token-history-contract/**

'@dashevo/dashpay-contract': &dashpay-contract
- .github/workflows/tests*
- packages/dashpay-contract/**
Expand Down Expand Up @@ -30,6 +34,7 @@
- *dpns-contract
- *withdrawals-contract
- *wallet-utils-contract
- *token-history-contract
- packages/rs-platform-serialization/**
- packages/rs-platform-serialization-derive/**
- packages/rs-platform-value/**
Expand Down Expand Up @@ -80,6 +85,7 @@ dashmate:
- *masternode-reward-shares-contract
- *dpns-contract
- *withdrawals-contract
- *token-history-contract
- *wallet-lib
- *dapi-client

Expand Down
5 changes: 5 additions & 0 deletions .github/package-filters/rs-packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@ wallet-utils-contract: &wallet-utils-contract
- .github/workflows/tests*
- packages/wallet-utils-contract/**

token-history-contract: &token-history-contract
- .github/workflows/tests*
- packages/token-history-contract/**

dashpay-contract: &dashpay-contract
- .github/workflows/tests*
- packages/dashpay-contract/**
Expand Down Expand Up @@ -30,6 +34,7 @@ dpp: &dpp
- *dpns-contract
- *withdrawals-contract
- *wallet-utils-contract
- *token-history-contract
- *json-schema-compatibility-validator
- packages/rs-platform-serialization/**
- packages/rs-platform-serialization-derive/**
Expand Down
6 changes: 1 addition & 5 deletions .github/workflows/release-docker-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,18 +39,14 @@ jobs:
include:
- runner: ubuntu-24.04
platform: linux/amd64
- runner: ubuntu-24.04
- runner: ubuntu-24.04-arm
platform: linux/arm64
steps:
- name: Check out repo
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Set up QEMU
uses: docker/setup-qemu-action@v3
if: ${{ matrix.platform == 'linux/arm64' }}

- name: Build and push by digest
uses: ./.github/actions/docker
id: docker_build
Expand Down
10 changes: 8 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,14 +70,20 @@ jobs:
if: ${{ steps.check-artifact.outputs.exists != 'true' }}

- name: Install wasm-bindgen-cli
run: cargo binstall [email protected]
run: cargo binstall [email protected]
if: ${{ steps.check-artifact.outputs.exists != 'true' }}

- name: Install Binaryen
run: |
wget https://github.com/WebAssembly/binaryen/releases/download/version_121/binaryen-version_121-x86_64-linux.tar.gz -P /tmp
tar -xzf /tmp/binaryen-version_121-x86_64-linux.tar.gz -C /tmp
sudo cp -r /tmp/binaryen-version_121/* /usr/local/
if: ${{ steps.check-artifact.outputs.exists != 'true' }}

- name: Build packages
run: yarn build
env:
CARGO_BUILD_PROFILE: release

if: ${{ steps.check-artifact.outputs.exists != 'true' }}

- name: Set suffix
Expand Down
9 changes: 8 additions & 1 deletion .github/workflows/tests-build-js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,14 @@ jobs:
if: ${{ steps.check-artifact.outputs.exists != 'true' }}

- name: Install wasm-bindgen-cli
run: cargo binstall [email protected]
run: cargo binstall [email protected]
if: ${{ steps.check-artifact.outputs.exists != 'true' }}

- name: Install Binaryen
run: |
wget https://github.com/WebAssembly/binaryen/releases/download/version_121/binaryen-version_121-x86_64-linux.tar.gz -P /tmp
tar -xzf /tmp/binaryen-version_121-x86_64-linux.tar.gz -C /tmp
sudo cp -r /tmp/binaryen-version_121/* /usr/local/
if: ${{ steps.check-artifact.outputs.exists != 'true' }}

- name: Build JS packages
Expand Down
Loading

0 comments on commit ee83d83

Please sign in to comment.