Skip to content

Commit 55fa78b

Browse files
committed
migrate proof data types
1 parent 53994e0 commit 55fa78b

File tree

30 files changed

+369
-447
lines changed

30 files changed

+369
-447
lines changed

Cargo.lock

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

zk-sdk-pod/src/lib.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
pub mod encryption;
22
pub mod errors;
33
pub mod macros;
4+
pub mod num;
5+
pub mod proof_data;
46
pub mod range_proof;
57
pub mod sigma_proofs;
68

zk-sdk-wasm-js/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ test-browser = []
2121

2222
[dependencies]
2323
solana-zk-sdk = { workspace = true }
24+
solana-zk-sdk-pod = { workspace = true }
2425
bytemuck = { workspace = true }
2526

2627
[target.'cfg(target_arch = "wasm32")'.dependencies]

zk-sdk-wasm-js/src/proof_data/batched_grouped_ciphertext_validity/handles_2.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@ use {
55
},
66
js_sys::Uint8Array,
77
solana_zk_sdk::zk_elgamal_proof_program::proof_data::{
8-
batched_grouped_ciphertext_validity, ZkProofData,
8+
BatchedGroupedCiphertext2HandlesValidityProofDataExt, ZkProofData,
99
},
10+
solana_zk_sdk_pod::proof_data::batched_grouped_ciphertext_validity,
1011
wasm_bindgen::prelude::*,
1112
};
1213

zk-sdk-wasm-js/src/proof_data/batched_grouped_ciphertext_validity/handles_3.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@ use {
55
},
66
js_sys::Uint8Array,
77
solana_zk_sdk::zk_elgamal_proof_program::proof_data::{
8-
batched_grouped_ciphertext_validity, ZkProofData,
8+
BatchedGroupedCiphertext3HandlesValidityProofDataExt, ZkProofData,
99
},
10+
solana_zk_sdk_pod::proof_data::batched_grouped_ciphertext_validity,
1011
wasm_bindgen::prelude::*,
1112
};
1213

zk-sdk-wasm-js/src/proof_data/ciphertext_ciphertext_equality.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@ use {
55
},
66
js_sys::Uint8Array,
77
solana_zk_sdk::zk_elgamal_proof_program::proof_data::{
8-
ciphertext_ciphertext_equality, ZkProofData,
8+
CiphertextCiphertextEqualityProofDataExt, ZkProofData,
99
},
10+
solana_zk_sdk_pod::proof_data::ciphertext_ciphertext_equality,
1011
wasm_bindgen::prelude::*,
1112
};
1213

zk-sdk-wasm-js/src/proof_data/ciphertext_commitment_equality.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@ use {
55
},
66
js_sys::Uint8Array,
77
solana_zk_sdk::zk_elgamal_proof_program::proof_data::{
8-
ciphertext_commitment_equality, ZkProofData,
8+
CiphertextCommitmentEqualityProofDataExt, ZkProofData,
99
},
10+
solana_zk_sdk_pod::proof_data::ciphertext_commitment_equality,
1011
wasm_bindgen::prelude::*,
1112
};
1213

zk-sdk-wasm-js/src/proof_data/grouped_ciphertext_validity/handles_2.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@ use {
55
},
66
js_sys::Uint8Array,
77
solana_zk_sdk::zk_elgamal_proof_program::proof_data::{
8-
grouped_ciphertext_validity, ZkProofData,
8+
GroupedCiphertext2HandlesValidityProofDataExt, ZkProofData,
99
},
10+
solana_zk_sdk_pod::proof_data::grouped_ciphertext_validity,
1011
wasm_bindgen::prelude::*,
1112
};
1213

zk-sdk-wasm-js/src/proof_data/grouped_ciphertext_validity/handles_3.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@ use {
55
},
66
js_sys::Uint8Array,
77
solana_zk_sdk::zk_elgamal_proof_program::proof_data::{
8-
grouped_ciphertext_validity, ZkProofData,
8+
GroupedCiphertext3HandlesValidityProofDataExt, ZkProofData,
99
},
10+
solana_zk_sdk_pod::proof_data::grouped_ciphertext_validity,
1011
wasm_bindgen::prelude::*,
1112
};
1213

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,35 @@
1-
pub mod batched_grouped_ciphertext_validity;
2-
pub mod batched_range_proof;
1+
// pub mod batched_grouped_ciphertext_validity;
2+
// pub mod batched_range_proof;
33
pub mod ciphertext_ciphertext_equality;
44
pub mod ciphertext_commitment_equality;
55
pub mod grouped_ciphertext_validity;
66
pub mod percentage_with_cap;
77
pub mod pubkey_validity;
8-
pub mod zero_ciphertext;
8+
// pub mod zero_ciphertext;
99

10-
pub use {
11-
batched_grouped_ciphertext_validity::{
12-
BatchedGroupedCiphertext2HandlesValidityProofContext,
13-
BatchedGroupedCiphertext2HandlesValidityProofData,
14-
BatchedGroupedCiphertext3HandlesValidityProofContext,
15-
BatchedGroupedCiphertext3HandlesValidityProofData,
16-
},
17-
batched_range_proof::{
18-
batched_range_proof_u128::BatchedRangeProofU128Data,
19-
batched_range_proof_u256::BatchedRangeProofU256Data,
20-
batched_range_proof_u64::BatchedRangeProofU64Data, BatchedRangeProofContext,
21-
},
22-
ciphertext_ciphertext_equality::{
23-
CiphertextCiphertextEqualityProofContext, CiphertextCiphertextEqualityProofData,
24-
},
25-
ciphertext_commitment_equality::{
26-
CiphertextCommitmentEqualityProofContext, CiphertextCommitmentEqualityProofData,
27-
},
28-
grouped_ciphertext_validity::{
29-
GroupedCiphertext2HandlesValidityProofContext, GroupedCiphertext2HandlesValidityProofData,
30-
GroupedCiphertext3HandlesValidityProofContext, GroupedCiphertext3HandlesValidityProofData,
31-
},
32-
percentage_with_cap::{PercentageWithCapProofContext, PercentageWithCapProofData},
33-
pubkey_validity::{PubkeyValidityProofContext, PubkeyValidityProofData},
34-
zero_ciphertext::{ZeroCiphertextProofContext, ZeroCiphertextProofData},
35-
};
10+
// pub use {
11+
// batched_grouped_ciphertext_validity::{
12+
// BatchedGroupedCiphertext2HandlesValidityProofContext,
13+
// BatchedGroupedCiphertext2HandlesValidityProofData,
14+
// BatchedGroupedCiphertext3HandlesValidityProofContext,
15+
// BatchedGroupedCiphertext3HandlesValidityProofData,
16+
// },
17+
// batched_range_proof::{
18+
// batched_range_proof_u128::BatchedRangeProofU128Data,
19+
// batched_range_proof_u256::BatchedRangeProofU256Data,
20+
// batched_range_proof_u64::BatchedRangeProofU64Data, BatchedRangeProofContext,
21+
// },
22+
// ciphertext_ciphertext_equality::{
23+
// CiphertextCiphertextEqualityProofContext, CiphertextCiphertextEqualityProofData,
24+
// },
25+
// ciphertext_commitment_equality::{
26+
// CiphertextCommitmentEqualityProofContext, CiphertextCommitmentEqualityProofData,
27+
// },
28+
// grouped_ciphertext_validity::{
29+
// GroupedCiphertext2HandlesValidityProofContext, GroupedCiphertext2HandlesValidityProofData,
30+
// GroupedCiphertext3HandlesValidityProofContext, GroupedCiphertext3HandlesValidityProofData,
31+
// },
32+
// percentage_with_cap::{PercentageWithCapProofContext, PercentageWithCapProofData},
33+
// pubkey_validity::{PubkeyValidityProofContext, PubkeyValidityProofData},
34+
// zero_ciphertext::{ZeroCiphertextProofContext, ZeroCiphertextProofData},
35+
// };

0 commit comments

Comments
 (0)