Skip to content

Commit 762c4c3

Browse files
author
dimxy
committed
Merge branch 'dev' into fix-2.5-rc-trezor-issues
* dev: (21 commits) feat(wallet-connect): impl BTC (UTxO) activation via WalletConnect (#2499) feat(utxo): add new fixed txfee option for DINGO-like coins (#2454) ci(pull-requests): review notification bot (#2468) improvement(walletconnect): return the `pairing_topic` in `new_connection` response (#2538) bless clippy (#2560) refactor(toolchain): use latest available stable compiler (#2557) feat(wallet): implement unified offline private key export API (#2542) improve note for docker test start failure (#2550) fix(DOCS): add note for macos to fix docker containers startup failure (#2544) refactor(toolchain): general stabilization for stable rust (#2528) fix(ci): adds nodejs 20 to ci-container (#2536) fix(WASM and Debian): fix build failures (#2534) improvement(event-streaming): impl DeriveStreamerId trait for all streamers (#2489) fix(eth): Propagate structured EIP-1559 fee errors (#2532) fix(eth): Correctly implement ETH max withdrawal logic (#2531) feat(use-clap-for-cli): use clap to parse CLI-Args #2215 (#2510) feat(orderbook): expirable maker orders (#2516) improvement(eth): drop parity support (#2527) chore(release): finalize changelog for v2.5.0-beta (#2524) chore(toolchain): upgrade toolchain to nightly 1.86.0 (#2444) ... # Conflicts: # mm2src/coins/lp_coins.rs # mm2src/coins/rpc_command/get_new_address.rs # mm2src/trezor/src/eth/eth_command.rs
2 parents f73e66a + 68bc4eb commit 762c4c3

File tree

580 files changed

+16150
-8479
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

580 files changed

+16150
-8479
lines changed

.cargo/config.toml

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,25 @@
11
[env]
2+
# Enables unstable features for specific crates to take advantage of useful
3+
# functionality not yet stabilized. Remove a crate from the list once all
4+
# required features are stabilized.
5+
#
6+
# # Core crates (used in production)
7+
#
8+
# - mm2_state_machine: Depends on `negative_impls` and `auto_traits`.
9+
# - mm2_err_handle: Depends on `negative_impls`, `auto_traits` and `allocator_api`.
10+
#
11+
# # Test crates (not leaked into the binary)
12+
#
13+
# - mocktopus: nightly only dependency.
14+
# - mocktopus_macros: nightly only dependency.
15+
# - docker_tests_main: Depends on `custom_test_frameworks` and `test`.
16+
# - docker_tests_sia_unique: Depends on `custom_test_frameworks` and `test`.
17+
RUSTC_BOOTSTRAP = "mm2_state_machine,mm2_err_handle,mocktopus,mocktopus_macros,docker_tests_main,docker_tests_sia_unique"
18+
219
JEMALLOC_SYS_WITH_MALLOC_CONF = "background_thread:true,narenas:1,tcache:false,dirty_decay_ms:0,muzzy_decay_ms:0,metadata_thp:auto"
320

421
[target.'cfg(all())']
5-
rustflags = [ "-Zshare-generics=y", '--cfg=curve25519_dalek_backend="fiat"' ]
22+
rustflags = [ '--cfg=curve25519_dalek_backend="fiat"' ]
623

724
# # Install lld using package manager
825
# [target.x86_64-unknown-linux-gnu]

.docker/Dockerfile.ci-container

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
FROM docker.io/debian:buster-slim
1+
FROM docker.io/debian:bullseye-slim
22

3-
MAINTAINER Onur Özkan <[email protected]>
3+
LABEL maintainer="Onur Özkan <[email protected]>"
44

55
RUN apt-get update -y
66

.docker/Dockerfile.dev-release

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
FROM docker.io/debian:stable-slim
22
WORKDIR /kdf
33
COPY target/release/kdf /usr/local/bin/kdf
4-
COPY target/release/mm2 /usr/local/bin/mm2
54
EXPOSE 7783
65
CMD ["kdf"]

.docker/Dockerfile.release

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
FROM docker.io/debian:stable-slim
22
WORKDIR /kdf
33
COPY target/release/kdf /usr/local/bin/kdf
4-
COPY target/release/mm2 /usr/local/bin/mm2
54
EXPOSE 7783
65
CMD ["kdf"]

.github/actions/build-cache/action.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,10 @@ runs:
66
- name: Checkout repository
77
uses: actions/checkout@v3
88

9+
- name: Set up Node.js
10+
uses: actions/setup-node@v4
11+
with:
12+
node-version: '20'
13+
914
- name: Set up rust-cache
1015
uses: Swatinem/rust-cache@v2

.github/workflows/dev-build.yml

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ jobs:
2929
3030
- name: Install toolchain
3131
run: |
32-
rustup toolchain install nightly-2023-06-01 --no-self-update --profile=minimal
33-
rustup default nightly-2023-06-01
32+
rustup toolchain install stable --no-self-update --profile=minimal
33+
rustup default stable
3434
3535
- name: Install build deps
3636
uses: ./.github/actions/deps-install
@@ -92,8 +92,8 @@ jobs:
9292
- uses: actions/checkout@v3
9393
- name: Install toolchain
9494
run: |
95-
rustup toolchain install nightly-2023-06-01 --no-self-update --profile=minimal
96-
rustup default nightly-2023-06-01
95+
rustup toolchain install stable --no-self-update --profile=minimal
96+
rustup default stable
9797
rustup target add x86_64-apple-darwin
9898
9999
- name: Install build deps
@@ -144,8 +144,8 @@ jobs:
144144
- uses: actions/checkout@v3
145145
- name: Install toolchain
146146
run: |
147-
rustup toolchain install nightly-2023-06-01 --no-self-update --profile=minimal
148-
rustup default nightly-2023-06-01
147+
rustup toolchain install stable --no-self-update --profile=minimal
148+
rustup default stable
149149
rustup target add aarch64-apple-darwin
150150
151151
- name: Install build deps
@@ -196,8 +196,8 @@ jobs:
196196
- uses: actions/checkout@v3
197197
- name: Install toolchain
198198
run: |
199-
rustup toolchain install nightly-2023-06-01 --no-self-update --profile=minimal
200-
rustup default nightly-2023-06-01
199+
rustup toolchain install stable --no-self-update --profile=minimal
200+
rustup default stable
201201
202202
- name: Install build deps
203203
uses: ./.github/actions/deps-install
@@ -247,8 +247,8 @@ jobs:
247247
- uses: actions/checkout@v3
248248
- name: Install toolchain
249249
run: |
250-
rustup toolchain install nightly-2023-06-01 --no-self-update --profile=minimal
251-
rustup default nightly-2023-06-01
250+
rustup toolchain install stable --no-self-update --profile=minimal
251+
rustup default stable
252252
rustup target add x86_64-apple-darwin
253253
254254
- name: Install build deps
@@ -314,8 +314,8 @@ jobs:
314314

315315
- name: Install toolchain
316316
run: |
317-
rustup toolchain install nightly-2023-06-01 --no-self-update --profile=minimal
318-
rustup default nightly-2023-06-01
317+
rustup toolchain install stable --no-self-update --profile=minimal
318+
rustup default stable
319319
rustup target add wasm32-unknown-unknown
320320
321321
- name: Install wasm-pack
@@ -365,8 +365,8 @@ jobs:
365365
- uses: actions/checkout@v3
366366
- name: Install toolchain
367367
run: |
368-
rustup toolchain install nightly-2023-06-01 --no-self-update --profile=minimal
369-
rustup default nightly-2023-06-01
368+
rustup toolchain install stable --no-self-update --profile=minimal
369+
rustup default stable
370370
rustup target add aarch64-apple-ios
371371
372372
- name: Install build deps
@@ -427,8 +427,8 @@ jobs:
427427
428428
- name: Install toolchain
429429
run: |
430-
rustup toolchain install nightly-2023-06-01 --no-self-update --profile=minimal
431-
rustup default nightly-2023-06-01
430+
rustup toolchain install stable --no-self-update --profile=minimal
431+
rustup default stable
432432
rustup target add aarch64-linux-android
433433
434434
- name: Install build deps
@@ -494,8 +494,8 @@ jobs:
494494
495495
- name: Install toolchain
496496
run: |
497-
rustup toolchain install nightly-2023-06-01 --no-self-update --profile=minimal
498-
rustup default nightly-2023-06-01
497+
rustup toolchain install stable --no-self-update --profile=minimal
498+
rustup default stable
499499
rustup target add armv7-linux-androideabi
500500
501501
- name: Install build deps

.github/workflows/fmt-and-lint.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ jobs:
1818

1919
- name: Install toolchain
2020
run: |
21-
rustup toolchain install nightly-2023-06-01 --no-self-update --profile=minimal --component rustfmt,clippy
22-
rustup default nightly-2023-06-01
21+
rustup toolchain install stable --no-self-update --profile=minimal --component rustfmt,clippy
22+
rustup default stable
2323
2424
- name: Install build deps
2525
uses: ./.github/actions/deps-install
@@ -45,8 +45,8 @@ jobs:
4545
- uses: actions/checkout@v3
4646
- name: Install toolchain
4747
run: |
48-
rustup toolchain install nightly-2023-06-01 --no-self-update --profile=minimal --component clippy
49-
rustup default nightly-2023-06-01
48+
rustup toolchain install stable --no-self-update --profile=minimal --component clippy
49+
rustup default stable
5050
rustup target add wasm32-unknown-unknown
5151
5252
- name: Install build deps

.github/workflows/pr-lint.yml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,3 @@ jobs:
4444
echo "PR title is too long (greater than 85 characters)"
4545
exit 1
4646
fi
47-
48-
- name: Check PR labels
49-
env:
50-
LABEL_NAMES: ${{ toJson(github.event.pull_request.labels.*.name) }}
51-
if: "!((contains(env.LABEL_NAMES, 'pending review') && !contains(env.LABEL_NAMES, 'in progress') && !contains(env.LABEL_NAMES, 'blocked'))
52-
|| (!contains(env.LABEL_NAMES, 'pending review') && contains(env.LABEL_NAMES, 'in progress') && !contains(env.LABEL_NAMES, 'blocked'))
53-
|| (!contains(env.LABEL_NAMES, 'pending review') && !contains(env.LABEL_NAMES, 'in progress') && contains(env.LABEL_NAMES, 'blocked')))"
54-
run: |
55-
echo "PR must have "exactly one" of these labels: ['status: pending review', 'status: in progress', 'status: blocked']."
56-
exit 1
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: PR Review Reminder
2+
3+
on:
4+
schedule:
5+
# Run at 12:00 PM everyday.
6+
- cron: '0 12 * * *'
7+
8+
jobs:
9+
pr-review-reminder:
10+
permissions:
11+
contents: read
12+
pull-requests: write
13+
14+
runs-on: ubuntu-latest
15+
name: PR Review Reminder
16+
17+
steps:
18+
- name: Run PR Review Reminder
19+
uses: thundermiracle/review-reminder-action@224d83b90c76ac597776c79ba1f63539f0bc2795
20+
with:
21+
stale-days: 2
22+
ignore-draft: true
23+
# Don't ping people at weekends.
24+
only-business-days: true
25+
# 2 approvals are enough.
26+
skip-approve-count: 2
27+
token: "${{ secrets.GITHUB_TOKEN }}"
28+
send-reminder-comment: true

.github/workflows/release-build.yml

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ jobs:
2929
3030
- name: Install toolchain
3131
run: |
32-
rustup toolchain install nightly-2023-06-01 --no-self-update --profile=minimal
33-
rustup default nightly-2023-06-01
32+
rustup toolchain install stable --no-self-update --profile=minimal
33+
rustup default stable
3434
3535
- name: Install build deps
3636
uses: ./.github/actions/deps-install
@@ -87,8 +87,8 @@ jobs:
8787
- uses: actions/checkout@v3
8888
- name: Install toolchain
8989
run: |
90-
rustup toolchain install nightly-2023-06-01 --no-self-update --profile=minimal
91-
rustup default nightly-2023-06-01
90+
rustup toolchain install stable --no-self-update --profile=minimal
91+
rustup default stable
9292
9393
- name: Install build deps
9494
uses: ./.github/actions/deps-install
@@ -135,8 +135,8 @@ jobs:
135135
- uses: actions/checkout@v3
136136
- name: Install toolchain
137137
run: |
138-
rustup toolchain install nightly-2023-06-01 --no-self-update --profile=minimal
139-
rustup default nightly-2023-06-01
138+
rustup toolchain install stable --no-self-update --profile=minimal
139+
rustup default stable
140140
rustup target add aarch64-apple-darwin
141141
142142
- name: Install build deps
@@ -184,8 +184,8 @@ jobs:
184184
- uses: actions/checkout@v3
185185
- name: Install toolchain
186186
run: |
187-
rustup toolchain install nightly-2023-06-01 --no-self-update --profile=minimal
188-
rustup default nightly-2023-06-01
187+
rustup toolchain install stable --no-self-update --profile=minimal
188+
rustup default stable
189189
190190
- name: Install build deps
191191
uses: ./.github/actions/deps-install
@@ -232,8 +232,8 @@ jobs:
232232
- uses: actions/checkout@v3
233233
- name: Install toolchain
234234
run: |
235-
rustup toolchain install nightly-2023-06-01 --no-self-update --profile=minimal
236-
rustup default nightly-2023-06-01
235+
rustup toolchain install stable --no-self-update --profile=minimal
236+
rustup default stable
237237
rustup target add x86_64-apple-darwin
238238
239239
- name: Install build deps
@@ -296,8 +296,8 @@ jobs:
296296

297297
- name: Install toolchain
298298
run: |
299-
rustup toolchain install nightly-2023-06-01 --no-self-update --profile=minimal
300-
rustup default nightly-2023-06-01
299+
rustup toolchain install stable --no-self-update --profile=minimal
300+
rustup default stable
301301
rustup target add wasm32-unknown-unknown
302302
303303
- name: Install wasm-pack
@@ -344,8 +344,8 @@ jobs:
344344
- uses: actions/checkout@v3
345345
- name: Install toolchain
346346
run: |
347-
rustup toolchain install nightly-2023-06-01 --no-self-update --profile=minimal
348-
rustup default nightly-2023-06-01
347+
rustup toolchain install stable --no-self-update --profile=minimal
348+
rustup default stable
349349
rustup target add aarch64-apple-ios
350350
351351
- name: Install build deps
@@ -403,8 +403,8 @@ jobs:
403403
404404
- name: Install toolchain
405405
run: |
406-
rustup toolchain install nightly-2023-06-01 --no-self-update --profile=minimal
407-
rustup default nightly-2023-06-01
406+
rustup toolchain install stable --no-self-update --profile=minimal
407+
rustup default stable
408408
rustup target add aarch64-linux-android
409409
410410
- name: Install build deps
@@ -467,8 +467,8 @@ jobs:
467467
468468
- name: Install toolchain
469469
run: |
470-
rustup toolchain install nightly-2023-06-01 --no-self-update --profile=minimal
471-
rustup default nightly-2023-06-01
470+
rustup toolchain install stable --no-self-update --profile=minimal
471+
rustup default stable
472472
rustup target add armv7-linux-androideabi
473473
474474
- name: Install build deps

0 commit comments

Comments
 (0)