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.

Sign up for GitHub

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

Jump to bottom

[CHIA-307] (long-lived) Vault #16610

Draft
wants to merge 575 commits into
base: main
Choose a base branch
from
Draft

[CHIA-307] (long-lived) Vault #16610

wants to merge 575 commits into from

Conversation

Quexington
Copy link
Contributor

@Quexington Quexington commented Oct 12, 2023 •
edited
Loading

Todo:

@Quexington Quexington added Added Required label for PR that categorizes merge commit message as "Added" for changelog vault labels Oct 12, 2023
@Chia-Network Chia-Network deleted a comment from coveralls-official bot Oct 19, 2023
@github-actions github-actions bot added the merge_conflict Branch has conflicts that prevent merge to main label Oct 30, 2023
@github-actions github-actions bot added merge_conflict Branch has conflicts that prevent merge to main and removed merge_conflict Branch has conflicts that prevent merge to main labels Feb 8, 2024
@github-actions github-actions bot removed the merge_conflict Branch has conflicts that prevent merge to main label Feb 27, 2024
@Chia-Network Chia-Network deleted a comment from github-actions bot Feb 28, 2024
@Chia-Network Chia-Network deleted a comment from github-actions bot Feb 28, 2024
@github-actions github-actions bot added the merge_conflict Branch has conflicts that prevent merge to main label Feb 28, 2024
Quexington and others added 18 commits February 28, 2024 10:23
@Quexington
Merge branch 'quex.main_wallet_protocol' into quex.prep_for_vault_wallet
ba64835
@Quexington
Tweak keychain_proxy.get_key_for_fingerprint
8d431a1
@Quexington
Fix wallet RPC test?
d9443e7
@Quexington
pragma: no cover
eb5eb59
@Quexington
Merge branch 'quex.transport_layer' into quex.signer_commands
7aa2449
@geoffwalmsley
make_solution and remove old launcher_id
8d228af
@geoffwalmsley
store vault_info in singleton_store's custom data field
37117fc
@geoffwalmsley
Merge branch 'quex.prep_for_vault_wallet' into gw.vault_creation
306f066
@geoffwalmsley
add vault keytype to keychain.add_key
8ad5e36
@Quexington
Make WalletStateManager.private_key optional (#16897)
6c940c6 
This PR removes the need of any code to rely on
`WalletStateManager.private_key`. This has been possible since #16896
which was the main need for the private key in the wallet (besides
finding non-observer addresses which is obviously impossible if you run
without the private key now).

This does not however remove the _ability_ to have a private key in the
wallet and operate as usual.
@geoffwalmsley
cleanup from quex's comments
6bbc436
@geoffwalmsley
make vault_wallet a dataclass and restructure vault_info and recovery…
8890364 
…_info
@Quexington
Redesign clvm_streamable
7eb45ab
@Quexington
Merge commit '83f090133f' into catchup/long_lived_vault_from_main_4df…
b44e595 
…4496f57423173acd62b75dfd64d7c1a30e4c7
@Quexington
Fix test imports
6e2c7c5
@Quexington
black
fa96d05
@Quexington
fix one more test
334b4bd
@Quexington
Address comments by @altendky
713bf95
@Quexington
Merge commit '1b4b8e8df517cb38d1637c54444ba3ab12286624' into catchup/…
1e0de4c 
…long_lived_vault_from_main_1b4b8e8df517cb38d1637c54444ba3ab12286624
@Quexington
Remove pointless (?) check
2cd3e64
@Quexington
Set vault transaction removals
328948e
@Quexington
catchup: long_lived/vault from main @ 1b4b8e8 (#18591)
4cb5948 
Source hash: 1b4b8e8
Remaining commits: 0
Merge diffs:
https://quexington.github.io/merge-diffs/c9d6ac67561a971299ac61faf6b46560fd9b16f7.html
@Quexington
Merge commit '111b0e57d5995d760cac877c45ef8822506800b6' into catchup/…
155bebf 
…long_lived_vault_from_main_111b0e57d5995d760cac877c45ef8822506800b6
@Quexington
[CHIA-1453] catchup: long_lived/vault from main @ 111b0e5 (#18623)
f9a01d9 
Source hash: 111b0e5
Remaining commits: 0
Merge diffs: (no conflicts except poetry)
@Quexington
Merge commit 'b4137651b6b2107f88b4a83e64b7b2c918c5c3f3' into catchup/…
ab44332 
…long_lived_vault_from_main_b4137651b6b2107f88b4a83e64b7b2c918c5c3f3
@Quexington
whoops
9087259
@Quexington
Fix vault client endpoints
c893846
@Quexington
catchup: long_lived/vault from main @ b413765 (#18652)
ea3101c 
Source hash: b413765
Remaining commits: 0
Merge diffs:
https://quexington.github.io/merge-diffs/e1d477943ee68ec5d74ef880c8a73a0309d5fe8c.html
@Quexington
Merge commit 'd678131ded709e6264127984ae5fc12c6823cafa' into long_liv…
61cb545 
…ed/vault
@Quexington
whoops
7c71915
@Quexington
pylint
210fa83
@Quexington
[CHIA-1634] catchup: long_lived/vault from main @ d678131 (#18699)
e73ceb5 
Source hash: d678131
Remaining commits: 0
Merge diffs:
[2e6f6491fa3f59d8af4202634536cc20af60adda](https://quexington.github.io/merge-diffs/2e6f6491fa3f59d8af4202634536cc20af60adda.html)
@github-actions GitHub Actions
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

1 similar comment
@github-actions GitHub Actions
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

@github-actions github-actions bot added merge_conflict Branch has conflicts that prevent merge to main and removed merge_conflict Branch has conflicts that prevent merge to main labels Oct 16, 2024
@github-actions GitHub Actions
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@Quexington
Merge commit '470ae0ff0291a337253609f17cb394370cbe1ffd' into catchup/…
3dfb08a 
…long_lived_vault_from_main_470ae0ff0291a337253609f17cb394370cbe1ffd
@Quexington
catchup: long_lived/vault from main @ 470ae0f (#18739)
9f35df0 
Source hash: 470ae0f
Remaining commits: 0
Merge diffs:
https://quexington.github.io/merge-diffs/b9cdfd450c3a88686dc350503f0569f0dc8a74fc.html
@Quexington
Merge commit '6084112d485fd6061a238b9c1a4882d845280feb' into catchup/…
6ee9fa4 
…long_lived_vault_from_main_6084112d485fd6061a238b9c1a4882d845280feb
@Quexington
Fix imports
140ce7d
@Quexington
[CHIA-1675] catchup: long_lived/vault from main @ 6084112 (#18781)
4e91ae7 
source hash: 6084112
remaining commits: 0

Not many changes made due to conflict here, just poetry and
pyproject.toml stuff
@Quexington
Merge commit '2b19c289a9488bfd813541e44745be52df413439' into catchup/…
e327b08 
…long_lived_vault_from_main_2b19c289a9488bfd813541e44745be52df413439
@Quexington
[CHIA-1706] catchup: long_lived/vault from main @ 2b19c28 (#18816)
037abda 
Source hash: 2b19c28
Remaining commits: 0
Merge diffs:
https://quexington.github.io/merge-diffs/62b1c78c384c29901fe3f3d4e3566946e97a2532.html
@Quexington
Merge commit '08730a266b201e487ca1d361e108491f7862d81b' into catchup/…
3388690 
…long_lived_vault_from_main_08730a266b201e487ca1d361e108491f7862d81b
@Quexington
Ruff format
e235ed5
@Quexington
[CHIA-1736] catchup: long_lived/vault from main @ 08730a2 (#18852)
fecb484 
Source hash: 08730a2
Remaining commits: 0
Merge diffs:
https://quexington.github.io/merge-diffs/50b997ed7024ac6f4fceb6dbdddeecf126503355.html
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
Added Required label for PR that categorizes merge commit message as "Added" for changelog coverage-diff merge_conflict Branch has conflicts that prevent merge to main vault
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Quexington @geoffwalmsley @AmineKhaldi