Skip to content

Commit 5339406

Browse files
authored
Merge branch 'main' into feature/update-wallet-js
2 parents 04e7b11 + 8cab8bc commit 5339406

File tree

123 files changed

+412
-23275
lines changed

Some content is hidden

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

123 files changed

+412
-23275
lines changed
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
---
2+
name: Bug report
3+
about: Create a report to help us improve
4+
title: ''
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+
**Describe the bug**
11+
A clear and concise description of what the bug is.
12+
13+
**To Reproduce**
14+
Steps to reproduce the behavior:
15+
1. Go to '...'
16+
2. Click on '....'
17+
3. Scroll down to '....'
18+
4. See error
19+
20+
**Expected behavior**
21+
A clear and concise description of what you expected to happen.
22+
23+
**Screenshots**
24+
If applicable, add screenshots to help explain your problem.
25+
26+
**Desktop (please complete the following information):**
27+
- OS: [e.g. iOS]
28+
- Browser [e.g. chrome, safari]
29+
- Version [e.g. 22]
30+
31+
**Smartphone (please complete the following information):**
32+
- Device: [e.g. iPhone6]
33+
- OS: [e.g. iOS8.1]
34+
- Browser [e.g. stock browser, safari]
35+
- Version [e.g. 22]
36+
37+
**Additional context**
38+
Add any other context about the problem here.
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
---
2+
name: Feature request
3+
about: Suggest an idea for this project
4+
title: ''
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+
**Is your feature request related to a problem? Please describe.**
11+
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
12+
13+
**Describe the solution you'd like**
14+
A clear and concise description of what you want to happen.
15+
16+
**Describe alternatives you've considered**
17+
A clear and concise description of any alternative solutions or features you've considered.
18+
19+
**Additional context**
20+
Add any other context or screenshots about the feature request here.

.github/workflows/ci_tests.yml

Lines changed: 2 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ name: CI-Tests
33
on:
44
push:
55
branches: [ "main" ]
6+
paths-ignore: ["README.md", "CODE_OF_CONDUCT.md", "CONTRIBUTING.md"]
67
pull_request:
8+
paths-ignore: ["README.md", "CODE_OF_CONDUCT.md", "CONTRIBUTING.md"]
79

810
env:
911
CARGO_TERM_COLOR: always
@@ -12,76 +14,6 @@ env:
1214
CARGO_INCREMENTAL: 0
1315

1416
jobs:
15-
# node_tests:
16-
# runs-on: ubuntu-latest
17-
# strategy:
18-
# matrix:
19-
# shardNumber: [1, 2, 3, 4]
20-
# totalShards: [4]
21-
# env:
22-
# CARGO_FLAGS: --verbose --locked --features systemd gelf
23-
# steps:
24-
# - name: Checkout code
25-
# uses: actions/checkout@v3
26-
# with:
27-
# ref: ${{ github.event.pull_request.head.sha }}
28-
# - uses: Swatinem/rust-cache@v2
29-
# - name: Free disk space
30-
# run: |
31-
# df -h
32-
# sudo rm -rf /usr/share/dotnet
33-
# sudo rm -rf /opt/ghc
34-
# sudo rm -rf "/usr/local/share/boost"
35-
# df -h
36-
# - name: Install Nextest
37-
# run: curl -LsSf https://get.nexte.st/latest/linux | tar zxf - -C ${CARGO_HOME:-~/.cargo}/bin
38-
# - name: Install deps
39-
# run:
40-
# sudo apt install -y protobuf-compiler libssl-dev libpq-dev libsqlite3-dev pkg-config
41-
#
42-
# - name: Run node tests
43-
# uses: actions-rs/toolchain@v1
44-
# with:
45-
# toolchain: "1.65" # it says it can read the rust-toolchain file, but it fails if we omit this
46-
# components: rustfmt, clippy
47-
# - run: |
48-
# cd src/jormungandr
49-
# cargo build
50-
# cargo nextest run -p jormungandr -p jcli -p jormungandr-integration-tests --partition hash:${{ matrix.shardNumber }}/${{ matrix.totalShards }}
51-
52-
# other_tests:
53-
# runs-on: ubuntu-latest
54-
# env:
55-
# CARGO_FLAGS: --verbose --locked
56-
# steps:
57-
# - name: Checkout code
58-
# uses: actions/checkout@v3
59-
# with:
60-
# ref: ${{ github.event.pull_request.head.sha }}
61-
# - uses: Swatinem/rust-cache@v2
62-
# - name: Install Nextest
63-
# run: curl -LsSf https://get.nexte.st/latest/linux | tar zxf - -C ${CARGO_HOME:-~/.cargo}/bin
64-
# - name: Install deps
65-
# run:
66-
# sudo apt install -y protobuf-compiler libssl-dev libpq-dev libsqlite3-dev pkg-config
67-
#
68-
# - name: Run other tests
69-
# uses: actions-rs/toolchain@v1
70-
# with:
71-
# toolchain: "1.65" # it says it can read the rust-toolchain file, but it fails if we omit this
72-
# components: rustfmt, clippy
73-
# - run: |
74-
# cargo nextest run --workspace \
75-
# --exclude jormungandr \
76-
# --exclude jcli \
77-
# --exclude jormungandr-integration-tests \
78-
# --exclude vit-servicing-station-lib \
79-
# --exclude vit-servicing-station-cli \
80-
# --exclude vit-servicing-station-tests \
81-
# --exclude vit-servicing-station-server \
82-
# --exclude catalyst-toolbox \
83-
# --exclude "chain-*" \
84-
8517
vit_servicing_station:
8618
name: Vit Servicing Station Tests
8719
runs-on: ubuntu-latest

Cargo.lock

Lines changed: 1 addition & 82 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ members = [
1616
"src/chain-libs/cardano-legacy-address",
1717
"src/chain-libs/sparse-array",
1818
"src/chain-libs/typed-bytes",
19-
"src/chain-wallet-libs/bip39",
2019
"src/chain-wallet-libs/chain-path-derivation",
2120
"src/chain-wallet-libs/hdkeygen",
2221
"src/chain-wallet-libs/wallet",
@@ -47,12 +46,10 @@ members = [
4746
"src/vit-testing/integration-tests",
4847
"src/vit-testing/mainnet-tools",
4948
"src/vit-testing/mainnet-lib",
50-
"src/vit-testing/registration-service",
51-
"src/vit-testing/registration-verify-service",
5249
"src/vit-testing/snapshot-trigger-service",
5350
"src/vit-testing/signals-handler",
5451
"src/vit-testing/scheduler-service-lib",
55-
"src/voting-tools-rs"
52+
"src/voting-tools-rs",
5653
]
5754

5855
[workspace.dependencies]
Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
11
[package]
22
name = "jormungandrwallet"
33
version = "0.8.1"
4-
authors = ["Nicolas Di Prima <[email protected]>", "Vincent Hanquez <[email protected]>"]
4+
authors = [
5+
"Nicolas Di Prima <[email protected]>",
6+
"Vincent Hanquez <[email protected]>",
7+
]
58
edition = "2018"
69
license = "MIT OR Apache-2.0"
710

811
[lib]
912
crate-type = ["staticlib", "cdylib"]
1013

1114
[dependencies]
12-
bip39 = { path = "../../bip39" }
1315
wallet = { path = "../../wallet" }
1416
chain-ser = { path = "../../../chain-libs/chain-ser" }
1517
chain-addr = { path = "../../../chain-libs/chain-addr" }
1618
chain-impl-mockchain = { path = "../../../chain-libs/chain-impl-mockchain" }
17-
wallet-core = { path = "../wallet-core"}
19+
wallet-core = { path = "../wallet-core" }

src/chain-wallet-libs/bindings/wallet-core/Cargo.toml

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
[package]
2-
authors = ["Nicolas Di Prima <[email protected]>", "Vincent Hanquez <[email protected]>"]
2+
authors = [
3+
"Nicolas Di Prima <[email protected]>",
4+
"Vincent Hanquez <[email protected]>",
5+
]
36
edition = "2018"
47
license = "MIT OR Apache-2.0"
58
name = "wallet-core"
@@ -11,19 +14,19 @@ version = "0.8.1"
1114
crate-type = ["lib"]
1215

1316
[dependencies]
14-
bip39 = {path = "../../bip39"}
17+
1518
chain-addr = { path = "../../../chain-libs/chain-addr" }
1619
chain-core = { path = "../../../chain-libs/chain-core" }
1720
chain-crypto = { path = "../../../chain-libs/chain-crypto" }
1821
chain-impl-mockchain = { path = "../../../chain-libs/chain-impl-mockchain" }
19-
chain-path-derivation = {path = "../../chain-path-derivation"}
22+
chain-path-derivation = { path = "../../chain-path-derivation" }
2023
chain-ser = { path = "../../../chain-libs/chain-ser" }
2124
chain-vote = { path = "../../../chain-libs/chain-vote" }
2225
chain-time = { path = "../../../chain-libs/chain-time" }
23-
hdkeygen = {path = "../../hdkeygen"}
24-
symmetric-cipher = {path = "../../symmetric-cipher"}
25-
thiserror = {version = "1.0.13", default-features = false}
26-
wallet = {path = "../../wallet"}
26+
hdkeygen = { path = "../../hdkeygen" }
27+
symmetric-cipher = { path = "../../symmetric-cipher" }
28+
thiserror = { version = "1.0.13", default-features = false }
29+
wallet = { path = "../../wallet" }
2730
bech32 = "0.7.2"
2831

2932
rand = { version = "0.8.3", features = ["getrandom"] }

src/chain-wallet-libs/bip39/Cargo.toml

Lines changed: 0 additions & 18 deletions
This file was deleted.

0 commit comments

Comments
 (0)