Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: branch keys #6413

Merged
merged 2 commits into from
Jul 19, 2024
Merged

Conversation

brianp
Copy link
Contributor

@brianp brianp commented Jul 18, 2024

Description

This corrects mismatched branch key matching as we've had a lot of code churn and they've changed over the last few days.

Also make a special code path for fetching the ledger comms key.

Motivation and Context

How Has This Been Tested?

Does the wallet start: Yes

What process can a PR reviewer use to test or verify this change?

Breaking Changes

  • None
  • Requires data directory on base node to be deleted
  • Requires hard fork
  • Other - Please specify

@brianp brianp requested a review from a team as a code owner July 18, 2024 16:10
@brianp brianp changed the title Fix branch keys fix: branch keys Jul 18, 2024
@ghpbot-tari-project ghpbot-tari-project added P-acks_required Process - Requires more ACKs or utACKs P-reviews_required Process - Requires a review from a lead maintainer to be merged labels Jul 18, 2024
@brianp brianp force-pushed the fix-branch-keys branch from 61a308e to 55ce5b1 Compare July 18, 2024 16:19
Copy link

Test Results (CI)

    3 files    120 suites   34m 31s ⏱️
1 294 tests 1 294 ✅ 0 💤 0 ❌
3 874 runs  3 874 ✅ 0 💤 0 ❌

Results for commit 55ce5b1.

Copy link

Test Results (Integration tests)

 2 files  11 suites   43m 11s ⏱️
35 tests 33 ✅ 0 💤 2 ❌
39 runs  33 ✅ 0 💤 6 ❌

For more details on these failures, see this check.

Results for commit 55ce5b1.

@SWvheerden SWvheerden merged commit 47e3761 into tari-project:development Jul 19, 2024
14 of 16 checks passed
sdbondi added a commit to sdbondi/tari that referenced this pull request Jul 22, 2024
* development: (93 commits)
  chore: fix build and osp (tari-project#6415)
  chore: refactor key manager names (tari-project#6411)
  fix: panic in from_base58 fn (tari-project#6414)
  fix: branch keys (tari-project#6413)
  chore: remove dependancy on ledger for common types (tari-project#6412)
  feat: count unique keys (tari-project#6401)
  feat!: fix key manager use of keys (tari-project#6407)
  refactor: remove metadata sig and use difference key branch for offset (tari-project#6400)
  feat: update ledger instructions (tari-project#6406)
  feat: add file-based input and output to faucet commands (tari-project#6405)
  chore: new release v1.0.0-pre.16 (tari-project#6404)
  feat: simplify leader sig generation (tari-project#6399)
  ci(fix): include macOS universal assets in release (tari-project#6402)
  fix: script dependance on party order (tari-project#6398)
  fix: claim n of m faucet (tari-project#6389)
  feat: add ffi features (tari-project#6390)
  chore: fix unwraps in memory key manager (tari-project#6396)
  docs: update hasher documentation (tari-project#6392)
  chore: fix ci (tari-project#6391)
  feat(miner): add SHA P2Pool mining related configuration and changes (tari-project#6370)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
P-acks_required Process - Requires more ACKs or utACKs P-reviews_required Process - Requires a review from a lead maintainer to be merged
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants