Refactored user and add custom errors#56

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 23, 2023
Merged

Refactored user and add custom errors #56

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
d4cbc73
refactored user class, and added custom errors
ananas-block Mar 23, 2023
3dcb4de
resolved rebase errors
ananas-block Mar 23, 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
4 changes: 2 additions & 2 deletions light-sdk-ts/src/constants.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -144,14 +144,14 @@ export const RELAYER_FEES = 1e6;
export const TOKEN_REGISTRY = [
{
symbol: "SOL",
decimals: 1e9,
decimals: new anchor.BN(1e9),
isNft: false, // TODO: parse from onchain state at configuration(decimlas, supply)
isSol: true,
tokenAccount: SystemProgram.programId,
},
{
symbol: "USDC",
decimals: 1e2,
decimals: new anchor.BN(1e2),
isNft: false,
isSol: false,
// copied from MINT (test-utils)
Expand Down
25 changes: 23 additions & 2 deletions light-sdk-ts/src/errors.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
import { ASSOCIATED_PROGRAM_ID } from "@coral-xyz/anchor/dist/cjs/utils/token";

export enum UtxoErrorCode {
APP_DATA_FROM_BYTES_FUNCTION_UNDEFINED = "APP_DATA_FROM_BYTES_FUNCTION_UNDEFINED",
INVALID_ASSET_OR_AMOUNTS_LENGTH = "INVALID_ASSET_OR_AMOUNTS_LENGTH",
Expand All@@ -10,6 +12,23 @@ export enum UtxoErrorCode {
ASSET_NOT_FOUND = "ASSET_NOT_FOUND",
}

export enum UserErrorCode {
NO_WALLET_PROVIDED = "NO_WALLET_PROVIDED",
LOAD_ERROR = "LOAD_ERROR",
PROVIDER_NOT_INITIALIZED = "PROVIDER_NOT_INITIALIZED",
UTXOS_NOT_INITIALIZED = "UTXOS_NOT_INITIALIZED",
USER_ACCOUNT_NOT_INITIALIZED = "USER_ACCOUNT_NOT_INITIALIZED",
TOKEN_NOT_FOUND = "TOKEN_NOT_FOUND",
NO_AMOUNTS_PROVIDED = "NO_AMOUNTS_PROVIDED",
APPROVE_ERROR = "APPROVE_ERROR",
INSUFFICIENT_BAlANCE = "INSUFFICIENT_BAlANCE",
ASSOCIATED_TOKEN_ACCOUNT_DOESNT_EXIST = "ASSOCIATED_TOKEN_ACCOUNT_DOESNT_EXIST",
TOKEN_ACCOUNT_DEFINED = "TOKEN_ACCOUNT_DEFINED",
SHIELDED_RECIPIENT_UNDEFINED = "SHIELDED_RECIPIENT_UNDEFINED",
TOKEN_UNDEFINED = "TOKEN_UNDEFINED",
INVALID_TOKEN = "INVALID_TOKEN",
}

export enum SelectInUtxosErrorCode {
INVALID_NUMER_OF_MINTS = "INVALID_NUMER_OF_MINTS",
FAILED_TO_SELECT_SOL_UTXO = "FAILED_TO_SELECT_SOL_UTXO",
Expand All@@ -27,8 +46,8 @@ export enum CreateUtxoErrorCode {
INVALID_NUMER_OF_RECIPIENTS = "INVALID_NUMER_OF_RECIPIENTS",
INVALID_RECIPIENT_MINT = "INVALID_RECIPIENT_MINT",
RECIPIENTS_SUM_AMOUNT_MISSMATCH = "RECIPIENTS_SUM_AMOUNT_MISSMATCH",
NO_PUBLIC_AMOUNTS_PROVIDED = "NO_PUBLIC_AMOUNTS_PROVIDED_FOR_UNSHIELD",
NO_PUBLIC_MINT_PROVIDED = "NO_PUBLIC_MINT_PROVIDED_FOR_UNSHIELD",
NO_PUBLIC_AMOUNTS_PROVIDED = "NO_PUBLIC_AMOUNTS_PROVIDED",
NO_PUBLIC_MINT_PROVIDED = "NO_PUBLIC_MINT_PROVIDED",
MINT_UNDEFINED = "MINT_UNDEFINED",
SPL_AMOUNT_UNDEFINED = "SPL_AMOUNT_UNDEFINED",
ACCOUNT_UNDEFINED = "ACCOUNT_UNDEFINED",
Expand DownExpand Up@@ -165,3 +184,5 @@ export class CreateUtxoError extends MetaError {}
export class ProviderError extends MetaError {}

export class SelectInUtxosError extends MetaError {}

export class UserError extends MetaError {}
30 changes: 14 additions & 16 deletions light-sdk-ts/src/test-utils/createAccounts.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -243,14 +243,9 @@ export async function createTestAccounts(
let balance = await connection.getBalance(ADMIN_AUTH_KEY, "confirmed");
if (balance === 0) {
let amount = 1_000_000_000_000;
console.time("requestAirdrop");

let res = await connection.requestAirdrop(ADMIN_AUTH_KEY, amount);
console.timeEnd("requestAirdrop");
console.time("confirmAirdrop");

await connection.confirmTransaction(res, "confirmed");
console.timeEnd("confirmAirdrop");

let Newbalance = await connection.getBalance(ADMIN_AUTH_KEY);

Expand DownExpand Up@@ -287,7 +282,10 @@ export async function createTestAccounts(
mintKeypair: Keypair.fromSecretKey(MINT_PRIVATE_KEY),
connection,
});
console.log("created mint");
console.log(
"created mint ",
Keypair.fromSecretKey(MINT_PRIVATE_KEY).publicKey.toBase58(),
);
}

let balanceUserToken = null;
Expand DownExpand Up@@ -330,17 +328,17 @@ export async function createTestAccounts(
} catch (error) {
console.log(error);
}
console.log("userSplAccount ", userSplAccount);
console.log("userSplAccount ", userSplAccount?.toBase58());

console.log(
"funded account",
await getAccount(
connection,
userSplAccount!, //userTokenAccount,
"confirmed",
TOKEN_PROGRAM_ID,
),
);
// console.log(
// "funded account",
// await getAccount(
// connection,
// userSplAccount!, //userTokenAccount,
// "confirmed",
// TOKEN_PROGRAM_ID,
// ),
// );

try {
if (balanceUserToken == null) {
Expand Down
22 changes: 11 additions & 11 deletions light-sdk-ts/src/test-utils/setUpMerkleTree.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -58,16 +58,16 @@ export async function setUpMerkleTree(provider: anchor.Provider) {
console.log(e);
}

console.log("AUTHORITY: ", AUTHORITY);
// console.log("AUTHORITY: ", AUTHORITY);

console.log("AUTHORITY: ", Array.from(AUTHORITY.toBytes()));
// console.log("AUTHORITY: ", Array.from(AUTHORITY.toBytes()));

console.log(
"verifierProgramZero.programId: ",
Array.from(verifierProgramZero.programId.toBytes()),
);
console.log("MERKLE_TREE_KEY: ", MERKLE_TREE_KEY.toBase58());
console.log("MERKLE_TREE_KEY: ", Array.from(MERKLE_TREE_KEY.toBytes()));
// console.log(
// "verifierProgramZero.programId: ",
// Array.from(verifierProgramZero.programId.toBytes()),
// );
// console.log("MERKLE_TREE_KEY: ", MERKLE_TREE_KEY.toBase58());
// console.log("MERKLE_TREE_KEY: ", Array.from(MERKLE_TREE_KEY.toBytes()));
// console.log("MERKLE_TREE_PDA_TOKEN: ", MERKLE_TREE_PDA_TOKEN.toBase58())
// console.log("MERKLE_TREE_PDA_TOKEN: ", Array.from(MERKLE_TREE_PDA_TOKEN.toBytes()))

Expand DownExpand Up@@ -100,7 +100,7 @@ export async function setUpMerkleTree(provider: anchor.Provider) {

try {
await merkleTreeConfig.registerVerifier(verifierProgramTwo.programId);
console.log("Registering Verifier One success");
console.log("Registering Verifier Two success");
} catch (e) {
console.log(e);
}
Expand All@@ -112,8 +112,8 @@ export async function setUpMerkleTree(provider: anchor.Provider) {
console.log(e);
}

console.log("MINT: ", MINT.toBase58());
console.log("POOL_TYPE_PDA: ", REGISTERED_POOL_PDA_SPL.toBase58());
// console.log("MINT: ", MINT.toBase58());
// console.log("POOL_TYPE_PDA: ", REGISTERED_POOL_PDA_SPL.toBase58());
try {
await merkleTreeConfig.registerSplPool(POOL_TYPE, MINT);
console.log("Registering spl pool success");
Expand Down
17 changes: 7 additions & 10 deletions light-sdk-ts/src/wallet/buildBalance.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -131,13 +131,13 @@ export async function getUnspentUtxos({
let accountInfo = await provider.connection.getAccountInfo(
nullifierPubkey,
);
console.log(
"inserted -- spent?",
accountInfo ? "yes" : "no ",
nullifierPubkey.toBase58(),
"amount:",
decryptedUtxo.amounts[0].toNumber(),
);
// console.log(
// "inserted -- spent?",
// accountInfo ? "yes" : "no ",
// nullifierPubkey.toBase58(),
// "amount:",
// decryptedUtxo.amounts[0].toNumber(),
// );
if (
!accountInfo &&
(decryptedUtxo.amounts[1].toString() !== "0" ||
Expand All@@ -147,9 +147,6 @@ export async function getUnspentUtxos({
}
}
}
if (decryptedUtxos.length == 0) {
console.log("no unspent leaf found");
}

return decryptedUtxos;
}
44 changes: 19 additions & 25 deletions light-sdk-ts/src/wallet/createOutUtxos.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -80,17 +80,17 @@ export function createOutUtxos({
poseidon,
inUtxos,
publicMint,
publicSplAmount,
publicSolAmount,
publicAmountSpl,
publicAmountSol,
relayerFee,
changeUtxoAccount,
recipients = [],
action,
}: {
inUtxos?: Utxo[];
publicMint?: PublicKey;
publicSplAmount?: BN;
publicSolAmount?: BN;
publicAmountSpl?: BN;
publicAmountSol?: BN;
relayerFee?: BN;
poseidon: any;
changeUtxoAccount: Account;
Expand All@@ -105,8 +105,8 @@ export function createOutUtxos({
);

if (relayerFee) {
publicSolAmount = publicSolAmount
? publicSolAmount.add(relayerFee)
publicAmountSol = publicAmountSol
? publicAmountSol.add(relayerFee)
: relayerFee;
}

Expand DownExpand Up@@ -192,20 +192,20 @@ export function createOutUtxos({

// subtract public amounts from sumIns
if (action === Action.UNSHIELD) {
if (!publicSolAmount && !publicSplAmount)
if (!publicAmountSol && !publicAmountSpl)
throw new CreateUtxoError(
CreateUtxoErrorCode.NO_PUBLIC_AMOUNTS_PROVIDED,
"createOutUtxos",
"publicSolAmount not initialized for unshield",
"publicAmountSol not initialized for unshield",
);
if (!publicSplAmount) publicSplAmount = new BN(0);
if (!publicSolAmount)
if (!publicAmountSpl) publicAmountSpl = new BN(0);
if (!publicAmountSol)
throw new CreateUtxoError(
CreateUtxoErrorCode.PUBLIC_SOL_AMOUNT_UNDEFINED,
"constructor",
);

if (publicSplAmount && !publicMint)
if (publicAmountSpl && !publicMint)
throw new CreateUtxoError(
CreateUtxoErrorCode.NO_PUBLIC_MINT_PROVIDED,
"createOutUtxos",
Expand All@@ -217,9 +217,9 @@ export function createOutUtxos({
);

assets[publicSplAssetIndex].sumIn =
assets[publicSplAssetIndex].sumIn.sub(publicSplAmount);
assets[publicSplAssetIndex].sumIn.sub(publicAmountSpl);
assets[publicSolAssetIndex].sumIn =
assets[publicSolAssetIndex].sumIn.sub(publicSolAmount);
assets[publicSolAssetIndex].sumIn.sub(publicAmountSol);
// add public amounts to sumIns
} else if (action === Action.SHIELD) {
if (relayerFee)
Expand All@@ -228,26 +228,20 @@ export function createOutUtxos({
"createOutUtxos",
"Shield and relayer fee defined",
);
if (!publicSolAmount && !publicSplAmount)
throw new CreateUtxoError(
CreateUtxoErrorCode.NO_PUBLIC_AMOUNTS_PROVIDED,
"createOutUtxos",
"publicSolAmount not initialized for unshield",
);
if (!publicSplAmount) publicSplAmount = new BN(0);
if (!publicSolAmount) publicSolAmount = new BN(0);
if (!publicAmountSpl) publicAmountSpl = new BN(0);
if (!publicAmountSol) publicAmountSol = new BN(0);
let publicSplAssetIndex = assets.findIndex(
(x) => x.asset.toBase58() === publicMint?.toBase58(),
);
let publicSolAssetIndex = assets.findIndex(
(x) => x.asset.toBase58() === SystemProgram.programId.toBase58(),
);
assets[publicSplAssetIndex].sumIn =
assets[publicSplAssetIndex].sumIn.add(publicSplAmount);
assets[publicSplAssetIndex].sumIn.add(publicAmountSpl);
assets[publicSolAssetIndex].sumIn =
assets[publicSolAssetIndex].sumIn.add(publicSolAmount);
assets[publicSolAssetIndex].sumIn.add(publicAmountSol);
} else if (action === Action.TRANSFER) {
if (!publicSolAmount)
if (!publicAmountSol)
throw new CreateUtxoError(
CreateUtxoErrorCode.PUBLIC_SOL_AMOUNT_UNDEFINED,
"constructor",
Expand All@@ -257,7 +251,7 @@ export function createOutUtxos({
);

assets[publicSolAssetIndex].sumIn =
assets[publicSolAssetIndex].sumIn.sub(publicSolAmount);
assets[publicSolAssetIndex].sumIn.sub(publicAmountSol);
}

var outputUtxos: Utxo[] = [];
Expand Down
15 changes: 12 additions & 3 deletions light-sdk-ts/src/wallet/provider.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
import { AnchorProvider, setProvider } from "@coral-xyz/anchor";
import {
AnchorError,
AnchorProvider,
BN,
setProvider,
Wallet,
} from "@coral-xyz/anchor";
import { SolMerkleTree } from "../merkleTree";
import {
PublicKey,
Expand DownExpand Up@@ -37,8 +43,8 @@ export class Provider {
solMerkleTree?: SolMerkleTree;
provider?: AnchorProvider | { connection: Connection }; // temp -?
url?: string;
// TODO: refactor by streamlining everything towards using connection and not anchor provider
// - get rid of url
minimumLamports: BN;

/**
* Init either with nodeWallet or browserWallet. Feepayer is the provided wallet
* Optionally provide confirmConfig, Default = 'confirmed'.
Expand All@@ -49,12 +55,14 @@ export class Provider {
confirmConfig,
connection,
url = "http://127.0.0.1:8899",
minimumLamports = new BN(5000 * 30),
}: {
nodeWallet?: SolanaKeypair;
browserWallet?: BrowserWallet;
confirmConfig?: ConfirmOptions;
connection?: Connection;
url?: string;
minimumLamports?: BN;
}) {
if (nodeWallet && browserWallet)
throw new ProviderError(
Expand DownExpand Up@@ -82,6 +90,7 @@ export class Provider {
);

this.confirmConfig = confirmConfig || { commitment: "confirmed" };
this.minimumLamports = minimumLamports;

if (nodeWallet) {
this.nodeWallet = nodeWallet;
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n 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;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Refactored user and add custom errors#56

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 23, 2023
 Merged


Refactored user and add custom errors
#56
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
d4cbc73

refactored user class, and added custom errors


ananas-block Mar 23, 2023
3dcb4de

resolved rebase errors


ananas-block Mar 23, 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


4 changes: 2 additions & 2 deletions
light-sdk-ts/src/constants.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -144,14 +144,14 @@ export const RELAYER_FEES = 1e6;
export const TOKEN_REGISTRY = [
 {
 symbol: "SOL",
 decimals: 1e9,
 decimals: new anchor.BN(1e9),
 isNft: false, // TODO: parse from onchain state at configuration(decimlas, supply)
 isSol: true,
 tokenAccount: SystemProgram.programId,
 },
 {
 symbol: "USDC",
 decimals: 1e2,
 decimals: new anchor.BN(1e2),
 isNft: false,
 isSol: false,
 // copied from MINT (test-utils)
Expand Down

25 changes: 23 additions & 2 deletions
light-sdk-ts/src/errors.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
import { ASSOCIATED_PROGRAM_ID } from "@coral-xyz/anchor/dist/cjs/utils/token";

export enum UtxoErrorCode {
 APP_DATA_FROM_BYTES_FUNCTION_UNDEFINED = "APP_DATA_FROM_BYTES_FUNCTION_UNDEFINED",
 INVALID_ASSET_OR_AMOUNTS_LENGTH = "INVALID_ASSET_OR_AMOUNTS_LENGTH",
Expand All@@ -10,6 +12,23 @@ export enum UtxoErrorCode {
 ASSET_NOT_FOUND = "ASSET_NOT_FOUND",
}

export enum UserErrorCode {
 NO_WALLET_PROVIDED = "NO_WALLET_PROVIDED",
 LOAD_ERROR = "LOAD_ERROR",
 PROVIDER_NOT_INITIALIZED = "PROVIDER_NOT_INITIALIZED",
 UTXOS_NOT_INITIALIZED = "UTXOS_NOT_INITIALIZED",
 USER_ACCOUNT_NOT_INITIALIZED = "USER_ACCOUNT_NOT_INITIALIZED",
 TOKEN_NOT_FOUND = "TOKEN_NOT_FOUND",
 NO_AMOUNTS_PROVIDED = "NO_AMOUNTS_PROVIDED",
 APPROVE_ERROR = "APPROVE_ERROR",
 INSUFFICIENT_BAlANCE = "INSUFFICIENT_BAlANCE",
 ASSOCIATED_TOKEN_ACCOUNT_DOESNT_EXIST = "ASSOCIATED_TOKEN_ACCOUNT_DOESNT_EXIST",
 TOKEN_ACCOUNT_DEFINED = "TOKEN_ACCOUNT_DEFINED",
 SHIELDED_RECIPIENT_UNDEFINED = "SHIELDED_RECIPIENT_UNDEFINED",
 TOKEN_UNDEFINED = "TOKEN_UNDEFINED",
 INVALID_TOKEN = "INVALID_TOKEN",
}

export enum SelectInUtxosErrorCode {
 INVALID_NUMER_OF_MINTS = "INVALID_NUMER_OF_MINTS",
 FAILED_TO_SELECT_SOL_UTXO = "FAILED_TO_SELECT_SOL_UTXO",
Expand All@@ -27,8 +46,8 @@ export enum CreateUtxoErrorCode {
 INVALID_NUMER_OF_RECIPIENTS = "INVALID_NUMER_OF_RECIPIENTS",
 INVALID_RECIPIENT_MINT = "INVALID_RECIPIENT_MINT",
 RECIPIENTS_SUM_AMOUNT_MISSMATCH = "RECIPIENTS_SUM_AMOUNT_MISSMATCH",
 NO_PUBLIC_AMOUNTS_PROVIDED = "NO_PUBLIC_AMOUNTS_PROVIDED_FOR_UNSHIELD",
 NO_PUBLIC_MINT_PROVIDED = "NO_PUBLIC_MINT_PROVIDED_FOR_UNSHIELD",
 NO_PUBLIC_AMOUNTS_PROVIDED = "NO_PUBLIC_AMOUNTS_PROVIDED",
 NO_PUBLIC_MINT_PROVIDED = "NO_PUBLIC_MINT_PROVIDED",
 MINT_UNDEFINED = "MINT_UNDEFINED",
 SPL_AMOUNT_UNDEFINED = "SPL_AMOUNT_UNDEFINED",
 ACCOUNT_UNDEFINED = "ACCOUNT_UNDEFINED",
Expand DownExpand Up@@ -165,3 +184,5 @@ export class CreateUtxoError extends MetaError {}
export class ProviderError extends MetaError {}

export class SelectInUtxosError extends MetaError {}

export class UserError extends MetaError {}

30 changes: 14 additions & 16 deletions
light-sdk-ts/src/test-utils/createAccounts.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -243,14 +243,9 @@ export async function createTestAccounts(
 let balance = await connection.getBalance(ADMIN_AUTH_KEY, "confirmed");
 if (balance === 0) {
 let amount = 1_000_000_000_000;
 console.time("requestAirdrop");

 let res = await connection.requestAirdrop(ADMIN_AUTH_KEY, amount);
 console.timeEnd("requestAirdrop");
 console.time("confirmAirdrop");

 await connection.confirmTransaction(res, "confirmed");
 console.timeEnd("confirmAirdrop");

 let Newbalance = await connection.getBalance(ADMIN_AUTH_KEY);

Expand DownExpand Up@@ -287,7 +282,10 @@ export async function createTestAccounts(
 mintKeypair: Keypair.fromSecretKey(MINT_PRIVATE_KEY),
 connection,
 });
 console.log("created mint");
 console.log(
 "created mint ",
 Keypair.fromSecretKey(MINT_PRIVATE_KEY).publicKey.toBase58(),
 );
 }

 let balanceUserToken = null;
Expand DownExpand Up@@ -330,17 +328,17 @@ export async function createTestAccounts(
 } catch (error) {
 console.log(error);
 }
 console.log("userSplAccount ", userSplAccount);
 console.log("userSplAccount ", userSplAccount?.toBase58());

 console.log(
 "funded account",
 await getAccount(
 connection,
 userSplAccount!, //userTokenAccount,
 "confirmed",
 TOKEN_PROGRAM_ID,
 ),
 );
// console.log(
//  "funded account",
//  await getAccount(
//  connection,
//  userSplAccount!, //userTokenAccount,
//  "confirmed",
//  TOKEN_PROGRAM_ID,
//  ),
// );

 try {
 if (balanceUserToken == null) {
Expand Down

22 changes: 11 additions & 11 deletions
light-sdk-ts/src/test-utils/setUpMerkleTree.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -58,16 +58,16 @@ export async function setUpMerkleTree(provider: anchor.Provider) {
 console.log(e);
 }

 console.log("AUTHORITY: ", AUTHORITY);
// console.log("AUTHORITY: ", AUTHORITY);

 console.log("AUTHORITY: ", Array.from(AUTHORITY.toBytes()));
// console.log("AUTHORITY: ", Array.from(AUTHORITY.toBytes()));

 console.log(
 "verifierProgramZero.programId: ",
 Array.from(verifierProgramZero.programId.toBytes()),
 );
 console.log("MERKLE_TREE_KEY: ", MERKLE_TREE_KEY.toBase58());
 console.log("MERKLE_TREE_KEY: ", Array.from(MERKLE_TREE_KEY.toBytes()));
// console.log(
//  "verifierProgramZero.programId: ",
//  Array.from(verifierProgramZero.programId.toBytes()),
// );
// console.log("MERKLE_TREE_KEY: ", MERKLE_TREE_KEY.toBase58());
// console.log("MERKLE_TREE_KEY: ", Array.from(MERKLE_TREE_KEY.toBytes()));
 // console.log("MERKLE_TREE_PDA_TOKEN: ", MERKLE_TREE_PDA_TOKEN.toBase58())
 // console.log("MERKLE_TREE_PDA_TOKEN: ", Array.from(MERKLE_TREE_PDA_TOKEN.toBytes()))

Expand DownExpand Up@@ -100,7 +100,7 @@ export async function setUpMerkleTree(provider: anchor.Provider) {

 try {
 await merkleTreeConfig.registerVerifier(verifierProgramTwo.programId);
 console.log("Registering Verifier One success");
 console.log("Registering Verifier Two success");
 } catch (e) {
 console.log(e);
 }
Expand All@@ -112,8 +112,8 @@ export async function setUpMerkleTree(provider: anchor.Provider) {
 console.log(e);
 }

 console.log("MINT: ", MINT.toBase58());
 console.log("POOL_TYPE_PDA: ", REGISTERED_POOL_PDA_SPL.toBase58());
// console.log("MINT: ", MINT.toBase58());
// console.log("POOL_TYPE_PDA: ", REGISTERED_POOL_PDA_SPL.toBase58());
 try {
 await merkleTreeConfig.registerSplPool(POOL_TYPE, MINT);
 console.log("Registering spl pool success");
Expand Down

17 changes: 7 additions & 10 deletions
light-sdk-ts/src/wallet/buildBalance.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -131,13 +131,13 @@ export async function getUnspentUtxos({
 let accountInfo = await provider.connection.getAccountInfo(
 nullifierPubkey,
 );
 console.log(
 "inserted -- spent?",
 accountInfo ? "yes" : "no ",
 nullifierPubkey.toBase58(),
 "amount:",
 decryptedUtxo.amounts[0].toNumber(),
 );
// console.log(
//  "inserted -- spent?",
//  accountInfo ? "yes" : "no ",
//  nullifierPubkey.toBase58(),
//  "amount:",
//  decryptedUtxo.amounts[0].toNumber(),
// );
 if (
 !accountInfo &&
 (decryptedUtxo.amounts[1].toString() !== "0" ||
Expand All@@ -147,9 +147,6 @@ export async function getUnspentUtxos({
 }
 }
 }
 if (decryptedUtxos.length == 0) {
 console.log("no unspent leaf found");
 }

 return decryptedUtxos;
}

44 changes: 19 additions & 25 deletions
light-sdk-ts/src/wallet/createOutUtxos.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,17 +80,17 @@ export function createOutUtxos({
 poseidon,
 inUtxos,
 publicMint,
publicSplAmount,
publicSolAmount,
publicAmountSpl,
publicAmountSol,
 relayerFee,
 changeUtxoAccount,
 recipients = [],
 action,
}: {
 inUtxos?: Utxo[];
 publicMint?: PublicKey;
publicSplAmount?: BN;
publicSolAmount?: BN;
publicAmountSpl?: BN;
publicAmountSol?: BN;
 relayerFee?: BN;
 poseidon: any;
 changeUtxoAccount: Account;
Expand All@@ -105,8 +105,8 @@ export function createOutUtxos({
 );

 if (relayerFee) {
publicSolAmount = publicSolAmount
 ? publicSolAmount.add(relayerFee)
publicAmountSol = publicAmountSol
 ? publicAmountSol.add(relayerFee)
 : relayerFee;
 }

Expand DownExpand Up@@ -192,20 +192,20 @@ export function createOutUtxos({

 // subtract public amounts from sumIns
 if (action === Action.UNSHIELD) {
 if (!publicSolAmount && !publicSplAmount)
 if (!publicAmountSol && !publicAmountSpl)
 throw new CreateUtxoError(
 CreateUtxoErrorCode.NO_PUBLIC_AMOUNTS_PROVIDED,
 "createOutUtxos",
 "publicSolAmount not initialized for unshield",
 "publicAmountSol not initialized for unshield",
 );
 if (!publicSplAmount) publicSplAmount = new BN(0);
 if (!publicSolAmount)
 if (!publicAmountSpl) publicAmountSpl = new BN(0);
 if (!publicAmountSol)
 throw new CreateUtxoError(
 CreateUtxoErrorCode.PUBLIC_SOL_AMOUNT_UNDEFINED,
 "constructor",
 );

 if (publicSplAmount && !publicMint)
 if (publicAmountSpl && !publicMint)
 throw new CreateUtxoError(
 CreateUtxoErrorCode.NO_PUBLIC_MINT_PROVIDED,
 "createOutUtxos",
Expand All@@ -217,9 +217,9 @@ export function createOutUtxos({
 );

 assets[publicSplAssetIndex].sumIn =
 assets[publicSplAssetIndex].sumIn.sub(publicSplAmount);
 assets[publicSplAssetIndex].sumIn.sub(publicAmountSpl);
 assets[publicSolAssetIndex].sumIn =
 assets[publicSolAssetIndex].sumIn.sub(publicSolAmount);
 assets[publicSolAssetIndex].sumIn.sub(publicAmountSol);
 // add public amounts to sumIns
 } else if (action === Action.SHIELD) {
 if (relayerFee)
Expand All@@ -228,26 +228,20 @@ export function createOutUtxos({
 "createOutUtxos",
 "Shield and relayer fee defined",
 );
 if (!publicSolAmount && !publicSplAmount)
 throw new CreateUtxoError(
 CreateUtxoErrorCode.NO_PUBLIC_AMOUNTS_PROVIDED,
 "createOutUtxos",
 "publicSolAmount not initialized for unshield",
 );
 if (!publicSplAmount) publicSplAmount = new BN(0);
 if (!publicSolAmount) publicSolAmount = new BN(0);
 if (!publicAmountSpl) publicAmountSpl = new BN(0);
 if (!publicAmountSol) publicAmountSol = new BN(0);
 let publicSplAssetIndex = assets.findIndex(
 (x) => x.asset.toBase58() === publicMint?.toBase58(),
 );
 let publicSolAssetIndex = assets.findIndex(
 (x) => x.asset.toBase58() === SystemProgram.programId.toBase58(),
 );
 assets[publicSplAssetIndex].sumIn =
 assets[publicSplAssetIndex].sumIn.add(publicSplAmount);
 assets[publicSplAssetIndex].sumIn.add(publicAmountSpl);
 assets[publicSolAssetIndex].sumIn =
 assets[publicSolAssetIndex].sumIn.add(publicSolAmount);
 assets[publicSolAssetIndex].sumIn.add(publicAmountSol);
 } else if (action === Action.TRANSFER) {
 if (!publicSolAmount)
 if (!publicAmountSol)
 throw new CreateUtxoError(
 CreateUtxoErrorCode.PUBLIC_SOL_AMOUNT_UNDEFINED,
 "constructor",
Expand All@@ -257,7 +251,7 @@ export function createOutUtxos({
 );

 assets[publicSolAssetIndex].sumIn =
 assets[publicSolAssetIndex].sumIn.sub(publicSolAmount);
 assets[publicSolAssetIndex].sumIn.sub(publicAmountSol);
 }

 var outputUtxos: Utxo[] = [];
Expand Down

15 changes: 12 additions & 3 deletions
light-sdk-ts/src/wallet/provider.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
import { AnchorProvider, setProvider } from "@coral-xyz/anchor";
import {
 AnchorError,
 AnchorProvider,
 BN,
 setProvider,
 Wallet,
} from "@coral-xyz/anchor";
import { SolMerkleTree } from "../merkleTree";
import {
 PublicKey,
Expand DownExpand Up@@ -37,8 +43,8 @@ export class Provider {
 solMerkleTree?: SolMerkleTree;
 provider?: AnchorProvider | { connection: Connection }; // temp -?
 url?: string;
// TODO: refactor by streamlining everything towards using connection and not anchor provider
 // - get rid of url
minimumLamports: BN;

 /**
 * Init either with nodeWallet or browserWallet. Feepayer is the provided wallet
 * Optionally provide confirmConfig, Default = 'confirmed'.
Expand All@@ -49,12 +55,14 @@ export class Provider {
 confirmConfig,
 connection,
 url = "http://127.0.0.1:8899",
 minimumLamports = new BN(5000 * 30),
 }: {
 nodeWallet?: SolanaKeypair;
 browserWallet?: BrowserWallet;
 confirmConfig?: ConfirmOptions;
 connection?: Connection;
 url?: string;
 minimumLamports?: BN;
 }) {
 if (nodeWallet && browserWallet)
 throw new ProviderError(
Expand DownExpand Up@@ -82,6 +90,7 @@ export class Provider {
 );

 this.confirmConfig = confirmConfig || { commitment: "confirmed" };
 this.minimumLamports = minimumLamports;

 if (nodeWallet) {
 this.nodeWallet = nodeWallet;
Expand Down
Loading

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

Skip to content
Refactored user and add custom errors#56

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 23, 2023
 Merged


Refactored user and add custom errors
#56
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
d4cbc73

refactored user class, and added custom errors


ananas-block Mar 23, 2023
3dcb4de

resolved rebase errors


ananas-block Mar 23, 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


4 changes: 2 additions & 2 deletions
light-sdk-ts/src/constants.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -144,14 +144,14 @@ export const RELAYER_FEES = 1e6;
export const TOKEN_REGISTRY = [
 {
 symbol: "SOL",
 decimals: 1e9,
 decimals: new anchor.BN(1e9),
 isNft: false, // TODO: parse from onchain state at configuration(decimlas, supply)
 isSol: true,
 tokenAccount: SystemProgram.programId,
 },
 {
 symbol: "USDC",
 decimals: 1e2,
 decimals: new anchor.BN(1e2),
 isNft: false,
 isSol: false,
 // copied from MINT (test-utils)
Expand Down

25 changes: 23 additions & 2 deletions
light-sdk-ts/src/errors.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
import { ASSOCIATED_PROGRAM_ID } from "@coral-xyz/anchor/dist/cjs/utils/token";

export enum UtxoErrorCode {
 APP_DATA_FROM_BYTES_FUNCTION_UNDEFINED = "APP_DATA_FROM_BYTES_FUNCTION_UNDEFINED",
 INVALID_ASSET_OR_AMOUNTS_LENGTH = "INVALID_ASSET_OR_AMOUNTS_LENGTH",
Expand All@@ -10,6 +12,23 @@ export enum UtxoErrorCode {
 ASSET_NOT_FOUND = "ASSET_NOT_FOUND",
}

export enum UserErrorCode {
 NO_WALLET_PROVIDED = "NO_WALLET_PROVIDED",
 LOAD_ERROR = "LOAD_ERROR",
 PROVIDER_NOT_INITIALIZED = "PROVIDER_NOT_INITIALIZED",
 UTXOS_NOT_INITIALIZED = "UTXOS_NOT_INITIALIZED",
 USER_ACCOUNT_NOT_INITIALIZED = "USER_ACCOUNT_NOT_INITIALIZED",
 TOKEN_NOT_FOUND = "TOKEN_NOT_FOUND",
 NO_AMOUNTS_PROVIDED = "NO_AMOUNTS_PROVIDED",
 APPROVE_ERROR = "APPROVE_ERROR",
 INSUFFICIENT_BAlANCE = "INSUFFICIENT_BAlANCE",
 ASSOCIATED_TOKEN_ACCOUNT_DOESNT_EXIST = "ASSOCIATED_TOKEN_ACCOUNT_DOESNT_EXIST",
 TOKEN_ACCOUNT_DEFINED = "TOKEN_ACCOUNT_DEFINED",
 SHIELDED_RECIPIENT_UNDEFINED = "SHIELDED_RECIPIENT_UNDEFINED",
 TOKEN_UNDEFINED = "TOKEN_UNDEFINED",
 INVALID_TOKEN = "INVALID_TOKEN",
}

export enum SelectInUtxosErrorCode {
 INVALID_NUMER_OF_MINTS = "INVALID_NUMER_OF_MINTS",
 FAILED_TO_SELECT_SOL_UTXO = "FAILED_TO_SELECT_SOL_UTXO",
Expand All@@ -27,8 +46,8 @@ export enum CreateUtxoErrorCode {
 INVALID_NUMER_OF_RECIPIENTS = "INVALID_NUMER_OF_RECIPIENTS",
 INVALID_RECIPIENT_MINT = "INVALID_RECIPIENT_MINT",
 RECIPIENTS_SUM_AMOUNT_MISSMATCH = "RECIPIENTS_SUM_AMOUNT_MISSMATCH",
 NO_PUBLIC_AMOUNTS_PROVIDED = "NO_PUBLIC_AMOUNTS_PROVIDED_FOR_UNSHIELD",
 NO_PUBLIC_MINT_PROVIDED = "NO_PUBLIC_MINT_PROVIDED_FOR_UNSHIELD",
 NO_PUBLIC_AMOUNTS_PROVIDED = "NO_PUBLIC_AMOUNTS_PROVIDED",
 NO_PUBLIC_MINT_PROVIDED = "NO_PUBLIC_MINT_PROVIDED",
 MINT_UNDEFINED = "MINT_UNDEFINED",
 SPL_AMOUNT_UNDEFINED = "SPL_AMOUNT_UNDEFINED",
 ACCOUNT_UNDEFINED = "ACCOUNT_UNDEFINED",
Expand DownExpand Up@@ -165,3 +184,5 @@ export class CreateUtxoError extends MetaError {}
export class ProviderError extends MetaError {}

export class SelectInUtxosError extends MetaError {}

export class UserError extends MetaError {}

30 changes: 14 additions & 16 deletions
light-sdk-ts/src/test-utils/createAccounts.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -243,14 +243,9 @@ export async function createTestAccounts(
 let balance = await connection.getBalance(ADMIN_AUTH_KEY, "confirmed");
 if (balance === 0) {
 let amount = 1_000_000_000_000;
 console.time("requestAirdrop");

 let res = await connection.requestAirdrop(ADMIN_AUTH_KEY, amount);
 console.timeEnd("requestAirdrop");
 console.time("confirmAirdrop");

 await connection.confirmTransaction(res, "confirmed");
 console.timeEnd("confirmAirdrop");

 let Newbalance = await connection.getBalance(ADMIN_AUTH_KEY);

Expand DownExpand Up@@ -287,7 +282,10 @@ export async function createTestAccounts(
 mintKeypair: Keypair.fromSecretKey(MINT_PRIVATE_KEY),
 connection,
 });
 console.log("created mint");
 console.log(
 "created mint ",
 Keypair.fromSecretKey(MINT_PRIVATE_KEY).publicKey.toBase58(),
 );
 }

 let balanceUserToken = null;
Expand DownExpand Up@@ -330,17 +328,17 @@ export async function createTestAccounts(
 } catch (error) {
 console.log(error);
 }
 console.log("userSplAccount ", userSplAccount);
 console.log("userSplAccount ", userSplAccount?.toBase58());

 console.log(
 "funded account",
 await getAccount(
 connection,
 userSplAccount!, //userTokenAccount,
 "confirmed",
 TOKEN_PROGRAM_ID,
 ),
 );
// console.log(
//  "funded account",
//  await getAccount(
//  connection,
//  userSplAccount!, //userTokenAccount,
//  "confirmed",
//  TOKEN_PROGRAM_ID,
//  ),
// );

 try {
 if (balanceUserToken == null) {
Expand Down

22 changes: 11 additions & 11 deletions
light-sdk-ts/src/test-utils/setUpMerkleTree.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -58,16 +58,16 @@ export async function setUpMerkleTree(provider: anchor.Provider) {
 console.log(e);
 }

 console.log("AUTHORITY: ", AUTHORITY);
// console.log("AUTHORITY: ", AUTHORITY);

 console.log("AUTHORITY: ", Array.from(AUTHORITY.toBytes()));
// console.log("AUTHORITY: ", Array.from(AUTHORITY.toBytes()));

 console.log(
 "verifierProgramZero.programId: ",
 Array.from(verifierProgramZero.programId.toBytes()),
 );
 console.log("MERKLE_TREE_KEY: ", MERKLE_TREE_KEY.toBase58());
 console.log("MERKLE_TREE_KEY: ", Array.from(MERKLE_TREE_KEY.toBytes()));
// console.log(
//  "verifierProgramZero.programId: ",
//  Array.from(verifierProgramZero.programId.toBytes()),
// );
// console.log("MERKLE_TREE_KEY: ", MERKLE_TREE_KEY.toBase58());
// console.log("MERKLE_TREE_KEY: ", Array.from(MERKLE_TREE_KEY.toBytes()));
 // console.log("MERKLE_TREE_PDA_TOKEN: ", MERKLE_TREE_PDA_TOKEN.toBase58())
 // console.log("MERKLE_TREE_PDA_TOKEN: ", Array.from(MERKLE_TREE_PDA_TOKEN.toBytes()))

Expand DownExpand Up@@ -100,7 +100,7 @@ export async function setUpMerkleTree(provider: anchor.Provider) {

 try {
 await merkleTreeConfig.registerVerifier(verifierProgramTwo.programId);
 console.log("Registering Verifier One success");
 console.log("Registering Verifier Two success");
 } catch (e) {
 console.log(e);
 }
Expand All@@ -112,8 +112,8 @@ export async function setUpMerkleTree(provider: anchor.Provider) {
 console.log(e);
 }

 console.log("MINT: ", MINT.toBase58());
 console.log("POOL_TYPE_PDA: ", REGISTERED_POOL_PDA_SPL.toBase58());
// console.log("MINT: ", MINT.toBase58());
// console.log("POOL_TYPE_PDA: ", REGISTERED_POOL_PDA_SPL.toBase58());
 try {
 await merkleTreeConfig.registerSplPool(POOL_TYPE, MINT);
 console.log("Registering spl pool success");
Expand Down

17 changes: 7 additions & 10 deletions
light-sdk-ts/src/wallet/buildBalance.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -131,13 +131,13 @@ export async function getUnspentUtxos({
 let accountInfo = await provider.connection.getAccountInfo(
 nullifierPubkey,
 );
 console.log(
 "inserted -- spent?",
 accountInfo ? "yes" : "no ",
 nullifierPubkey.toBase58(),
 "amount:",
 decryptedUtxo.amounts[0].toNumber(),
 );
// console.log(
//  "inserted -- spent?",
//  accountInfo ? "yes" : "no ",
//  nullifierPubkey.toBase58(),
//  "amount:",
//  decryptedUtxo.amounts[0].toNumber(),
// );
 if (
 !accountInfo &&
 (decryptedUtxo.amounts[1].toString() !== "0" ||
Expand All@@ -147,9 +147,6 @@ export async function getUnspentUtxos({
 }
 }
 }
 if (decryptedUtxos.length == 0) {
 console.log("no unspent leaf found");
 }

 return decryptedUtxos;
}

44 changes: 19 additions & 25 deletions
light-sdk-ts/src/wallet/createOutUtxos.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,17 +80,17 @@ export function createOutUtxos({
 poseidon,
 inUtxos,
 publicMint,
publicSplAmount,
publicSolAmount,
publicAmountSpl,
publicAmountSol,
 relayerFee,
 changeUtxoAccount,
 recipients = [],
 action,
}: {
 inUtxos?: Utxo[];
 publicMint?: PublicKey;
publicSplAmount?: BN;
publicSolAmount?: BN;
publicAmountSpl?: BN;
publicAmountSol?: BN;
 relayerFee?: BN;
 poseidon: any;
 changeUtxoAccount: Account;
Expand All@@ -105,8 +105,8 @@ export function createOutUtxos({
 );

 if (relayerFee) {
publicSolAmount = publicSolAmount
 ? publicSolAmount.add(relayerFee)
publicAmountSol = publicAmountSol
 ? publicAmountSol.add(relayerFee)
 : relayerFee;
 }

Expand DownExpand Up@@ -192,20 +192,20 @@ export function createOutUtxos({

 // subtract public amounts from sumIns
 if (action === Action.UNSHIELD) {
 if (!publicSolAmount && !publicSplAmount)
 if (!publicAmountSol && !publicAmountSpl)
 throw new CreateUtxoError(
 CreateUtxoErrorCode.NO_PUBLIC_AMOUNTS_PROVIDED,
 "createOutUtxos",
 "publicSolAmount not initialized for unshield",
 "publicAmountSol not initialized for unshield",
 );
 if (!publicSplAmount) publicSplAmount = new BN(0);
 if (!publicSolAmount)
 if (!publicAmountSpl) publicAmountSpl = new BN(0);
 if (!publicAmountSol)
 throw new CreateUtxoError(
 CreateUtxoErrorCode.PUBLIC_SOL_AMOUNT_UNDEFINED,
 "constructor",
 );

 if (publicSplAmount && !publicMint)
 if (publicAmountSpl && !publicMint)
 throw new CreateUtxoError(
 CreateUtxoErrorCode.NO_PUBLIC_MINT_PROVIDED,
 "createOutUtxos",
Expand All@@ -217,9 +217,9 @@ export function createOutUtxos({
 );

 assets[publicSplAssetIndex].sumIn =
 assets[publicSplAssetIndex].sumIn.sub(publicSplAmount);
 assets[publicSplAssetIndex].sumIn.sub(publicAmountSpl);
 assets[publicSolAssetIndex].sumIn =
 assets[publicSolAssetIndex].sumIn.sub(publicSolAmount);
 assets[publicSolAssetIndex].sumIn.sub(publicAmountSol);
 // add public amounts to sumIns
 } else if (action === Action.SHIELD) {
 if (relayerFee)
Expand All@@ -228,26 +228,20 @@ export function createOutUtxos({
 "createOutUtxos",
 "Shield and relayer fee defined",
 );
 if (!publicSolAmount && !publicSplAmount)
 throw new CreateUtxoError(
 CreateUtxoErrorCode.NO_PUBLIC_AMOUNTS_PROVIDED,
 "createOutUtxos",
 "publicSolAmount not initialized for unshield",
 );
 if (!publicSplAmount) publicSplAmount = new BN(0);
 if (!publicSolAmount) publicSolAmount = new BN(0);
 if (!publicAmountSpl) publicAmountSpl = new BN(0);
 if (!publicAmountSol) publicAmountSol = new BN(0);
 let publicSplAssetIndex = assets.findIndex(
 (x) => x.asset.toBase58() === publicMint?.toBase58(),
 );
 let publicSolAssetIndex = assets.findIndex(
 (x) => x.asset.toBase58() === SystemProgram.programId.toBase58(),
 );
 assets[publicSplAssetIndex].sumIn =
 assets[publicSplAssetIndex].sumIn.add(publicSplAmount);
 assets[publicSplAssetIndex].sumIn.add(publicAmountSpl);
 assets[publicSolAssetIndex].sumIn =
 assets[publicSolAssetIndex].sumIn.add(publicSolAmount);
 assets[publicSolAssetIndex].sumIn.add(publicAmountSol);
 } else if (action === Action.TRANSFER) {
 if (!publicSolAmount)
 if (!publicAmountSol)
 throw new CreateUtxoError(
 CreateUtxoErrorCode.PUBLIC_SOL_AMOUNT_UNDEFINED,
 "constructor",
Expand All@@ -257,7 +251,7 @@ export function createOutUtxos({
 );

 assets[publicSolAssetIndex].sumIn =
 assets[publicSolAssetIndex].sumIn.sub(publicSolAmount);
 assets[publicSolAssetIndex].sumIn.sub(publicAmountSol);
 }

 var outputUtxos: Utxo[] = [];
Expand Down

15 changes: 12 additions & 3 deletions
light-sdk-ts/src/wallet/provider.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
import { AnchorProvider, setProvider } from "@coral-xyz/anchor";
import {
 AnchorError,
 AnchorProvider,
 BN,
 setProvider,
 Wallet,
} from "@coral-xyz/anchor";
import { SolMerkleTree } from "../merkleTree";
import {
 PublicKey,
Expand DownExpand Up@@ -37,8 +43,8 @@ export class Provider {
 solMerkleTree?: SolMerkleTree;
 provider?: AnchorProvider | { connection: Connection }; // temp -?
 url?: string;
// TODO: refactor by streamlining everything towards using connection and not anchor provider
 // - get rid of url
minimumLamports: BN;

 /**
 * Init either with nodeWallet or browserWallet. Feepayer is the provided wallet
 * Optionally provide confirmConfig, Default = 'confirmed'.
Expand All@@ -49,12 +55,14 @@ export class Provider {
 confirmConfig,
 connection,
 url = "http://127.0.0.1:8899",
 minimumLamports = new BN(5000 * 30),
 }: {
 nodeWallet?: SolanaKeypair;
 browserWallet?: BrowserWallet;
 confirmConfig?: ConfirmOptions;
 connection?: Connection;
 url?: string;
 minimumLamports?: BN;
 }) {
 if (nodeWallet && browserWallet)
 throw new ProviderError(
Expand DownExpand Up@@ -82,6 +90,7 @@ export class Provider {
 );

 this.confirmConfig = confirmConfig || { commitment: "confirmed" };
 this.minimumLamports = minimumLamports;

 if (nodeWallet) {
 this.nodeWallet = nodeWallet;
Expand Down
Loading

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

Skip to content
Refactored user and add custom errors#56

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 23, 2023
 Merged


Refactored user and add custom errors
#56
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
d4cbc73

refactored user class, and added custom errors


ananas-block Mar 23, 2023
3dcb4de

resolved rebase errors


ananas-block Mar 23, 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


4 changes: 2 additions & 2 deletions
light-sdk-ts/src/constants.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -144,14 +144,14 @@ export const RELAYER_FEES = 1e6;
export const TOKEN_REGISTRY = [
 {
 symbol: "SOL",
 decimals: 1e9,
 decimals: new anchor.BN(1e9),
 isNft: false, // TODO: parse from onchain state at configuration(decimlas, supply)
 isSol: true,
 tokenAccount: SystemProgram.programId,
 },
 {
 symbol: "USDC",
 decimals: 1e2,
 decimals: new anchor.BN(1e2),
 isNft: false,
 isSol: false,
 // copied from MINT (test-utils)
Expand Down

25 changes: 23 additions & 2 deletions
light-sdk-ts/src/errors.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
import { ASSOCIATED_PROGRAM_ID } from "@coral-xyz/anchor/dist/cjs/utils/token";

export enum UtxoErrorCode {
 APP_DATA_FROM_BYTES_FUNCTION_UNDEFINED = "APP_DATA_FROM_BYTES_FUNCTION_UNDEFINED",
 INVALID_ASSET_OR_AMOUNTS_LENGTH = "INVALID_ASSET_OR_AMOUNTS_LENGTH",
Expand All@@ -10,6 +12,23 @@ export enum UtxoErrorCode {
 ASSET_NOT_FOUND = "ASSET_NOT_FOUND",
}

export enum UserErrorCode {
 NO_WALLET_PROVIDED = "NO_WALLET_PROVIDED",
 LOAD_ERROR = "LOAD_ERROR",
 PROVIDER_NOT_INITIALIZED = "PROVIDER_NOT_INITIALIZED",
 UTXOS_NOT_INITIALIZED = "UTXOS_NOT_INITIALIZED",
 USER_ACCOUNT_NOT_INITIALIZED = "USER_ACCOUNT_NOT_INITIALIZED",
 TOKEN_NOT_FOUND = "TOKEN_NOT_FOUND",
 NO_AMOUNTS_PROVIDED = "NO_AMOUNTS_PROVIDED",
 APPROVE_ERROR = "APPROVE_ERROR",
 INSUFFICIENT_BAlANCE = "INSUFFICIENT_BAlANCE",
 ASSOCIATED_TOKEN_ACCOUNT_DOESNT_EXIST = "ASSOCIATED_TOKEN_ACCOUNT_DOESNT_EXIST",
 TOKEN_ACCOUNT_DEFINED = "TOKEN_ACCOUNT_DEFINED",
 SHIELDED_RECIPIENT_UNDEFINED = "SHIELDED_RECIPIENT_UNDEFINED",
 TOKEN_UNDEFINED = "TOKEN_UNDEFINED",
 INVALID_TOKEN = "INVALID_TOKEN",
}

export enum SelectInUtxosErrorCode {
 INVALID_NUMER_OF_MINTS = "INVALID_NUMER_OF_MINTS",
 FAILED_TO_SELECT_SOL_UTXO = "FAILED_TO_SELECT_SOL_UTXO",
Expand All@@ -27,8 +46,8 @@ export enum CreateUtxoErrorCode {
 INVALID_NUMER_OF_RECIPIENTS = "INVALID_NUMER_OF_RECIPIENTS",
 INVALID_RECIPIENT_MINT = "INVALID_RECIPIENT_MINT",
 RECIPIENTS_SUM_AMOUNT_MISSMATCH = "RECIPIENTS_SUM_AMOUNT_MISSMATCH",
 NO_PUBLIC_AMOUNTS_PROVIDED = "NO_PUBLIC_AMOUNTS_PROVIDED_FOR_UNSHIELD",
 NO_PUBLIC_MINT_PROVIDED = "NO_PUBLIC_MINT_PROVIDED_FOR_UNSHIELD",
 NO_PUBLIC_AMOUNTS_PROVIDED = "NO_PUBLIC_AMOUNTS_PROVIDED",
 NO_PUBLIC_MINT_PROVIDED = "NO_PUBLIC_MINT_PROVIDED",
 MINT_UNDEFINED = "MINT_UNDEFINED",
 SPL_AMOUNT_UNDEFINED = "SPL_AMOUNT_UNDEFINED",
 ACCOUNT_UNDEFINED = "ACCOUNT_UNDEFINED",
Expand DownExpand Up@@ -165,3 +184,5 @@ export class CreateUtxoError extends MetaError {}
export class ProviderError extends MetaError {}

export class SelectInUtxosError extends MetaError {}

export class UserError extends MetaError {}

30 changes: 14 additions & 16 deletions
light-sdk-ts/src/test-utils/createAccounts.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -243,14 +243,9 @@ export async function createTestAccounts(
 let balance = await connection.getBalance(ADMIN_AUTH_KEY, "confirmed");
 if (balance === 0) {
 let amount = 1_000_000_000_000;
 console.time("requestAirdrop");

 let res = await connection.requestAirdrop(ADMIN_AUTH_KEY, amount);
 console.timeEnd("requestAirdrop");
 console.time("confirmAirdrop");

 await connection.confirmTransaction(res, "confirmed");
 console.timeEnd("confirmAirdrop");

 let Newbalance = await connection.getBalance(ADMIN_AUTH_KEY);

Expand DownExpand Up@@ -287,7 +282,10 @@ export async function createTestAccounts(
 mintKeypair: Keypair.fromSecretKey(MINT_PRIVATE_KEY),
 connection,
 });
 console.log("created mint");
 console.log(
 "created mint ",
 Keypair.fromSecretKey(MINT_PRIVATE_KEY).publicKey.toBase58(),
 );
 }

 let balanceUserToken = null;
Expand DownExpand Up@@ -330,17 +328,17 @@ export async function createTestAccounts(
 } catch (error) {
 console.log(error);
 }
 console.log("userSplAccount ", userSplAccount);
 console.log("userSplAccount ", userSplAccount?.toBase58());

 console.log(
 "funded account",
 await getAccount(
 connection,
 userSplAccount!, //userTokenAccount,
 "confirmed",
 TOKEN_PROGRAM_ID,
 ),
 );
// console.log(
//  "funded account",
//  await getAccount(
//  connection,
//  userSplAccount!, //userTokenAccount,
//  "confirmed",
//  TOKEN_PROGRAM_ID,
//  ),
// );

 try {
 if (balanceUserToken == null) {
Expand Down

22 changes: 11 additions & 11 deletions
light-sdk-ts/src/test-utils/setUpMerkleTree.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -58,16 +58,16 @@ export async function setUpMerkleTree(provider: anchor.Provider) {
 console.log(e);
 }

 console.log("AUTHORITY: ", AUTHORITY);
// console.log("AUTHORITY: ", AUTHORITY);

 console.log("AUTHORITY: ", Array.from(AUTHORITY.toBytes()));
// console.log("AUTHORITY: ", Array.from(AUTHORITY.toBytes()));

 console.log(
 "verifierProgramZero.programId: ",
 Array.from(verifierProgramZero.programId.toBytes()),
 );
 console.log("MERKLE_TREE_KEY: ", MERKLE_TREE_KEY.toBase58());
 console.log("MERKLE_TREE_KEY: ", Array.from(MERKLE_TREE_KEY.toBytes()));
// console.log(
//  "verifierProgramZero.programId: ",
//  Array.from(verifierProgramZero.programId.toBytes()),
// );
// console.log("MERKLE_TREE_KEY: ", MERKLE_TREE_KEY.toBase58());
// console.log("MERKLE_TREE_KEY: ", Array.from(MERKLE_TREE_KEY.toBytes()));
 // console.log("MERKLE_TREE_PDA_TOKEN: ", MERKLE_TREE_PDA_TOKEN.toBase58())
 // console.log("MERKLE_TREE_PDA_TOKEN: ", Array.from(MERKLE_TREE_PDA_TOKEN.toBytes()))

Expand DownExpand Up@@ -100,7 +100,7 @@ export async function setUpMerkleTree(provider: anchor.Provider) {

 try {
 await merkleTreeConfig.registerVerifier(verifierProgramTwo.programId);
 console.log("Registering Verifier One success");
 console.log("Registering Verifier Two success");
 } catch (e) {
 console.log(e);
 }
Expand All@@ -112,8 +112,8 @@ export async function setUpMerkleTree(provider: anchor.Provider) {
 console.log(e);
 }

 console.log("MINT: ", MINT.toBase58());
 console.log("POOL_TYPE_PDA: ", REGISTERED_POOL_PDA_SPL.toBase58());
// console.log("MINT: ", MINT.toBase58());
// console.log("POOL_TYPE_PDA: ", REGISTERED_POOL_PDA_SPL.toBase58());
 try {
 await merkleTreeConfig.registerSplPool(POOL_TYPE, MINT);
 console.log("Registering spl pool success");
Expand Down

17 changes: 7 additions & 10 deletions
light-sdk-ts/src/wallet/buildBalance.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -131,13 +131,13 @@ export async function getUnspentUtxos({
 let accountInfo = await provider.connection.getAccountInfo(
 nullifierPubkey,
 );
 console.log(
 "inserted -- spent?",
 accountInfo ? "yes" : "no ",
 nullifierPubkey.toBase58(),
 "amount:",
 decryptedUtxo.amounts[0].toNumber(),
 );
// console.log(
//  "inserted -- spent?",
//  accountInfo ? "yes" : "no ",
//  nullifierPubkey.toBase58(),
//  "amount:",
//  decryptedUtxo.amounts[0].toNumber(),
// );
 if (
 !accountInfo &&
 (decryptedUtxo.amounts[1].toString() !== "0" ||
Expand All@@ -147,9 +147,6 @@ export async function getUnspentUtxos({
 }
 }
 }
 if (decryptedUtxos.length == 0) {
 console.log("no unspent leaf found");
 }

 return decryptedUtxos;
}

44 changes: 19 additions & 25 deletions
light-sdk-ts/src/wallet/createOutUtxos.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,17 +80,17 @@ export function createOutUtxos({
 poseidon,
 inUtxos,
 publicMint,
publicSplAmount,
publicSolAmount,
publicAmountSpl,
publicAmountSol,
 relayerFee,
 changeUtxoAccount,
 recipients = [],
 action,
}: {
 inUtxos?: Utxo[];
 publicMint?: PublicKey;
publicSplAmount?: BN;
publicSolAmount?: BN;
publicAmountSpl?: BN;
publicAmountSol?: BN;
 relayerFee?: BN;
 poseidon: any;
 changeUtxoAccount: Account;
Expand All@@ -105,8 +105,8 @@ export function createOutUtxos({
 );

 if (relayerFee) {
publicSolAmount = publicSolAmount
 ? publicSolAmount.add(relayerFee)
publicAmountSol = publicAmountSol
 ? publicAmountSol.add(relayerFee)
 : relayerFee;
 }

Expand DownExpand Up@@ -192,20 +192,20 @@ export function createOutUtxos({

 // subtract public amounts from sumIns
 if (action === Action.UNSHIELD) {
 if (!publicSolAmount && !publicSplAmount)
 if (!publicAmountSol && !publicAmountSpl)
 throw new CreateUtxoError(
 CreateUtxoErrorCode.NO_PUBLIC_AMOUNTS_PROVIDED,
 "createOutUtxos",
 "publicSolAmount not initialized for unshield",
 "publicAmountSol not initialized for unshield",
 );
 if (!publicSplAmount) publicSplAmount = new BN(0);
 if (!publicSolAmount)
 if (!publicAmountSpl) publicAmountSpl = new BN(0);
 if (!publicAmountSol)
 throw new CreateUtxoError(
 CreateUtxoErrorCode.PUBLIC_SOL_AMOUNT_UNDEFINED,
 "constructor",
 );

 if (publicSplAmount && !publicMint)
 if (publicAmountSpl && !publicMint)
 throw new CreateUtxoError(
 CreateUtxoErrorCode.NO_PUBLIC_MINT_PROVIDED,
 "createOutUtxos",
Expand All@@ -217,9 +217,9 @@ export function createOutUtxos({
 );

 assets[publicSplAssetIndex].sumIn =
 assets[publicSplAssetIndex].sumIn.sub(publicSplAmount);
 assets[publicSplAssetIndex].sumIn.sub(publicAmountSpl);
 assets[publicSolAssetIndex].sumIn =
 assets[publicSolAssetIndex].sumIn.sub(publicSolAmount);
 assets[publicSolAssetIndex].sumIn.sub(publicAmountSol);
 // add public amounts to sumIns
 } else if (action === Action.SHIELD) {
 if (relayerFee)
Expand All@@ -228,26 +228,20 @@ export function createOutUtxos({
 "createOutUtxos",
 "Shield and relayer fee defined",
 );
 if (!publicSolAmount && !publicSplAmount)
 throw new CreateUtxoError(
 CreateUtxoErrorCode.NO_PUBLIC_AMOUNTS_PROVIDED,
 "createOutUtxos",
 "publicSolAmount not initialized for unshield",
 );
 if (!publicSplAmount) publicSplAmount = new BN(0);
 if (!publicSolAmount) publicSolAmount = new BN(0);
 if (!publicAmountSpl) publicAmountSpl = new BN(0);
 if (!publicAmountSol) publicAmountSol = new BN(0);
 let publicSplAssetIndex = assets.findIndex(
 (x) => x.asset.toBase58() === publicMint?.toBase58(),
 );
 let publicSolAssetIndex = assets.findIndex(
 (x) => x.asset.toBase58() === SystemProgram.programId.toBase58(),
 );
 assets[publicSplAssetIndex].sumIn =
 assets[publicSplAssetIndex].sumIn.add(publicSplAmount);
 assets[publicSplAssetIndex].sumIn.add(publicAmountSpl);
 assets[publicSolAssetIndex].sumIn =
 assets[publicSolAssetIndex].sumIn.add(publicSolAmount);
 assets[publicSolAssetIndex].sumIn.add(publicAmountSol);
 } else if (action === Action.TRANSFER) {
 if (!publicSolAmount)
 if (!publicAmountSol)
 throw new CreateUtxoError(
 CreateUtxoErrorCode.PUBLIC_SOL_AMOUNT_UNDEFINED,
 "constructor",
Expand All@@ -257,7 +251,7 @@ export function createOutUtxos({
 );

 assets[publicSolAssetIndex].sumIn =
 assets[publicSolAssetIndex].sumIn.sub(publicSolAmount);
 assets[publicSolAssetIndex].sumIn.sub(publicAmountSol);
 }

 var outputUtxos: Utxo[] = [];
Expand Down

15 changes: 12 additions & 3 deletions
light-sdk-ts/src/wallet/provider.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
import { AnchorProvider, setProvider } from "@coral-xyz/anchor";
import {
 AnchorError,
 AnchorProvider,
 BN,
 setProvider,
 Wallet,
} from "@coral-xyz/anchor";
import { SolMerkleTree } from "../merkleTree";
import {
 PublicKey,
Expand DownExpand Up@@ -37,8 +43,8 @@ export class Provider {
 solMerkleTree?: SolMerkleTree;
 provider?: AnchorProvider | { connection: Connection }; // temp -?
 url?: string;
// TODO: refactor by streamlining everything towards using connection and not anchor provider
 // - get rid of url
minimumLamports: BN;

 /**
 * Init either with nodeWallet or browserWallet. Feepayer is the provided wallet
 * Optionally provide confirmConfig, Default = 'confirmed'.
Expand All@@ -49,12 +55,14 @@ export class Provider {
 confirmConfig,
 connection,
 url = "http://127.0.0.1:8899",
 minimumLamports = new BN(5000 * 30),
 }: {
 nodeWallet?: SolanaKeypair;
 browserWallet?: BrowserWallet;
 confirmConfig?: ConfirmOptions;
 connection?: Connection;
 url?: string;
 minimumLamports?: BN;
 }) {
 if (nodeWallet && browserWallet)
 throw new ProviderError(
Expand DownExpand Up@@ -82,6 +90,7 @@ export class Provider {
 );

 this.confirmConfig = confirmConfig || { commitment: "confirmed" };
 this.minimumLamports = minimumLamports;

 if (nodeWallet) {
 this.nodeWallet = nodeWallet;
Expand Down
Loading

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

Skip to content
Refactored user and add custom errors#56

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 23, 2023
 Merged


Refactored user and add custom errors
#56
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
d4cbc73

refactored user class, and added custom errors


ananas-block Mar 23, 2023
3dcb4de

resolved rebase errors


ananas-block Mar 23, 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


4 changes: 2 additions & 2 deletions
light-sdk-ts/src/constants.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -144,14 +144,14 @@ export const RELAYER_FEES = 1e6;
export const TOKEN_REGISTRY = [
 {
 symbol: "SOL",
 decimals: 1e9,
 decimals: new anchor.BN(1e9),
 isNft: false, // TODO: parse from onchain state at configuration(decimlas, supply)
 isSol: true,
 tokenAccount: SystemProgram.programId,
 },
 {
 symbol: "USDC",
 decimals: 1e2,
 decimals: new anchor.BN(1e2),
 isNft: false,
 isSol: false,
 // copied from MINT (test-utils)
Expand Down

25 changes: 23 additions & 2 deletions
light-sdk-ts/src/errors.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
import { ASSOCIATED_PROGRAM_ID } from "@coral-xyz/anchor/dist/cjs/utils/token";

export enum UtxoErrorCode {
 APP_DATA_FROM_BYTES_FUNCTION_UNDEFINED = "APP_DATA_FROM_BYTES_FUNCTION_UNDEFINED",
 INVALID_ASSET_OR_AMOUNTS_LENGTH = "INVALID_ASSET_OR_AMOUNTS_LENGTH",
Expand All@@ -10,6 +12,23 @@ export enum UtxoErrorCode {
 ASSET_NOT_FOUND = "ASSET_NOT_FOUND",
}

export enum UserErrorCode {
 NO_WALLET_PROVIDED = "NO_WALLET_PROVIDED",
 LOAD_ERROR = "LOAD_ERROR",
 PROVIDER_NOT_INITIALIZED = "PROVIDER_NOT_INITIALIZED",
 UTXOS_NOT_INITIALIZED = "UTXOS_NOT_INITIALIZED",
 USER_ACCOUNT_NOT_INITIALIZED = "USER_ACCOUNT_NOT_INITIALIZED",
 TOKEN_NOT_FOUND = "TOKEN_NOT_FOUND",
 NO_AMOUNTS_PROVIDED = "NO_AMOUNTS_PROVIDED",
 APPROVE_ERROR = "APPROVE_ERROR",
 INSUFFICIENT_BAlANCE = "INSUFFICIENT_BAlANCE",
 ASSOCIATED_TOKEN_ACCOUNT_DOESNT_EXIST = "ASSOCIATED_TOKEN_ACCOUNT_DOESNT_EXIST",
 TOKEN_ACCOUNT_DEFINED = "TOKEN_ACCOUNT_DEFINED",
 SHIELDED_RECIPIENT_UNDEFINED = "SHIELDED_RECIPIENT_UNDEFINED",
 TOKEN_UNDEFINED = "TOKEN_UNDEFINED",
 INVALID_TOKEN = "INVALID_TOKEN",
}

export enum SelectInUtxosErrorCode {
 INVALID_NUMER_OF_MINTS = "INVALID_NUMER_OF_MINTS",
 FAILED_TO_SELECT_SOL_UTXO = "FAILED_TO_SELECT_SOL_UTXO",
Expand All@@ -27,8 +46,8 @@ export enum CreateUtxoErrorCode {
 INVALID_NUMER_OF_RECIPIENTS = "INVALID_NUMER_OF_RECIPIENTS",
 INVALID_RECIPIENT_MINT = "INVALID_RECIPIENT_MINT",
 RECIPIENTS_SUM_AMOUNT_MISSMATCH = "RECIPIENTS_SUM_AMOUNT_MISSMATCH",
 NO_PUBLIC_AMOUNTS_PROVIDED = "NO_PUBLIC_AMOUNTS_PROVIDED_FOR_UNSHIELD",
 NO_PUBLIC_MINT_PROVIDED = "NO_PUBLIC_MINT_PROVIDED_FOR_UNSHIELD",
 NO_PUBLIC_AMOUNTS_PROVIDED = "NO_PUBLIC_AMOUNTS_PROVIDED",
 NO_PUBLIC_MINT_PROVIDED = "NO_PUBLIC_MINT_PROVIDED",
 MINT_UNDEFINED = "MINT_UNDEFINED",
 SPL_AMOUNT_UNDEFINED = "SPL_AMOUNT_UNDEFINED",
 ACCOUNT_UNDEFINED = "ACCOUNT_UNDEFINED",
Expand DownExpand Up@@ -165,3 +184,5 @@ export class CreateUtxoError extends MetaError {}
export class ProviderError extends MetaError {}

export class SelectInUtxosError extends MetaError {}

export class UserError extends MetaError {}

30 changes: 14 additions & 16 deletions
light-sdk-ts/src/test-utils/createAccounts.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -243,14 +243,9 @@ export async function createTestAccounts(
 let balance = await connection.getBalance(ADMIN_AUTH_KEY, "confirmed");
 if (balance === 0) {
 let amount = 1_000_000_000_000;
 console.time("requestAirdrop");

 let res = await connection.requestAirdrop(ADMIN_AUTH_KEY, amount);
 console.timeEnd("requestAirdrop");
 console.time("confirmAirdrop");

 await connection.confirmTransaction(res, "confirmed");
 console.timeEnd("confirmAirdrop");

 let Newbalance = await connection.getBalance(ADMIN_AUTH_KEY);

Expand DownExpand Up@@ -287,7 +282,10 @@ export async function createTestAccounts(
 mintKeypair: Keypair.fromSecretKey(MINT_PRIVATE_KEY),
 connection,
 });
 console.log("created mint");
 console.log(
 "created mint ",
 Keypair.fromSecretKey(MINT_PRIVATE_KEY).publicKey.toBase58(),
 );
 }

 let balanceUserToken = null;
Expand DownExpand Up@@ -330,17 +328,17 @@ export async function createTestAccounts(
 } catch (error) {
 console.log(error);
 }
 console.log("userSplAccount ", userSplAccount);
 console.log("userSplAccount ", userSplAccount?.toBase58());

 console.log(
 "funded account",
 await getAccount(
 connection,
 userSplAccount!, //userTokenAccount,
 "confirmed",
 TOKEN_PROGRAM_ID,
 ),
 );
// console.log(
//  "funded account",
//  await getAccount(
//  connection,
//  userSplAccount!, //userTokenAccount,
//  "confirmed",
//  TOKEN_PROGRAM_ID,
//  ),
// );

 try {
 if (balanceUserToken == null) {
Expand Down

22 changes: 11 additions & 11 deletions
light-sdk-ts/src/test-utils/setUpMerkleTree.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -58,16 +58,16 @@ export async function setUpMerkleTree(provider: anchor.Provider) {
 console.log(e);
 }

 console.log("AUTHORITY: ", AUTHORITY);
// console.log("AUTHORITY: ", AUTHORITY);

 console.log("AUTHORITY: ", Array.from(AUTHORITY.toBytes()));
// console.log("AUTHORITY: ", Array.from(AUTHORITY.toBytes()));

 console.log(
 "verifierProgramZero.programId: ",
 Array.from(verifierProgramZero.programId.toBytes()),
 );
 console.log("MERKLE_TREE_KEY: ", MERKLE_TREE_KEY.toBase58());
 console.log("MERKLE_TREE_KEY: ", Array.from(MERKLE_TREE_KEY.toBytes()));
// console.log(
//  "verifierProgramZero.programId: ",
//  Array.from(verifierProgramZero.programId.toBytes()),
// );
// console.log("MERKLE_TREE_KEY: ", MERKLE_TREE_KEY.toBase58());
// console.log("MERKLE_TREE_KEY: ", Array.from(MERKLE_TREE_KEY.toBytes()));
 // console.log("MERKLE_TREE_PDA_TOKEN: ", MERKLE_TREE_PDA_TOKEN.toBase58())
 // console.log("MERKLE_TREE_PDA_TOKEN: ", Array.from(MERKLE_TREE_PDA_TOKEN.toBytes()))

Expand DownExpand Up@@ -100,7 +100,7 @@ export async function setUpMerkleTree(provider: anchor.Provider) {

 try {
 await merkleTreeConfig.registerVerifier(verifierProgramTwo.programId);
 console.log("Registering Verifier One success");
 console.log("Registering Verifier Two success");
 } catch (e) {
 console.log(e);
 }
Expand All@@ -112,8 +112,8 @@ export async function setUpMerkleTree(provider: anchor.Provider) {
 console.log(e);
 }

 console.log("MINT: ", MINT.toBase58());
 console.log("POOL_TYPE_PDA: ", REGISTERED_POOL_PDA_SPL.toBase58());
// console.log("MINT: ", MINT.toBase58());
// console.log("POOL_TYPE_PDA: ", REGISTERED_POOL_PDA_SPL.toBase58());
 try {
 await merkleTreeConfig.registerSplPool(POOL_TYPE, MINT);
 console.log("Registering spl pool success");
Expand Down

17 changes: 7 additions & 10 deletions
light-sdk-ts/src/wallet/buildBalance.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -131,13 +131,13 @@ export async function getUnspentUtxos({
 let accountInfo = await provider.connection.getAccountInfo(
 nullifierPubkey,
 );
 console.log(
 "inserted -- spent?",
 accountInfo ? "yes" : "no ",
 nullifierPubkey.toBase58(),
 "amount:",
 decryptedUtxo.amounts[0].toNumber(),
 );
// console.log(
//  "inserted -- spent?",
//  accountInfo ? "yes" : "no ",
//  nullifierPubkey.toBase58(),
//  "amount:",
//  decryptedUtxo.amounts[0].toNumber(),
// );
 if (
 !accountInfo &&
 (decryptedUtxo.amounts[1].toString() !== "0" ||
Expand All@@ -147,9 +147,6 @@ export async function getUnspentUtxos({
 }
 }
 }
 if (decryptedUtxos.length == 0) {
 console.log("no unspent leaf found");
 }

 return decryptedUtxos;
}

44 changes: 19 additions & 25 deletions
light-sdk-ts/src/wallet/createOutUtxos.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,17 +80,17 @@ export function createOutUtxos({
 poseidon,
 inUtxos,
 publicMint,
publicSplAmount,
publicSolAmount,
publicAmountSpl,
publicAmountSol,
 relayerFee,
 changeUtxoAccount,
 recipients = [],
 action,
}: {
 inUtxos?: Utxo[];
 publicMint?: PublicKey;
publicSplAmount?: BN;
publicSolAmount?: BN;
publicAmountSpl?: BN;
publicAmountSol?: BN;
 relayerFee?: BN;
 poseidon: any;
 changeUtxoAccount: Account;
Expand All@@ -105,8 +105,8 @@ export function createOutUtxos({
 );

 if (relayerFee) {
publicSolAmount = publicSolAmount
 ? publicSolAmount.add(relayerFee)
publicAmountSol = publicAmountSol
 ? publicAmountSol.add(relayerFee)
 : relayerFee;
 }

Expand DownExpand Up@@ -192,20 +192,20 @@ export function createOutUtxos({

 // subtract public amounts from sumIns
 if (action === Action.UNSHIELD) {
 if (!publicSolAmount && !publicSplAmount)
 if (!publicAmountSol && !publicAmountSpl)
 throw new CreateUtxoError(
 CreateUtxoErrorCode.NO_PUBLIC_AMOUNTS_PROVIDED,
 "createOutUtxos",
 "publicSolAmount not initialized for unshield",
 "publicAmountSol not initialized for unshield",
 );
 if (!publicSplAmount) publicSplAmount = new BN(0);
 if (!publicSolAmount)
 if (!publicAmountSpl) publicAmountSpl = new BN(0);
 if (!publicAmountSol)
 throw new CreateUtxoError(
 CreateUtxoErrorCode.PUBLIC_SOL_AMOUNT_UNDEFINED,
 "constructor",
 );

 if (publicSplAmount && !publicMint)
 if (publicAmountSpl && !publicMint)
 throw new CreateUtxoError(
 CreateUtxoErrorCode.NO_PUBLIC_MINT_PROVIDED,
 "createOutUtxos",
Expand All@@ -217,9 +217,9 @@ export function createOutUtxos({
 );

 assets[publicSplAssetIndex].sumIn =
 assets[publicSplAssetIndex].sumIn.sub(publicSplAmount);
 assets[publicSplAssetIndex].sumIn.sub(publicAmountSpl);
 assets[publicSolAssetIndex].sumIn =
 assets[publicSolAssetIndex].sumIn.sub(publicSolAmount);
 assets[publicSolAssetIndex].sumIn.sub(publicAmountSol);
 // add public amounts to sumIns
 } else if (action === Action.SHIELD) {
 if (relayerFee)
Expand All@@ -228,26 +228,20 @@ export function createOutUtxos({
 "createOutUtxos",
 "Shield and relayer fee defined",
 );
 if (!publicSolAmount && !publicSplAmount)
 throw new CreateUtxoError(
 CreateUtxoErrorCode.NO_PUBLIC_AMOUNTS_PROVIDED,
 "createOutUtxos",
 "publicSolAmount not initialized for unshield",
 );
 if (!publicSplAmount) publicSplAmount = new BN(0);
 if (!publicSolAmount) publicSolAmount = new BN(0);
 if (!publicAmountSpl) publicAmountSpl = new BN(0);
 if (!publicAmountSol) publicAmountSol = new BN(0);
 let publicSplAssetIndex = assets.findIndex(
 (x) => x.asset.toBase58() === publicMint?.toBase58(),
 );
 let publicSolAssetIndex = assets.findIndex(
 (x) => x.asset.toBase58() === SystemProgram.programId.toBase58(),
 );
 assets[publicSplAssetIndex].sumIn =
 assets[publicSplAssetIndex].sumIn.add(publicSplAmount);
 assets[publicSplAssetIndex].sumIn.add(publicAmountSpl);
 assets[publicSolAssetIndex].sumIn =
 assets[publicSolAssetIndex].sumIn.add(publicSolAmount);
 assets[publicSolAssetIndex].sumIn.add(publicAmountSol);
 } else if (action === Action.TRANSFER) {
 if (!publicSolAmount)
 if (!publicAmountSol)
 throw new CreateUtxoError(
 CreateUtxoErrorCode.PUBLIC_SOL_AMOUNT_UNDEFINED,
 "constructor",
Expand All@@ -257,7 +251,7 @@ export function createOutUtxos({
 );

 assets[publicSolAssetIndex].sumIn =
 assets[publicSolAssetIndex].sumIn.sub(publicSolAmount);
 assets[publicSolAssetIndex].sumIn.sub(publicAmountSol);
 }

 var outputUtxos: Utxo[] = [];
Expand Down

15 changes: 12 additions & 3 deletions
light-sdk-ts/src/wallet/provider.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
import { AnchorProvider, setProvider } from "@coral-xyz/anchor";
import {
 AnchorError,
 AnchorProvider,
 BN,
 setProvider,
 Wallet,
} from "@coral-xyz/anchor";
import { SolMerkleTree } from "../merkleTree";
import {
 PublicKey,
Expand DownExpand Up@@ -37,8 +43,8 @@ export class Provider {
 solMerkleTree?: SolMerkleTree;
 provider?: AnchorProvider | { connection: Connection }; // temp -?
 url?: string;
// TODO: refactor by streamlining everything towards using connection and not anchor provider
 // - get rid of url
minimumLamports: BN;

 /**
 * Init either with nodeWallet or browserWallet. Feepayer is the provided wallet
 * Optionally provide confirmConfig, Default = 'confirmed'.
Expand All@@ -49,12 +55,14 @@ export class Provider {
 confirmConfig,
 connection,
 url = "http://127.0.0.1:8899",
 minimumLamports = new BN(5000 * 30),
 }: {
 nodeWallet?: SolanaKeypair;
 browserWallet?: BrowserWallet;
 confirmConfig?: ConfirmOptions;
 connection?: Connection;
 url?: string;
 minimumLamports?: BN;
 }) {
 if (nodeWallet && browserWallet)
 throw new ProviderError(
Expand DownExpand Up@@ -82,6 +90,7 @@ export class Provider {
 );

 this.confirmConfig = confirmConfig || { commitment: "confirmed" };
 this.minimumLamports = minimumLamports;

 if (nodeWallet) {
 this.nodeWallet = nodeWallet;
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Refactored user and add custom errors#56

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 23, 2023
 Merged


Refactored user and add custom errors
#56
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
d4cbc73

refactored user class, and added custom errors


ananas-block Mar 23, 2023
3dcb4de

resolved rebase errors


ananas-block Mar 23, 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


4 changes: 2 additions & 2 deletions
light-sdk-ts/src/constants.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -144,14 +144,14 @@ export const RELAYER_FEES = 1e6;
export const TOKEN_REGISTRY = [
 {
 symbol: "SOL",
 decimals: 1e9,
 decimals: new anchor.BN(1e9),
 isNft: false, // TODO: parse from onchain state at configuration(decimlas, supply)
 isSol: true,
 tokenAccount: SystemProgram.programId,
 },
 {
 symbol: "USDC",
 decimals: 1e2,
 decimals: new anchor.BN(1e2),
 isNft: false,
 isSol: false,
 // copied from MINT (test-utils)
Expand Down

25 changes: 23 additions & 2 deletions
light-sdk-ts/src/errors.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
import { ASSOCIATED_PROGRAM_ID } from "@coral-xyz/anchor/dist/cjs/utils/token";

export enum UtxoErrorCode {
 APP_DATA_FROM_BYTES_FUNCTION_UNDEFINED = "APP_DATA_FROM_BYTES_FUNCTION_UNDEFINED",
 INVALID_ASSET_OR_AMOUNTS_LENGTH = "INVALID_ASSET_OR_AMOUNTS_LENGTH",
Expand All@@ -10,6 +12,23 @@ export enum UtxoErrorCode {
 ASSET_NOT_FOUND = "ASSET_NOT_FOUND",
}

export enum UserErrorCode {
 NO_WALLET_PROVIDED = "NO_WALLET_PROVIDED",
 LOAD_ERROR = "LOAD_ERROR",
 PROVIDER_NOT_INITIALIZED = "PROVIDER_NOT_INITIALIZED",
 UTXOS_NOT_INITIALIZED = "UTXOS_NOT_INITIALIZED",
 USER_ACCOUNT_NOT_INITIALIZED = "USER_ACCOUNT_NOT_INITIALIZED",
 TOKEN_NOT_FOUND = "TOKEN_NOT_FOUND",
 NO_AMOUNTS_PROVIDED = "NO_AMOUNTS_PROVIDED",
 APPROVE_ERROR = "APPROVE_ERROR",
 INSUFFICIENT_BAlANCE = "INSUFFICIENT_BAlANCE",
 ASSOCIATED_TOKEN_ACCOUNT_DOESNT_EXIST = "ASSOCIATED_TOKEN_ACCOUNT_DOESNT_EXIST",
 TOKEN_ACCOUNT_DEFINED = "TOKEN_ACCOUNT_DEFINED",
 SHIELDED_RECIPIENT_UNDEFINED = "SHIELDED_RECIPIENT_UNDEFINED",
 TOKEN_UNDEFINED = "TOKEN_UNDEFINED",
 INVALID_TOKEN = "INVALID_TOKEN",
}

export enum SelectInUtxosErrorCode {
 INVALID_NUMER_OF_MINTS = "INVALID_NUMER_OF_MINTS",
 FAILED_TO_SELECT_SOL_UTXO = "FAILED_TO_SELECT_SOL_UTXO",
Expand All@@ -27,8 +46,8 @@ export enum CreateUtxoErrorCode {
 INVALID_NUMER_OF_RECIPIENTS = "INVALID_NUMER_OF_RECIPIENTS",
 INVALID_RECIPIENT_MINT = "INVALID_RECIPIENT_MINT",
 RECIPIENTS_SUM_AMOUNT_MISSMATCH = "RECIPIENTS_SUM_AMOUNT_MISSMATCH",
 NO_PUBLIC_AMOUNTS_PROVIDED = "NO_PUBLIC_AMOUNTS_PROVIDED_FOR_UNSHIELD",
 NO_PUBLIC_MINT_PROVIDED = "NO_PUBLIC_MINT_PROVIDED_FOR_UNSHIELD",
 NO_PUBLIC_AMOUNTS_PROVIDED = "NO_PUBLIC_AMOUNTS_PROVIDED",
 NO_PUBLIC_MINT_PROVIDED = "NO_PUBLIC_MINT_PROVIDED",
 MINT_UNDEFINED = "MINT_UNDEFINED",
 SPL_AMOUNT_UNDEFINED = "SPL_AMOUNT_UNDEFINED",
 ACCOUNT_UNDEFINED = "ACCOUNT_UNDEFINED",
Expand DownExpand Up@@ -165,3 +184,5 @@ export class CreateUtxoError extends MetaError {}
export class ProviderError extends MetaError {}

export class SelectInUtxosError extends MetaError {}

export class UserError extends MetaError {}

30 changes: 14 additions & 16 deletions
light-sdk-ts/src/test-utils/createAccounts.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -243,14 +243,9 @@ export async function createTestAccounts(
 let balance = await connection.getBalance(ADMIN_AUTH_KEY, "confirmed");
 if (balance === 0) {
 let amount = 1_000_000_000_000;
 console.time("requestAirdrop");

 let res = await connection.requestAirdrop(ADMIN_AUTH_KEY, amount);
 console.timeEnd("requestAirdrop");
 console.time("confirmAirdrop");

 await connection.confirmTransaction(res, "confirmed");
 console.timeEnd("confirmAirdrop");

 let Newbalance = await connection.getBalance(ADMIN_AUTH_KEY);

Expand DownExpand Up@@ -287,7 +282,10 @@ export async function createTestAccounts(
 mintKeypair: Keypair.fromSecretKey(MINT_PRIVATE_KEY),
 connection,
 });
 console.log("created mint");
 console.log(
 "created mint ",
 Keypair.fromSecretKey(MINT_PRIVATE_KEY).publicKey.toBase58(),
 );
 }

 let balanceUserToken = null;
Expand DownExpand Up@@ -330,17 +328,17 @@ export async function createTestAccounts(
 } catch (error) {
 console.log(error);
 }
 console.log("userSplAccount ", userSplAccount);
 console.log("userSplAccount ", userSplAccount?.toBase58());

 console.log(
 "funded account",
 await getAccount(
 connection,
 userSplAccount!, //userTokenAccount,
 "confirmed",
 TOKEN_PROGRAM_ID,
 ),
 );
// console.log(
//  "funded account",
//  await getAccount(
//  connection,
//  userSplAccount!, //userTokenAccount,
//  "confirmed",
//  TOKEN_PROGRAM_ID,
//  ),
// );

 try {
 if (balanceUserToken == null) {
Expand Down

22 changes: 11 additions & 11 deletions
light-sdk-ts/src/test-utils/setUpMerkleTree.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -58,16 +58,16 @@ export async function setUpMerkleTree(provider: anchor.Provider) {
 console.log(e);
 }

 console.log("AUTHORITY: ", AUTHORITY);
// console.log("AUTHORITY: ", AUTHORITY);

 console.log("AUTHORITY: ", Array.from(AUTHORITY.toBytes()));
// console.log("AUTHORITY: ", Array.from(AUTHORITY.toBytes()));

 console.log(
 "verifierProgramZero.programId: ",
 Array.from(verifierProgramZero.programId.toBytes()),
 );
 console.log("MERKLE_TREE_KEY: ", MERKLE_TREE_KEY.toBase58());
 console.log("MERKLE_TREE_KEY: ", Array.from(MERKLE_TREE_KEY.toBytes()));
// console.log(
//  "verifierProgramZero.programId: ",
//  Array.from(verifierProgramZero.programId.toBytes()),
// );
// console.log("MERKLE_TREE_KEY: ", MERKLE_TREE_KEY.toBase58());
// console.log("MERKLE_TREE_KEY: ", Array.from(MERKLE_TREE_KEY.toBytes()));
 // console.log("MERKLE_TREE_PDA_TOKEN: ", MERKLE_TREE_PDA_TOKEN.toBase58())
 // console.log("MERKLE_TREE_PDA_TOKEN: ", Array.from(MERKLE_TREE_PDA_TOKEN.toBytes()))

Expand DownExpand Up@@ -100,7 +100,7 @@ export async function setUpMerkleTree(provider: anchor.Provider) {

 try {
 await merkleTreeConfig.registerVerifier(verifierProgramTwo.programId);
 console.log("Registering Verifier One success");
 console.log("Registering Verifier Two success");
 } catch (e) {
 console.log(e);
 }
Expand All@@ -112,8 +112,8 @@ export async function setUpMerkleTree(provider: anchor.Provider) {
 console.log(e);
 }

 console.log("MINT: ", MINT.toBase58());
 console.log("POOL_TYPE_PDA: ", REGISTERED_POOL_PDA_SPL.toBase58());
// console.log("MINT: ", MINT.toBase58());
// console.log("POOL_TYPE_PDA: ", REGISTERED_POOL_PDA_SPL.toBase58());
 try {
 await merkleTreeConfig.registerSplPool(POOL_TYPE, MINT);
 console.log("Registering spl pool success");
Expand Down

17 changes: 7 additions & 10 deletions
light-sdk-ts/src/wallet/buildBalance.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -131,13 +131,13 @@ export async function getUnspentUtxos({
 let accountInfo = await provider.connection.getAccountInfo(
 nullifierPubkey,
 );
 console.log(
 "inserted -- spent?",
 accountInfo ? "yes" : "no ",
 nullifierPubkey.toBase58(),
 "amount:",
 decryptedUtxo.amounts[0].toNumber(),
 );
// console.log(
//  "inserted -- spent?",
//  accountInfo ? "yes" : "no ",
//  nullifierPubkey.toBase58(),
//  "amount:",
//  decryptedUtxo.amounts[0].toNumber(),
// );
 if (
 !accountInfo &&
 (decryptedUtxo.amounts[1].toString() !== "0" ||
Expand All@@ -147,9 +147,6 @@ export async function getUnspentUtxos({
 }
 }
 }
 if (decryptedUtxos.length == 0) {
 console.log("no unspent leaf found");
 }

 return decryptedUtxos;
}

44 changes: 19 additions & 25 deletions
light-sdk-ts/src/wallet/createOutUtxos.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,17 +80,17 @@ export function createOutUtxos({
 poseidon,
 inUtxos,
 publicMint,
publicSplAmount,
publicSolAmount,
publicAmountSpl,
publicAmountSol,
 relayerFee,
 changeUtxoAccount,
 recipients = [],
 action,
}: {
 inUtxos?: Utxo[];
 publicMint?: PublicKey;
publicSplAmount?: BN;
publicSolAmount?: BN;
publicAmountSpl?: BN;
publicAmountSol?: BN;
 relayerFee?: BN;
 poseidon: any;
 changeUtxoAccount: Account;
Expand All@@ -105,8 +105,8 @@ export function createOutUtxos({
 );

 if (relayerFee) {
publicSolAmount = publicSolAmount
 ? publicSolAmount.add(relayerFee)
publicAmountSol = publicAmountSol
 ? publicAmountSol.add(relayerFee)
 : relayerFee;
 }

Expand DownExpand Up@@ -192,20 +192,20 @@ export function createOutUtxos({

 // subtract public amounts from sumIns
 if (action === Action.UNSHIELD) {
 if (!publicSolAmount && !publicSplAmount)
 if (!publicAmountSol && !publicAmountSpl)
 throw new CreateUtxoError(
 CreateUtxoErrorCode.NO_PUBLIC_AMOUNTS_PROVIDED,
 "createOutUtxos",
 "publicSolAmount not initialized for unshield",
 "publicAmountSol not initialized for unshield",
 );
 if (!publicSplAmount) publicSplAmount = new BN(0);
 if (!publicSolAmount)
 if (!publicAmountSpl) publicAmountSpl = new BN(0);
 if (!publicAmountSol)
 throw new CreateUtxoError(
 CreateUtxoErrorCode.PUBLIC_SOL_AMOUNT_UNDEFINED,
 "constructor",
 );

 if (publicSplAmount && !publicMint)
 if (publicAmountSpl && !publicMint)
 throw new CreateUtxoError(
 CreateUtxoErrorCode.NO_PUBLIC_MINT_PROVIDED,
 "createOutUtxos",
Expand All@@ -217,9 +217,9 @@ export function createOutUtxos({
 );

 assets[publicSplAssetIndex].sumIn =
 assets[publicSplAssetIndex].sumIn.sub(publicSplAmount);
 assets[publicSplAssetIndex].sumIn.sub(publicAmountSpl);
 assets[publicSolAssetIndex].sumIn =
 assets[publicSolAssetIndex].sumIn.sub(publicSolAmount);
 assets[publicSolAssetIndex].sumIn.sub(publicAmountSol);
 // add public amounts to sumIns
 } else if (action === Action.SHIELD) {
 if (relayerFee)
Expand All@@ -228,26 +228,20 @@ export function createOutUtxos({
 "createOutUtxos",
 "Shield and relayer fee defined",
 );
 if (!publicSolAmount && !publicSplAmount)
 throw new CreateUtxoError(
 CreateUtxoErrorCode.NO_PUBLIC_AMOUNTS_PROVIDED,
 "createOutUtxos",
 "publicSolAmount not initialized for unshield",
 );
 if (!publicSplAmount) publicSplAmount = new BN(0);
 if (!publicSolAmount) publicSolAmount = new BN(0);
 if (!publicAmountSpl) publicAmountSpl = new BN(0);
 if (!publicAmountSol) publicAmountSol = new BN(0);
 let publicSplAssetIndex = assets.findIndex(
 (x) => x.asset.toBase58() === publicMint?.toBase58(),
 );
 let publicSolAssetIndex = assets.findIndex(
 (x) => x.asset.toBase58() === SystemProgram.programId.toBase58(),
 );
 assets[publicSplAssetIndex].sumIn =
 assets[publicSplAssetIndex].sumIn.add(publicSplAmount);
 assets[publicSplAssetIndex].sumIn.add(publicAmountSpl);
 assets[publicSolAssetIndex].sumIn =
 assets[publicSolAssetIndex].sumIn.add(publicSolAmount);
 assets[publicSolAssetIndex].sumIn.add(publicAmountSol);
 } else if (action === Action.TRANSFER) {
 if (!publicSolAmount)
 if (!publicAmountSol)
 throw new CreateUtxoError(
 CreateUtxoErrorCode.PUBLIC_SOL_AMOUNT_UNDEFINED,
 "constructor",
Expand All@@ -257,7 +251,7 @@ export function createOutUtxos({
 );

 assets[publicSolAssetIndex].sumIn =
 assets[publicSolAssetIndex].sumIn.sub(publicSolAmount);
 assets[publicSolAssetIndex].sumIn.sub(publicAmountSol);
 }

 var outputUtxos: Utxo[] = [];
Expand Down

15 changes: 12 additions & 3 deletions
light-sdk-ts/src/wallet/provider.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
import { AnchorProvider, setProvider } from "@coral-xyz/anchor";
import {
 AnchorError,
 AnchorProvider,
 BN,
 setProvider,
 Wallet,
} from "@coral-xyz/anchor";
import { SolMerkleTree } from "../merkleTree";
import {
 PublicKey,
Expand DownExpand Up@@ -37,8 +43,8 @@ export class Provider {
 solMerkleTree?: SolMerkleTree;
 provider?: AnchorProvider | { connection: Connection }; // temp -?
 url?: string;
// TODO: refactor by streamlining everything towards using connection and not anchor provider
 // - get rid of url
minimumLamports: BN;

 /**
 * Init either with nodeWallet or browserWallet. Feepayer is the provided wallet
 * Optionally provide confirmConfig, Default = 'confirmed'.
Expand All@@ -49,12 +55,14 @@ export class Provider {
 confirmConfig,
 connection,
 url = "http://127.0.0.1:8899",
 minimumLamports = new BN(5000 * 30),
 }: {
 nodeWallet?: SolanaKeypair;
 browserWallet?: BrowserWallet;
 confirmConfig?: ConfirmOptions;
 connection?: Connection;
 url?: string;
 minimumLamports?: BN;
 }) {
 if (nodeWallet && browserWallet)
 throw new ProviderError(
Expand DownExpand Up@@ -82,6 +90,7 @@ export class Provider {
 );

 this.confirmConfig = confirmConfig || { commitment: "confirmed" };
 this.minimumLamports = minimumLamports;

 if (nodeWallet) {
 this.nodeWallet = nodeWallet;
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Refactored user and add custom errors#56

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 23, 2023
 Merged


Refactored user and add custom errors
#56
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
d4cbc73

refactored user class, and added custom errors


ananas-block Mar 23, 2023
3dcb4de

resolved rebase errors


ananas-block Mar 23, 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


4 changes: 2 additions & 2 deletions
light-sdk-ts/src/constants.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -144,14 +144,14 @@ export const RELAYER_FEES = 1e6;
export const TOKEN_REGISTRY = [
 {
 symbol: "SOL",
 decimals: 1e9,
 decimals: new anchor.BN(1e9),
 isNft: false, // TODO: parse from onchain state at configuration(decimlas, supply)
 isSol: true,
 tokenAccount: SystemProgram.programId,
 },
 {
 symbol: "USDC",
 decimals: 1e2,
 decimals: new anchor.BN(1e2),
 isNft: false,
 isSol: false,
 // copied from MINT (test-utils)
Expand Down

25 changes: 23 additions & 2 deletions
light-sdk-ts/src/errors.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
import { ASSOCIATED_PROGRAM_ID } from "@coral-xyz/anchor/dist/cjs/utils/token";

export enum UtxoErrorCode {
 APP_DATA_FROM_BYTES_FUNCTION_UNDEFINED = "APP_DATA_FROM_BYTES_FUNCTION_UNDEFINED",
 INVALID_ASSET_OR_AMOUNTS_LENGTH = "INVALID_ASSET_OR_AMOUNTS_LENGTH",
Expand All@@ -10,6 +12,23 @@ export enum UtxoErrorCode {
 ASSET_NOT_FOUND = "ASSET_NOT_FOUND",
}

export enum UserErrorCode {
 NO_WALLET_PROVIDED = "NO_WALLET_PROVIDED",
 LOAD_ERROR = "LOAD_ERROR",
 PROVIDER_NOT_INITIALIZED = "PROVIDER_NOT_INITIALIZED",
 UTXOS_NOT_INITIALIZED = "UTXOS_NOT_INITIALIZED",
 USER_ACCOUNT_NOT_INITIALIZED = "USER_ACCOUNT_NOT_INITIALIZED",
 TOKEN_NOT_FOUND = "TOKEN_NOT_FOUND",
 NO_AMOUNTS_PROVIDED = "NO_AMOUNTS_PROVIDED",
 APPROVE_ERROR = "APPROVE_ERROR",
 INSUFFICIENT_BAlANCE = "INSUFFICIENT_BAlANCE",
 ASSOCIATED_TOKEN_ACCOUNT_DOESNT_EXIST = "ASSOCIATED_TOKEN_ACCOUNT_DOESNT_EXIST",
 TOKEN_ACCOUNT_DEFINED = "TOKEN_ACCOUNT_DEFINED",
 SHIELDED_RECIPIENT_UNDEFINED = "SHIELDED_RECIPIENT_UNDEFINED",
 TOKEN_UNDEFINED = "TOKEN_UNDEFINED",
 INVALID_TOKEN = "INVALID_TOKEN",
}

export enum SelectInUtxosErrorCode {
 INVALID_NUMER_OF_MINTS = "INVALID_NUMER_OF_MINTS",
 FAILED_TO_SELECT_SOL_UTXO = "FAILED_TO_SELECT_SOL_UTXO",
Expand All@@ -27,8 +46,8 @@ export enum CreateUtxoErrorCode {
 INVALID_NUMER_OF_RECIPIENTS = "INVALID_NUMER_OF_RECIPIENTS",
 INVALID_RECIPIENT_MINT = "INVALID_RECIPIENT_MINT",
 RECIPIENTS_SUM_AMOUNT_MISSMATCH = "RECIPIENTS_SUM_AMOUNT_MISSMATCH",
 NO_PUBLIC_AMOUNTS_PROVIDED = "NO_PUBLIC_AMOUNTS_PROVIDED_FOR_UNSHIELD",
 NO_PUBLIC_MINT_PROVIDED = "NO_PUBLIC_MINT_PROVIDED_FOR_UNSHIELD",
 NO_PUBLIC_AMOUNTS_PROVIDED = "NO_PUBLIC_AMOUNTS_PROVIDED",
 NO_PUBLIC_MINT_PROVIDED = "NO_PUBLIC_MINT_PROVIDED",
 MINT_UNDEFINED = "MINT_UNDEFINED",
 SPL_AMOUNT_UNDEFINED = "SPL_AMOUNT_UNDEFINED",
 ACCOUNT_UNDEFINED = "ACCOUNT_UNDEFINED",
Expand DownExpand Up@@ -165,3 +184,5 @@ export class CreateUtxoError extends MetaError {}
export class ProviderError extends MetaError {}

export class SelectInUtxosError extends MetaError {}

export class UserError extends MetaError {}

30 changes: 14 additions & 16 deletions
light-sdk-ts/src/test-utils/createAccounts.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -243,14 +243,9 @@ export async function createTestAccounts(
 let balance = await connection.getBalance(ADMIN_AUTH_KEY, "confirmed");
 if (balance === 0) {
 let amount = 1_000_000_000_000;
 console.time("requestAirdrop");

 let res = await connection.requestAirdrop(ADMIN_AUTH_KEY, amount);
 console.timeEnd("requestAirdrop");
 console.time("confirmAirdrop");

 await connection.confirmTransaction(res, "confirmed");
 console.timeEnd("confirmAirdrop");

 let Newbalance = await connection.getBalance(ADMIN_AUTH_KEY);

Expand DownExpand Up@@ -287,7 +282,10 @@ export async function createTestAccounts(
 mintKeypair: Keypair.fromSecretKey(MINT_PRIVATE_KEY),
 connection,
 });
 console.log("created mint");
 console.log(
 "created mint ",
 Keypair.fromSecretKey(MINT_PRIVATE_KEY).publicKey.toBase58(),
 );
 }

 let balanceUserToken = null;
Expand DownExpand Up@@ -330,17 +328,17 @@ export async function createTestAccounts(
 } catch (error) {
 console.log(error);
 }
 console.log("userSplAccount ", userSplAccount);
 console.log("userSplAccount ", userSplAccount?.toBase58());

 console.log(
 "funded account",
 await getAccount(
 connection,
 userSplAccount!, //userTokenAccount,
 "confirmed",
 TOKEN_PROGRAM_ID,
 ),
 );
// console.log(
//  "funded account",
//  await getAccount(
//  connection,
//  userSplAccount!, //userTokenAccount,
//  "confirmed",
//  TOKEN_PROGRAM_ID,
//  ),
// );

 try {
 if (balanceUserToken == null) {
Expand Down

22 changes: 11 additions & 11 deletions
light-sdk-ts/src/test-utils/setUpMerkleTree.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -58,16 +58,16 @@ export async function setUpMerkleTree(provider: anchor.Provider) {
 console.log(e);
 }

 console.log("AUTHORITY: ", AUTHORITY);
// console.log("AUTHORITY: ", AUTHORITY);

 console.log("AUTHORITY: ", Array.from(AUTHORITY.toBytes()));
// console.log("AUTHORITY: ", Array.from(AUTHORITY.toBytes()));

 console.log(
 "verifierProgramZero.programId: ",
 Array.from(verifierProgramZero.programId.toBytes()),
 );
 console.log("MERKLE_TREE_KEY: ", MERKLE_TREE_KEY.toBase58());
 console.log("MERKLE_TREE_KEY: ", Array.from(MERKLE_TREE_KEY.toBytes()));
// console.log(
//  "verifierProgramZero.programId: ",
//  Array.from(verifierProgramZero.programId.toBytes()),
// );
// console.log("MERKLE_TREE_KEY: ", MERKLE_TREE_KEY.toBase58());
// console.log("MERKLE_TREE_KEY: ", Array.from(MERKLE_TREE_KEY.toBytes()));
 // console.log("MERKLE_TREE_PDA_TOKEN: ", MERKLE_TREE_PDA_TOKEN.toBase58())
 // console.log("MERKLE_TREE_PDA_TOKEN: ", Array.from(MERKLE_TREE_PDA_TOKEN.toBytes()))

Expand DownExpand Up@@ -100,7 +100,7 @@ export async function setUpMerkleTree(provider: anchor.Provider) {

 try {
 await merkleTreeConfig.registerVerifier(verifierProgramTwo.programId);
 console.log("Registering Verifier One success");
 console.log("Registering Verifier Two success");
 } catch (e) {
 console.log(e);
 }
Expand All@@ -112,8 +112,8 @@ export async function setUpMerkleTree(provider: anchor.Provider) {
 console.log(e);
 }

 console.log("MINT: ", MINT.toBase58());
 console.log("POOL_TYPE_PDA: ", REGISTERED_POOL_PDA_SPL.toBase58());
// console.log("MINT: ", MINT.toBase58());
// console.log("POOL_TYPE_PDA: ", REGISTERED_POOL_PDA_SPL.toBase58());
 try {
 await merkleTreeConfig.registerSplPool(POOL_TYPE, MINT);
 console.log("Registering spl pool success");
Expand Down

17 changes: 7 additions & 10 deletions
light-sdk-ts/src/wallet/buildBalance.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -131,13 +131,13 @@ export async function getUnspentUtxos({
 let accountInfo = await provider.connection.getAccountInfo(
 nullifierPubkey,
 );
 console.log(
 "inserted -- spent?",
 accountInfo ? "yes" : "no ",
 nullifierPubkey.toBase58(),
 "amount:",
 decryptedUtxo.amounts[0].toNumber(),
 );
// console.log(
//  "inserted -- spent?",
//  accountInfo ? "yes" : "no ",
//  nullifierPubkey.toBase58(),
//  "amount:",
//  decryptedUtxo.amounts[0].toNumber(),
// );
 if (
 !accountInfo &&
 (decryptedUtxo.amounts[1].toString() !== "0" ||
Expand All@@ -147,9 +147,6 @@ export async function getUnspentUtxos({
 }
 }
 }
 if (decryptedUtxos.length == 0) {
 console.log("no unspent leaf found");
 }

 return decryptedUtxos;
}

44 changes: 19 additions & 25 deletions
light-sdk-ts/src/wallet/createOutUtxos.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,17 +80,17 @@ export function createOutUtxos({
 poseidon,
 inUtxos,
 publicMint,
publicSplAmount,
publicSolAmount,
publicAmountSpl,
publicAmountSol,
 relayerFee,
 changeUtxoAccount,
 recipients = [],
 action,
}: {
 inUtxos?: Utxo[];
 publicMint?: PublicKey;
publicSplAmount?: BN;
publicSolAmount?: BN;
publicAmountSpl?: BN;
publicAmountSol?: BN;
 relayerFee?: BN;
 poseidon: any;
 changeUtxoAccount: Account;
Expand All@@ -105,8 +105,8 @@ export function createOutUtxos({
 );

 if (relayerFee) {
publicSolAmount = publicSolAmount
 ? publicSolAmount.add(relayerFee)
publicAmountSol = publicAmountSol
 ? publicAmountSol.add(relayerFee)
 : relayerFee;
 }

Expand DownExpand Up@@ -192,20 +192,20 @@ export function createOutUtxos({

 // subtract public amounts from sumIns
 if (action === Action.UNSHIELD) {
 if (!publicSolAmount && !publicSplAmount)
 if (!publicAmountSol && !publicAmountSpl)
 throw new CreateUtxoError(
 CreateUtxoErrorCode.NO_PUBLIC_AMOUNTS_PROVIDED,
 "createOutUtxos",
 "publicSolAmount not initialized for unshield",
 "publicAmountSol not initialized for unshield",
 );
 if (!publicSplAmount) publicSplAmount = new BN(0);
 if (!publicSolAmount)
 if (!publicAmountSpl) publicAmountSpl = new BN(0);
 if (!publicAmountSol)
 throw new CreateUtxoError(
 CreateUtxoErrorCode.PUBLIC_SOL_AMOUNT_UNDEFINED,
 "constructor",
 );

 if (publicSplAmount && !publicMint)
 if (publicAmountSpl && !publicMint)
 throw new CreateUtxoError(
 CreateUtxoErrorCode.NO_PUBLIC_MINT_PROVIDED,
 "createOutUtxos",
Expand All@@ -217,9 +217,9 @@ export function createOutUtxos({
 );

 assets[publicSplAssetIndex].sumIn =
 assets[publicSplAssetIndex].sumIn.sub(publicSplAmount);
 assets[publicSplAssetIndex].sumIn.sub(publicAmountSpl);
 assets[publicSolAssetIndex].sumIn =
 assets[publicSolAssetIndex].sumIn.sub(publicSolAmount);
 assets[publicSolAssetIndex].sumIn.sub(publicAmountSol);
 // add public amounts to sumIns
 } else if (action === Action.SHIELD) {
 if (relayerFee)
Expand All@@ -228,26 +228,20 @@ export function createOutUtxos({
 "createOutUtxos",
 "Shield and relayer fee defined",
 );
 if (!publicSolAmount && !publicSplAmount)
 throw new CreateUtxoError(
 CreateUtxoErrorCode.NO_PUBLIC_AMOUNTS_PROVIDED,
 "createOutUtxos",
 "publicSolAmount not initialized for unshield",
 );
 if (!publicSplAmount) publicSplAmount = new BN(0);
 if (!publicSolAmount) publicSolAmount = new BN(0);
 if (!publicAmountSpl) publicAmountSpl = new BN(0);
 if (!publicAmountSol) publicAmountSol = new BN(0);
 let publicSplAssetIndex = assets.findIndex(
 (x) => x.asset.toBase58() === publicMint?.toBase58(),
 );
 let publicSolAssetIndex = assets.findIndex(
 (x) => x.asset.toBase58() === SystemProgram.programId.toBase58(),
 );
 assets[publicSplAssetIndex].sumIn =
 assets[publicSplAssetIndex].sumIn.add(publicSplAmount);
 assets[publicSplAssetIndex].sumIn.add(publicAmountSpl);
 assets[publicSolAssetIndex].sumIn =
 assets[publicSolAssetIndex].sumIn.add(publicSolAmount);
 assets[publicSolAssetIndex].sumIn.add(publicAmountSol);
 } else if (action === Action.TRANSFER) {
 if (!publicSolAmount)
 if (!publicAmountSol)
 throw new CreateUtxoError(
 CreateUtxoErrorCode.PUBLIC_SOL_AMOUNT_UNDEFINED,
 "constructor",
Expand All@@ -257,7 +251,7 @@ export function createOutUtxos({
 );

 assets[publicSolAssetIndex].sumIn =
 assets[publicSolAssetIndex].sumIn.sub(publicSolAmount);
 assets[publicSolAssetIndex].sumIn.sub(publicAmountSol);
 }

 var outputUtxos: Utxo[] = [];
Expand Down

15 changes: 12 additions & 3 deletions
light-sdk-ts/src/wallet/provider.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
import { AnchorProvider, setProvider } from "@coral-xyz/anchor";
import {
 AnchorError,
 AnchorProvider,
 BN,
 setProvider,
 Wallet,
} from "@coral-xyz/anchor";
import { SolMerkleTree } from "../merkleTree";
import {
 PublicKey,
Expand DownExpand Up@@ -37,8 +43,8 @@ export class Provider {
 solMerkleTree?: SolMerkleTree;
 provider?: AnchorProvider | { connection: Connection }; // temp -?
 url?: string;
// TODO: refactor by streamlining everything towards using connection and not anchor provider
 // - get rid of url
minimumLamports: BN;

 /**
 * Init either with nodeWallet or browserWallet. Feepayer is the provided wallet
 * Optionally provide confirmConfig, Default = 'confirmed'.
Expand All@@ -49,12 +55,14 @@ export class Provider {
 confirmConfig,
 connection,
 url = "http://127.0.0.1:8899",
 minimumLamports = new BN(5000 * 30),
 }: {
 nodeWallet?: SolanaKeypair;
 browserWallet?: BrowserWallet;
 confirmConfig?: ConfirmOptions;
 connection?: Connection;
 url?: string;
 minimumLamports?: BN;
 }) {
 if (nodeWallet && browserWallet)
 throw new ProviderError(
Expand DownExpand Up@@ -82,6 +90,7 @@ export class Provider {
 );

 this.confirmConfig = confirmConfig || { commitment: "confirmed" };
 this.minimumLamports = minimumLamports;

 if (nodeWallet) {
 this.nodeWallet = nodeWallet;
Expand Down
Loading

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

Skip to content
Refactored user and add custom errors#56

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 23, 2023
 Merged


Refactored user and add custom errors
#56
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
d4cbc73

refactored user class, and added custom errors


ananas-block Mar 23, 2023
3dcb4de

resolved rebase errors


ananas-block Mar 23, 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


4 changes: 2 additions & 2 deletions
light-sdk-ts/src/constants.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -144,14 +144,14 @@ export const RELAYER_FEES = 1e6;
export const TOKEN_REGISTRY = [
 {
 symbol: "SOL",
 decimals: 1e9,
 decimals: new anchor.BN(1e9),
 isNft: false, // TODO: parse from onchain state at configuration(decimlas, supply)
 isSol: true,
 tokenAccount: SystemProgram.programId,
 },
 {
 symbol: "USDC",
 decimals: 1e2,
 decimals: new anchor.BN(1e2),
 isNft: false,
 isSol: false,
 // copied from MINT (test-utils)
Expand Down

25 changes: 23 additions & 2 deletions
light-sdk-ts/src/errors.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
import { ASSOCIATED_PROGRAM_ID } from "@coral-xyz/anchor/dist/cjs/utils/token";

export enum UtxoErrorCode {
 APP_DATA_FROM_BYTES_FUNCTION_UNDEFINED = "APP_DATA_FROM_BYTES_FUNCTION_UNDEFINED",
 INVALID_ASSET_OR_AMOUNTS_LENGTH = "INVALID_ASSET_OR_AMOUNTS_LENGTH",
Expand All@@ -10,6 +12,23 @@ export enum UtxoErrorCode {
 ASSET_NOT_FOUND = "ASSET_NOT_FOUND",
}

export enum UserErrorCode {
 NO_WALLET_PROVIDED = "NO_WALLET_PROVIDED",
 LOAD_ERROR = "LOAD_ERROR",
 PROVIDER_NOT_INITIALIZED = "PROVIDER_NOT_INITIALIZED",
 UTXOS_NOT_INITIALIZED = "UTXOS_NOT_INITIALIZED",
 USER_ACCOUNT_NOT_INITIALIZED = "USER_ACCOUNT_NOT_INITIALIZED",
 TOKEN_NOT_FOUND = "TOKEN_NOT_FOUND",
 NO_AMOUNTS_PROVIDED = "NO_AMOUNTS_PROVIDED",
 APPROVE_ERROR = "APPROVE_ERROR",
 INSUFFICIENT_BAlANCE = "INSUFFICIENT_BAlANCE",
 ASSOCIATED_TOKEN_ACCOUNT_DOESNT_EXIST = "ASSOCIATED_TOKEN_ACCOUNT_DOESNT_EXIST",
 TOKEN_ACCOUNT_DEFINED = "TOKEN_ACCOUNT_DEFINED",
 SHIELDED_RECIPIENT_UNDEFINED = "SHIELDED_RECIPIENT_UNDEFINED",
 TOKEN_UNDEFINED = "TOKEN_UNDEFINED",
 INVALID_TOKEN = "INVALID_TOKEN",
}

export enum SelectInUtxosErrorCode {
 INVALID_NUMER_OF_MINTS = "INVALID_NUMER_OF_MINTS",
 FAILED_TO_SELECT_SOL_UTXO = "FAILED_TO_SELECT_SOL_UTXO",
Expand All@@ -27,8 +46,8 @@ export enum CreateUtxoErrorCode {
 INVALID_NUMER_OF_RECIPIENTS = "INVALID_NUMER_OF_RECIPIENTS",
 INVALID_RECIPIENT_MINT = "INVALID_RECIPIENT_MINT",
 RECIPIENTS_SUM_AMOUNT_MISSMATCH = "RECIPIENTS_SUM_AMOUNT_MISSMATCH",
 NO_PUBLIC_AMOUNTS_PROVIDED = "NO_PUBLIC_AMOUNTS_PROVIDED_FOR_UNSHIELD",
 NO_PUBLIC_MINT_PROVIDED = "NO_PUBLIC_MINT_PROVIDED_FOR_UNSHIELD",
 NO_PUBLIC_AMOUNTS_PROVIDED = "NO_PUBLIC_AMOUNTS_PROVIDED",
 NO_PUBLIC_MINT_PROVIDED = "NO_PUBLIC_MINT_PROVIDED",
 MINT_UNDEFINED = "MINT_UNDEFINED",
 SPL_AMOUNT_UNDEFINED = "SPL_AMOUNT_UNDEFINED",
 ACCOUNT_UNDEFINED = "ACCOUNT_UNDEFINED",
Expand DownExpand Up@@ -165,3 +184,5 @@ export class CreateUtxoError extends MetaError {}
export class ProviderError extends MetaError {}

export class SelectInUtxosError extends MetaError {}

export class UserError extends MetaError {}

30 changes: 14 additions & 16 deletions
light-sdk-ts/src/test-utils/createAccounts.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -243,14 +243,9 @@ export async function createTestAccounts(
 let balance = await connection.getBalance(ADMIN_AUTH_KEY, "confirmed");
 if (balance === 0) {
 let amount = 1_000_000_000_000;
 console.time("requestAirdrop");

 let res = await connection.requestAirdrop(ADMIN_AUTH_KEY, amount);
 console.timeEnd("requestAirdrop");
 console.time("confirmAirdrop");

 await connection.confirmTransaction(res, "confirmed");
 console.timeEnd("confirmAirdrop");

 let Newbalance = await connection.getBalance(ADMIN_AUTH_KEY);

Expand DownExpand Up@@ -287,7 +282,10 @@ export async function createTestAccounts(
 mintKeypair: Keypair.fromSecretKey(MINT_PRIVATE_KEY),
 connection,
 });
 console.log("created mint");
 console.log(
 "created mint ",
 Keypair.fromSecretKey(MINT_PRIVATE_KEY).publicKey.toBase58(),
 );
 }

 let balanceUserToken = null;
Expand DownExpand Up@@ -330,17 +328,17 @@ export async function createTestAccounts(
 } catch (error) {
 console.log(error);
 }
 console.log("userSplAccount ", userSplAccount);
 console.log("userSplAccount ", userSplAccount?.toBase58());

 console.log(
 "funded account",
 await getAccount(
 connection,
 userSplAccount!, //userTokenAccount,
 "confirmed",
 TOKEN_PROGRAM_ID,
 ),
 );
// console.log(
//  "funded account",
//  await getAccount(
//  connection,
//  userSplAccount!, //userTokenAccount,
//  "confirmed",
//  TOKEN_PROGRAM_ID,
//  ),
// );

 try {
 if (balanceUserToken == null) {
Expand Down

22 changes: 11 additions & 11 deletions
light-sdk-ts/src/test-utils/setUpMerkleTree.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -58,16 +58,16 @@ export async function setUpMerkleTree(provider: anchor.Provider) {
 console.log(e);
 }

 console.log("AUTHORITY: ", AUTHORITY);
// console.log("AUTHORITY: ", AUTHORITY);

 console.log("AUTHORITY: ", Array.from(AUTHORITY.toBytes()));
// console.log("AUTHORITY: ", Array.from(AUTHORITY.toBytes()));

 console.log(
 "verifierProgramZero.programId: ",
 Array.from(verifierProgramZero.programId.toBytes()),
 );
 console.log("MERKLE_TREE_KEY: ", MERKLE_TREE_KEY.toBase58());
 console.log("MERKLE_TREE_KEY: ", Array.from(MERKLE_TREE_KEY.toBytes()));
// console.log(
//  "verifierProgramZero.programId: ",
//  Array.from(verifierProgramZero.programId.toBytes()),
// );
// console.log("MERKLE_TREE_KEY: ", MERKLE_TREE_KEY.toBase58());
// console.log("MERKLE_TREE_KEY: ", Array.from(MERKLE_TREE_KEY.toBytes()));
 // console.log("MERKLE_TREE_PDA_TOKEN: ", MERKLE_TREE_PDA_TOKEN.toBase58())
 // console.log("MERKLE_TREE_PDA_TOKEN: ", Array.from(MERKLE_TREE_PDA_TOKEN.toBytes()))

Expand DownExpand Up@@ -100,7 +100,7 @@ export async function setUpMerkleTree(provider: anchor.Provider) {

 try {
 await merkleTreeConfig.registerVerifier(verifierProgramTwo.programId);
 console.log("Registering Verifier One success");
 console.log("Registering Verifier Two success");
 } catch (e) {
 console.log(e);
 }
Expand All@@ -112,8 +112,8 @@ export async function setUpMerkleTree(provider: anchor.Provider) {
 console.log(e);
 }

 console.log("MINT: ", MINT.toBase58());
 console.log("POOL_TYPE_PDA: ", REGISTERED_POOL_PDA_SPL.toBase58());
// console.log("MINT: ", MINT.toBase58());
// console.log("POOL_TYPE_PDA: ", REGISTERED_POOL_PDA_SPL.toBase58());
 try {
 await merkleTreeConfig.registerSplPool(POOL_TYPE, MINT);
 console.log("Registering spl pool success");
Expand Down

17 changes: 7 additions & 10 deletions
light-sdk-ts/src/wallet/buildBalance.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -131,13 +131,13 @@ export async function getUnspentUtxos({
 let accountInfo = await provider.connection.getAccountInfo(
 nullifierPubkey,
 );
 console.log(
 "inserted -- spent?",
 accountInfo ? "yes" : "no ",
 nullifierPubkey.toBase58(),
 "amount:",
 decryptedUtxo.amounts[0].toNumber(),
 );
// console.log(
//  "inserted -- spent?",
//  accountInfo ? "yes" : "no ",
//  nullifierPubkey.toBase58(),
//  "amount:",
//  decryptedUtxo.amounts[0].toNumber(),
// );
 if (
 !accountInfo &&
 (decryptedUtxo.amounts[1].toString() !== "0" ||
Expand All@@ -147,9 +147,6 @@ export async function getUnspentUtxos({
 }
 }
 }
 if (decryptedUtxos.length == 0) {
 console.log("no unspent leaf found");
 }

 return decryptedUtxos;
}

44 changes: 19 additions & 25 deletions
light-sdk-ts/src/wallet/createOutUtxos.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,17 +80,17 @@ export function createOutUtxos({
 poseidon,
 inUtxos,
 publicMint,
publicSplAmount,
publicSolAmount,
publicAmountSpl,
publicAmountSol,
 relayerFee,
 changeUtxoAccount,
 recipients = [],
 action,
}: {
 inUtxos?: Utxo[];
 publicMint?: PublicKey;
publicSplAmount?: BN;
publicSolAmount?: BN;
publicAmountSpl?: BN;
publicAmountSol?: BN;
 relayerFee?: BN;
 poseidon: any;
 changeUtxoAccount: Account;
Expand All@@ -105,8 +105,8 @@ export function createOutUtxos({
 );

 if (relayerFee) {
publicSolAmount = publicSolAmount
 ? publicSolAmount.add(relayerFee)
publicAmountSol = publicAmountSol
 ? publicAmountSol.add(relayerFee)
 : relayerFee;
 }

Expand DownExpand Up@@ -192,20 +192,20 @@ export function createOutUtxos({

 // subtract public amounts from sumIns
 if (action === Action.UNSHIELD) {
 if (!publicSolAmount && !publicSplAmount)
 if (!publicAmountSol && !publicAmountSpl)
 throw new CreateUtxoError(
 CreateUtxoErrorCode.NO_PUBLIC_AMOUNTS_PROVIDED,
 "createOutUtxos",
 "publicSolAmount not initialized for unshield",
 "publicAmountSol not initialized for unshield",
 );
 if (!publicSplAmount) publicSplAmount = new BN(0);
 if (!publicSolAmount)
 if (!publicAmountSpl) publicAmountSpl = new BN(0);
 if (!publicAmountSol)
 throw new CreateUtxoError(
 CreateUtxoErrorCode.PUBLIC_SOL_AMOUNT_UNDEFINED,
 "constructor",
 );

 if (publicSplAmount && !publicMint)
 if (publicAmountSpl && !publicMint)
 throw new CreateUtxoError(
 CreateUtxoErrorCode.NO_PUBLIC_MINT_PROVIDED,
 "createOutUtxos",
Expand All@@ -217,9 +217,9 @@ export function createOutUtxos({
 );

 assets[publicSplAssetIndex].sumIn =
 assets[publicSplAssetIndex].sumIn.sub(publicSplAmount);
 assets[publicSplAssetIndex].sumIn.sub(publicAmountSpl);
 assets[publicSolAssetIndex].sumIn =
 assets[publicSolAssetIndex].sumIn.sub(publicSolAmount);
 assets[publicSolAssetIndex].sumIn.sub(publicAmountSol);
 // add public amounts to sumIns
 } else if (action === Action.SHIELD) {
 if (relayerFee)
Expand All@@ -228,26 +228,20 @@ export function createOutUtxos({
 "createOutUtxos",
 "Shield and relayer fee defined",
 );
 if (!publicSolAmount && !publicSplAmount)
 throw new CreateUtxoError(
 CreateUtxoErrorCode.NO_PUBLIC_AMOUNTS_PROVIDED,
 "createOutUtxos",
 "publicSolAmount not initialized for unshield",
 );
 if (!publicSplAmount) publicSplAmount = new BN(0);
 if (!publicSolAmount) publicSolAmount = new BN(0);
 if (!publicAmountSpl) publicAmountSpl = new BN(0);
 if (!publicAmountSol) publicAmountSol = new BN(0);
 let publicSplAssetIndex = assets.findIndex(
 (x) => x.asset.toBase58() === publicMint?.toBase58(),
 );
 let publicSolAssetIndex = assets.findIndex(
 (x) => x.asset.toBase58() === SystemProgram.programId.toBase58(),
 );
 assets[publicSplAssetIndex].sumIn =
 assets[publicSplAssetIndex].sumIn.add(publicSplAmount);
 assets[publicSplAssetIndex].sumIn.add(publicAmountSpl);
 assets[publicSolAssetIndex].sumIn =
 assets[publicSolAssetIndex].sumIn.add(publicSolAmount);
 assets[publicSolAssetIndex].sumIn.add(publicAmountSol);
 } else if (action === Action.TRANSFER) {
 if (!publicSolAmount)
 if (!publicAmountSol)
 throw new CreateUtxoError(
 CreateUtxoErrorCode.PUBLIC_SOL_AMOUNT_UNDEFINED,
 "constructor",
Expand All@@ -257,7 +251,7 @@ export function createOutUtxos({
 );

 assets[publicSolAssetIndex].sumIn =
 assets[publicSolAssetIndex].sumIn.sub(publicSolAmount);
 assets[publicSolAssetIndex].sumIn.sub(publicAmountSol);
 }

 var outputUtxos: Utxo[] = [];
Expand Down

15 changes: 12 additions & 3 deletions
light-sdk-ts/src/wallet/provider.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
import { AnchorProvider, setProvider } from "@coral-xyz/anchor";
import {
 AnchorError,
 AnchorProvider,
 BN,
 setProvider,
 Wallet,
} from "@coral-xyz/anchor";
import { SolMerkleTree } from "../merkleTree";
import {
 PublicKey,
Expand DownExpand Up@@ -37,8 +43,8 @@ export class Provider {
 solMerkleTree?: SolMerkleTree;
 provider?: AnchorProvider | { connection: Connection }; // temp -?
 url?: string;
// TODO: refactor by streamlining everything towards using connection and not anchor provider
 // - get rid of url
minimumLamports: BN;

 /**
 * Init either with nodeWallet or browserWallet. Feepayer is the provided wallet
 * Optionally provide confirmConfig, Default = 'confirmed'.
Expand All@@ -49,12 +55,14 @@ export class Provider {
 confirmConfig,
 connection,
 url = "http://127.0.0.1:8899",
 minimumLamports = new BN(5000 * 30),
 }: {
 nodeWallet?: SolanaKeypair;
 browserWallet?: BrowserWallet;
 confirmConfig?: ConfirmOptions;
 connection?: Connection;
 url?: string;
 minimumLamports?: BN;
 }) {
 if (nodeWallet && browserWallet)
 throw new ProviderError(
Expand DownExpand Up@@ -82,6 +90,7 @@ export class Provider {
 );

 this.confirmConfig = confirmConfig || { commitment: "confirmed" };
 this.minimumLamports = minimumLamports;

 if (nodeWallet) {
 this.nodeWallet = nodeWallet;
Expand Down
Loading