Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
22 changes: 11 additions & 11 deletions Cargo.lock

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

20 changes: 10 additions & 10 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -166,18 +166,18 @@ ark-std = "0.5"
light-hash-set = { version = "4.0.0", path = "program-libs/hash-set" }
light-indexed-merkle-tree = { version = "4.0.0", path = "program-libs/indexed-merkle-tree" }
light-concurrent-merkle-tree = { version = "4.0.0", path = "program-libs/concurrent-merkle-tree" }
light-sparse-merkle-tree = { version = "0.2.0", path = "sparse-merkle-tree" }
light-client = { path = "sdk-libs/client", version = "0.15.0" }
light-event = { path = "sdk-libs/event", version = "0.1.0" }
light-sparse-merkle-tree = { version = "0.3.0", path = "sparse-merkle-tree" }
light-client = { path = "sdk-libs/client", version = "0.16.0" }
light-event = { path = "sdk-libs/event", version = "0.1.1" }
light-hasher = { path = "program-libs/hasher", version = "5.0.0", default-features = false }
light-macros = { path = "program-libs/macros", version = "2.2.0" }
light-merkle-tree-reference = { path = "program-tests/merkle-tree", version = "3.0.1" }
light-merkle-tree-reference = { path = "program-tests/merkle-tree", version = "4.0.0" }
light-heap = { path = "program-libs/heap", version = "2.0.0" }
light-prover-client = { path = "prover/client", version = "3.0.0" }
light-sdk = { path = "sdk-libs/sdk", version = "0.15.0" }
light-sdk-pinocchio = { path = "sdk-libs/sdk-pinocchio", version = "0.13.0" }
light-sdk-macros = { path = "sdk-libs/macros", version = "0.15.0" }
light-sdk-types = { path = "sdk-libs/sdk-types", version = "0.15.0", default-features = false }
light-prover-client = { path = "prover/client", version = "4.0.0" }
light-sdk = { path = "sdk-libs/sdk", version = "0.16.0" }
light-sdk-pinocchio = { path = "sdk-libs/sdk-pinocchio", version = "0.16.0" }
light-sdk-macros = { path = "sdk-libs/macros", version = "0.16.0" }
light-sdk-types = { path = "sdk-libs/sdk-types", version = "0.16.0", default-features = false }
light-compressed-account = { path = "program-libs/compressed-account", version = "0.6.1", default-features = false }
light-compressible = { path = "program-libs/compressible", version = "0.1.0" }
light-ctoken-types = { path = "program-libs/ctoken-types", version = "0.1.0" }
Expand Down Expand Up @@ -205,7 +205,7 @@ light-registry = { path = "programs/registry", version = "2.0.0", features = [
create-address-test-program = { path = "program-tests/create-address-test-program", version = "1.0.0", features = [
"cpi",
] }
light-program-test = { path = "sdk-libs/program-test", version = "0.15.0" }
light-program-test = { path = "sdk-libs/program-test", version = "0.16.0" }
light-batched-merkle-tree = { path = "program-libs/batched-merkle-tree", version = "0.6.0" }
light-merkle-tree-metadata = { path = "program-libs/merkle-tree-metadata", version = "0.6.0" }
aligned-sized = { path = "program-libs/aligned-sized", version = "1.1.0" }
Expand Down
2 changes: 1 addition & 1 deletion program-tests/merkle-tree/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "light-merkle-tree-reference"
version = "3.0.1"
version = "4.0.0"
description = "Non-sparse reference Merkle tree implementation"
repository = "https://github.com/Lightprotocol/light-protocol"
license = "Apache-2.0"
Expand Down
2 changes: 1 addition & 1 deletion prover/client/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "light-prover-client"
version = "3.0.0"
version = "4.0.0"
description = "Crate for interacting with Light Protocol circuits"
repository = "https://github.com/Lightprotocol/light-protocol"
license = "Apache-2.0"
Expand Down
2 changes: 1 addition & 1 deletion sdk-libs/client/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "light-client"
version = "0.15.0"
version = "0.16.0"
edition = "2021"
license = "Apache-2.0"
repository = "https://github.com/lightprotocol/light-protocol"
Expand Down
2 changes: 1 addition & 1 deletion sdk-libs/event/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "light-event"
version = "0.1.0"
version = "0.1.1"
description = "Event types and utilities for Light Protocol"
repository = "https://github.com/Lightprotocol/light-protocol"
license = "Apache-2.0"
Expand Down
2 changes: 1 addition & 1 deletion sdk-libs/macros/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "light-sdk-macros"
version = "0.15.0"
version = "0.16.0"
description = "Macros for Programs using the Light SDK for ZK Compression "
repository = "https://github.com/Lightprotocol/light-protocol"
license = "Apache-2.0"
Expand Down
10 changes: 5 additions & 5 deletions sdk-libs/program-test/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
[package]
name = "light-program-test"
version = "0.15.0"
version = "0.16.0"
description = "A fast local test environment for Solana programs using compressed accounts and tokens."
license = "MIT"
edition = "2021"

[features]
default = []
devenv = ["v2", "light-client/devenv", "light-prover-client/devenv", "dep:account-compression", "dep:light-compressed-token", "dep:light-registry", "dep:light-batched-merkle-tree", "dep:light-concurrent-merkle-tree"]
devenv = ["v2", "light-client/devenv", "light-prover-client/devenv", "dep:account-compression", "dep:light-compressed-token", "dep:light-compressed-token-sdk", "dep:light-ctoken-types", "dep:light-compressible", "dep:light-registry", "dep:light-batched-merkle-tree", "dep:light-concurrent-merkle-tree"]
v2 = ["light-client/v2"]

[dependencies]
Expand All @@ -18,9 +18,9 @@ light-merkle-tree-reference = { workspace = true }
light-merkle-tree-metadata = { workspace = true, features = ["anchor"] }
light-concurrent-merkle-tree = { workspace = true, optional = true }
light-hasher = { workspace = true, features = ["poseidon", "sha256", "keccak", "std"] }
light-ctoken-types = { workspace = true }
light-compressible = { workspace = true }
light-compressed-token-sdk = { workspace = true }
light-ctoken-types = { workspace = true, optional = true }
light-compressible = { workspace = true, optional = true }
light-compressed-token-sdk = { workspace = true, optional = true }
light-compressed-account = { workspace = true, features = ["anchor", "poseidon"] }
light-batched-merkle-tree = { workspace = true, features = ["test-only"], optional = true }
light-event = { workspace = true }
Expand Down
1 change: 1 addition & 0 deletions sdk-libs/program-test/src/accounts/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
pub mod address_tree;
#[cfg(feature = "devenv")]
pub mod address_tree_v2;
#[cfg(feature = "devenv")]
pub mod compressible_config;
#[cfg(feature = "devenv")]
pub mod initialize;
Expand Down
5 changes: 5 additions & 0 deletions sdk-libs/program-test/src/accounts/test_accounts.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ use solana_sdk::{pubkey, pubkey::Pubkey, signature::Keypair};
#[cfg(feature = "devenv")]
use super::initialize::*;
use super::test_keypairs::*;
#[cfg(feature = "devenv")]
use crate::compressible::FundingPoolConfig;

pub const NOOP_PROGRAM_ID: Pubkey = pubkey!("noopb9bkMVfRPU8AsbpTUg8AQkHtKwMYZiFUjNRtMmV");
Expand Down Expand Up @@ -50,6 +51,7 @@ impl From<StateMerkleTreeAccountsV2> for TreeInfo {
#[derive(Debug)]
pub struct TestAccounts {
pub protocol: ProtocolAccounts,
#[cfg(feature = "devenv")]
pub funding_pool_config: FundingPoolConfig,
pub v1_state_trees: Vec<StateMerkleTreeAccounts>,
pub v1_address_trees: Vec<AddressMerkleTreeAccounts>,
Expand Down Expand Up @@ -119,6 +121,7 @@ impl TestAccounts {
cpi_context: pubkey!("cpi5ZTjdgYpZ1Xr7B1cMLLUE81oTtJbNNAyKary2nV6"),
},
],
#[cfg(feature = "devenv")]
funding_pool_config: FundingPoolConfig::get_v1(),
}
}
Expand Down Expand Up @@ -238,6 +241,7 @@ impl TestAccounts {
},
],
v2_address_trees: vec![pubkey!("amt2kaJA14v3urZbZvnc5v2np8jqvc4Z8zDep5wbtzx")],
#[cfg(feature = "devenv")]
funding_pool_config: FundingPoolConfig::get_v1(),
}
}
Expand All @@ -262,6 +266,7 @@ impl Clone for TestAccounts {
v1_address_trees: self.v1_address_trees.clone(),
v2_state_trees: self.v2_state_trees.clone(),
v2_address_trees: self.v2_address_trees.clone(),
#[cfg(feature = "devenv")]
funding_pool_config: self.funding_pool_config,
}
}
Expand Down
5 changes: 5 additions & 0 deletions sdk-libs/program-test/src/compressible.rs
Original file line number Diff line number Diff line change
@@ -1,19 +1,22 @@
#[cfg(feature = "devenv")]
use std::collections::HashMap;

#[cfg(feature = "devenv")]
use anchor_lang::pubkey;
#[cfg(feature = "devenv")]
use borsh::BorshDeserialize;
#[cfg(feature = "devenv")]
use light_client::rpc::{Rpc, RpcError};
#[cfg(feature = "devenv")]
use light_compressible::rent::SLOTS_PER_EPOCH;
#[cfg(feature = "devenv")]
use light_compressible::{config::CompressibleConfig, rent::RentConfig};
#[cfg(feature = "devenv")]
use light_ctoken_types::{
state::{CToken, ExtensionStruct},
COMPRESSIBLE_TOKEN_ACCOUNT_SIZE,
};
#[cfg(feature = "devenv")]
use solana_pubkey::Pubkey;

#[cfg(feature = "devenv")]
Expand All @@ -30,6 +33,7 @@ pub struct StoredCompressibleAccount {
pub account: CToken,
}

#[cfg(feature = "devenv")]
#[derive(Debug, PartialEq, Copy, Clone)]
pub struct FundingPoolConfig {
pub compressible_config_pda: Pubkey,
Expand All @@ -40,6 +44,7 @@ pub struct FundingPoolConfig {
pub rent_sponsor_pda_bump: u8,
}

#[cfg(feature = "devenv")]
impl FundingPoolConfig {
pub fn new(version: u16) -> Self {
let config = CompressibleConfig::new_ctoken(
Expand Down
2 changes: 1 addition & 1 deletion sdk-libs/sdk-pinocchio/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "light-sdk-pinocchio"
version = "0.13.0"
version = "0.16.0"
description = "Rust SDK for ZK Compression on Solana with Pinocchio features"
repository = "https://github.com/Lightprotocol/light-protocol"
license = "Apache-2.0"
Expand Down
2 changes: 1 addition & 1 deletion sdk-libs/sdk-types/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "light-sdk-types"
version = "0.15.0"
version = "0.16.0"
edition = "2021"
license = "Apache-2.0"
repository = "https://github.com/lightprotocol/light-protocol"
Expand Down
2 changes: 1 addition & 1 deletion sdk-libs/sdk/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "light-sdk"
version = "0.15.0"
version = "0.16.0"
description = "Rust SDK for ZK Compression on Solana"
repository = "https://github.com/Lightprotocol/light-protocol"
license = "Apache-2.0"
Expand Down
2 changes: 1 addition & 1 deletion sparse-merkle-tree/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "light-sparse-merkle-tree"
version = "0.2.0"
version = "0.3.0"
description = "Implementation of a sparse indexed (and concurrent) Merkle tree in Rust"
repository = "https://github.com/Lightprotocol/light-protocol"
license = "Apache-2.0"
Expand Down
Loading