Dev merge main 3 by mcelrath · Pull Request #154 · braidpool/braidpool · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
c5428cc
Refactor: Replace custom types with rust-bitcoin primitives
Calisto-Mathias Mar 27, 2025
133bd3f
Rename project and crate to braidpool-primitives
Calisto-Mathias Mar 27, 2025
7c25fd5
Refactor project structure and implement bead validation
Calisto-Mathias Mar 28, 2025
b2a0cad
Remove redundant curly braces xD
Calisto-Mathias Mar 28, 2025
44c0cca
Remove redundant keywords
Calisto-Mathias Mar 29, 2025
3bd2585
Remove redundant import in `beads.rs`
Calisto-Mathias Mar 28, 2025
1984e7b
Add orphan bead support and database loading stub
Calisto-Mathias Mar 28, 2025
4a5c60a
Add support for updating orphan bead set and bead checks
Calisto-Mathias Mar 28, 2025
53a1b92
Add rustfmt to the code and format the whole codebase
Aritra8438 Mar 30, 2025
78bca57
Merge work from external repo into main
Calisto-Mathias Mar 30, 2025
44d1e52
Remove redundant structs and rename definitions
Calisto-Mathias Mar 30, 2025
b6a16c1
Fix linting
Aritra8438 Mar 30, 2025
293cc2e
Refactor beads.rs and add testing structure
TypiCal25 Mar 31, 2025
03dce76
Fix rebase issues
TypiCal25 Apr 1, 2025
f36889e
feat: add custom error type BeadLoadError for improved error handling
TypiCal25 Apr 2, 2025
8f0cef7
Update `rustfmt.yml` to target all the branches (#105)
Aritra8438 Apr 2, 2025
933638f
Add tests submodule for private function tests!
TypiCal25 Apr 2, 2025
5b08c73
feat: add load_bead_from_memory function with custom error handling
TypiCal25 Apr 2, 2025
ea09d3f
feat: implement is_genesis_bead function with custom error handling
TypiCal25 Apr 2, 2025
51cf3c0
Run rustfmt on crate
TypiCal25 Apr 2, 2025
138641e
Fix typo
TypiCal25 Apr 2, 2025
037b5c4
fix: correct MerklePathProof hashing order for left and right leaf nodes
TypiCal25 Apr 6, 2025
1f1629a
Directory restructure
TypiCal25 Apr 6, 2025
77fa5b7
Run rustfmt
TypiCal25 Apr 6, 2025
3dfda0a
Dashboard Mockup: Implement responsive Braidpool data visualization a…
nox-dave Apr 11, 2025
920d0c3
patch: add dag visualisation and fix vite build (#121)
its-me-abhishek Apr 11, 2025
09adf04
feat: Add Mined Shares Explorer and integrate with Dashboard (#122)
priyashuu Apr 13, 2025
4c1b299
Refactor dashboard codebase (#124)
its-me-abhishek Apr 14, 2025
89f8a7e
Update Readme Files (#131)
its-me-abhishek Apr 16, 2025
5a01b6b
Updating the definitions for structs (#123)
Sansh2356 Apr 17, 2025
6407c09
docs: add contributing.md (#136)
its-me-abhishek Apr 22, 2025
eada81a
feat: add prettier workflow (#137)
its-me-abhishek Apr 22, 2025
d203cda
refactor: lint applied to each file on the frontend (#138)
its-me-abhishek Apr 22, 2025
b8397f8
feat: Implement chart data hooks and components for miner dashboard (…
priyashuu Apr 24, 2025
d1eb344
feat: Dashboard frontend revamp (#148)
its-me-abhishek Apr 28, 2025
d8629a5
Dev merge main (#152)
mcelrath Apr 28, 2025
63e19fc
Dev merge main (#153)
mcelrath Apr 28, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .githooks/pre-commit
21 changes: 21 additions & 0 deletions .github/workflows/prettier.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
name: Prettier
on:
push:
branches:
- "main"
pull_request:
branches:
- "*"
jobs:
prettier:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Use Node.js
uses: actions/setup-node@v3
with:
node-version: "20.x"
- run: npm ci
working-directory: dashboard
- run: npx prettier --check .
working-directory: dashboard
21 changes: 21 additions & 0 deletions .github/workflows/rustfmt.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
name: Rust Format Check

on: [push, pull_request]

jobs:
rustfmt:
runs-on: ubuntu-latest

steps:
- name: Checkout code
uses: actions/checkout@v2

- name: Install Rust
uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: stable
components: rustfmt

- name: Run rustfmt
run: cargo fmt -- --check
68 changes: 68 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
# Welcome to BraidPool contributing guide

Thank you for investing your time in contributing to our project!

In this guide, you will get an overview of a contribution workflow from opening an issue, creating a PR, reviewing, and merging the PR.

## New contributor guide

To get an overview of the project, read the [documentations of BraidPool](./docs/).

### Issues

#### Create a new issue

If you spot a problem with the project, [search if an issue already exists](https://github.com/braidpool/braidpool/issues). If a related issue doesn't exist, you can open a new issue using a relevant issue form.

#### Solve an issue

Scan through our [existing issues](https://github.com/braidpool/braidpool/issues) to find one that interests you. You can narrow down the search using `labels` as filters. If you find an issue to work on, and after discussion, it comes out to be a valid issue, you are welcome to open a PR with a fix.

### Make Changes

1. Fork the repository.

- Using GitHub Desktop:

- [Getting started with GitHub Desktop](https://docs.github.com/en/desktop/installing-and-configuring-github-desktop/getting-started-with-github-desktop) will guide you through setting up Desktop.
- Once Desktop is set up, you can use it to [fork the repo](https://docs.github.com/en/desktop/contributing-and-collaborating-using-github-desktop/cloning-and-forking-repositories-from-github-desktop)!

- Using the command line:
- [Fork the repo](https://docs.github.com/en/github/getting-started-with-github/fork-a-repo#fork-an-example-repository) so that you can make your changes without affecting the original project until you're ready to merge them.

2. Create a new working branch and start with your changes!

### Commit your updates

Commit the changes once you are happy with them.

- Note: The commits being made to dev branch [should be signed using a PGP key](https://docs.github.com/en/authentication/managing-commit-signature-verification/signing-commits)

#### 1. For Dashboard Development:

Please follow these rules or conventions while committing any new changes to the [Braidpool dashboard](./dashboard/):

- `feat`: new feature for the user, not a new feature for build script
- `fix`: bug fix for the user
- `docs`: changes to the documentation
- `style`: formatting, missing semi colons, etc
- `refactor`: refactoring production code, eg. renaming a variable
- `test`: adding missing tests, refactoring tests
- `chore`: updating grunt tasks, etc., no production code change
- Be sure to run `npx prettier --write .` before commiting so as to cross-check that the commits adhere to the linting scheme of the project's frontend

#### 2. For Node Development:

- TO-DO

### Pull Request

When you're finished with the changes, create a pull request, also known as a PR.

- Don't forget to link PR to issue if you are solving one.
- Enable the checkbox to [allow maintainer edits](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/allowing-changes-to-a-pull-request-branch-created-from-a-fork) so the branch can be updated for a merge.
- If you run into any merge issues, checkout this [git tutorial](https://github.com/skills/resolve-merge-conflicts) to help you resolve merge conflicts and other issues.

### Your PR is merged!

Congratulations! once your PR is merged, your contributions will be publicly visible in [closed PRs](https://github.com/braidpool/braidpool/pulls?q=is%3Apr+is%3Aclosed).
157 changes: 147 additions & 10 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Loading