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

Account compression: Init with root allowing trees with a canopy #6764

Merged
merged 27 commits into from
Sep 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
3aa4a77
preinitialize_canopy method with the major modifications to the canopy
StanChe May 21, 2024
4265777
append canopy nodes implementation
StanChe May 21, 2024
1d94f80
init_merkle_tree_with_root and refactored prepare_tree
StanChe May 22, 2024
4274c9b
rename init_merkle_tree_with_root into finalize_merkle_tree_with_root
StanChe May 24, 2024
a4f8fcb
using the Modify context for append_canopy_nodes and finalize_merkle_…
StanChe May 24, 2024
7193f09
tests for preparing and finalizing an offline built tree
StanChe May 27, 2024
f2d2a46
cleanup and formatting for rust code
StanChe May 27, 2024
a6e3c67
regenerated sdk
StanChe May 27, 2024
f8263c1
fmt/prettier on the new changes in js/ts
StanChe May 27, 2024
eb80c93
cleanup
StanChe May 27, 2024
c547cff
cargo clippy over new code
StanChe May 27, 2024
41e5017
nit: updating a comment for Modify context on account compression to …
StanChe Jun 10, 2024
1a759e1
using the stackoverflow-safe version of the initialize_with_root call…
StanChe Jun 25, 2024
6e7a347
fixed an issue with addressing a canopy directly, without the check f…
StanChe Jun 27, 2024
5dc6dd7
alligned the comment style for a constant with other comments
StanChe Jul 18, 2024
d49dc5b
extended the concurrent merkle tree header with a is_batch_initialize…
StanChe Jul 23, 2024
c94a3fa
updated close account to allow closing prepared and not finalized acc…
StanChe Jul 23, 2024
48a7b96
adding more tests
StanChe Jul 26, 2024
1ddb5ce
refactored tree unitialized check on bytes directly, also moved tree …
StanChe Jul 26, 2024
a936383
typo fix + a docstring for tree_bytes_uninitialized + removed unused …
StanChe Jul 29, 2024
26fb7c8
naming changes
StanChe Jul 29, 2024
29ec013
lint the ts
StanChe Jul 29, 2024
13ba21d
minor naming adjustment in comments
StanChe Jul 30, 2024
7cda6c4
fix formatting, update lock file and generated idl versions
StanChe Aug 22, 2024
6a3c9cb
using node 20.5 for 2 workflows that are failing
StanChe Sep 11, 2024
7fab6b9
Merge branch 'master' into feature/init_with_root
ngundotra Sep 13, 2024
4d2153f
update versions for release
ngundotra Sep 13, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/pull-request-account-compression.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ jobs:
js-test-account-compression:
runs-on: ubuntu-latest
env:
NODE_VERSION: 16.x
NODE_VERSION: 20.5
steps:
- uses: actions/checkout@v4
- name: Use Node.js ${{ env.NODE_VERSION }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pull-request-libraries.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ jobs:
js-test:
runs-on: ubuntu-latest
env:
NODE_VERSION: 16.x
NODE_VERSION: 20.5
steps:
- uses: actions/checkout@v4
- name: Use Node.js ${{ env.NODE_VERSION }}
Expand Down
8 changes: 4 additions & 4 deletions account-compression/Cargo.lock

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

4 changes: 2 additions & 2 deletions account-compression/programs/account-compression/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "spl-account-compression"
version = "0.3.1"
version = "0.4.0"
description = "Solana Program Library Account Compression Program"
authors = ["Solana Labs Maintainers <[email protected]>"]
repository = "https://github.com/solana-labs/solana-program-library"
Expand All @@ -21,7 +21,7 @@ default = []
anchor-lang = "0.29.0"
bytemuck = "1.13"
solana-program = ">=1.18.11,<=2"
spl-concurrent-merkle-tree = { version = "0.3.0", path = "../../../libraries/concurrent-merkle-tree" }
spl-concurrent-merkle-tree = { version = "0.4.0", path = "../../../libraries/concurrent-merkle-tree" }
spl-noop = { version = "0.2.0", path = "../noop", features = ["no-entrypoint"] }

[profile.release]
Expand Down
Loading