Skip to content

add custom errors transaction, utxo, verifier classes#41

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

Merged
SwenSchaeferjohann merged 2 commits into from
Mar 13, 2023
Merged

add custom errors transaction, utxo, verifier classes #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7f13141
added custom errors transaction, utxo, verifier classes
ananas-block Mar 13, 2023
022cb0b
relaxed version requirement on solana web3.js
ananas-block Mar 13, 2023
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
61 changes: 1 addition & 60 deletions light-circuits/tests/test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ import {
Verifier,
VerifierOne,
Action,
functionalCircuitTest,
} from "light-sdk";
import * as anchor from "@coral-xyz/anchor";
import { assert, expect } from "chai";
Expand DownExpand Up@@ -50,63 +51,3 @@ describe("verifier_program", () => {
await functionalCircuitTest(new VerifierTwo(), true);
});
});

async function functionalCircuitTest(verifier: Verifier, app: boolean = false) {
const poseidon = await circomlibjs.buildPoseidonOpt();
let seed32 = new Uint8Array(32).fill(1).toString();
let keypair = new Account({ poseidon: poseidon, seed: seed32 });
let depositAmount = 20_000;
let depositFeeAmount = 10_000;
let deposit_utxo1 = new Utxo({
poseidon: poseidon,
assets: [FEE_ASSET, MINT],
amounts: [new anchor.BN(depositFeeAmount), new anchor.BN(depositAmount)],
account: keypair,
});
let mockPubkey = SolanaKeypair.generate().publicKey;

let lightProvider = await LightProvider.loadMock(mockPubkey);
let txParams = new TransactionParameters({
outputUtxos: [deposit_utxo1],
merkleTreePubkey: mockPubkey,
sender: mockPubkey,
senderFee: lightProvider.nodeWallet.publicKey,
verifier: verifier,
lookUpTable: mockPubkey,
action: Action.DEPOSIT,
poseidon
});

let tx

// successful proofgeneration
if (app) {
tx = new Transaction({
provider: lightProvider,
params: txParams,
appParams: { mock: "123" }
});
} else {
tx = new Transaction({
provider: lightProvider,
params: txParams,
});
}
await tx.compile();

await tx.getProof();
// unsuccessful proofgeneration
let x = true;

try {
tx.proofInput.inIndices[0][1][1] = "1";
// TODO: investigate why this does not kill the proof
tx.proofInput.inIndices[0][1][0] = "1";
expect(await tx.getProof()).to.Throw();
x = false;

} catch (error) {
// assert.isTrue(error.toString().includes("CheckIndices_3 line:"));
assert.isTrue(x);
}
}
4 changes: 2 additions & 2 deletions light-circuits/yarn.lock
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@
dependencies:
regenerator-runtime "^0.13.11"

"@coral-xyz/anchor@^0.26.0":
"@coral-xyz/anchor@0.26.0", "@coral-xyz/anchor@^0.26.0":
version "0.26.0"
resolved "https://registry.yarnpkg.com/@coral-xyz/anchor/-/anchor-0.26.0.tgz#c8e4f7177e93441afd030f22d777d54d0194d7d1"
integrity sha512-PxRl+wu5YyptWiR9F2MBHOLLibm87Z4IMUBPreX+DYBtPM+xggvcPi0KAN7+kIL4IrIhXI8ma5V0MCXxSN1pHg==
Expand DownExpand Up@@ -1397,7 +1397,7 @@ jsonparse@^1.2.0:
"light-sdk@file:../light-sdk-ts":
version "0.0.1"
dependencies:
"@coral-xyz/anchor" "^0.26.0"
"@coral-xyz/anchor" "0.26.0"
"@noble/hashes" "^1.1.5"
"@solana/spl-account-compression" "^0.1.5"
"@solana/spl-token" "0.3.7"
Expand Down
1 change: 1 addition & 0 deletions light-macros
Open in desktop
Submodule light-macros added at b98829
2 changes: 1 addition & 1 deletion light-sdk-ts/package-lock.json
View file
Open in desktop

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

8 changes: 6 additions & 2 deletions light-sdk-ts/package.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,10 @@
"main": "lib/index.js",
"scripts": {
"test": "ts-mocha --resolveJsonModule ./tsconfig.json -t 100000000 tests/**.ts --exit",
"test-tx-params": "ts-mocha --resolveJsonModule ./tsconfig.json -t 100000000 tests/transactionParameters.test.ts --exit",
"test-utxo": "ts-mocha --resolveJsonModule ./tsconfig.json -t 100000000 tests/utxo.test.ts --exit",
"test-verifiers": "ts-mocha --resolveJsonModule ./tsconfig.json -t 100000000 tests/verifiers.test.ts --exit",
"test-transaction": "ts-mocha --resolveJsonModule ./tsconfig.json -t 100000000 tests/transaction.test.ts --exit",
"build": "yarn tsc",
"format": "prettier --write \"src/**/*.{ts,js}\"",
"lint:fix": "prettier */*.js \"*/**/*{.js,.ts}\" -w",
Expand All@@ -28,11 +32,11 @@
"author": "ananas-block",
"license": "UNLICENSED",
"dependencies": {
"@coral-xyz/anchor": "^0.26.0",
"@coral-xyz/anchor": "0.26.0",
"@noble/hashes": "^1.1.5",
"@solana/spl-account-compression": "^0.1.5",
"@solana/spl-token": "0.3.7",
"@solana/web3.js": "1.73.2",
"@solana/web3.js": "^1.73.2",
"axios": "^1.3.4",
"circomlib": "^2.0.5",
"circomlibjs": "^0.1.7",
Expand Down
12 changes: 10 additions & 2 deletions light-sdk-ts/src/account.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -196,9 +196,17 @@ export class Account {
const privkey = new BN(privateKey);
return new Account({ poseidon, privateKey: privkey });
}
static fromPubkey(publicKey: Uint8Array, encPubkey: Uint8Array): Account {
static fromPubkey(
publicKey: Uint8Array,
encPubkey: Uint8Array,
poseidon: any,
): Account {
const pubKey = new BN(publicKey, undefined, "be");
return new Account({ publicKey: pubKey, encryptionPublicKey: encPubkey });
return new Account({
publicKey: pubKey,
encryptionPublicKey: encPubkey,
poseidon,
});
}

static getEncryptionKeyPair(seed: String): nacl.BoxKeyPair {
Expand Down
33 changes: 18 additions & 15 deletions light-sdk-ts/src/errors.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,21 +5,9 @@ export enum UtxoErrorCode {
NEGATIVE_AMOUNT = "NEGATIVE_AMOUNT",
NOT_U64 = "NOT_U64",
BLINDING_EXCEEDS_SIZE = "BLINDING_EXCEEDS_SIZE",
}

/**
* @description Thrown when something fails in the Utxo class.
**/
export class UtxoError extends Error {
name = this.constructor.name;
code: string;
codeMessage: string;

constructor(code: string, codeMessage: string) {
super(`Utxo error ${code}: ${codeMessage}`);
this.code = code;
this.codeMessage = codeMessage;
}
INDEX_NOT_PROVIDED = "INDEX_NOT_PROVIDED",
ACCOUNT_HAS_NO_PRIVKEY = "ACCOUNT_HAS_NO_PRIVKEY",
ASSET_NOT_FOUND = "ASSET_NOT_FOUND",
}

export enum ProviderErrorCode {
Expand All@@ -28,9 +16,16 @@ export enum ProviderErrorCode {
PROVIDER_UNDEFINED = "PROVIDER_UNDEFINED",
}

export enum VerifierErrorCode {
PUBLIC_INPUTS_UNDEFINED = "PUBLIC_INPUTS_UNDEFINED",
INVALID_INPUTS_NUMBER = "INVALID_INPUTS_NUMBER",
ENCRYPTING_UTXOS_UNDEFINED = "ENCRYPTING_UTXOS_UNDEFINED",
}

export enum SolMerkleTreeErrorCode {
MERKLE_TREE_UNDEFINED = "MERKLE_TREE_UNDEFINED",
}

export enum TransactionParametersErrorCode {
NO_VERIFIER_PROVIDED = "NO_VERIFIER_PROVIDED",
NO_POSEIDON_HASHER_PROVIDED = "NO_POSEIDON_HASHER_PROVIDED",
Expand All@@ -49,6 +44,7 @@ export enum TransactionParametersErrorCode {
}

export enum TransactionErrorCode {
PROVIDER_UNDEFINED = "PROVIDER_UNDEFINED",
ROOT_INDEX_NOT_FETCHED = "ROOT_INDEX_NOT_FETCHED",
REMAINING_ACCOUNTS_NOT_CREATED = "REMAINING_ACCOUNTS_NOT_CREATED",
TRANSACTION_INPUTS_UNDEFINED = "TRANSACTION_INPUTS_UNDEFINED",
Expand DownExpand Up@@ -106,3 +102,10 @@ export class MetaError extends Error {
export class TransactionError extends MetaError {}

export class TransactioParametersError extends MetaError {}

/**
* @description Thrown when something fails in the Utxo class.
**/
export class UtxoError extends MetaError {}

export class VerifierError extends MetaError {}
1 change: 1 addition & 0 deletions light-sdk-ts/src/merkleTree/index.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
export * from "./solMerkleTree";
export * from "./merkleTreeConfig";
export * from "./merkleTreeUpdater";
export * from "./merkleTree";
1 change: 1 addition & 0 deletions light-sdk-ts/src/merkleTree/merkleTree.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -100,6 +100,7 @@ export class MerkleTree {
this._rebuild();
}

// TODO: update does not work debug

@SwenSchaeferjohannSwenSchaeferjohannMar 13, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this resolved?

@ananas-blockananas-blockMar 13, 2023

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no

/**
* Change an element in the tree
* @param {number} index Index of element to change
Expand Down
50 changes: 24 additions & 26 deletions light-sdk-ts/src/test-utils/functionalCircuit.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,25 +10,18 @@ import {
Utxo,
VerifierZero,
Action,
Verifier,
Provider,
} from "../index";
import * as anchor from "@coral-xyz/anchor";
import { assert, expect } from "chai";
import { Connection, Keypair as SolanaKeypair } from "@solana/web3.js";
const circomlibjs = require("circomlibjs");

export async function functionalCircuitTest() {
try {
const provider = new anchor.AnchorProvider(
await new Connection("http://127.0.0.1:8899"),
new anchor.Wallet(SolanaKeypair.generate()),
confirmConfig,
);
await anchor.setProvider(provider);
} catch (error) {
console.log("expected local test validator to be running");
process.exit();
}

export async function functionalCircuitTest(
verifier: Verifier,
app: boolean = false,
) {
const poseidon = await circomlibjs.buildPoseidonOpt();
let seed32 = new Uint8Array(32).fill(1).toString();
let keypair = new Account({ poseidon: poseidon, seed: seed32 });
Expand All@@ -43,40 +36,45 @@ export async function functionalCircuitTest() {
let mockPubkey = SolanaKeypair.generate().publicKey;

let lightProvider = await LightProvider.loadMock(mockPubkey);

let txParams = new TransactionParameters({
outputUtxos: [deposit_utxo1],
merkleTreePubkey: mockPubkey,
sender: mockPubkey,
senderFee: lightProvider.nodeWallet?.publicKey,
verifier: new VerifierZero(),
senderFee: lightProvider.nodeWallet!.publicKey,
verifier: verifier,
lookUpTable: mockPubkey,
action: Action.DEPOSIT,
poseidon,
lookUpTable: mockPubkey,
});

let tx = new Transaction({
provider: lightProvider,
params: txParams,
});
let tx;

// successful proofgeneration
if (app) {
tx = new Transaction({
provider: lightProvider,
params: txParams,
appParams: { mock: "123" },
});
} else {
tx = new Transaction({
provider: lightProvider,
params: txParams,
});
}
await tx.compile();

await tx.getProof();
let x = true;
// unsuccessful proofgeneration
let x = true;

try {
tx.proofInput.inIndices[0][1][1] = "1";
// TODO: investigate why this does not kill the proof
tx.proofInput.inIndices[0][1][0] = "1";
// TODO: switch to async testing framework to catch error
expect(await tx.getProof()).to.Throw();
// console.log(tx.input.inIndices[0])
// console.log(tx.input.inIndices[1])
x = false;
} catch (error) {
// console.log("This is ok the error catching is just fucked.");
// assert.isTrue(error.toString().includes("CheckIndices_3 line:"));
assert.isTrue(x);
}
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
add custom errors transaction, utxo, verifier classes by ananas-block · Pull Request #41 · Lightprotocol/light-protocol · GitHub
Skip to content
add custom errors transaction, utxo, verifier classes#41

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

 Merged

SwenSchaeferjohann
merged 2 commits into

from

Mar 13, 2023
 Merged


add custom errors transaction, utxo, verifier classes
#41
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
7f13141

added custom errors transaction, utxo, verifier classes


ananas-block Mar 13, 2023
022cb0b

relaxed version requirement on solana web3.js


ananas-block Mar 13, 2023

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


61 changes: 1 addition & 60 deletions
light-circuits/tests/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ import {
 Verifier,
 VerifierOne,
 Action,
 functionalCircuitTest,
} from "light-sdk";
import * as anchor from "@coral-xyz/anchor";
import { assert, expect } from "chai";
Expand DownExpand Up@@ -50,63 +51,3 @@ describe("verifier_program", () => {
 await functionalCircuitTest(new VerifierTwo(), true);
 });
});

async function functionalCircuitTest(verifier: Verifier, app: boolean = false) {
 const poseidon = await circomlibjs.buildPoseidonOpt();
 let seed32 = new Uint8Array(32).fill(1).toString();
 let keypair = new Account({ poseidon: poseidon, seed: seed32 });
 let depositAmount = 20_000;
 let depositFeeAmount = 10_000;
 let deposit_utxo1 = new Utxo({
 poseidon: poseidon,
 assets: [FEE_ASSET, MINT],
 amounts: [new anchor.BN(depositFeeAmount), new anchor.BN(depositAmount)],
 account: keypair,
 });
 let mockPubkey = SolanaKeypair.generate().publicKey;

 let lightProvider = await LightProvider.loadMock(mockPubkey);
 let txParams = new TransactionParameters({
 outputUtxos: [deposit_utxo1],
 merkleTreePubkey: mockPubkey,
 sender: mockPubkey,
 senderFee: lightProvider.nodeWallet.publicKey,
 verifier: verifier,
 lookUpTable: mockPubkey,
 action: Action.DEPOSIT,
 poseidon
 });

 let tx 

 // successful proofgeneration
 if (app) {
 tx = new Transaction({
 provider: lightProvider,
 params: txParams,
 appParams: { mock: "123" }
 });
 } else {
 tx = new Transaction({
 provider: lightProvider,
 params: txParams,
 });
 }
 await tx.compile();

 await tx.getProof();
 // unsuccessful proofgeneration
 let x = true;

 try {
 tx.proofInput.inIndices[0][1][1] = "1";
 // TODO: investigate why this does not kill the proof
 tx.proofInput.inIndices[0][1][0] = "1";
 expect(await tx.getProof()).to.Throw();
 x = false;

 } catch (error) {
 // assert.isTrue(error.toString().includes("CheckIndices_3 line:"));
 assert.isTrue(x);
 }
}

4 changes: 2 additions & 2 deletions
light-circuits/yarn.lock

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@
 dependencies:
 regenerator-runtime "^0.13.11"

"@coral-xyz/anchor@^0.26.0":
"@coral-xyz/anchor@0.26.0", "@coral-xyz/anchor@^0.26.0":
 version "0.26.0"
 resolved "https://registry.yarnpkg.com/@coral-xyz/anchor/-/anchor-0.26.0.tgz#c8e4f7177e93441afd030f22d777d54d0194d7d1"
 integrity sha512-PxRl+wu5YyptWiR9F2MBHOLLibm87Z4IMUBPreX+DYBtPM+xggvcPi0KAN7+kIL4IrIhXI8ma5V0MCXxSN1pHg==
Expand DownExpand Up@@ -1397,7 +1397,7 @@ jsonparse@^1.2.0:
"light-sdk@file:../light-sdk-ts":
 version "0.0.1"
 dependencies:
 "@coral-xyz/anchor" "^0.26.0"
 "@coral-xyz/anchor" "0.26.0"
 "@noble/hashes" "^1.1.5"
 "@solana/spl-account-compression" "^0.1.5"
 "@solana/spl-token" "0.3.7"
Expand Down

1 change: 1 addition & 0 deletions
light-macros

Open in desktop


Submodule light-macros
added at
b98829


2 changes: 1 addition & 1 deletion
light-sdk-ts/package-lock.json

View file


Open in desktop


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


8 changes: 6 additions & 2 deletions
light-sdk-ts/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,10 @@
 "main": "lib/index.js",
 "scripts": {
 "test": "ts-mocha --resolveJsonModule ./tsconfig.json -t 100000000 tests/**.ts --exit",
 "test-tx-params": "ts-mocha --resolveJsonModule ./tsconfig.json -t 100000000 tests/transactionParameters.test.ts --exit",
 "test-utxo": "ts-mocha --resolveJsonModule ./tsconfig.json -t 100000000 tests/utxo.test.ts --exit",
 "test-verifiers": "ts-mocha --resolveJsonModule ./tsconfig.json -t 100000000 tests/verifiers.test.ts --exit",
 "test-transaction": "ts-mocha --resolveJsonModule ./tsconfig.json -t 100000000 tests/transaction.test.ts --exit",
 "build": "yarn tsc",
 "format": "prettier --write \"src/**/*.{ts,js}\"",
 "lint:fix": "prettier */*.js \"*/**/*{.js,.ts}\" -w",
Expand All@@ -28,11 +32,11 @@
 "author": "ananas-block",
 "license": "UNLICENSED",
 "dependencies": {
 "@coral-xyz/anchor": "^0.26.0",
 "@coral-xyz/anchor": "0.26.0",
 "@noble/hashes": "^1.1.5",
 "@solana/spl-account-compression": "^0.1.5",
 "@solana/spl-token": "0.3.7",
 "@solana/web3.js": "1.73.2",
 "@solana/web3.js": "^1.73.2",
 "axios": "^1.3.4",
 "circomlib": "^2.0.5",
 "circomlibjs": "^0.1.7",
Expand Down

12 changes: 10 additions & 2 deletions
light-sdk-ts/src/account.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -196,9 +196,17 @@ export class Account {
 const privkey = new BN(privateKey);
 return new Account({ poseidon, privateKey: privkey });
 }
 static fromPubkey(publicKey: Uint8Array, encPubkey: Uint8Array): Account {
 static fromPubkey(
 publicKey: Uint8Array,
 encPubkey: Uint8Array,
 poseidon: any,
 ): Account {
 const pubKey = new BN(publicKey, undefined, "be");
 return new Account({ publicKey: pubKey, encryptionPublicKey: encPubkey });
 return new Account({
 publicKey: pubKey,
 encryptionPublicKey: encPubkey,
 poseidon,
 });
 }

 static getEncryptionKeyPair(seed: String): nacl.BoxKeyPair {
Expand Down

33 changes: 18 additions & 15 deletions
light-sdk-ts/src/errors.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,21 +5,9 @@ export enum UtxoErrorCode {
 NEGATIVE_AMOUNT = "NEGATIVE_AMOUNT",
 NOT_U64 = "NOT_U64",
 BLINDING_EXCEEDS_SIZE = "BLINDING_EXCEEDS_SIZE",
}

/**
 * @description Thrown when something fails in the Utxo class.
 **/
export class UtxoError extends Error {
 name = this.constructor.name;
 code: string;
 codeMessage: string;

 constructor(code: string, codeMessage: string) {
 super(`Utxo error ${code}: ${codeMessage}`);
 this.code = code;
 this.codeMessage = codeMessage;
 }
 INDEX_NOT_PROVIDED = "INDEX_NOT_PROVIDED",
 ACCOUNT_HAS_NO_PRIVKEY = "ACCOUNT_HAS_NO_PRIVKEY",
 ASSET_NOT_FOUND = "ASSET_NOT_FOUND",
}

export enum ProviderErrorCode {
Expand All@@ -28,9 +16,16 @@ export enum ProviderErrorCode {
 PROVIDER_UNDEFINED = "PROVIDER_UNDEFINED",
}

export enum VerifierErrorCode {
 PUBLIC_INPUTS_UNDEFINED = "PUBLIC_INPUTS_UNDEFINED",
 INVALID_INPUTS_NUMBER = "INVALID_INPUTS_NUMBER",
 ENCRYPTING_UTXOS_UNDEFINED = "ENCRYPTING_UTXOS_UNDEFINED",
}

export enum SolMerkleTreeErrorCode {
 MERKLE_TREE_UNDEFINED = "MERKLE_TREE_UNDEFINED",
}

export enum TransactionParametersErrorCode {
 NO_VERIFIER_PROVIDED = "NO_VERIFIER_PROVIDED",
 NO_POSEIDON_HASHER_PROVIDED = "NO_POSEIDON_HASHER_PROVIDED",
Expand All@@ -49,6 +44,7 @@ export enum TransactionParametersErrorCode {
}

export enum TransactionErrorCode {
 PROVIDER_UNDEFINED = "PROVIDER_UNDEFINED",
 ROOT_INDEX_NOT_FETCHED = "ROOT_INDEX_NOT_FETCHED",
 REMAINING_ACCOUNTS_NOT_CREATED = "REMAINING_ACCOUNTS_NOT_CREATED",
 TRANSACTION_INPUTS_UNDEFINED = "TRANSACTION_INPUTS_UNDEFINED",
Expand DownExpand Up@@ -106,3 +102,10 @@ export class MetaError extends Error {
export class TransactionError extends MetaError {}

export class TransactioParametersError extends MetaError {}

/**
 * @description Thrown when something fails in the Utxo class.
 **/
export class UtxoError extends MetaError {}

export class VerifierError extends MetaError {}

1 change: 1 addition & 0 deletions
light-sdk-ts/src/merkleTree/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
export * from "./solMerkleTree";
export * from "./merkleTreeConfig";
export * from "./merkleTreeUpdater";
export * from "./merkleTree";

1 change: 1 addition & 0 deletions
light-sdk-ts/src/merkleTree/merkleTree.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -100,6 +100,7 @@ export class MerkleTree {
 this._rebuild();
 }

 // TODO: update does not work debug
@SwenSchaeferjohannSwenSchaeferjohannMar 13, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this resolved?
@ananas-blockananas-blockMar 13, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no
 /**
 * Change an element in the tree
 * @param {number} index Index of element to change
Expand Down

50 changes: 24 additions & 26 deletions
light-sdk-ts/src/test-utils/functionalCircuit.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,25 +10,18 @@ import {
 Utxo,
 VerifierZero,
 Action,
 Verifier,
 Provider,
} from "../index";
import * as anchor from "@coral-xyz/anchor";
import { assert, expect } from "chai";
import { Connection, Keypair as SolanaKeypair } from "@solana/web3.js";
const circomlibjs = require("circomlibjs");

export async function functionalCircuitTest() {
 try {
 const provider = new anchor.AnchorProvider(
 await new Connection("http://127.0.0.1:8899"),
 new anchor.Wallet(SolanaKeypair.generate()),
 confirmConfig,
 );
 await anchor.setProvider(provider);
 } catch (error) {
 console.log("expected local test validator to be running");
 process.exit();
 }

export async function functionalCircuitTest(
 verifier: Verifier,
 app: boolean = false,
) {
 const poseidon = await circomlibjs.buildPoseidonOpt();
 let seed32 = new Uint8Array(32).fill(1).toString();
 let keypair = new Account({ poseidon: poseidon, seed: seed32 });
Expand All@@ -43,40 +36,45 @@ export async function functionalCircuitTest() {
 let mockPubkey = SolanaKeypair.generate().publicKey;

 let lightProvider = await LightProvider.loadMock(mockPubkey);

 let txParams = new TransactionParameters({
 outputUtxos: [deposit_utxo1],
 merkleTreePubkey: mockPubkey,
 sender: mockPubkey,
 senderFee: lightProvider.nodeWallet?.publicKey,
 verifier: new VerifierZero(),
 senderFee: lightProvider.nodeWallet!.publicKey,
 verifier: verifier,
 lookUpTable: mockPubkey,
 action: Action.DEPOSIT,
 poseidon,
 lookUpTable: mockPubkey,
 });

 let tx = new Transaction({
 provider: lightProvider,
 params: txParams,
 });
 let tx;

 // successful proofgeneration
 if (app) {
 tx = new Transaction({
 provider: lightProvider,
 params: txParams,
 appParams: { mock: "123" },
 });
 } else {
 tx = new Transaction({
 provider: lightProvider,
 params: txParams,
 });
 }
 await tx.compile();

 await tx.getProof();
 let x = true;
 // unsuccessful proofgeneration
 let x = true;

 try {
 tx.proofInput.inIndices[0][1][1] = "1";
 // TODO: investigate why this does not kill the proof
 tx.proofInput.inIndices[0][1][0] = "1";
 // TODO: switch to async testing framework to catch error
 expect(await tx.getProof()).to.Throw();
 // console.log(tx.input.inIndices[0])
 // console.log(tx.input.inIndices[1])
 x = false;
 } catch (error) {
 // console.log("This is ok the error catching is just fucked.");
 // assert.isTrue(error.toString().includes("CheckIndices_3 line:"));
 assert.isTrue(x);
 }
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
add custom errors transaction, utxo, verifier classes by ananas-block · Pull Request #41 · Lightprotocol/light-protocol · GitHub
Skip to content
add custom errors transaction, utxo, verifier classes#41

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

 Merged

SwenSchaeferjohann
merged 2 commits into

from

Mar 13, 2023
 Merged


add custom errors transaction, utxo, verifier classes
#41
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
7f13141

added custom errors transaction, utxo, verifier classes


ananas-block Mar 13, 2023
022cb0b

relaxed version requirement on solana web3.js


ananas-block Mar 13, 2023

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


61 changes: 1 addition & 60 deletions
light-circuits/tests/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ import {
 Verifier,
 VerifierOne,
 Action,
 functionalCircuitTest,
} from "light-sdk";
import * as anchor from "@coral-xyz/anchor";
import { assert, expect } from "chai";
Expand DownExpand Up@@ -50,63 +51,3 @@ describe("verifier_program", () => {
 await functionalCircuitTest(new VerifierTwo(), true);
 });
});

async function functionalCircuitTest(verifier: Verifier, app: boolean = false) {
 const poseidon = await circomlibjs.buildPoseidonOpt();
 let seed32 = new Uint8Array(32).fill(1).toString();
 let keypair = new Account({ poseidon: poseidon, seed: seed32 });
 let depositAmount = 20_000;
 let depositFeeAmount = 10_000;
 let deposit_utxo1 = new Utxo({
 poseidon: poseidon,
 assets: [FEE_ASSET, MINT],
 amounts: [new anchor.BN(depositFeeAmount), new anchor.BN(depositAmount)],
 account: keypair,
 });
 let mockPubkey = SolanaKeypair.generate().publicKey;

 let lightProvider = await LightProvider.loadMock(mockPubkey);
 let txParams = new TransactionParameters({
 outputUtxos: [deposit_utxo1],
 merkleTreePubkey: mockPubkey,
 sender: mockPubkey,
 senderFee: lightProvider.nodeWallet.publicKey,
 verifier: verifier,
 lookUpTable: mockPubkey,
 action: Action.DEPOSIT,
 poseidon
 });

 let tx 

 // successful proofgeneration
 if (app) {
 tx = new Transaction({
 provider: lightProvider,
 params: txParams,
 appParams: { mock: "123" }
 });
 } else {
 tx = new Transaction({
 provider: lightProvider,
 params: txParams,
 });
 }
 await tx.compile();

 await tx.getProof();
 // unsuccessful proofgeneration
 let x = true;

 try {
 tx.proofInput.inIndices[0][1][1] = "1";
 // TODO: investigate why this does not kill the proof
 tx.proofInput.inIndices[0][1][0] = "1";
 expect(await tx.getProof()).to.Throw();
 x = false;

 } catch (error) {
 // assert.isTrue(error.toString().includes("CheckIndices_3 line:"));
 assert.isTrue(x);
 }
}

4 changes: 2 additions & 2 deletions
light-circuits/yarn.lock

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@
 dependencies:
 regenerator-runtime "^0.13.11"

"@coral-xyz/anchor@^0.26.0":
"@coral-xyz/anchor@0.26.0", "@coral-xyz/anchor@^0.26.0":
 version "0.26.0"
 resolved "https://registry.yarnpkg.com/@coral-xyz/anchor/-/anchor-0.26.0.tgz#c8e4f7177e93441afd030f22d777d54d0194d7d1"
 integrity sha512-PxRl+wu5YyptWiR9F2MBHOLLibm87Z4IMUBPreX+DYBtPM+xggvcPi0KAN7+kIL4IrIhXI8ma5V0MCXxSN1pHg==
Expand DownExpand Up@@ -1397,7 +1397,7 @@ jsonparse@^1.2.0:
"light-sdk@file:../light-sdk-ts":
 version "0.0.1"
 dependencies:
 "@coral-xyz/anchor" "^0.26.0"
 "@coral-xyz/anchor" "0.26.0"
 "@noble/hashes" "^1.1.5"
 "@solana/spl-account-compression" "^0.1.5"
 "@solana/spl-token" "0.3.7"
Expand Down

1 change: 1 addition & 0 deletions
light-macros

Open in desktop


Submodule light-macros
added at
b98829


2 changes: 1 addition & 1 deletion
light-sdk-ts/package-lock.json

View file


Open in desktop


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


8 changes: 6 additions & 2 deletions
light-sdk-ts/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,10 @@
 "main": "lib/index.js",
 "scripts": {
 "test": "ts-mocha --resolveJsonModule ./tsconfig.json -t 100000000 tests/**.ts --exit",
 "test-tx-params": "ts-mocha --resolveJsonModule ./tsconfig.json -t 100000000 tests/transactionParameters.test.ts --exit",
 "test-utxo": "ts-mocha --resolveJsonModule ./tsconfig.json -t 100000000 tests/utxo.test.ts --exit",
 "test-verifiers": "ts-mocha --resolveJsonModule ./tsconfig.json -t 100000000 tests/verifiers.test.ts --exit",
 "test-transaction": "ts-mocha --resolveJsonModule ./tsconfig.json -t 100000000 tests/transaction.test.ts --exit",
 "build": "yarn tsc",
 "format": "prettier --write \"src/**/*.{ts,js}\"",
 "lint:fix": "prettier */*.js \"*/**/*{.js,.ts}\" -w",
Expand All@@ -28,11 +32,11 @@
 "author": "ananas-block",
 "license": "UNLICENSED",
 "dependencies": {
 "@coral-xyz/anchor": "^0.26.0",
 "@coral-xyz/anchor": "0.26.0",
 "@noble/hashes": "^1.1.5",
 "@solana/spl-account-compression": "^0.1.5",
 "@solana/spl-token": "0.3.7",
 "@solana/web3.js": "1.73.2",
 "@solana/web3.js": "^1.73.2",
 "axios": "^1.3.4",
 "circomlib": "^2.0.5",
 "circomlibjs": "^0.1.7",
Expand Down

12 changes: 10 additions & 2 deletions
light-sdk-ts/src/account.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -196,9 +196,17 @@ export class Account {
 const privkey = new BN(privateKey);
 return new Account({ poseidon, privateKey: privkey });
 }
 static fromPubkey(publicKey: Uint8Array, encPubkey: Uint8Array): Account {
 static fromPubkey(
 publicKey: Uint8Array,
 encPubkey: Uint8Array,
 poseidon: any,
 ): Account {
 const pubKey = new BN(publicKey, undefined, "be");
 return new Account({ publicKey: pubKey, encryptionPublicKey: encPubkey });
 return new Account({
 publicKey: pubKey,
 encryptionPublicKey: encPubkey,
 poseidon,
 });
 }

 static getEncryptionKeyPair(seed: String): nacl.BoxKeyPair {
Expand Down

33 changes: 18 additions & 15 deletions
light-sdk-ts/src/errors.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,21 +5,9 @@ export enum UtxoErrorCode {
 NEGATIVE_AMOUNT = "NEGATIVE_AMOUNT",
 NOT_U64 = "NOT_U64",
 BLINDING_EXCEEDS_SIZE = "BLINDING_EXCEEDS_SIZE",
}

/**
 * @description Thrown when something fails in the Utxo class.
 **/
export class UtxoError extends Error {
 name = this.constructor.name;
 code: string;
 codeMessage: string;

 constructor(code: string, codeMessage: string) {
 super(`Utxo error ${code}: ${codeMessage}`);
 this.code = code;
 this.codeMessage = codeMessage;
 }
 INDEX_NOT_PROVIDED = "INDEX_NOT_PROVIDED",
 ACCOUNT_HAS_NO_PRIVKEY = "ACCOUNT_HAS_NO_PRIVKEY",
 ASSET_NOT_FOUND = "ASSET_NOT_FOUND",
}

export enum ProviderErrorCode {
Expand All@@ -28,9 +16,16 @@ export enum ProviderErrorCode {
 PROVIDER_UNDEFINED = "PROVIDER_UNDEFINED",
}

export enum VerifierErrorCode {
 PUBLIC_INPUTS_UNDEFINED = "PUBLIC_INPUTS_UNDEFINED",
 INVALID_INPUTS_NUMBER = "INVALID_INPUTS_NUMBER",
 ENCRYPTING_UTXOS_UNDEFINED = "ENCRYPTING_UTXOS_UNDEFINED",
}

export enum SolMerkleTreeErrorCode {
 MERKLE_TREE_UNDEFINED = "MERKLE_TREE_UNDEFINED",
}

export enum TransactionParametersErrorCode {
 NO_VERIFIER_PROVIDED = "NO_VERIFIER_PROVIDED",
 NO_POSEIDON_HASHER_PROVIDED = "NO_POSEIDON_HASHER_PROVIDED",
Expand All@@ -49,6 +44,7 @@ export enum TransactionParametersErrorCode {
}

export enum TransactionErrorCode {
 PROVIDER_UNDEFINED = "PROVIDER_UNDEFINED",
 ROOT_INDEX_NOT_FETCHED = "ROOT_INDEX_NOT_FETCHED",
 REMAINING_ACCOUNTS_NOT_CREATED = "REMAINING_ACCOUNTS_NOT_CREATED",
 TRANSACTION_INPUTS_UNDEFINED = "TRANSACTION_INPUTS_UNDEFINED",
Expand DownExpand Up@@ -106,3 +102,10 @@ export class MetaError extends Error {
export class TransactionError extends MetaError {}

export class TransactioParametersError extends MetaError {}

/**
 * @description Thrown when something fails in the Utxo class.
 **/
export class UtxoError extends MetaError {}

export class VerifierError extends MetaError {}

1 change: 1 addition & 0 deletions
light-sdk-ts/src/merkleTree/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
export * from "./solMerkleTree";
export * from "./merkleTreeConfig";
export * from "./merkleTreeUpdater";
export * from "./merkleTree";

1 change: 1 addition & 0 deletions
light-sdk-ts/src/merkleTree/merkleTree.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -100,6 +100,7 @@ export class MerkleTree {
 this._rebuild();
 }

 // TODO: update does not work debug
@SwenSchaeferjohannSwenSchaeferjohannMar 13, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this resolved?
@ananas-blockananas-blockMar 13, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no
 /**
 * Change an element in the tree
 * @param {number} index Index of element to change
Expand Down

50 changes: 24 additions & 26 deletions
light-sdk-ts/src/test-utils/functionalCircuit.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,25 +10,18 @@ import {
 Utxo,
 VerifierZero,
 Action,
 Verifier,
 Provider,
} from "../index";
import * as anchor from "@coral-xyz/anchor";
import { assert, expect } from "chai";
import { Connection, Keypair as SolanaKeypair } from "@solana/web3.js";
const circomlibjs = require("circomlibjs");

export async function functionalCircuitTest() {
 try {
 const provider = new anchor.AnchorProvider(
 await new Connection("http://127.0.0.1:8899"),
 new anchor.Wallet(SolanaKeypair.generate()),
 confirmConfig,
 );
 await anchor.setProvider(provider);
 } catch (error) {
 console.log("expected local test validator to be running");
 process.exit();
 }

export async function functionalCircuitTest(
 verifier: Verifier,
 app: boolean = false,
) {
 const poseidon = await circomlibjs.buildPoseidonOpt();
 let seed32 = new Uint8Array(32).fill(1).toString();
 let keypair = new Account({ poseidon: poseidon, seed: seed32 });
Expand All@@ -43,40 +36,45 @@ export async function functionalCircuitTest() {
 let mockPubkey = SolanaKeypair.generate().publicKey;

 let lightProvider = await LightProvider.loadMock(mockPubkey);

 let txParams = new TransactionParameters({
 outputUtxos: [deposit_utxo1],
 merkleTreePubkey: mockPubkey,
 sender: mockPubkey,
 senderFee: lightProvider.nodeWallet?.publicKey,
 verifier: new VerifierZero(),
 senderFee: lightProvider.nodeWallet!.publicKey,
 verifier: verifier,
 lookUpTable: mockPubkey,
 action: Action.DEPOSIT,
 poseidon,
 lookUpTable: mockPubkey,
 });

 let tx = new Transaction({
 provider: lightProvider,
 params: txParams,
 });
 let tx;

 // successful proofgeneration
 if (app) {
 tx = new Transaction({
 provider: lightProvider,
 params: txParams,
 appParams: { mock: "123" },
 });
 } else {
 tx = new Transaction({
 provider: lightProvider,
 params: txParams,
 });
 }
 await tx.compile();

 await tx.getProof();
 let x = true;
 // unsuccessful proofgeneration
 let x = true;

 try {
 tx.proofInput.inIndices[0][1][1] = "1";
 // TODO: investigate why this does not kill the proof
 tx.proofInput.inIndices[0][1][0] = "1";
 // TODO: switch to async testing framework to catch error
 expect(await tx.getProof()).to.Throw();
 // console.log(tx.input.inIndices[0])
 // console.log(tx.input.inIndices[1])
 x = false;
 } catch (error) {
 // console.log("This is ok the error catching is just fucked.");
 // assert.isTrue(error.toString().includes("CheckIndices_3 line:"));
 assert.isTrue(x);
 }
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
add custom errors transaction, utxo, verifier classes by ananas-block · Pull Request #41 · Lightprotocol/light-protocol · GitHub
Skip to content
add custom errors transaction, utxo, verifier classes#41

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

 Merged

SwenSchaeferjohann
merged 2 commits into

from

Mar 13, 2023
 Merged


add custom errors transaction, utxo, verifier classes
#41
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
7f13141

added custom errors transaction, utxo, verifier classes


ananas-block Mar 13, 2023
022cb0b

relaxed version requirement on solana web3.js


ananas-block Mar 13, 2023

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


61 changes: 1 addition & 60 deletions
light-circuits/tests/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ import {
 Verifier,
 VerifierOne,
 Action,
 functionalCircuitTest,
} from "light-sdk";
import * as anchor from "@coral-xyz/anchor";
import { assert, expect } from "chai";
Expand DownExpand Up@@ -50,63 +51,3 @@ describe("verifier_program", () => {
 await functionalCircuitTest(new VerifierTwo(), true);
 });
});

async function functionalCircuitTest(verifier: Verifier, app: boolean = false) {
 const poseidon = await circomlibjs.buildPoseidonOpt();
 let seed32 = new Uint8Array(32).fill(1).toString();
 let keypair = new Account({ poseidon: poseidon, seed: seed32 });
 let depositAmount = 20_000;
 let depositFeeAmount = 10_000;
 let deposit_utxo1 = new Utxo({
 poseidon: poseidon,
 assets: [FEE_ASSET, MINT],
 amounts: [new anchor.BN(depositFeeAmount), new anchor.BN(depositAmount)],
 account: keypair,
 });
 let mockPubkey = SolanaKeypair.generate().publicKey;

 let lightProvider = await LightProvider.loadMock(mockPubkey);
 let txParams = new TransactionParameters({
 outputUtxos: [deposit_utxo1],
 merkleTreePubkey: mockPubkey,
 sender: mockPubkey,
 senderFee: lightProvider.nodeWallet.publicKey,
 verifier: verifier,
 lookUpTable: mockPubkey,
 action: Action.DEPOSIT,
 poseidon
 });

 let tx 

 // successful proofgeneration
 if (app) {
 tx = new Transaction({
 provider: lightProvider,
 params: txParams,
 appParams: { mock: "123" }
 });
 } else {
 tx = new Transaction({
 provider: lightProvider,
 params: txParams,
 });
 }
 await tx.compile();

 await tx.getProof();
 // unsuccessful proofgeneration
 let x = true;

 try {
 tx.proofInput.inIndices[0][1][1] = "1";
 // TODO: investigate why this does not kill the proof
 tx.proofInput.inIndices[0][1][0] = "1";
 expect(await tx.getProof()).to.Throw();
 x = false;

 } catch (error) {
 // assert.isTrue(error.toString().includes("CheckIndices_3 line:"));
 assert.isTrue(x);
 }
}

4 changes: 2 additions & 2 deletions
light-circuits/yarn.lock

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@
 dependencies:
 regenerator-runtime "^0.13.11"

"@coral-xyz/anchor@^0.26.0":
"@coral-xyz/anchor@0.26.0", "@coral-xyz/anchor@^0.26.0":
 version "0.26.0"
 resolved "https://registry.yarnpkg.com/@coral-xyz/anchor/-/anchor-0.26.0.tgz#c8e4f7177e93441afd030f22d777d54d0194d7d1"
 integrity sha512-PxRl+wu5YyptWiR9F2MBHOLLibm87Z4IMUBPreX+DYBtPM+xggvcPi0KAN7+kIL4IrIhXI8ma5V0MCXxSN1pHg==
Expand DownExpand Up@@ -1397,7 +1397,7 @@ jsonparse@^1.2.0:
"light-sdk@file:../light-sdk-ts":
 version "0.0.1"
 dependencies:
 "@coral-xyz/anchor" "^0.26.0"
 "@coral-xyz/anchor" "0.26.0"
 "@noble/hashes" "^1.1.5"
 "@solana/spl-account-compression" "^0.1.5"
 "@solana/spl-token" "0.3.7"
Expand Down

1 change: 1 addition & 0 deletions
light-macros

Open in desktop


Submodule light-macros
added at
b98829


2 changes: 1 addition & 1 deletion
light-sdk-ts/package-lock.json

View file


Open in desktop


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


8 changes: 6 additions & 2 deletions
light-sdk-ts/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,10 @@
 "main": "lib/index.js",
 "scripts": {
 "test": "ts-mocha --resolveJsonModule ./tsconfig.json -t 100000000 tests/**.ts --exit",
 "test-tx-params": "ts-mocha --resolveJsonModule ./tsconfig.json -t 100000000 tests/transactionParameters.test.ts --exit",
 "test-utxo": "ts-mocha --resolveJsonModule ./tsconfig.json -t 100000000 tests/utxo.test.ts --exit",
 "test-verifiers": "ts-mocha --resolveJsonModule ./tsconfig.json -t 100000000 tests/verifiers.test.ts --exit",
 "test-transaction": "ts-mocha --resolveJsonModule ./tsconfig.json -t 100000000 tests/transaction.test.ts --exit",
 "build": "yarn tsc",
 "format": "prettier --write \"src/**/*.{ts,js}\"",
 "lint:fix": "prettier */*.js \"*/**/*{.js,.ts}\" -w",
Expand All@@ -28,11 +32,11 @@
 "author": "ananas-block",
 "license": "UNLICENSED",
 "dependencies": {
 "@coral-xyz/anchor": "^0.26.0",
 "@coral-xyz/anchor": "0.26.0",
 "@noble/hashes": "^1.1.5",
 "@solana/spl-account-compression": "^0.1.5",
 "@solana/spl-token": "0.3.7",
 "@solana/web3.js": "1.73.2",
 "@solana/web3.js": "^1.73.2",
 "axios": "^1.3.4",
 "circomlib": "^2.0.5",
 "circomlibjs": "^0.1.7",
Expand Down

12 changes: 10 additions & 2 deletions
light-sdk-ts/src/account.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -196,9 +196,17 @@ export class Account {
 const privkey = new BN(privateKey);
 return new Account({ poseidon, privateKey: privkey });
 }
 static fromPubkey(publicKey: Uint8Array, encPubkey: Uint8Array): Account {
 static fromPubkey(
 publicKey: Uint8Array,
 encPubkey: Uint8Array,
 poseidon: any,
 ): Account {
 const pubKey = new BN(publicKey, undefined, "be");
 return new Account({ publicKey: pubKey, encryptionPublicKey: encPubkey });
 return new Account({
 publicKey: pubKey,
 encryptionPublicKey: encPubkey,
 poseidon,
 });
 }

 static getEncryptionKeyPair(seed: String): nacl.BoxKeyPair {
Expand Down

33 changes: 18 additions & 15 deletions
light-sdk-ts/src/errors.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,21 +5,9 @@ export enum UtxoErrorCode {
 NEGATIVE_AMOUNT = "NEGATIVE_AMOUNT",
 NOT_U64 = "NOT_U64",
 BLINDING_EXCEEDS_SIZE = "BLINDING_EXCEEDS_SIZE",
}

/**
 * @description Thrown when something fails in the Utxo class.
 **/
export class UtxoError extends Error {
 name = this.constructor.name;
 code: string;
 codeMessage: string;

 constructor(code: string, codeMessage: string) {
 super(`Utxo error ${code}: ${codeMessage}`);
 this.code = code;
 this.codeMessage = codeMessage;
 }
 INDEX_NOT_PROVIDED = "INDEX_NOT_PROVIDED",
 ACCOUNT_HAS_NO_PRIVKEY = "ACCOUNT_HAS_NO_PRIVKEY",
 ASSET_NOT_FOUND = "ASSET_NOT_FOUND",
}

export enum ProviderErrorCode {
Expand All@@ -28,9 +16,16 @@ export enum ProviderErrorCode {
 PROVIDER_UNDEFINED = "PROVIDER_UNDEFINED",
}

export enum VerifierErrorCode {
 PUBLIC_INPUTS_UNDEFINED = "PUBLIC_INPUTS_UNDEFINED",
 INVALID_INPUTS_NUMBER = "INVALID_INPUTS_NUMBER",
 ENCRYPTING_UTXOS_UNDEFINED = "ENCRYPTING_UTXOS_UNDEFINED",
}

export enum SolMerkleTreeErrorCode {
 MERKLE_TREE_UNDEFINED = "MERKLE_TREE_UNDEFINED",
}

export enum TransactionParametersErrorCode {
 NO_VERIFIER_PROVIDED = "NO_VERIFIER_PROVIDED",
 NO_POSEIDON_HASHER_PROVIDED = "NO_POSEIDON_HASHER_PROVIDED",
Expand All@@ -49,6 +44,7 @@ export enum TransactionParametersErrorCode {
}

export enum TransactionErrorCode {
 PROVIDER_UNDEFINED = "PROVIDER_UNDEFINED",
 ROOT_INDEX_NOT_FETCHED = "ROOT_INDEX_NOT_FETCHED",
 REMAINING_ACCOUNTS_NOT_CREATED = "REMAINING_ACCOUNTS_NOT_CREATED",
 TRANSACTION_INPUTS_UNDEFINED = "TRANSACTION_INPUTS_UNDEFINED",
Expand DownExpand Up@@ -106,3 +102,10 @@ export class MetaError extends Error {
export class TransactionError extends MetaError {}

export class TransactioParametersError extends MetaError {}

/**
 * @description Thrown when something fails in the Utxo class.
 **/
export class UtxoError extends MetaError {}

export class VerifierError extends MetaError {}

1 change: 1 addition & 0 deletions
light-sdk-ts/src/merkleTree/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
export * from "./solMerkleTree";
export * from "./merkleTreeConfig";
export * from "./merkleTreeUpdater";
export * from "./merkleTree";

1 change: 1 addition & 0 deletions
light-sdk-ts/src/merkleTree/merkleTree.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -100,6 +100,7 @@ export class MerkleTree {
 this._rebuild();
 }

 // TODO: update does not work debug
@SwenSchaeferjohannSwenSchaeferjohannMar 13, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this resolved?
@ananas-blockananas-blockMar 13, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no
 /**
 * Change an element in the tree
 * @param {number} index Index of element to change
Expand Down

50 changes: 24 additions & 26 deletions
light-sdk-ts/src/test-utils/functionalCircuit.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,25 +10,18 @@ import {
 Utxo,
 VerifierZero,
 Action,
 Verifier,
 Provider,
} from "../index";
import * as anchor from "@coral-xyz/anchor";
import { assert, expect } from "chai";
import { Connection, Keypair as SolanaKeypair } from "@solana/web3.js";
const circomlibjs = require("circomlibjs");

export async function functionalCircuitTest() {
 try {
 const provider = new anchor.AnchorProvider(
 await new Connection("http://127.0.0.1:8899"),
 new anchor.Wallet(SolanaKeypair.generate()),
 confirmConfig,
 );
 await anchor.setProvider(provider);
 } catch (error) {
 console.log("expected local test validator to be running");
 process.exit();
 }

export async function functionalCircuitTest(
 verifier: Verifier,
 app: boolean = false,
) {
 const poseidon = await circomlibjs.buildPoseidonOpt();
 let seed32 = new Uint8Array(32).fill(1).toString();
 let keypair = new Account({ poseidon: poseidon, seed: seed32 });
Expand All@@ -43,40 +36,45 @@ export async function functionalCircuitTest() {
 let mockPubkey = SolanaKeypair.generate().publicKey;

 let lightProvider = await LightProvider.loadMock(mockPubkey);

 let txParams = new TransactionParameters({
 outputUtxos: [deposit_utxo1],
 merkleTreePubkey: mockPubkey,
 sender: mockPubkey,
 senderFee: lightProvider.nodeWallet?.publicKey,
 verifier: new VerifierZero(),
 senderFee: lightProvider.nodeWallet!.publicKey,
 verifier: verifier,
 lookUpTable: mockPubkey,
 action: Action.DEPOSIT,
 poseidon,
 lookUpTable: mockPubkey,
 });

 let tx = new Transaction({
 provider: lightProvider,
 params: txParams,
 });
 let tx;

 // successful proofgeneration
 if (app) {
 tx = new Transaction({
 provider: lightProvider,
 params: txParams,
 appParams: { mock: "123" },
 });
 } else {
 tx = new Transaction({
 provider: lightProvider,
 params: txParams,
 });
 }
 await tx.compile();

 await tx.getProof();
 let x = true;
 // unsuccessful proofgeneration
 let x = true;

 try {
 tx.proofInput.inIndices[0][1][1] = "1";
 // TODO: investigate why this does not kill the proof
 tx.proofInput.inIndices[0][1][0] = "1";
 // TODO: switch to async testing framework to catch error
 expect(await tx.getProof()).to.Throw();
 // console.log(tx.input.inIndices[0])
 // console.log(tx.input.inIndices[1])
 x = false;
 } catch (error) {
 // console.log("This is ok the error catching is just fucked.");
 // assert.isTrue(error.toString().includes("CheckIndices_3 line:"));
 assert.isTrue(x);
 }
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
add custom errors transaction, utxo, verifier classes by ananas-block · Pull Request #41 · Lightprotocol/light-protocol · GitHub
Skip to content
add custom errors transaction, utxo, verifier classes#41

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

 Merged

SwenSchaeferjohann
merged 2 commits into

from

Mar 13, 2023
 Merged


add custom errors transaction, utxo, verifier classes
#41
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
7f13141

added custom errors transaction, utxo, verifier classes


ananas-block Mar 13, 2023
022cb0b

relaxed version requirement on solana web3.js


ananas-block Mar 13, 2023

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


61 changes: 1 addition & 60 deletions
light-circuits/tests/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ import {
 Verifier,
 VerifierOne,
 Action,
 functionalCircuitTest,
} from "light-sdk";
import * as anchor from "@coral-xyz/anchor";
import { assert, expect } from "chai";
Expand DownExpand Up@@ -50,63 +51,3 @@ describe("verifier_program", () => {
 await functionalCircuitTest(new VerifierTwo(), true);
 });
});

async function functionalCircuitTest(verifier: Verifier, app: boolean = false) {
 const poseidon = await circomlibjs.buildPoseidonOpt();
 let seed32 = new Uint8Array(32).fill(1).toString();
 let keypair = new Account({ poseidon: poseidon, seed: seed32 });
 let depositAmount = 20_000;
 let depositFeeAmount = 10_000;
 let deposit_utxo1 = new Utxo({
 poseidon: poseidon,
 assets: [FEE_ASSET, MINT],
 amounts: [new anchor.BN(depositFeeAmount), new anchor.BN(depositAmount)],
 account: keypair,
 });
 let mockPubkey = SolanaKeypair.generate().publicKey;

 let lightProvider = await LightProvider.loadMock(mockPubkey);
 let txParams = new TransactionParameters({
 outputUtxos: [deposit_utxo1],
 merkleTreePubkey: mockPubkey,
 sender: mockPubkey,
 senderFee: lightProvider.nodeWallet.publicKey,
 verifier: verifier,
 lookUpTable: mockPubkey,
 action: Action.DEPOSIT,
 poseidon
 });

 let tx 

 // successful proofgeneration
 if (app) {
 tx = new Transaction({
 provider: lightProvider,
 params: txParams,
 appParams: { mock: "123" }
 });
 } else {
 tx = new Transaction({
 provider: lightProvider,
 params: txParams,
 });
 }
 await tx.compile();

 await tx.getProof();
 // unsuccessful proofgeneration
 let x = true;

 try {
 tx.proofInput.inIndices[0][1][1] = "1";
 // TODO: investigate why this does not kill the proof
 tx.proofInput.inIndices[0][1][0] = "1";
 expect(await tx.getProof()).to.Throw();
 x = false;

 } catch (error) {
 // assert.isTrue(error.toString().includes("CheckIndices_3 line:"));
 assert.isTrue(x);
 }
}

4 changes: 2 additions & 2 deletions
light-circuits/yarn.lock

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@
 dependencies:
 regenerator-runtime "^0.13.11"

"@coral-xyz/anchor@^0.26.0":
"@coral-xyz/anchor@0.26.0", "@coral-xyz/anchor@^0.26.0":
 version "0.26.0"
 resolved "https://registry.yarnpkg.com/@coral-xyz/anchor/-/anchor-0.26.0.tgz#c8e4f7177e93441afd030f22d777d54d0194d7d1"
 integrity sha512-PxRl+wu5YyptWiR9F2MBHOLLibm87Z4IMUBPreX+DYBtPM+xggvcPi0KAN7+kIL4IrIhXI8ma5V0MCXxSN1pHg==
Expand DownExpand Up@@ -1397,7 +1397,7 @@ jsonparse@^1.2.0:
"light-sdk@file:../light-sdk-ts":
 version "0.0.1"
 dependencies:
 "@coral-xyz/anchor" "^0.26.0"
 "@coral-xyz/anchor" "0.26.0"
 "@noble/hashes" "^1.1.5"
 "@solana/spl-account-compression" "^0.1.5"
 "@solana/spl-token" "0.3.7"
Expand Down

1 change: 1 addition & 0 deletions
light-macros

Open in desktop


Submodule light-macros
added at
b98829


2 changes: 1 addition & 1 deletion
light-sdk-ts/package-lock.json

View file


Open in desktop


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


8 changes: 6 additions & 2 deletions
light-sdk-ts/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,10 @@
 "main": "lib/index.js",
 "scripts": {
 "test": "ts-mocha --resolveJsonModule ./tsconfig.json -t 100000000 tests/**.ts --exit",
 "test-tx-params": "ts-mocha --resolveJsonModule ./tsconfig.json -t 100000000 tests/transactionParameters.test.ts --exit",
 "test-utxo": "ts-mocha --resolveJsonModule ./tsconfig.json -t 100000000 tests/utxo.test.ts --exit",
 "test-verifiers": "ts-mocha --resolveJsonModule ./tsconfig.json -t 100000000 tests/verifiers.test.ts --exit",
 "test-transaction": "ts-mocha --resolveJsonModule ./tsconfig.json -t 100000000 tests/transaction.test.ts --exit",
 "build": "yarn tsc",
 "format": "prettier --write \"src/**/*.{ts,js}\"",
 "lint:fix": "prettier */*.js \"*/**/*{.js,.ts}\" -w",
Expand All@@ -28,11 +32,11 @@
 "author": "ananas-block",
 "license": "UNLICENSED",
 "dependencies": {
 "@coral-xyz/anchor": "^0.26.0",
 "@coral-xyz/anchor": "0.26.0",
 "@noble/hashes": "^1.1.5",
 "@solana/spl-account-compression": "^0.1.5",
 "@solana/spl-token": "0.3.7",
 "@solana/web3.js": "1.73.2",
 "@solana/web3.js": "^1.73.2",
 "axios": "^1.3.4",
 "circomlib": "^2.0.5",
 "circomlibjs": "^0.1.7",
Expand Down

12 changes: 10 additions & 2 deletions
light-sdk-ts/src/account.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -196,9 +196,17 @@ export class Account {
 const privkey = new BN(privateKey);
 return new Account({ poseidon, privateKey: privkey });
 }
 static fromPubkey(publicKey: Uint8Array, encPubkey: Uint8Array): Account {
 static fromPubkey(
 publicKey: Uint8Array,
 encPubkey: Uint8Array,
 poseidon: any,
 ): Account {
 const pubKey = new BN(publicKey, undefined, "be");
 return new Account({ publicKey: pubKey, encryptionPublicKey: encPubkey });
 return new Account({
 publicKey: pubKey,
 encryptionPublicKey: encPubkey,
 poseidon,
 });
 }

 static getEncryptionKeyPair(seed: String): nacl.BoxKeyPair {
Expand Down

33 changes: 18 additions & 15 deletions
light-sdk-ts/src/errors.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,21 +5,9 @@ export enum UtxoErrorCode {
 NEGATIVE_AMOUNT = "NEGATIVE_AMOUNT",
 NOT_U64 = "NOT_U64",
 BLINDING_EXCEEDS_SIZE = "BLINDING_EXCEEDS_SIZE",
}

/**
 * @description Thrown when something fails in the Utxo class.
 **/
export class UtxoError extends Error {
 name = this.constructor.name;
 code: string;
 codeMessage: string;

 constructor(code: string, codeMessage: string) {
 super(`Utxo error ${code}: ${codeMessage}`);
 this.code = code;
 this.codeMessage = codeMessage;
 }
 INDEX_NOT_PROVIDED = "INDEX_NOT_PROVIDED",
 ACCOUNT_HAS_NO_PRIVKEY = "ACCOUNT_HAS_NO_PRIVKEY",
 ASSET_NOT_FOUND = "ASSET_NOT_FOUND",
}

export enum ProviderErrorCode {
Expand All@@ -28,9 +16,16 @@ export enum ProviderErrorCode {
 PROVIDER_UNDEFINED = "PROVIDER_UNDEFINED",
}

export enum VerifierErrorCode {
 PUBLIC_INPUTS_UNDEFINED = "PUBLIC_INPUTS_UNDEFINED",
 INVALID_INPUTS_NUMBER = "INVALID_INPUTS_NUMBER",
 ENCRYPTING_UTXOS_UNDEFINED = "ENCRYPTING_UTXOS_UNDEFINED",
}

export enum SolMerkleTreeErrorCode {
 MERKLE_TREE_UNDEFINED = "MERKLE_TREE_UNDEFINED",
}

export enum TransactionParametersErrorCode {
 NO_VERIFIER_PROVIDED = "NO_VERIFIER_PROVIDED",
 NO_POSEIDON_HASHER_PROVIDED = "NO_POSEIDON_HASHER_PROVIDED",
Expand All@@ -49,6 +44,7 @@ export enum TransactionParametersErrorCode {
}

export enum TransactionErrorCode {
 PROVIDER_UNDEFINED = "PROVIDER_UNDEFINED",
 ROOT_INDEX_NOT_FETCHED = "ROOT_INDEX_NOT_FETCHED",
 REMAINING_ACCOUNTS_NOT_CREATED = "REMAINING_ACCOUNTS_NOT_CREATED",
 TRANSACTION_INPUTS_UNDEFINED = "TRANSACTION_INPUTS_UNDEFINED",
Expand DownExpand Up@@ -106,3 +102,10 @@ export class MetaError extends Error {
export class TransactionError extends MetaError {}

export class TransactioParametersError extends MetaError {}

/**
 * @description Thrown when something fails in the Utxo class.
 **/
export class UtxoError extends MetaError {}

export class VerifierError extends MetaError {}

1 change: 1 addition & 0 deletions
light-sdk-ts/src/merkleTree/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
export * from "./solMerkleTree";
export * from "./merkleTreeConfig";
export * from "./merkleTreeUpdater";
export * from "./merkleTree";

1 change: 1 addition & 0 deletions
light-sdk-ts/src/merkleTree/merkleTree.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -100,6 +100,7 @@ export class MerkleTree {
 this._rebuild();
 }

 // TODO: update does not work debug
@SwenSchaeferjohannSwenSchaeferjohannMar 13, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this resolved?
@ananas-blockananas-blockMar 13, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no
 /**
 * Change an element in the tree
 * @param {number} index Index of element to change
Expand Down

50 changes: 24 additions & 26 deletions
light-sdk-ts/src/test-utils/functionalCircuit.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,25 +10,18 @@ import {
 Utxo,
 VerifierZero,
 Action,
 Verifier,
 Provider,
} from "../index";
import * as anchor from "@coral-xyz/anchor";
import { assert, expect } from "chai";
import { Connection, Keypair as SolanaKeypair } from "@solana/web3.js";
const circomlibjs = require("circomlibjs");

export async function functionalCircuitTest() {
 try {
 const provider = new anchor.AnchorProvider(
 await new Connection("http://127.0.0.1:8899"),
 new anchor.Wallet(SolanaKeypair.generate()),
 confirmConfig,
 );
 await anchor.setProvider(provider);
 } catch (error) {
 console.log("expected local test validator to be running");
 process.exit();
 }

export async function functionalCircuitTest(
 verifier: Verifier,
 app: boolean = false,
) {
 const poseidon = await circomlibjs.buildPoseidonOpt();
 let seed32 = new Uint8Array(32).fill(1).toString();
 let keypair = new Account({ poseidon: poseidon, seed: seed32 });
Expand All@@ -43,40 +36,45 @@ export async function functionalCircuitTest() {
 let mockPubkey = SolanaKeypair.generate().publicKey;

 let lightProvider = await LightProvider.loadMock(mockPubkey);

 let txParams = new TransactionParameters({
 outputUtxos: [deposit_utxo1],
 merkleTreePubkey: mockPubkey,
 sender: mockPubkey,
 senderFee: lightProvider.nodeWallet?.publicKey,
 verifier: new VerifierZero(),
 senderFee: lightProvider.nodeWallet!.publicKey,
 verifier: verifier,
 lookUpTable: mockPubkey,
 action: Action.DEPOSIT,
 poseidon,
 lookUpTable: mockPubkey,
 });

 let tx = new Transaction({
 provider: lightProvider,
 params: txParams,
 });
 let tx;

 // successful proofgeneration
 if (app) {
 tx = new Transaction({
 provider: lightProvider,
 params: txParams,
 appParams: { mock: "123" },
 });
 } else {
 tx = new Transaction({
 provider: lightProvider,
 params: txParams,
 });
 }
 await tx.compile();

 await tx.getProof();
 let x = true;
 // unsuccessful proofgeneration
 let x = true;

 try {
 tx.proofInput.inIndices[0][1][1] = "1";
 // TODO: investigate why this does not kill the proof
 tx.proofInput.inIndices[0][1][0] = "1";
 // TODO: switch to async testing framework to catch error
 expect(await tx.getProof()).to.Throw();
 // console.log(tx.input.inIndices[0])
 // console.log(tx.input.inIndices[1])
 x = false;
 } catch (error) {
 // console.log("This is ok the error catching is just fucked.");
 // assert.isTrue(error.toString().includes("CheckIndices_3 line:"));
 assert.isTrue(x);
 }
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
add custom errors transaction, utxo, verifier classes by ananas-block · Pull Request #41 · Lightprotocol/light-protocol · GitHub
Skip to content
add custom errors transaction, utxo, verifier classes#41

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

 Merged

SwenSchaeferjohann
merged 2 commits into

from

Mar 13, 2023
 Merged


add custom errors transaction, utxo, verifier classes
#41
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
7f13141

added custom errors transaction, utxo, verifier classes


ananas-block Mar 13, 2023
022cb0b

relaxed version requirement on solana web3.js


ananas-block Mar 13, 2023

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


61 changes: 1 addition & 60 deletions
light-circuits/tests/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ import {
 Verifier,
 VerifierOne,
 Action,
 functionalCircuitTest,
} from "light-sdk";
import * as anchor from "@coral-xyz/anchor";
import { assert, expect } from "chai";
Expand DownExpand Up@@ -50,63 +51,3 @@ describe("verifier_program", () => {
 await functionalCircuitTest(new VerifierTwo(), true);
 });
});

async function functionalCircuitTest(verifier: Verifier, app: boolean = false) {
 const poseidon = await circomlibjs.buildPoseidonOpt();
 let seed32 = new Uint8Array(32).fill(1).toString();
 let keypair = new Account({ poseidon: poseidon, seed: seed32 });
 let depositAmount = 20_000;
 let depositFeeAmount = 10_000;
 let deposit_utxo1 = new Utxo({
 poseidon: poseidon,
 assets: [FEE_ASSET, MINT],
 amounts: [new anchor.BN(depositFeeAmount), new anchor.BN(depositAmount)],
 account: keypair,
 });
 let mockPubkey = SolanaKeypair.generate().publicKey;

 let lightProvider = await LightProvider.loadMock(mockPubkey);
 let txParams = new TransactionParameters({
 outputUtxos: [deposit_utxo1],
 merkleTreePubkey: mockPubkey,
 sender: mockPubkey,
 senderFee: lightProvider.nodeWallet.publicKey,
 verifier: verifier,
 lookUpTable: mockPubkey,
 action: Action.DEPOSIT,
 poseidon
 });

 let tx 

 // successful proofgeneration
 if (app) {
 tx = new Transaction({
 provider: lightProvider,
 params: txParams,
 appParams: { mock: "123" }
 });
 } else {
 tx = new Transaction({
 provider: lightProvider,
 params: txParams,
 });
 }
 await tx.compile();

 await tx.getProof();
 // unsuccessful proofgeneration
 let x = true;

 try {
 tx.proofInput.inIndices[0][1][1] = "1";
 // TODO: investigate why this does not kill the proof
 tx.proofInput.inIndices[0][1][0] = "1";
 expect(await tx.getProof()).to.Throw();
 x = false;

 } catch (error) {
 // assert.isTrue(error.toString().includes("CheckIndices_3 line:"));
 assert.isTrue(x);
 }
}

4 changes: 2 additions & 2 deletions
light-circuits/yarn.lock

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@
 dependencies:
 regenerator-runtime "^0.13.11"

"@coral-xyz/anchor@^0.26.0":
"@coral-xyz/anchor@0.26.0", "@coral-xyz/anchor@^0.26.0":
 version "0.26.0"
 resolved "https://registry.yarnpkg.com/@coral-xyz/anchor/-/anchor-0.26.0.tgz#c8e4f7177e93441afd030f22d777d54d0194d7d1"
 integrity sha512-PxRl+wu5YyptWiR9F2MBHOLLibm87Z4IMUBPreX+DYBtPM+xggvcPi0KAN7+kIL4IrIhXI8ma5V0MCXxSN1pHg==
Expand DownExpand Up@@ -1397,7 +1397,7 @@ jsonparse@^1.2.0:
"light-sdk@file:../light-sdk-ts":
 version "0.0.1"
 dependencies:
 "@coral-xyz/anchor" "^0.26.0"
 "@coral-xyz/anchor" "0.26.0"
 "@noble/hashes" "^1.1.5"
 "@solana/spl-account-compression" "^0.1.5"
 "@solana/spl-token" "0.3.7"
Expand Down

1 change: 1 addition & 0 deletions
light-macros

Open in desktop


Submodule light-macros
added at
b98829


2 changes: 1 addition & 1 deletion
light-sdk-ts/package-lock.json

View file


Open in desktop


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


8 changes: 6 additions & 2 deletions
light-sdk-ts/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,10 @@
 "main": "lib/index.js",
 "scripts": {
 "test": "ts-mocha --resolveJsonModule ./tsconfig.json -t 100000000 tests/**.ts --exit",
 "test-tx-params": "ts-mocha --resolveJsonModule ./tsconfig.json -t 100000000 tests/transactionParameters.test.ts --exit",
 "test-utxo": "ts-mocha --resolveJsonModule ./tsconfig.json -t 100000000 tests/utxo.test.ts --exit",
 "test-verifiers": "ts-mocha --resolveJsonModule ./tsconfig.json -t 100000000 tests/verifiers.test.ts --exit",
 "test-transaction": "ts-mocha --resolveJsonModule ./tsconfig.json -t 100000000 tests/transaction.test.ts --exit",
 "build": "yarn tsc",
 "format": "prettier --write \"src/**/*.{ts,js}\"",
 "lint:fix": "prettier */*.js \"*/**/*{.js,.ts}\" -w",
Expand All@@ -28,11 +32,11 @@
 "author": "ananas-block",
 "license": "UNLICENSED",
 "dependencies": {
 "@coral-xyz/anchor": "^0.26.0",
 "@coral-xyz/anchor": "0.26.0",
 "@noble/hashes": "^1.1.5",
 "@solana/spl-account-compression": "^0.1.5",
 "@solana/spl-token": "0.3.7",
 "@solana/web3.js": "1.73.2",
 "@solana/web3.js": "^1.73.2",
 "axios": "^1.3.4",
 "circomlib": "^2.0.5",
 "circomlibjs": "^0.1.7",
Expand Down

12 changes: 10 additions & 2 deletions
light-sdk-ts/src/account.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -196,9 +196,17 @@ export class Account {
 const privkey = new BN(privateKey);
 return new Account({ poseidon, privateKey: privkey });
 }
 static fromPubkey(publicKey: Uint8Array, encPubkey: Uint8Array): Account {
 static fromPubkey(
 publicKey: Uint8Array,
 encPubkey: Uint8Array,
 poseidon: any,
 ): Account {
 const pubKey = new BN(publicKey, undefined, "be");
 return new Account({ publicKey: pubKey, encryptionPublicKey: encPubkey });
 return new Account({
 publicKey: pubKey,
 encryptionPublicKey: encPubkey,
 poseidon,
 });
 }

 static getEncryptionKeyPair(seed: String): nacl.BoxKeyPair {
Expand Down

33 changes: 18 additions & 15 deletions
light-sdk-ts/src/errors.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,21 +5,9 @@ export enum UtxoErrorCode {
 NEGATIVE_AMOUNT = "NEGATIVE_AMOUNT",
 NOT_U64 = "NOT_U64",
 BLINDING_EXCEEDS_SIZE = "BLINDING_EXCEEDS_SIZE",
}

/**
 * @description Thrown when something fails in the Utxo class.
 **/
export class UtxoError extends Error {
 name = this.constructor.name;
 code: string;
 codeMessage: string;

 constructor(code: string, codeMessage: string) {
 super(`Utxo error ${code}: ${codeMessage}`);
 this.code = code;
 this.codeMessage = codeMessage;
 }
 INDEX_NOT_PROVIDED = "INDEX_NOT_PROVIDED",
 ACCOUNT_HAS_NO_PRIVKEY = "ACCOUNT_HAS_NO_PRIVKEY",
 ASSET_NOT_FOUND = "ASSET_NOT_FOUND",
}

export enum ProviderErrorCode {
Expand All@@ -28,9 +16,16 @@ export enum ProviderErrorCode {
 PROVIDER_UNDEFINED = "PROVIDER_UNDEFINED",
}

export enum VerifierErrorCode {
 PUBLIC_INPUTS_UNDEFINED = "PUBLIC_INPUTS_UNDEFINED",
 INVALID_INPUTS_NUMBER = "INVALID_INPUTS_NUMBER",
 ENCRYPTING_UTXOS_UNDEFINED = "ENCRYPTING_UTXOS_UNDEFINED",
}

export enum SolMerkleTreeErrorCode {
 MERKLE_TREE_UNDEFINED = "MERKLE_TREE_UNDEFINED",
}

export enum TransactionParametersErrorCode {
 NO_VERIFIER_PROVIDED = "NO_VERIFIER_PROVIDED",
 NO_POSEIDON_HASHER_PROVIDED = "NO_POSEIDON_HASHER_PROVIDED",
Expand All@@ -49,6 +44,7 @@ export enum TransactionParametersErrorCode {
}

export enum TransactionErrorCode {
 PROVIDER_UNDEFINED = "PROVIDER_UNDEFINED",
 ROOT_INDEX_NOT_FETCHED = "ROOT_INDEX_NOT_FETCHED",
 REMAINING_ACCOUNTS_NOT_CREATED = "REMAINING_ACCOUNTS_NOT_CREATED",
 TRANSACTION_INPUTS_UNDEFINED = "TRANSACTION_INPUTS_UNDEFINED",
Expand DownExpand Up@@ -106,3 +102,10 @@ export class MetaError extends Error {
export class TransactionError extends MetaError {}

export class TransactioParametersError extends MetaError {}

/**
 * @description Thrown when something fails in the Utxo class.
 **/
export class UtxoError extends MetaError {}

export class VerifierError extends MetaError {}

1 change: 1 addition & 0 deletions
light-sdk-ts/src/merkleTree/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
export * from "./solMerkleTree";
export * from "./merkleTreeConfig";
export * from "./merkleTreeUpdater";
export * from "./merkleTree";

1 change: 1 addition & 0 deletions
light-sdk-ts/src/merkleTree/merkleTree.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -100,6 +100,7 @@ export class MerkleTree {
 this._rebuild();
 }

 // TODO: update does not work debug
@SwenSchaeferjohannSwenSchaeferjohannMar 13, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this resolved?
@ananas-blockananas-blockMar 13, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no
 /**
 * Change an element in the tree
 * @param {number} index Index of element to change
Expand Down

50 changes: 24 additions & 26 deletions
light-sdk-ts/src/test-utils/functionalCircuit.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,25 +10,18 @@ import {
 Utxo,
 VerifierZero,
 Action,
 Verifier,
 Provider,
} from "../index";
import * as anchor from "@coral-xyz/anchor";
import { assert, expect } from "chai";
import { Connection, Keypair as SolanaKeypair } from "@solana/web3.js";
const circomlibjs = require("circomlibjs");

export async function functionalCircuitTest() {
 try {
 const provider = new anchor.AnchorProvider(
 await new Connection("http://127.0.0.1:8899"),
 new anchor.Wallet(SolanaKeypair.generate()),
 confirmConfig,
 );
 await anchor.setProvider(provider);
 } catch (error) {
 console.log("expected local test validator to be running");
 process.exit();
 }

export async function functionalCircuitTest(
 verifier: Verifier,
 app: boolean = false,
) {
 const poseidon = await circomlibjs.buildPoseidonOpt();
 let seed32 = new Uint8Array(32).fill(1).toString();
 let keypair = new Account({ poseidon: poseidon, seed: seed32 });
Expand All@@ -43,40 +36,45 @@ export async function functionalCircuitTest() {
 let mockPubkey = SolanaKeypair.generate().publicKey;

 let lightProvider = await LightProvider.loadMock(mockPubkey);

 let txParams = new TransactionParameters({
 outputUtxos: [deposit_utxo1],
 merkleTreePubkey: mockPubkey,
 sender: mockPubkey,
 senderFee: lightProvider.nodeWallet?.publicKey,
 verifier: new VerifierZero(),
 senderFee: lightProvider.nodeWallet!.publicKey,
 verifier: verifier,
 lookUpTable: mockPubkey,
 action: Action.DEPOSIT,
 poseidon,
 lookUpTable: mockPubkey,
 });

 let tx = new Transaction({
 provider: lightProvider,
 params: txParams,
 });
 let tx;

 // successful proofgeneration
 if (app) {
 tx = new Transaction({
 provider: lightProvider,
 params: txParams,
 appParams: { mock: "123" },
 });
 } else {
 tx = new Transaction({
 provider: lightProvider,
 params: txParams,
 });
 }
 await tx.compile();

 await tx.getProof();
 let x = true;
 // unsuccessful proofgeneration
 let x = true;

 try {
 tx.proofInput.inIndices[0][1][1] = "1";
 // TODO: investigate why this does not kill the proof
 tx.proofInput.inIndices[0][1][0] = "1";
 // TODO: switch to async testing framework to catch error
 expect(await tx.getProof()).to.Throw();
 // console.log(tx.input.inIndices[0])
 // console.log(tx.input.inIndices[1])
 x = false;
 } catch (error) {
 // console.log("This is ok the error catching is just fucked.");
 // assert.isTrue(error.toString().includes("CheckIndices_3 line:"));
 assert.isTrue(x);
 }
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
add custom errors transaction, utxo, verifier classes by ananas-block · Pull Request #41 · Lightprotocol/light-protocol · GitHub
Skip to content
add custom errors transaction, utxo, verifier classes#41

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

 Merged

SwenSchaeferjohann
merged 2 commits into

from

Mar 13, 2023
 Merged


add custom errors transaction, utxo, verifier classes
#41
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
7f13141

added custom errors transaction, utxo, verifier classes


ananas-block Mar 13, 2023
022cb0b

relaxed version requirement on solana web3.js


ananas-block Mar 13, 2023

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


61 changes: 1 addition & 60 deletions
light-circuits/tests/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ import {
 Verifier,
 VerifierOne,
 Action,
 functionalCircuitTest,
} from "light-sdk";
import * as anchor from "@coral-xyz/anchor";
import { assert, expect } from "chai";
Expand DownExpand Up@@ -50,63 +51,3 @@ describe("verifier_program", () => {
 await functionalCircuitTest(new VerifierTwo(), true);
 });
});

async function functionalCircuitTest(verifier: Verifier, app: boolean = false) {
 const poseidon = await circomlibjs.buildPoseidonOpt();
 let seed32 = new Uint8Array(32).fill(1).toString();
 let keypair = new Account({ poseidon: poseidon, seed: seed32 });
 let depositAmount = 20_000;
 let depositFeeAmount = 10_000;
 let deposit_utxo1 = new Utxo({
 poseidon: poseidon,
 assets: [FEE_ASSET, MINT],
 amounts: [new anchor.BN(depositFeeAmount), new anchor.BN(depositAmount)],
 account: keypair,
 });
 let mockPubkey = SolanaKeypair.generate().publicKey;

 let lightProvider = await LightProvider.loadMock(mockPubkey);
 let txParams = new TransactionParameters({
 outputUtxos: [deposit_utxo1],
 merkleTreePubkey: mockPubkey,
 sender: mockPubkey,
 senderFee: lightProvider.nodeWallet.publicKey,
 verifier: verifier,
 lookUpTable: mockPubkey,
 action: Action.DEPOSIT,
 poseidon
 });

 let tx 

 // successful proofgeneration
 if (app) {
 tx = new Transaction({
 provider: lightProvider,
 params: txParams,
 appParams: { mock: "123" }
 });
 } else {
 tx = new Transaction({
 provider: lightProvider,
 params: txParams,
 });
 }
 await tx.compile();

 await tx.getProof();
 // unsuccessful proofgeneration
 let x = true;

 try {
 tx.proofInput.inIndices[0][1][1] = "1";
 // TODO: investigate why this does not kill the proof
 tx.proofInput.inIndices[0][1][0] = "1";
 expect(await tx.getProof()).to.Throw();
 x = false;

 } catch (error) {
 // assert.isTrue(error.toString().includes("CheckIndices_3 line:"));
 assert.isTrue(x);
 }
}

4 changes: 2 additions & 2 deletions
light-circuits/yarn.lock

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@
 dependencies:
 regenerator-runtime "^0.13.11"

"@coral-xyz/anchor@^0.26.0":
"@coral-xyz/anchor@0.26.0", "@coral-xyz/anchor@^0.26.0":
 version "0.26.0"
 resolved "https://registry.yarnpkg.com/@coral-xyz/anchor/-/anchor-0.26.0.tgz#c8e4f7177e93441afd030f22d777d54d0194d7d1"
 integrity sha512-PxRl+wu5YyptWiR9F2MBHOLLibm87Z4IMUBPreX+DYBtPM+xggvcPi0KAN7+kIL4IrIhXI8ma5V0MCXxSN1pHg==
Expand DownExpand Up@@ -1397,7 +1397,7 @@ jsonparse@^1.2.0:
"light-sdk@file:../light-sdk-ts":
 version "0.0.1"
 dependencies:
 "@coral-xyz/anchor" "^0.26.0"
 "@coral-xyz/anchor" "0.26.0"
 "@noble/hashes" "^1.1.5"
 "@solana/spl-account-compression" "^0.1.5"
 "@solana/spl-token" "0.3.7"
Expand Down

1 change: 1 addition & 0 deletions
light-macros

Open in desktop


Submodule light-macros
added at
b98829


2 changes: 1 addition & 1 deletion
light-sdk-ts/package-lock.json

View file


Open in desktop


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


8 changes: 6 additions & 2 deletions
light-sdk-ts/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,10 @@
 "main": "lib/index.js",
 "scripts": {
 "test": "ts-mocha --resolveJsonModule ./tsconfig.json -t 100000000 tests/**.ts --exit",
 "test-tx-params": "ts-mocha --resolveJsonModule ./tsconfig.json -t 100000000 tests/transactionParameters.test.ts --exit",
 "test-utxo": "ts-mocha --resolveJsonModule ./tsconfig.json -t 100000000 tests/utxo.test.ts --exit",
 "test-verifiers": "ts-mocha --resolveJsonModule ./tsconfig.json -t 100000000 tests/verifiers.test.ts --exit",
 "test-transaction": "ts-mocha --resolveJsonModule ./tsconfig.json -t 100000000 tests/transaction.test.ts --exit",
 "build": "yarn tsc",
 "format": "prettier --write \"src/**/*.{ts,js}\"",
 "lint:fix": "prettier */*.js \"*/**/*{.js,.ts}\" -w",
Expand All@@ -28,11 +32,11 @@
 "author": "ananas-block",
 "license": "UNLICENSED",
 "dependencies": {
 "@coral-xyz/anchor": "^0.26.0",
 "@coral-xyz/anchor": "0.26.0",
 "@noble/hashes": "^1.1.5",
 "@solana/spl-account-compression": "^0.1.5",
 "@solana/spl-token": "0.3.7",
 "@solana/web3.js": "1.73.2",
 "@solana/web3.js": "^1.73.2",
 "axios": "^1.3.4",
 "circomlib": "^2.0.5",
 "circomlibjs": "^0.1.7",
Expand Down

12 changes: 10 additions & 2 deletions
light-sdk-ts/src/account.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -196,9 +196,17 @@ export class Account {
 const privkey = new BN(privateKey);
 return new Account({ poseidon, privateKey: privkey });
 }
 static fromPubkey(publicKey: Uint8Array, encPubkey: Uint8Array): Account {
 static fromPubkey(
 publicKey: Uint8Array,
 encPubkey: Uint8Array,
 poseidon: any,
 ): Account {
 const pubKey = new BN(publicKey, undefined, "be");
 return new Account({ publicKey: pubKey, encryptionPublicKey: encPubkey });
 return new Account({
 publicKey: pubKey,
 encryptionPublicKey: encPubkey,
 poseidon,
 });
 }

 static getEncryptionKeyPair(seed: String): nacl.BoxKeyPair {
Expand Down

33 changes: 18 additions & 15 deletions
light-sdk-ts/src/errors.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,21 +5,9 @@ export enum UtxoErrorCode {
 NEGATIVE_AMOUNT = "NEGATIVE_AMOUNT",
 NOT_U64 = "NOT_U64",
 BLINDING_EXCEEDS_SIZE = "BLINDING_EXCEEDS_SIZE",
}

/**
 * @description Thrown when something fails in the Utxo class.
 **/
export class UtxoError extends Error {
 name = this.constructor.name;
 code: string;
 codeMessage: string;

 constructor(code: string, codeMessage: string) {
 super(`Utxo error ${code}: ${codeMessage}`);
 this.code = code;
 this.codeMessage = codeMessage;
 }
 INDEX_NOT_PROVIDED = "INDEX_NOT_PROVIDED",
 ACCOUNT_HAS_NO_PRIVKEY = "ACCOUNT_HAS_NO_PRIVKEY",
 ASSET_NOT_FOUND = "ASSET_NOT_FOUND",
}

export enum ProviderErrorCode {
Expand All@@ -28,9 +16,16 @@ export enum ProviderErrorCode {
 PROVIDER_UNDEFINED = "PROVIDER_UNDEFINED",
}

export enum VerifierErrorCode {
 PUBLIC_INPUTS_UNDEFINED = "PUBLIC_INPUTS_UNDEFINED",
 INVALID_INPUTS_NUMBER = "INVALID_INPUTS_NUMBER",
 ENCRYPTING_UTXOS_UNDEFINED = "ENCRYPTING_UTXOS_UNDEFINED",
}

export enum SolMerkleTreeErrorCode {
 MERKLE_TREE_UNDEFINED = "MERKLE_TREE_UNDEFINED",
}

export enum TransactionParametersErrorCode {
 NO_VERIFIER_PROVIDED = "NO_VERIFIER_PROVIDED",
 NO_POSEIDON_HASHER_PROVIDED = "NO_POSEIDON_HASHER_PROVIDED",
Expand All@@ -49,6 +44,7 @@ export enum TransactionParametersErrorCode {
}

export enum TransactionErrorCode {
 PROVIDER_UNDEFINED = "PROVIDER_UNDEFINED",
 ROOT_INDEX_NOT_FETCHED = "ROOT_INDEX_NOT_FETCHED",
 REMAINING_ACCOUNTS_NOT_CREATED = "REMAINING_ACCOUNTS_NOT_CREATED",
 TRANSACTION_INPUTS_UNDEFINED = "TRANSACTION_INPUTS_UNDEFINED",
Expand DownExpand Up@@ -106,3 +102,10 @@ export class MetaError extends Error {
export class TransactionError extends MetaError {}

export class TransactioParametersError extends MetaError {}

/**
 * @description Thrown when something fails in the Utxo class.
 **/
export class UtxoError extends MetaError {}

export class VerifierError extends MetaError {}

1 change: 1 addition & 0 deletions
light-sdk-ts/src/merkleTree/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
export * from "./solMerkleTree";
export * from "./merkleTreeConfig";
export * from "./merkleTreeUpdater";
export * from "./merkleTree";

1 change: 1 addition & 0 deletions
light-sdk-ts/src/merkleTree/merkleTree.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -100,6 +100,7 @@ export class MerkleTree {
 this._rebuild();
 }

 // TODO: update does not work debug
@SwenSchaeferjohannSwenSchaeferjohannMar 13, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this resolved?
@ananas-blockananas-blockMar 13, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no
 /**
 * Change an element in the tree
 * @param {number} index Index of element to change
Expand Down

50 changes: 24 additions & 26 deletions
light-sdk-ts/src/test-utils/functionalCircuit.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,25 +10,18 @@ import {
 Utxo,
 VerifierZero,
 Action,
 Verifier,
 Provider,
} from "../index";
import * as anchor from "@coral-xyz/anchor";
import { assert, expect } from "chai";
import { Connection, Keypair as SolanaKeypair } from "@solana/web3.js";
const circomlibjs = require("circomlibjs");

export async function functionalCircuitTest() {
 try {
 const provider = new anchor.AnchorProvider(
 await new Connection("http://127.0.0.1:8899"),
 new anchor.Wallet(SolanaKeypair.generate()),
 confirmConfig,
 );
 await anchor.setProvider(provider);
 } catch (error) {
 console.log("expected local test validator to be running");
 process.exit();
 }

export async function functionalCircuitTest(
 verifier: Verifier,
 app: boolean = false,
) {
 const poseidon = await circomlibjs.buildPoseidonOpt();
 let seed32 = new Uint8Array(32).fill(1).toString();
 let keypair = new Account({ poseidon: poseidon, seed: seed32 });
Expand All@@ -43,40 +36,45 @@ export async function functionalCircuitTest() {
 let mockPubkey = SolanaKeypair.generate().publicKey;

 let lightProvider = await LightProvider.loadMock(mockPubkey);

 let txParams = new TransactionParameters({
 outputUtxos: [deposit_utxo1],
 merkleTreePubkey: mockPubkey,
 sender: mockPubkey,
 senderFee: lightProvider.nodeWallet?.publicKey,
 verifier: new VerifierZero(),
 senderFee: lightProvider.nodeWallet!.publicKey,
 verifier: verifier,
 lookUpTable: mockPubkey,
 action: Action.DEPOSIT,
 poseidon,
 lookUpTable: mockPubkey,
 });

 let tx = new Transaction({
 provider: lightProvider,
 params: txParams,
 });
 let tx;

 // successful proofgeneration
 if (app) {
 tx = new Transaction({
 provider: lightProvider,
 params: txParams,
 appParams: { mock: "123" },
 });
 } else {
 tx = new Transaction({
 provider: lightProvider,
 params: txParams,
 });
 }
 await tx.compile();

 await tx.getProof();
 let x = true;
 // unsuccessful proofgeneration
 let x = true;

 try {
 tx.proofInput.inIndices[0][1][1] = "1";
 // TODO: investigate why this does not kill the proof
 tx.proofInput.inIndices[0][1][0] = "1";
 // TODO: switch to async testing framework to catch error
 expect(await tx.getProof()).to.Throw();
 // console.log(tx.input.inIndices[0])
 // console.log(tx.input.inIndices[1])
 x = false;
 } catch (error) {
 // console.log("This is ok the error catching is just fucked.");
 // assert.isTrue(error.toString().includes("CheckIndices_3 line:"));
 assert.isTrue(x);
 }
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
add custom errors transaction, utxo, verifier classes by ananas-block · Pull Request #41 · Lightprotocol/light-protocol · GitHub
Skip to content
add custom errors transaction, utxo, verifier classes#41

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

 Merged

SwenSchaeferjohann
merged 2 commits into

from

Mar 13, 2023
 Merged


add custom errors transaction, utxo, verifier classes
#41
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
7f13141

added custom errors transaction, utxo, verifier classes


ananas-block Mar 13, 2023
022cb0b

relaxed version requirement on solana web3.js


ananas-block Mar 13, 2023

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


61 changes: 1 addition & 60 deletions
light-circuits/tests/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ import {
 Verifier,
 VerifierOne,
 Action,
 functionalCircuitTest,
} from "light-sdk";
import * as anchor from "@coral-xyz/anchor";
import { assert, expect } from "chai";
Expand DownExpand Up@@ -50,63 +51,3 @@ describe("verifier_program", () => {
 await functionalCircuitTest(new VerifierTwo(), true);
 });
});

async function functionalCircuitTest(verifier: Verifier, app: boolean = false) {
 const poseidon = await circomlibjs.buildPoseidonOpt();
 let seed32 = new Uint8Array(32).fill(1).toString();
 let keypair = new Account({ poseidon: poseidon, seed: seed32 });
 let depositAmount = 20_000;
 let depositFeeAmount = 10_000;
 let deposit_utxo1 = new Utxo({
 poseidon: poseidon,
 assets: [FEE_ASSET, MINT],
 amounts: [new anchor.BN(depositFeeAmount), new anchor.BN(depositAmount)],
 account: keypair,
 });
 let mockPubkey = SolanaKeypair.generate().publicKey;

 let lightProvider = await LightProvider.loadMock(mockPubkey);
 let txParams = new TransactionParameters({
 outputUtxos: [deposit_utxo1],
 merkleTreePubkey: mockPubkey,
 sender: mockPubkey,
 senderFee: lightProvider.nodeWallet.publicKey,
 verifier: verifier,
 lookUpTable: mockPubkey,
 action: Action.DEPOSIT,
 poseidon
 });

 let tx 

 // successful proofgeneration
 if (app) {
 tx = new Transaction({
 provider: lightProvider,
 params: txParams,
 appParams: { mock: "123" }
 });
 } else {
 tx = new Transaction({
 provider: lightProvider,
 params: txParams,
 });
 }
 await tx.compile();

 await tx.getProof();
 // unsuccessful proofgeneration
 let x = true;

 try {
 tx.proofInput.inIndices[0][1][1] = "1";
 // TODO: investigate why this does not kill the proof
 tx.proofInput.inIndices[0][1][0] = "1";
 expect(await tx.getProof()).to.Throw();
 x = false;

 } catch (error) {
 // assert.isTrue(error.toString().includes("CheckIndices_3 line:"));
 assert.isTrue(x);
 }
}

4 changes: 2 additions & 2 deletions
light-circuits/yarn.lock

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@
 dependencies:
 regenerator-runtime "^0.13.11"

"@coral-xyz/anchor@^0.26.0":
"@coral-xyz/anchor@0.26.0", "@coral-xyz/anchor@^0.26.0":
 version "0.26.0"
 resolved "https://registry.yarnpkg.com/@coral-xyz/anchor/-/anchor-0.26.0.tgz#c8e4f7177e93441afd030f22d777d54d0194d7d1"
 integrity sha512-PxRl+wu5YyptWiR9F2MBHOLLibm87Z4IMUBPreX+DYBtPM+xggvcPi0KAN7+kIL4IrIhXI8ma5V0MCXxSN1pHg==
Expand DownExpand Up@@ -1397,7 +1397,7 @@ jsonparse@^1.2.0:
"light-sdk@file:../light-sdk-ts":
 version "0.0.1"
 dependencies:
 "@coral-xyz/anchor" "^0.26.0"
 "@coral-xyz/anchor" "0.26.0"
 "@noble/hashes" "^1.1.5"
 "@solana/spl-account-compression" "^0.1.5"
 "@solana/spl-token" "0.3.7"
Expand Down

1 change: 1 addition & 0 deletions
light-macros

Open in desktop


Submodule light-macros
added at
b98829


2 changes: 1 addition & 1 deletion
light-sdk-ts/package-lock.json

View file


Open in desktop


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


8 changes: 6 additions & 2 deletions
light-sdk-ts/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,10 @@
 "main": "lib/index.js",
 "scripts": {
 "test": "ts-mocha --resolveJsonModule ./tsconfig.json -t 100000000 tests/**.ts --exit",
 "test-tx-params": "ts-mocha --resolveJsonModule ./tsconfig.json -t 100000000 tests/transactionParameters.test.ts --exit",
 "test-utxo": "ts-mocha --resolveJsonModule ./tsconfig.json -t 100000000 tests/utxo.test.ts --exit",
 "test-verifiers": "ts-mocha --resolveJsonModule ./tsconfig.json -t 100000000 tests/verifiers.test.ts --exit",
 "test-transaction": "ts-mocha --resolveJsonModule ./tsconfig.json -t 100000000 tests/transaction.test.ts --exit",
 "build": "yarn tsc",
 "format": "prettier --write \"src/**/*.{ts,js}\"",
 "lint:fix": "prettier */*.js \"*/**/*{.js,.ts}\" -w",
Expand All@@ -28,11 +32,11 @@
 "author": "ananas-block",
 "license": "UNLICENSED",
 "dependencies": {
 "@coral-xyz/anchor": "^0.26.0",
 "@coral-xyz/anchor": "0.26.0",
 "@noble/hashes": "^1.1.5",
 "@solana/spl-account-compression": "^0.1.5",
 "@solana/spl-token": "0.3.7",
 "@solana/web3.js": "1.73.2",
 "@solana/web3.js": "^1.73.2",
 "axios": "^1.3.4",
 "circomlib": "^2.0.5",
 "circomlibjs": "^0.1.7",
Expand Down

12 changes: 10 additions & 2 deletions
light-sdk-ts/src/account.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -196,9 +196,17 @@ export class Account {
 const privkey = new BN(privateKey);
 return new Account({ poseidon, privateKey: privkey });
 }
 static fromPubkey(publicKey: Uint8Array, encPubkey: Uint8Array): Account {
 static fromPubkey(
 publicKey: Uint8Array,
 encPubkey: Uint8Array,
 poseidon: any,
 ): Account {
 const pubKey = new BN(publicKey, undefined, "be");
 return new Account({ publicKey: pubKey, encryptionPublicKey: encPubkey });
 return new Account({
 publicKey: pubKey,
 encryptionPublicKey: encPubkey,
 poseidon,
 });
 }

 static getEncryptionKeyPair(seed: String): nacl.BoxKeyPair {
Expand Down

33 changes: 18 additions & 15 deletions
light-sdk-ts/src/errors.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,21 +5,9 @@ export enum UtxoErrorCode {
 NEGATIVE_AMOUNT = "NEGATIVE_AMOUNT",
 NOT_U64 = "NOT_U64",
 BLINDING_EXCEEDS_SIZE = "BLINDING_EXCEEDS_SIZE",
}

/**
 * @description Thrown when something fails in the Utxo class.
 **/
export class UtxoError extends Error {
 name = this.constructor.name;
 code: string;
 codeMessage: string;

 constructor(code: string, codeMessage: string) {
 super(`Utxo error ${code}: ${codeMessage}`);
 this.code = code;
 this.codeMessage = codeMessage;
 }
 INDEX_NOT_PROVIDED = "INDEX_NOT_PROVIDED",
 ACCOUNT_HAS_NO_PRIVKEY = "ACCOUNT_HAS_NO_PRIVKEY",
 ASSET_NOT_FOUND = "ASSET_NOT_FOUND",
}

export enum ProviderErrorCode {
Expand All@@ -28,9 +16,16 @@ export enum ProviderErrorCode {
 PROVIDER_UNDEFINED = "PROVIDER_UNDEFINED",
}

export enum VerifierErrorCode {
 PUBLIC_INPUTS_UNDEFINED = "PUBLIC_INPUTS_UNDEFINED",
 INVALID_INPUTS_NUMBER = "INVALID_INPUTS_NUMBER",
 ENCRYPTING_UTXOS_UNDEFINED = "ENCRYPTING_UTXOS_UNDEFINED",
}

export enum SolMerkleTreeErrorCode {
 MERKLE_TREE_UNDEFINED = "MERKLE_TREE_UNDEFINED",
}

export enum TransactionParametersErrorCode {
 NO_VERIFIER_PROVIDED = "NO_VERIFIER_PROVIDED",
 NO_POSEIDON_HASHER_PROVIDED = "NO_POSEIDON_HASHER_PROVIDED",
Expand All@@ -49,6 +44,7 @@ export enum TransactionParametersErrorCode {
}

export enum TransactionErrorCode {
 PROVIDER_UNDEFINED = "PROVIDER_UNDEFINED",
 ROOT_INDEX_NOT_FETCHED = "ROOT_INDEX_NOT_FETCHED",
 REMAINING_ACCOUNTS_NOT_CREATED = "REMAINING_ACCOUNTS_NOT_CREATED",
 TRANSACTION_INPUTS_UNDEFINED = "TRANSACTION_INPUTS_UNDEFINED",
Expand DownExpand Up@@ -106,3 +102,10 @@ export class MetaError extends Error {
export class TransactionError extends MetaError {}

export class TransactioParametersError extends MetaError {}

/**
 * @description Thrown when something fails in the Utxo class.
 **/
export class UtxoError extends MetaError {}

export class VerifierError extends MetaError {}

1 change: 1 addition & 0 deletions
light-sdk-ts/src/merkleTree/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
export * from "./solMerkleTree";
export * from "./merkleTreeConfig";
export * from "./merkleTreeUpdater";
export * from "./merkleTree";

1 change: 1 addition & 0 deletions
light-sdk-ts/src/merkleTree/merkleTree.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -100,6 +100,7 @@ export class MerkleTree {
 this._rebuild();
 }

 // TODO: update does not work debug
@SwenSchaeferjohannSwenSchaeferjohannMar 13, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this resolved?
@ananas-blockananas-blockMar 13, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no
 /**
 * Change an element in the tree
 * @param {number} index Index of element to change
Expand Down

50 changes: 24 additions & 26 deletions
light-sdk-ts/src/test-utils/functionalCircuit.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,25 +10,18 @@ import {
 Utxo,
 VerifierZero,
 Action,
 Verifier,
 Provider,
} from "../index";
import * as anchor from "@coral-xyz/anchor";
import { assert, expect } from "chai";
import { Connection, Keypair as SolanaKeypair } from "@solana/web3.js";
const circomlibjs = require("circomlibjs");

export async function functionalCircuitTest() {
 try {
 const provider = new anchor.AnchorProvider(
 await new Connection("http://127.0.0.1:8899"),
 new anchor.Wallet(SolanaKeypair.generate()),
 confirmConfig,
 );
 await anchor.setProvider(provider);
 } catch (error) {
 console.log("expected local test validator to be running");
 process.exit();
 }

export async function functionalCircuitTest(
 verifier: Verifier,
 app: boolean = false,
) {
 const poseidon = await circomlibjs.buildPoseidonOpt();
 let seed32 = new Uint8Array(32).fill(1).toString();
 let keypair = new Account({ poseidon: poseidon, seed: seed32 });
Expand All@@ -43,40 +36,45 @@ export async function functionalCircuitTest() {
 let mockPubkey = SolanaKeypair.generate().publicKey;

 let lightProvider = await LightProvider.loadMock(mockPubkey);

 let txParams = new TransactionParameters({
 outputUtxos: [deposit_utxo1],
 merkleTreePubkey: mockPubkey,
 sender: mockPubkey,
 senderFee: lightProvider.nodeWallet?.publicKey,
 verifier: new VerifierZero(),
 senderFee: lightProvider.nodeWallet!.publicKey,
 verifier: verifier,
 lookUpTable: mockPubkey,
 action: Action.DEPOSIT,
 poseidon,
 lookUpTable: mockPubkey,
 });

 let tx = new Transaction({
 provider: lightProvider,
 params: txParams,
 });
 let tx;

 // successful proofgeneration
 if (app) {
 tx = new Transaction({
 provider: lightProvider,
 params: txParams,
 appParams: { mock: "123" },
 });
 } else {
 tx = new Transaction({
 provider: lightProvider,
 params: txParams,
 });
 }
 await tx.compile();

 await tx.getProof();
 let x = true;
 // unsuccessful proofgeneration
 let x = true;

 try {
 tx.proofInput.inIndices[0][1][1] = "1";
 // TODO: investigate why this does not kill the proof
 tx.proofInput.inIndices[0][1][0] = "1";
 // TODO: switch to async testing framework to catch error
 expect(await tx.getProof()).to.Throw();
 // console.log(tx.input.inIndices[0])
 // console.log(tx.input.inIndices[1])
 x = false;
 } catch (error) {
 // console.log("This is ok the error catching is just fucked.");
 // assert.isTrue(error.toString().includes("CheckIndices_3 line:"));
 assert.isTrue(x);
 }
Expand Down
Loading