Skip to content

Commit 47fd4a6

Browse files
committed
Merge branch 'main' into feature/improve-node-config-builder
2 parents d7fdf5a + 8cab8bc commit 47fd4a6

File tree

133 files changed

+700
-23301
lines changed

Some content is hidden

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

133 files changed

+700
-23301
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]

README.md

Lines changed: 26 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,13 @@
44
<h2 align="center">Core Catalyst Governance Engine and utilities</h2>
55
</p>
66

7-
<p align="center">
7+
<p align="center">
88
<a href="https://github.com/input-output-hk/catalyst-core/actions/workflows/ci_tests.yml">
99
<img src="https://github.com/input-output-hk/catalyst-core/actions/workflows/ci_tests.yml/badge.svg" alt="Current CI Status." />
1010
</a>
11-
1211
<a href="https://github.com/input-output-hk/catalyst-core#license">
1312
<img src="https://img.shields.io/badge/license-MIT%2FApache--2.0-blue" alt="Catalyst Core is released under either of Apache License, Version 2.0 or MIT license at your option.." />
1413
</a>
15-
1614
<a href="https://github.com/input-output-hk/catalyst-core/blob/main/CODE_OF_CONDUCT.md">
1715
<img src="https://img.shields.io/badge/PRs-welcome-brightgreen.svg" alt="PRs welcome!" />
1816
</a>
@@ -24,9 +22,12 @@
2422
- [What's inside?](#whats-inside)
2523
- [Requirements](#requirements)
2624
- [Development](#development)
27-
- [Prerequisites](#prerequisites)
2825
- [Development Environment (NIX Shell)](#development-environment-nix-shell)
2926
- [Development Environment (Manual)](#development-environment-manual)
27+
- [Prerequisites](#prerequisites)
28+
- [Linux](#linux)
29+
- [macOS](#macos)
30+
- [Windows](#windows)
3031
- [Install Extra Packages/Tools](#install-extra-packagestools)
3132
- [Testing](#testing)
3233
- [Deployment](#deployment)
@@ -40,11 +41,8 @@ TODO:
4041

4142
## Requirements
4243

43-
TODO:
44-
4544
## Development
4645

47-
## Prerequisites
4846

4947
### Development Environment (NIX Shell)
5048

@@ -58,7 +56,27 @@ This is the **preferred** development environment.
5856

5957
~~ ***NOT RECOMMENDED*** ~~
6058

61-
TODO...
59+
#### Prerequisites
60+
61+
##### Linux
62+
63+
```sh
64+
sudo apt install -y protobuf-compiler libssl-dev libpq-dev libsqlite3-dev pkg-config
65+
```
66+
67+
##### macOS
68+
69+
- [brew](https://brew.sh/)
70+
71+
```sh
72+
brew install protobuf-c libsigsegv libpq libserdes pkg-config
73+
```
74+
75+
##### Windows
76+
77+
78+
TODO: - https://github.com/input-output-hk/catalyst-core/issues/138
79+
6280

6381
### Install Extra Packages/Tools
6482

0 commit comments

Comments
 (0)