Merge branch 'v1.7-dev' into refactor/sdk-put-dry

dashpay · Dec 2, 2024 · 4f9190c · 4f9190c
2 parents 4ab4565 + db86d33
commit 4f9190c
Show file tree

Hide file tree

Showing 55 changed files with 265 additions and 127 deletions.
diff --git a/.github/actions/docker/action.yaml b/.github/actions/docker/action.yaml
@@ -190,7 +190,9 @@ runs:
         platforms: ${{ inputs.platform }}
         secret-files: |
           AWS=${{ env.HOME }}/.aws/credentials
-        build-args: ${{ steps.sccache.outputs.env_vars }}
+        build-args: |
+          CARGO_BUILD_PROFILE=${{ inputs.cargo_profile }}
+          ${{ steps.sccache.outputs.env_vars }}
         cache-from: ${{ steps.layer_cache_settings.outputs.cache_from }}
         cache-to: ${{ steps.layer_cache_settings.outputs.cache_to }}
         outputs: type=image,name=${{ inputs.image_org }}/${{ inputs.image_name }},push-by-digest=${{ inputs.push_tags != 'true' }},name-canonical=true,push=true
diff --git a/.github/workflows/release-docker-image.yml b/.github/workflows/release-docker-image.yml
@@ -68,6 +68,8 @@ jobs:
           cache_endpoint: ${{ vars.CACHE_S3_ENDPOINT }}
           cache_access_key_id: ${{ secrets.CACHE_KEY_ID }}
           cache_secret_access_key: ${{ secrets.CACHE_SECRET_KEY }}
+          # On release, we generate a new "base" image, so we need to save cache to name manifest, like '.../drive'
+          cache_to_name: ${{ github.event_name == 'release' && 'true' || 'false' }}
 
       - name: Export digest
         run: |
@@ -78,7 +80,7 @@ jobs:
           ls -lah ${{ env.DIGEST_DIR_PATH }}
 
       - name: Upload digest
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ env.DIGEST_NAME }}
           path: ${{ env.DIGEST_DIR_PATH }}/*

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -282,7 +282,7 @@ jobs:
         run: "${GITHUB_WORKSPACE}/scripts/pack_dashmate.sh ${{ matrix.package_type }}"
 
       - name: Upload artifacts to action summary
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: github.event_name != 'release'
         with:
           name: dashmate

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,25 @@
+## [1.6.0-dev.2](https://github.com/dashpay/platform/compare/v1.6.0-dev.1...v1.6.0-dev.2) (2024-11-27)
+
+
+### ⚠ BREAKING CHANGES
+
+* **sdk:** retry broadcast operations (#2337)
+
+
+### Features
+
+* **sdk:** retry broadcast operations ([#2337](https://github.com/dashpay/platform/issues/2337))
+
+
+### Reverted
+
+* **dashmate:** update Core to version 22
+
+
+### Continuous Integration
+
+* change s3 cache provider to optimize costs ([#2344](https://github.com/dashpay/platform/issues/2344))
+
 ## [1.6.0-dev.1](https://github.com/dashpay/platform/compare/v1.5.1...v1.6.0-dev.1) (2024-11-25)
 
 
@@ -25,7 +47,7 @@
 
 ### Miscellaneous Chores
 
-* **dashmate:** update Core to 21.2 nightly
+* **dashmate:** update Core to version 22
 * **sdk:** expose proof verifier errors ([#2333](https://github.com/dashpay/platform/issues/2333))
 * **sdk:** vote poll queries encoding ([#2334](https://github.com/dashpay/platform/issues/2334))
 

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Dockerfile b/Dockerfile
@@ -131,9 +131,6 @@ RUN if [[ "$TARGETARCH" == "arm64" ]] ; then export PROTOC_ARCH=aarch_64; else e
 # Switch to clang
 RUN rm /usr/bin/cc && ln -s /usr/bin/clang /usr/bin/cc
 
-# Select whether we want dev or release
-ONBUILD ARG CARGO_BUILD_PROFILE=dev
-
 ARG NODE_ENV=production
 ENV NODE_ENV=${NODE_ENV}
 
@@ -326,6 +323,10 @@ RUN --mount=type=secret,id=AWS \
     --no-track \
     --no-confirm
 
+
+# Select whether we want dev or release
+ONBUILD ARG CARGO_BUILD_PROFILE=dev
+
 #
 # Rust build planner to speed up builds
 #

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dashevo/platform",
-  "version": "1.6.0-dev.1",
+  "version": "1.6.0",
   "private": true,
   "scripts": {
     "setup": "yarn install && yarn run build && yarn run configure",

diff --git a/packages/bench-suite/package.json b/packages/bench-suite/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@dashevo/bench-suite",
   "private": true,
-  "version": "1.6.0-dev.1",
+  "version": "1.6.0-dev.2",
   "description": "Dash Platform benchmark tool",
   "scripts": {
     "bench": "node ./bin/bench.js",

diff --git a/packages/check-features/Cargo.toml b/packages/check-features/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "check-features"
-version = "1.6.0-dev.1"
+version = "1.6.0-dev.2"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

diff --git a/packages/dapi-grpc/Cargo.toml b/packages/dapi-grpc/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "dapi-grpc"
 description = "GRPC client for Dash Platform"
-version = "1.6.0-dev.1"
+version = "1.6.0-dev.2"
 authors = [
   "Samuel Westrich <[email protected]>",
   "Igor Markin <[email protected]>",
@@ -35,7 +35,7 @@ mocks = ["serde", "dep:serde_json"]
 [dependencies]
 prost = { version = "0.13" }
 futures-core = "0.3.30"
-tonic = { version = "0.12", features = [
+tonic = { version = "0.12.3", features = [
   "codegen",
   "prost",
 ], default-features = false }
@@ -49,7 +49,7 @@ dapi-grpc-macros = { path = "../rs-dapi-grpc-macros" }
 platform-version = { path = "../rs-platform-version" }
 
 [build-dependencies]
-tonic-build = { version = "0.12" }
+tonic-build = { version = "0.12.3" }
 
 [lib]
 

diff --git a/packages/dapi-grpc/package.json b/packages/dapi-grpc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dashevo/dapi-grpc",
-  "version": "1.6.0-dev.1",
+  "version": "1.6.0-dev.2",
   "description": "DAPI GRPC definition file and generated clients",
   "browser": "browser.js",
   "main": "node.js",

diff --git a/packages/dapi/package.json b/packages/dapi/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@dashevo/dapi",
   "private": true,
-  "version": "1.6.0-dev.1",
+  "version": "1.6.0-dev.2",
   "description": "A decentralized API for the Dash network",
   "scripts": {
     "api": "node scripts/api.js",