Skip to content

Commit d2a6271

Browse files
committed
Merge branch 'bip32-ed25519-tagged'
2 parents fe79c2a + 0bb329e commit d2a6271

File tree

5 files changed

+57
-4
lines changed

5 files changed

+57
-4
lines changed

src/rust/Cargo.lock

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/rust/bitbox02-rust/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ sha2 = { version = "0.9.2", default-features = false }
3535
sha3 = { version = "0.9.1", default-features = false, optional = true }
3636
zeroize = "1.1.0"
3737
num-bigint = { version = "0.3.1", default-features = false, optional = true }
38-
bip32-ed25519 = { git = "https://github.com/digitalbitbox/rust-bip32-ed25519", branch = "master", optional = true }
38+
bip32-ed25519 = { git = "https://github.com/digitalbitbox/rust-bip32-ed25519", tag = "v0.1.0", optional = true }
3939
bech32 = { version = "0.8.1", default-features = false, optional = true }
4040
blake2 = { version = "0.9.2", default-features = false, optional = true }
4141
minicbor = { version = "0.11.3", default-features = false, features = ["alloc"], optional = true }
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"files":{"Cargo.toml":"11239d4a8056c2d876eb9787ed03c52a4476a65d4dc3a4da1eb033220170553c","LICENSE-APACHE":"c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4","LICENSE-MIT":"5530596cde343de2238ec3276d94599ff6e78b7b7a20f6143162b3eceb727f29","README.md":"99a18dfc2a588d8b8cb3c287dad52d2e76c2b2b3be0e7a95cce19f509e9d59d7","src/arbitrary.rs":"ecb52788eec1142459ab252c320a5f0e421eb63cf959260b16e689ccfc8f2590","src/bigint.rs":"756b33c8d971b282b43268671c08fb4d8af095a6ebb6e9dc0c750631650e4d14","src/lib.rs":"58fab93730730271106ad22682f1995a70537b30912b7e256649fd76627d6cfb","tests/table_test.rs":"a2e40ed32e495dbed8fc93f402476624e4609b9e5ef47a34e8be8dd8ed90dc92","tests/testdata/gen_table.py":"2fd91055920d9ac4cfb6c004b96aca42aaf2e3cf074d0d49d48ada993abdaedf","tests/testdata/table.json":"9e37a43d759f793b091f87488ea4b6d733154a10d29554c5103e12d617ae70cd"},"package":null}
1+
{"files":{".github/workflows/ci.yml":"c8a9063d44963604b66d58eada923660f915ba0491051d1ffc052de32635e3b3","Cargo.toml":"11239d4a8056c2d876eb9787ed03c52a4476a65d4dc3a4da1eb033220170553c","LICENSE-APACHE":"c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4","LICENSE-MIT":"5530596cde343de2238ec3276d94599ff6e78b7b7a20f6143162b3eceb727f29","README.md":"99a18dfc2a588d8b8cb3c287dad52d2e76c2b2b3be0e7a95cce19f509e9d59d7","src/arbitrary.rs":"ecb52788eec1142459ab252c320a5f0e421eb63cf959260b16e689ccfc8f2590","src/bigint.rs":"756b33c8d971b282b43268671c08fb4d8af095a6ebb6e9dc0c750631650e4d14","src/lib.rs":"8b72bc7813435de856ae314bd9e55c1cf9c7ef85ac7907da3f51d903b46900b1","tests/table_test.rs":"a2e40ed32e495dbed8fc93f402476624e4609b9e5ef47a34e8be8dd8ed90dc92","tests/testdata/gen_table.py":"2fd91055920d9ac4cfb6c004b96aca42aaf2e3cf074d0d49d48ada993abdaedf","tests/testdata/table.json":"9e37a43d759f793b091f87488ea4b6d733154a10d29554c5103e12d617ae70cd"},"package":null}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
# Based on https://github.com/actions-rs/meta/blob/master/recipes/quickstart.md.
2+
# See GitHub CI reference docs at
3+
# https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions.
4+
5+
name: ci
6+
on: [push, pull_request]
7+
8+
jobs:
9+
lint:
10+
name: Lint
11+
runs-on: ubuntu-18.04
12+
steps:
13+
- name: Checkout sources
14+
uses: actions/checkout@v2
15+
16+
- name: Install stable toolchain
17+
uses: actions-rs/toolchain@v1
18+
with:
19+
profile: minimal
20+
toolchain: stable
21+
override: true
22+
components: rustfmt, clippy
23+
24+
- name: Run cargo fmt
25+
uses: actions-rs/cargo@v1
26+
with:
27+
command: fmt
28+
args: --all -- --check
29+
30+
- name: Run cargo clippy
31+
uses: actions-rs/cargo@v1
32+
with:
33+
command: clippy
34+
args: -- -D warnings -A clippy::branches_sharing_code
35+
36+
test:
37+
name: Test Suite
38+
runs-on: ubuntu-18.04
39+
steps:
40+
- name: Checkout sources
41+
uses: actions/checkout@v2
42+
43+
- name: Install stable toolchain
44+
uses: actions-rs/toolchain@v1
45+
with:
46+
profile: minimal
47+
toolchain: stable
48+
override: true
49+
50+
- name: Run cargo test
51+
uses: actions-rs/cargo@v1
52+
with:
53+
command: test

src/rust/vendor/bip32-ed25519/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ impl Xprv {
263263

264264
let iout = imac.finalize_reset().into_bytes();
265265
let chain_code = &iout[32..];
266-
Xprv::from(left.deref(), &right, chain_code.try_into().unwrap())
266+
Xprv::from(left.deref(), &right, chain_code)
267267
}
268268

269269
// Derives a child extended private key.

0 commit comments

Comments
 (0)