Skip to content

Commit a295579

Browse files
shamardyshamardy
authored
Merge pull request #2637 from KomodoPlatform/staging
chore(release): v2.5.2-beta
2 parents a9fbf60 + 9602371 commit a295579

File tree

20 files changed

+474
-207
lines changed

20 files changed

+474
-207
lines changed

‎.docker/Dockerfile.ci-container‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM docker.io/debian:buster-slim
1+
FROM docker.io/debian:bullseye-slim
22

33
MAINTAINER Onur Özkan <[email protected]>
44

‎.github/workflows/dev-build.yml‎

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,12 @@ jobs:
115115
- name: Build
116116
run: cargo build --release --target x86_64-apple-darwin
117117

118+
- name: Upload build for next job
119+
uses: actions/upload-artifact@v4
120+
with:
121+
name: x86_64-apple-darwin-release-kdf
122+
path: target/x86_64-apple-darwin/release/kdf
123+
118124
- name: Compress kdf build output
119125
env:
120126
AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
@@ -167,6 +173,12 @@ jobs:
167173
- name: Build
168174
run: cargo build --release --target aarch64-apple-darwin
169175

176+
- name: Upload build for next job
177+
uses: actions/upload-artifact@v4
178+
with:
179+
name: aarch64-apple-darwin-release-kdf
180+
path: target/aarch64-apple-darwin/release/kdf
181+
170182
- name: Compress kdf build output
171183
env:
172184
AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
@@ -189,6 +201,70 @@ jobs:
189201
SAFE_BRANCH_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
190202
python3 ./scripts/ci/upload_artifact.py "$SAFE_BRANCH_NAME" "/uploads/$SAFE_BRANCH_NAME"
191203
204+
mac-universal:
205+
timeout-minutes: 60
206+
runs-on: macos-latest
207+
needs: [mac-x86-64, mac-arm64]
208+
steps:
209+
- uses: actions/checkout@v3
210+
211+
- name: Install build deps
212+
uses: ./.github/actions/deps-install
213+
with:
214+
deps: ('protoc', 'python3', 'paramiko')
215+
216+
- name: Calculate build tag (commit hash) for PR commit
217+
if: github.event_name == 'pull_request'
218+
run: echo "KDF_BUILD_TAG=$(git rev-parse --short=7 ${{ github.event.pull_request.head.sha }})" >> $GITHUB_ENV
219+
220+
- name: Calculate build tag (commit hash) for merge commit
221+
if: github.event_name != 'pull_request'
222+
run: echo "KDF_BUILD_TAG=$(git rev-parse --short=7 HEAD)" >> $GITHUB_ENV
223+
224+
- name: Download macos x86_64 build
225+
uses: actions/download-artifact@v5
226+
with:
227+
name: x86_64-apple-darwin-release-kdf
228+
path: target/x86_64-apple-darwin/release
229+
230+
- name: Download macos aarch64 build
231+
uses: actions/download-artifact@v5
232+
with:
233+
name: aarch64-apple-darwin-release-kdf
234+
path: target/aarch64-apple-darwin/release
235+
236+
- name: Make universal kdf build output
237+
run: |
238+
AARCH64_BIN="target/aarch64-apple-darwin/release/kdf"
239+
X86_64_BIN="target/x86_64-apple-darwin/release/kdf"
240+
OUT_DIR="target/universal-apple-darwin/release"
241+
OUT_BIN="$OUT_DIR/kdf"
242+
mkdir -p "$OUT_DIR"
243+
lipo -create "$AARCH64_BIN" "$X86_64_BIN" -output "$OUT_BIN"
244+
lipo -info "$OUT_BIN"
245+
246+
- name: Compress kdf build output
247+
env:
248+
AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
249+
if: ${{ env.AVAILABLE != '' }}
250+
run: |
251+
NAME="kdf_$KDF_BUILD_TAG-mac-universal.zip"
252+
zip $NAME target/universal-apple-darwin/release/kdf -j
253+
SAFE_DIR_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
254+
mkdir $SAFE_DIR_NAME
255+
mv $NAME ./$SAFE_DIR_NAME/
256+
257+
- name: Upload build artifact
258+
env:
259+
FILE_SERVER_HOST: ${{ secrets.FILE_SERVER_HOST }}
260+
FILE_SERVER_USERNAME: ${{ secrets.FILE_SERVER_USERNAME }}
261+
FILE_SERVER_PORT: ${{ secrets.FILE_SERVER_PORT }}
262+
FILE_SERVER_KEY: ${{ secrets.FILE_SERVER_KEY }}
263+
if: ${{ env.FILE_SERVER_KEY != '' }}
264+
run: |
265+
SAFE_BRANCH_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
266+
python3 ./scripts/ci/upload_artifact.py "$SAFE_BRANCH_NAME" "/uploads/$SAFE_BRANCH_NAME"
267+
192268
win-x86-64:
193269
timeout-minutes: 60
194270
runs-on: windows-latest

‎.github/workflows/release-build.yml‎

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ jobs:
8989
run: |
9090
rustup toolchain install nightly-2023-06-01 --no-self-update --profile=minimal
9191
rustup default nightly-2023-06-01
92+
rustup target add x86_64-apple-darwin
9293
9394
- name: Install build deps
9495
uses: ./.github/actions/deps-install
@@ -109,6 +110,12 @@ jobs:
109110
- name: Build
110111
run: cargo build --release --target x86_64-apple-darwin
111112

113+
- name: Upload build for next job
114+
uses: actions/upload-artifact@v4
115+
with:
116+
name: x86_64-apple-darwin-release-kdf
117+
path: target/x86_64-apple-darwin/release/kdf
118+
112119
- name: Compress kdf build output
113120
run: |
114121
NAME="kdf_$KDF_BUILD_TAG-mac-x86-64.zip"
@@ -158,6 +165,12 @@ jobs:
158165
- name: Build
159166
run: cargo build --release --target aarch64-apple-darwin
160167

168+
- name: Upload build for next job
169+
uses: actions/upload-artifact@v4
170+
with:
171+
name: aarch64-apple-darwin-release-kdf
172+
path: target/aarch64-apple-darwin/release/kdf
173+
161174
- name: Compress kdf build output
162175
run: |
163176
NAME="kdf_$KDF_BUILD_TAG-mac-arm64.zip"
@@ -177,6 +190,70 @@ jobs:
177190
SAFE_BRANCH_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
178191
python3 ./scripts/ci/upload_artifact.py "$SAFE_BRANCH_NAME" "/uploads/$SAFE_BRANCH_NAME"
179192
193+
mac-universal:
194+
timeout-minutes: 60
195+
runs-on: macos-latest
196+
needs: [mac-x86-64, mac-arm64]
197+
steps:
198+
- uses: actions/checkout@v3
199+
200+
- name: Install build deps
201+
uses: ./.github/actions/deps-install
202+
with:
203+
deps: ('protoc', 'python3', 'paramiko')
204+
205+
- name: Calculate build tag (commit hash) for PR commit
206+
if: github.event_name == 'pull_request'
207+
run: echo "KDF_BUILD_TAG=$(git rev-parse --short=7 ${{ github.event.pull_request.head.sha }})" >> $GITHUB_ENV
208+
209+
- name: Calculate build tag (commit hash) for merge commit
210+
if: github.event_name != 'pull_request'
211+
run: echo "KDF_BUILD_TAG=$(git rev-parse --short=7 HEAD)" >> $GITHUB_ENV
212+
213+
- name: Download macos x86_64 build
214+
uses: actions/download-artifact@v5
215+
with:
216+
name: x86_64-apple-darwin-release-kdf
217+
path: target/x86_64-apple-darwin/release
218+
219+
- name: Download macos aarch64 build
220+
uses: actions/download-artifact@v5
221+
with:
222+
name: aarch64-apple-darwin-release-kdf
223+
path: target/aarch64-apple-darwin/release
224+
225+
- name: Make universal kdf build output
226+
run: |
227+
AARCH64_BIN="target/aarch64-apple-darwin/release/kdf"
228+
X86_64_BIN="target/x86_64-apple-darwin/release/kdf"
229+
OUT_DIR="target/universal-apple-darwin/release"
230+
OUT_BIN="$OUT_DIR/kdf"
231+
mkdir -p "$OUT_DIR"
232+
lipo -create "$AARCH64_BIN" "$X86_64_BIN" -output "$OUT_BIN"
233+
lipo -info "$OUT_BIN"
234+
235+
- name: Compress kdf build output
236+
env:
237+
AVAILABLE: ${{ secrets.FILE_SERVER_KEY }}
238+
if: ${{ env.AVAILABLE != '' }}
239+
run: |
240+
NAME="kdf_$KDF_BUILD_TAG-mac-universal.zip"
241+
zip $NAME target/universal-apple-darwin/release/kdf -j
242+
SAFE_DIR_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
243+
mkdir $SAFE_DIR_NAME
244+
mv $NAME ./$SAFE_DIR_NAME/
245+
246+
- name: Upload build artifact
247+
env:
248+
FILE_SERVER_HOST: ${{ secrets.FILE_SERVER_HOST }}
249+
FILE_SERVER_USERNAME: ${{ secrets.FILE_SERVER_USERNAME }}
250+
FILE_SERVER_PORT: ${{ secrets.FILE_SERVER_PORT }}
251+
FILE_SERVER_KEY: ${{ secrets.FILE_SERVER_KEY }}
252+
if: ${{ env.FILE_SERVER_KEY != '' }}
253+
run: |
254+
SAFE_BRANCH_NAME=$(echo "$BRANCH_NAME" | tr '/' '-')
255+
python3 ./scripts/ci/upload_artifact.py "$SAFE_BRANCH_NAME" "/uploads/$SAFE_BRANCH_NAME"
256+
180257
win-x86-64:
181258
timeout-minutes: 60
182259
runs-on: windows-latest

‎CHANGELOG.md‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,33 @@
1+
## v2.5.2-beta - 2025-10-10
2+
3+
### Enhancements/Fixes:
4+
5+
**Swap Stats DB**:
6+
- Swap status broadcasting was enabled for privacy coins with the persistent pubkey hidden (set to zeros) to maintain user privacy. [#2648](https://github.com/KomodoPlatform/komodo-defi-framework/pull/2648)
7+
- Stats database now correctly stores persistent pubkeys for both maker and taker instead of incorrectly storing htlc pubkeys in some cases. [#2648](https://github.com/KomodoPlatform/komodo-defi-framework/pull/2648)
8+
9+
**ARRR/Pirate**:
10+
- The `get_nullifiers` function for Zcoin WASM build is now aligned with its sqlite counterpart to return nullifiers for both unspent notes and notes with unconfirmed spends, fixing the `spent_by_me` field in transaction history and balance calculations. [#2651](https://github.com/KomodoPlatform/komodo-defi-framework/pull/2651)
11+
12+
**Metrics**:
13+
- The `memory_db` size metric that relied on `parity-util-mem::malloc_size` was removed because it intermittently segfaulted on Linux due to allocator conflicts. [#2632](https://github.com/KomodoPlatform/komodo-defi-framework/pull/2632)
14+
15+
**Build and Dependency Management**:
16+
- A CI job was added to build macOS Universal2 artifacts for KDF, this combines `x86_64-apple-darwin` and `aarch64-apple-darwin` binaries via `lipo` to produce a single binary that runs natively on both Intel and Apple Silicon. The universal binary is uploaded as `kdf_<commit>-mac-universal.zip`. [#2628](https://github.com/KomodoPlatform/komodo-defi-framework/pull/2628)
17+
- The `parity-util-mem` dependency was removed. [#2632](https://github.com/KomodoPlatform/komodo-defi-framework/pull/2632)
18+
- CI container base image was bumped to `debian:bullseye-slim` [#2534](https://github.com/KomodoPlatform/komodo-defi-framework/pull/2534) [#2641](https://github.com/KomodoPlatform/komodo-defi-framework/pull/2641)
19+
20+
---
21+
22+
## v2.5.1-beta - 2025-07-28
23+
24+
### Enhancements/Fixes:
25+
26+
**Wallet**:
27+
- A comprehensive `get_private_keys` RPC was implemented to export private keys, public keys, and addresses for any configured coin without requiring activation. HD and Iguana modes with protocol-specific logic for UTXO, EVM, Tendermint, and ZHTLC coins were supported, enabling offline recovery workflows (implemented by Devin AI). [#2542](https://github.com/KomodoPlatform/komodo-defi-framework/pull/2542)
28+
29+
---
30+
131
## v2.5.0-beta - 2025-07-04
232

333
### Features:

‎Cargo.lock‎

Lines changed: 2 additions & 25 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,6 @@ mocktopus = "0.8.0"
141141
nom = "6.1.2"
142142
num-bigint = { version = "0.4", features = ["serde", "std"] }
143143
num-rational = { version = "0.4", features = ["serde"] }
144-
parity-util-mem = "0.11"
145144
num-traits = "0.2"
146145
pairing_api = { git = "https://github.com/komodoplatform/walletconnectrust", tag = "k-0.1.3" }
147146
parking_lot = { version = "0.12.0", default-features = false }

0 commit comments

Comments
 (0)