Streamline wallet#55

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 10 commits into from
Mar 24, 2023
Merged

Streamline wallet #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
6de2110
added mockUseWallet
Mar 14, 2023
0af02e8
Jorrit add custom errors for transaction class and transaction parame…
ananas-block Mar 13, 2023
ff46ed4
minor changes
Mar 24, 2023
731d7fb
Revert "minor changes"
Mar 24, 2023
1696b84
minor changes
Mar 24, 2023
19c3098
added promise await in transaction
Mar 24, 2023
706b9b8
naming conventions
Mar 24, 2023
f2ef002
Revert "naming conventions"
Mar 24, 2023
f6bd5b8
naming conventions
Mar 24, 2023
921e7cc
method name changed
Mar 24, 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
5 changes: 5 additions & 0 deletions build-sdk.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,3 +20,8 @@ pushd mock-app-verifier
rm -rf node_modules
yarn
popd

pushd relayer
rm -rf node_modules
yarn
popd
5 changes: 5 additions & 0 deletions build.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,3 +15,8 @@ popd
pushd light-circuits
yarn install
popd

pushd relayer
yarn install
yarn run build
popd
4 changes: 2 additions & 2 deletions light-sdk-ts/src/errors.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -71,13 +71,13 @@ export enum ProviderErrorCode {
SOL_MERKLE_TREE_UNDEFINED = "SOL_MERKLE_TREE_UNDEFINED",
ANCHOR_PROVIDER_UNDEFINED = "ANCHOR_PROVIDER_UNDEFINED",
PROVIDER_UNDEFINED = "PROVIDER_UNDEFINED",
NODE_WALLET_AND_BROWSER_WALLET_UNDEFINED = "NODE_WALLET_AND_BROWSER_WALLET_UNDEFINED",
WALLET_UNDEFINED = "WALLET_UNDEFINED",
NODE_WALLET_UNDEFINED = "NODE_WALLET_UNDEFINED",
URL_UNDEFINED = "URL_UNDEFINED",
CONNECTION_UNDEFINED = "CONNECTION_UNDEFINED",
CONNECTION_DEFINED = "CONNECTION_DEFINED",
KEYPAIR_UNDEFINED = "KEYPAIR_UNDEFINED",
NODE_WALLET_AND_BROWSER_WALLET_DEFINED = "NODE_WALLET_AND_BROWSER_WALLET_DEFINED",
WALLET_DEFINED = "WALLET_DEFINED",
MERKLE_TREE_NOT_INITIALIZED = "MERKLE_TREE_NOT_INITIALIZED",
}

Expand Down
7 changes: 2 additions & 5 deletions light-sdk-ts/src/merkleTree/solMerkleTree.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -67,15 +67,12 @@ export class SolMerkleTree {

const mtFetched = await merkleTreeProgram.account.merkleTree.fetch(
merkleTreePubkey,
"confirmed",
);

const merkleTreeIndex = mtFetched.nextIndex;
// console.log(
// "getCompressedLeaves merkleTreeIndex",
// merkleTreeIndex.toNumber(),
// );

merkleTreeProgram.account.twoLeavesBytesPda.all();
// merkleTreeProgram.account.twoLeavesBytesPda

let leavesAccounts: Array<{
account: QueuedLeavesPda;
Expand Down
4 changes: 2 additions & 2 deletions light-sdk-ts/src/test-utils/createAccounts.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -288,8 +288,8 @@ export async function createTestAccounts(
);
}

let balanceUserToken = null;
let userSplAccount = null;
let balanceUserToken: null | any = null;

@SwenSchaeferjohannSwenSchaeferjohannMar 24, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

please make the type explicit

let userSplAccount: PublicKey | null = null;
try {
let tokenCtx = TOKEN_REGISTRY.find((t) => t.symbol === "USDC");
if (userTokenAccount) {
Expand Down
2 changes: 1 addition & 1 deletion light-sdk-ts/src/test-utils/functionalCircuit.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -40,7 +40,7 @@ export async function functionalCircuitTest(
outputUtxos: [deposit_utxo1],
merkleTreePubkey: mockPubkey,
sender: mockPubkey,
senderFee: lightProvider.nodeWallet!.publicKey,
senderFee: lightProvider.wallet!.publicKey,
verifier: verifier,
lookUpTable: mockPubkey,
action: Action.SHIELD,
Expand Down
3 changes: 2 additions & 1 deletion light-sdk-ts/src/test-utils/initLookUpTable.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@ import {
SystemProgram,
sendAndConfirmTransaction,
Transaction,
AccountInfo,
} from "@solana/web3.js";
import * as anchor from "@coral-xyz/anchor";
import { TOKEN_PROGRAM_ID } from "@solana/spl-token";
Expand DownExpand Up@@ -80,7 +81,7 @@ export async function initLookUpTable(
recentSlot: number,
extraAccounts?: Array<PublicKey>,
): Promise<PublicKey> {
var lookUpTableInfoInit = null;
var lookUpTableInfoInit: AccountInfo<Buffer> | null = null;
if (lookupTableAddress != undefined) {
lookUpTableInfoInit = await provider.connection.getAccountInfo(
lookupTableAddress,
Expand Down
2 changes: 2 additions & 0 deletions light-sdk-ts/src/test-utils/testChecks.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -126,6 +126,7 @@ export async function checkMerkleTreeBatchUpdateSuccess({
}) {
var merkleTreeTmpStateAccount = await connection.getAccountInfo(
merkleTreeUpdateState,
"confirmed",
);

assert.equal(
Expand All@@ -136,6 +137,7 @@ export async function checkMerkleTreeBatchUpdateSuccess({

var merkleTreeAccount = await merkleTreeProgram.account.merkleTree.fetch(
merkle_tree_pubkey,
"confirmed",
);
// Merkle tree is locked by merkleTreeUpdateState
assert.equal(
Expand Down
86 changes: 45 additions & 41 deletions light-sdk-ts/src/transaction.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ import {
VersionedTransaction,
TransactionSignature,
TransactionInstruction,
Transaction as SolanaTransaction,
} from "@solana/web3.js";
import * as anchor from "@coral-xyz/anchor";
import { TOKEN_PROGRAM_ID, getAccount } from "@solana/spl-token";
Expand All@@ -30,6 +31,7 @@ import {
initLookUpTable,
TransactionParametersErrorCode,
Provider,
ADMIN_AUTH_KEYPAIR,
} from "./index";
import { IDL_MERKLE_TREE_PROGRAM } from "./idls/index";
const snarkjs = require("snarkjs");
Expand DownExpand Up@@ -808,7 +810,7 @@ export class Transaction {
"constructor",
"Merkle tree not set in provider",
);
if (!provider.browserWallet && !provider.nodeWallet)
if (!provider.wallet)
throw new TransactionError(
TransactionErrorCode.WALLET_UNDEFINED,
"constructor",
Expand All@@ -829,10 +831,7 @@ export class Transaction {

//TODO: change to check whether browser/node wallet are the same as signing address
if (params.action === Action.SHIELD) {
let wallet =
this.provider.browserWallet !== undefined
? this.provider.browserWallet
: this.provider.nodeWallet;
let wallet = this.provider.wallet;
if (
wallet?.publicKey.toBase58() !==
params.relayer.accounts.relayerPubkey.toBase58() &&
Expand DownExpand Up@@ -1103,7 +1102,7 @@ export class Transaction {
IDL_MERKLE_TREE_PROGRAM,
merkleTreeProgramId,
// @ts-ignore
this.provider.browserWallet && this.provider,
this.provider.provider,
);
let root = Uint8Array.from(
leInt2Buff(
Expand All@@ -1114,6 +1113,7 @@ export class Transaction {
let merkle_tree_account_data =
await this.merkleTreeProgram.account.merkleTree.fetch(
this.provider.solMerkleTree.pubkey,
"confirmed",
);
// @ts-ignore: unknown type error
merkle_tree_account_data.roots.map((x: any, index: any) => {
Expand DownExpand Up@@ -1509,7 +1509,7 @@ export class Transaction {

async sendTransaction(ix: any): Promise<TransactionSignature | undefined> {
if (false) {
// TODO: replace this with (this.provider.browserWallet.pubkey != new relayer... this.relayer
// TODO: replace this with (this.provider.wallet.pubkey != new relayer... this.relayer
// then we know that an actual relayer was passed in and that it's supposed to be sent to one.
// we cant do that tho as we'd want to add the default relayer to the provider itself.
// so just pass in a flag here "shield, unshield, transfer" -> so devs don't have to know that it goes to a relayer.
Expand DownExpand Up@@ -1592,18 +1592,7 @@ export class Transaction {
let retries = 3;
let res;
while (retries > 0) {
if (this.provider.browserWallet) {
// TODO: versiontx??
console.error("versioned tx might throw here");
tx = await this.provider.browserWallet.signTransaction(tx);
// throw new Error(
// "versioned transaction in browser not implemented yet",
// );
} else {
/** Just need to define relayer pubkey as signer a creation */
tx.sign([this.provider.nodeWallet!]);
}

tx = await this.provider.wallet.signTransaction(tx);
try {
let serializedTx = tx.serialize();

Expand DownExpand Up@@ -1642,11 +1631,11 @@ export class Transaction {
"",
);

if (!this.provider.nodeWallet && !this.provider.browserWallet)
if (!this.provider.wallet)
throw new TransactionError(
TransactionErrorCode.WALLET_UNDEFINED,
"sendAndConfirmTransaction",
"Cannot use sendAndConfirmTransaction without payer or browserWallet",
"Cannot use sendAndConfirmTransaction without wallet",
);

await this.getRootIndex();
Expand DownExpand Up@@ -1692,11 +1681,11 @@ export class Transaction {
// TODO: deal with this: set own payer just for that? where is this used?
// This is used by applications not the relayer
async closeVerifierState(): Promise<TransactionSignature> {
if (!this.provider.nodeWallet && !this.provider.browserWallet)
if (!this.provider.wallet)
throw new TransactionError(
TransactionErrorCode.WALLET_UNDEFINED,
"closeVerifierState",
"Cannot use closeVerifierState without payer or browserWallet",
"Cannot use closeVerifierState without wallet",
);
if (!this.params)
throw new TransactionError(
Expand All@@ -1711,21 +1700,27 @@ export class Transaction {
"",
);
if (this.appParams) {
return await this.appParams?.verifier.verifierProgram.methods
.closeVerifierState()
.accounts({
...this.params.accounts,
})
.signers([this.provider.nodeWallet!]) // TODO: browserwallet? or only ever used by relayer?
.rpc(confirmConfig);
const transaction = new SolanaTransaction().add(
await this.appParams?.verifier.verifierProgram.methods
.closeVerifierState()
.accounts({
...this.params.accounts,
})
.instruction(),
);

return await this.provider.wallet!.sendAndConfirmTransaction(transaction);
} else {
return await this.params?.verifier.verifierProgram.methods
.closeVerifierState()
.accounts({
...this.params.accounts,
})
.signers([this.provider.nodeWallet!]) // TODO: browserwallet? or only ever used by relayer?
.rpc(confirmConfig);
const transaction = new SolanaTransaction().add(
await this.params?.verifier.verifierProgram.methods
.closeVerifierState()
.accounts({
...this.params.accounts,
})
.instruction(),
);

return await this.provider.wallet!.sendAndConfirmTransaction(transaction);
}
}

Expand DownExpand Up@@ -1913,14 +1908,12 @@ export class Transaction {
"test values relayerRecipientAccountBalancePriorLastTx undefined",
);
}

// Checking that nullifiers were inserted
if (new BN(this.proofInput.publicAmount).toString() === "0") {
this.testValues.is_token = false;
} else {
this.testValues.is_token = true;
}

for (
var i = 0;
i < this.remainingAccounts.nullifierPdaPubkeys?.length;
Expand All@@ -1946,6 +1939,7 @@ export class Transaction {
leavesAccountData =
await this.merkleTreeProgram.account.twoLeavesBytesPda.fetch(
this.remainingAccounts.leavesPdaPubkeys[i].pubkey,
"confirmed",
);

assert(
Expand All@@ -1963,7 +1957,6 @@ export class Transaction {
this.provider.solMerkleTree.pubkey.toBase58(),
"merkleTreePubkey not inserted correctly",
);

for (var j = 0; j < this.params.encryptedUtxos.length / 256; j++) {
// console.log(j);

Expand DownExpand Up@@ -2035,14 +2028,18 @@ export class Transaction {

try {
const merkleTreeAfterUpdate =
await this.merkleTreeProgram.account.merkleTree.fetch(MERKLE_TREE_KEY);
await this.merkleTreeProgram.account.merkleTree.fetch(
MERKLE_TREE_KEY,
"confirmed",
);
console.log(
"Number(merkleTreeAfterUpdate.nextQueuedIndex) ",
Number(merkleTreeAfterUpdate.nextQueuedIndex),
);
leavesAccountData =
await this.merkleTreeProgram.account.twoLeavesBytesPda.fetch(
this.remainingAccounts.leavesPdaPubkeys[0].pubkey,
"confirmed",
);
console.log(
`${Number(leavesAccountData.leftLeafIndex)} + ${
Expand DownExpand Up@@ -2072,6 +2069,7 @@ export class Transaction {
var recipientFeeAccountBalance =
await this.provider.provider.connection.getBalance(
this.params.accounts.recipientFee,
"confirmed",
);
console.log(
"testValues.recipientFeeBalancePriorTx: ",
Expand All@@ -2081,6 +2079,7 @@ export class Transaction {
var senderFeeAccountBalance =
await this.provider.provider.connection.getBalance(
this.params.relayer.accounts.relayerPubkey,
"confirmed",
);
assert(
recipientFeeAccountBalance ==
Expand DownExpand Up@@ -2157,6 +2156,7 @@ export class Transaction {
var senderFeeAccountBalance =
await this.provider.provider.connection.getBalance(
this.params.accounts.senderFee,
"confirmed",
);

assert(
Expand All@@ -2182,11 +2182,13 @@ export class Transaction {
) {
var relayerAccount = await this.provider.provider.connection.getBalance(
this.params.relayer.accounts.relayerRecipient,
"confirmed",
);

var recipientFeeAccount =
await this.provider.provider.connection.getBalance(
this.params.accounts.recipientFee,
"confirmed",
);

// console.log("relayerAccount ", relayerAccount);
Expand DownExpand Up@@ -2269,11 +2271,13 @@ export class Transaction {

var relayerAccount = await this.provider.provider.connection.getBalance(
this.params.relayer.accounts.relayerRecipient,
"confirmed",
);

var recipientFeeAccount =
await this.provider.provider.connection.getBalance(
this.params.accounts.recipientFee,
"confirmed",
);

// console.log("relayerAccount ", relayerAccount);
Expand Down
7 changes: 2 additions & 5 deletions light-sdk-ts/src/verifiers/verifierOne.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -111,14 +111,11 @@ export class VerifierOne implements Verifier {
"getInstructions",
"verifier one: params.encryptedUtxos undefined",
);
if (
!transaction.provider.browserWallet &&
!transaction.provider.nodeWallet
) {
if (!transaction.provider.wallet) {
throw new VerifierError(
TransactionErrorCode.WALLET_UNDEFINED,
"getInstructions",
"verifier one: Payer(browserwallet, nodewallet) not defined",
"verifier one: Payer(wallet) not defined",
);
}
if (!this.verifierProgram)
Expand Down
7 changes: 2 additions & 5 deletions light-sdk-ts/src/verifiers/verifierZero.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -114,14 +114,11 @@ export class VerifierZero implements Verifier {
"getInstructions",
"verifier zero: params.encryptedUtxos undefined",
);
if (
!transaction.provider.browserWallet &&
!transaction.provider.nodeWallet
) {
if (!transaction.provider.wallet) {
throw new VerifierError(
TransactionErrorCode.WALLET_UNDEFINED,
"getInstructions",
"verifier zero: Payer(browserwallet, nodewallet) not defined",
"verifier zero: Payer(wallet) not defined",
);
}
if (!this.verifierProgram)
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
Streamline wallet#55

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 10 commits into

from

Mar 24, 2023
 Merged


Streamline wallet
#55
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
6de2110

added mockUseWallet

Mar 14, 2023
0af02e8

Jorrit add custom errors for transaction class and transaction parame…


ananas-block Mar 13, 2023
ff46ed4

minor changes

Mar 24, 2023
731d7fb

Revert "minor changes"

Mar 24, 2023
1696b84

minor changes

Mar 24, 2023
19c3098

added promise await in transaction

Mar 24, 2023
706b9b8

naming conventions

Mar 24, 2023
f2ef002

Revert "naming conventions"

Mar 24, 2023
f6bd5b8

naming conventions

Mar 24, 2023
921e7cc

method name changed

Mar 24, 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


5 changes: 5 additions & 0 deletions
build-sdk.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,3 +20,8 @@ pushd mock-app-verifier
rm -rf node_modules
yarn
popd

pushd relayer
rm -rf node_modules
yarn
popd

5 changes: 5 additions & 0 deletions
build.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,3 +15,8 @@ popd
pushd light-circuits
yarn install
popd

pushd relayer
yarn install
yarn run build
popd

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -71,13 +71,13 @@ export enum ProviderErrorCode {
 SOL_MERKLE_TREE_UNDEFINED = "SOL_MERKLE_TREE_UNDEFINED",
 ANCHOR_PROVIDER_UNDEFINED = "ANCHOR_PROVIDER_UNDEFINED",
 PROVIDER_UNDEFINED = "PROVIDER_UNDEFINED",
NODE_WALLET_AND_BROWSER_WALLET_UNDEFINED = "NODE_WALLET_AND_BROWSER_WALLET_UNDEFINED",
WALLET_UNDEFINED = "WALLET_UNDEFINED",
 NODE_WALLET_UNDEFINED = "NODE_WALLET_UNDEFINED",
 URL_UNDEFINED = "URL_UNDEFINED",
 CONNECTION_UNDEFINED = "CONNECTION_UNDEFINED",
 CONNECTION_DEFINED = "CONNECTION_DEFINED",
 KEYPAIR_UNDEFINED = "KEYPAIR_UNDEFINED",
NODE_WALLET_AND_BROWSER_WALLET_DEFINED = "NODE_WALLET_AND_BROWSER_WALLET_DEFINED",
WALLET_DEFINED = "WALLET_DEFINED",
 MERKLE_TREE_NOT_INITIALIZED = "MERKLE_TREE_NOT_INITIALIZED",
}

Expand Down

7 changes: 2 additions & 5 deletions
light-sdk-ts/src/merkleTree/solMerkleTree.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,15 +67,12 @@ export class SolMerkleTree {

 const mtFetched = await merkleTreeProgram.account.merkleTree.fetch(
 merkleTreePubkey,
 "confirmed",
 );

 const merkleTreeIndex = mtFetched.nextIndex;
 // console.log(
 // "getCompressedLeaves merkleTreeIndex",
 // merkleTreeIndex.toNumber(),
 // );

 merkleTreeProgram.account.twoLeavesBytesPda.all();
 // merkleTreeProgram.account.twoLeavesBytesPda

 let leavesAccounts: Array<{
 account: QueuedLeavesPda;
Expand Down

4 changes: 2 additions & 2 deletions
light-sdk-ts/src/test-utils/createAccounts.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -288,8 +288,8 @@ export async function createTestAccounts(
 );
 }

 let balanceUserToken = null;
 let userSplAccount = null;
 let balanceUserToken: null | any = null;
@SwenSchaeferjohannSwenSchaeferjohannMar 24, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

please make the type explicit
 let userSplAccount: PublicKey | null = null;
 try {
 let tokenCtx = TOKEN_REGISTRY.find((t) => t.symbol === "USDC");
 if (userTokenAccount) {
Expand Down

2 changes: 1 addition & 1 deletion
light-sdk-ts/src/test-utils/functionalCircuit.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,7 +40,7 @@ export async function functionalCircuitTest(
 outputUtxos: [deposit_utxo1],
 merkleTreePubkey: mockPubkey,
 sender: mockPubkey,
 senderFee: lightProvider.nodeWallet!.publicKey,
 senderFee: lightProvider.wallet!.publicKey,
 verifier: verifier,
 lookUpTable: mockPubkey,
 action: Action.SHIELD,
Expand Down

3 changes: 2 additions & 1 deletion
light-sdk-ts/src/test-utils/initLookUpTable.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@ import {
 SystemProgram,
 sendAndConfirmTransaction,
 Transaction,
 AccountInfo,
} from "@solana/web3.js";
import * as anchor from "@coral-xyz/anchor";
import { TOKEN_PROGRAM_ID } from "@solana/spl-token";
Expand DownExpand Up@@ -80,7 +81,7 @@ export async function initLookUpTable(
 recentSlot: number,
 extraAccounts?: Array<PublicKey>,
): Promise<PublicKey> {
 var lookUpTableInfoInit = null;
 var lookUpTableInfoInit: AccountInfo<Buffer> | null = null;
 if (lookupTableAddress != undefined) {
 lookUpTableInfoInit = await provider.connection.getAccountInfo(
 lookupTableAddress,
Expand Down

2 changes: 2 additions & 0 deletions
light-sdk-ts/src/test-utils/testChecks.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -126,6 +126,7 @@ export async function checkMerkleTreeBatchUpdateSuccess({
}) {
 var merkleTreeTmpStateAccount = await connection.getAccountInfo(
 merkleTreeUpdateState,
 "confirmed",
 );

 assert.equal(
Expand All@@ -136,6 +137,7 @@ export async function checkMerkleTreeBatchUpdateSuccess({

 var merkleTreeAccount = await merkleTreeProgram.account.merkleTree.fetch(
 merkle_tree_pubkey,
 "confirmed",
 );
 // Merkle tree is locked by merkleTreeUpdateState
 assert.equal(
Expand Down

86 changes: 45 additions & 41 deletions
light-sdk-ts/src/transaction.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ import {
 VersionedTransaction,
 TransactionSignature,
 TransactionInstruction,
 Transaction as SolanaTransaction,
} from "@solana/web3.js";
import * as anchor from "@coral-xyz/anchor";
import { TOKEN_PROGRAM_ID, getAccount } from "@solana/spl-token";
Expand All@@ -30,6 +31,7 @@ import {
 initLookUpTable,
 TransactionParametersErrorCode,
 Provider,
 ADMIN_AUTH_KEYPAIR,
} from "./index";
import { IDL_MERKLE_TREE_PROGRAM } from "./idls/index";
const snarkjs = require("snarkjs");
Expand DownExpand Up@@ -808,7 +810,7 @@ export class Transaction {
 "constructor",
 "Merkle tree not set in provider",
 );
 if (!provider.browserWallet && !provider.nodeWallet)
 if (!provider.wallet)
 throw new TransactionError(
 TransactionErrorCode.WALLET_UNDEFINED,
 "constructor",
Expand All@@ -829,10 +831,7 @@ export class Transaction {

 //TODO: change to check whether browser/node wallet are the same as signing address
 if (params.action === Action.SHIELD) {
 let wallet =
 this.provider.browserWallet !== undefined
 ? this.provider.browserWallet
 : this.provider.nodeWallet;
 let wallet = this.provider.wallet;
 if (
 wallet?.publicKey.toBase58() !==
 params.relayer.accounts.relayerPubkey.toBase58() &&
Expand DownExpand Up@@ -1103,7 +1102,7 @@ export class Transaction {
 IDL_MERKLE_TREE_PROGRAM,
 merkleTreeProgramId,
 // @ts-ignore
 this.provider.browserWallet && this.provider,
 this.provider.provider,
 );
 let root = Uint8Array.from(
 leInt2Buff(
Expand All@@ -1114,6 +1113,7 @@ export class Transaction {
 let merkle_tree_account_data =
 await this.merkleTreeProgram.account.merkleTree.fetch(
 this.provider.solMerkleTree.pubkey,
 "confirmed",
 );
 // @ts-ignore: unknown type error
 merkle_tree_account_data.roots.map((x: any, index: any) => {
Expand DownExpand Up@@ -1509,7 +1509,7 @@ export class Transaction {

 async sendTransaction(ix: any): Promise<TransactionSignature | undefined> {
 if (false) {
 // TODO: replace this with (this.provider.browserWallet.pubkey != new relayer... this.relayer
 // TODO: replace this with (this.provider.wallet.pubkey != new relayer... this.relayer
 // then we know that an actual relayer was passed in and that it's supposed to be sent to one.
 // we cant do that tho as we'd want to add the default relayer to the provider itself.
 // so just pass in a flag here "shield, unshield, transfer" -> so devs don't have to know that it goes to a relayer.
Expand DownExpand Up@@ -1592,18 +1592,7 @@ export class Transaction {
 let retries = 3;
 let res;
 while (retries > 0) {
 if (this.provider.browserWallet) {
 // TODO: versiontx??
 console.error("versioned tx might throw here");
 tx = await this.provider.browserWallet.signTransaction(tx);
 // throw new Error(
 // "versioned transaction in browser not implemented yet",
 // );
 } else {
 /** Just need to define relayer pubkey as signer a creation */
 tx.sign([this.provider.nodeWallet!]);
 }

 tx = await this.provider.wallet.signTransaction(tx);
 try {
 let serializedTx = tx.serialize();

Expand DownExpand Up@@ -1642,11 +1631,11 @@ export class Transaction {
 "",
 );

 if (!this.provider.nodeWallet && !this.provider.browserWallet)
 if (!this.provider.wallet)
 throw new TransactionError(
 TransactionErrorCode.WALLET_UNDEFINED,
 "sendAndConfirmTransaction",
 "Cannot use sendAndConfirmTransaction without payer or browserWallet",
 "Cannot use sendAndConfirmTransaction without wallet",
 );

 await this.getRootIndex();
Expand DownExpand Up@@ -1692,11 +1681,11 @@ export class Transaction {
 // TODO: deal with this: set own payer just for that? where is this used?
 // This is used by applications not the relayer
 async closeVerifierState(): Promise<TransactionSignature> {
 if (!this.provider.nodeWallet && !this.provider.browserWallet)
 if (!this.provider.wallet)
 throw new TransactionError(
 TransactionErrorCode.WALLET_UNDEFINED,
 "closeVerifierState",
 "Cannot use closeVerifierState without payer or browserWallet",
 "Cannot use closeVerifierState without wallet",
 );
 if (!this.params)
 throw new TransactionError(
Expand All@@ -1711,21 +1700,27 @@ export class Transaction {
 "",
 );
 if (this.appParams) {
 return await this.appParams?.verifier.verifierProgram.methods
 .closeVerifierState()
 .accounts({
 ...this.params.accounts,
 })
 .signers([this.provider.nodeWallet!]) // TODO: browserwallet? or only ever used by relayer?
 .rpc(confirmConfig);
 const transaction = new SolanaTransaction().add(
 await this.appParams?.verifier.verifierProgram.methods
 .closeVerifierState()
 .accounts({
 ...this.params.accounts,
 })
 .instruction(),
 );

 return await this.provider.wallet!.sendAndConfirmTransaction(transaction);
 } else {
 return await this.params?.verifier.verifierProgram.methods
 .closeVerifierState()
 .accounts({
 ...this.params.accounts,
 })
 .signers([this.provider.nodeWallet!]) // TODO: browserwallet? or only ever used by relayer?
 .rpc(confirmConfig);
 const transaction = new SolanaTransaction().add(
 await this.params?.verifier.verifierProgram.methods
 .closeVerifierState()
 .accounts({
 ...this.params.accounts,
 })
 .instruction(),
 );

 return await this.provider.wallet!.sendAndConfirmTransaction(transaction);
 }
 }

Expand DownExpand Up@@ -1913,14 +1908,12 @@ export class Transaction {
 "test values relayerRecipientAccountBalancePriorLastTx undefined",
 );
 }

 // Checking that nullifiers were inserted
 if (new BN(this.proofInput.publicAmount).toString() === "0") {
 this.testValues.is_token = false;
 } else {
 this.testValues.is_token = true;
 }

 for (
 var i = 0;
 i < this.remainingAccounts.nullifierPdaPubkeys?.length;
Expand All@@ -1946,6 +1939,7 @@ export class Transaction {
 leavesAccountData =
 await this.merkleTreeProgram.account.twoLeavesBytesPda.fetch(
 this.remainingAccounts.leavesPdaPubkeys[i].pubkey,
 "confirmed",
 );

 assert(
Expand All@@ -1963,7 +1957,6 @@ export class Transaction {
 this.provider.solMerkleTree.pubkey.toBase58(),
 "merkleTreePubkey not inserted correctly",
 );

 for (var j = 0; j < this.params.encryptedUtxos.length / 256; j++) {
 // console.log(j);

Expand DownExpand Up@@ -2035,14 +2028,18 @@ export class Transaction {

 try {
 const merkleTreeAfterUpdate =
 await this.merkleTreeProgram.account.merkleTree.fetch(MERKLE_TREE_KEY);
 await this.merkleTreeProgram.account.merkleTree.fetch(
 MERKLE_TREE_KEY,
 "confirmed",
 );
 console.log(
 "Number(merkleTreeAfterUpdate.nextQueuedIndex) ",
 Number(merkleTreeAfterUpdate.nextQueuedIndex),
 );
 leavesAccountData =
 await this.merkleTreeProgram.account.twoLeavesBytesPda.fetch(
 this.remainingAccounts.leavesPdaPubkeys[0].pubkey,
 "confirmed",
 );
 console.log(
 `${Number(leavesAccountData.leftLeafIndex)} + ${
Expand DownExpand Up@@ -2072,6 +2069,7 @@ export class Transaction {
 var recipientFeeAccountBalance =
 await this.provider.provider.connection.getBalance(
 this.params.accounts.recipientFee,
 "confirmed",
 );
 console.log(
 "testValues.recipientFeeBalancePriorTx: ",
Expand All@@ -2081,6 +2079,7 @@ export class Transaction {
 var senderFeeAccountBalance =
 await this.provider.provider.connection.getBalance(
 this.params.relayer.accounts.relayerPubkey,
 "confirmed",
 );
 assert(
 recipientFeeAccountBalance ==
Expand DownExpand Up@@ -2157,6 +2156,7 @@ export class Transaction {
 var senderFeeAccountBalance =
 await this.provider.provider.connection.getBalance(
 this.params.accounts.senderFee,
 "confirmed",
 );

 assert(
Expand All@@ -2182,11 +2182,13 @@ export class Transaction {
 ) {
 var relayerAccount = await this.provider.provider.connection.getBalance(
 this.params.relayer.accounts.relayerRecipient,
 "confirmed",
 );

 var recipientFeeAccount =
 await this.provider.provider.connection.getBalance(
 this.params.accounts.recipientFee,
 "confirmed",
 );

 // console.log("relayerAccount ", relayerAccount);
Expand DownExpand Up@@ -2269,11 +2271,13 @@ export class Transaction {

 var relayerAccount = await this.provider.provider.connection.getBalance(
 this.params.relayer.accounts.relayerRecipient,
 "confirmed",
 );

 var recipientFeeAccount =
 await this.provider.provider.connection.getBalance(
 this.params.accounts.recipientFee,
 "confirmed",
 );

 // console.log("relayerAccount ", relayerAccount);
Expand Down

7 changes: 2 additions & 5 deletions
light-sdk-ts/src/verifiers/verifierOne.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -111,14 +111,11 @@ export class VerifierOne implements Verifier {
 "getInstructions",
 "verifier one: params.encryptedUtxos undefined",
 );
 if (
 !transaction.provider.browserWallet &&
 !transaction.provider.nodeWallet
 ) {
 if (!transaction.provider.wallet) {
 throw new VerifierError(
 TransactionErrorCode.WALLET_UNDEFINED,
 "getInstructions",
 "verifier one: Payer(browserwallet, nodewallet) not defined",
 "verifier one: Payer(wallet) not defined",
 );
 }
 if (!this.verifierProgram)
Expand Down

7 changes: 2 additions & 5 deletions
light-sdk-ts/src/verifiers/verifierZero.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -114,14 +114,11 @@ export class VerifierZero implements Verifier {
 "getInstructions",
 "verifier zero: params.encryptedUtxos undefined",
 );
 if (
 !transaction.provider.browserWallet &&
 !transaction.provider.nodeWallet
 ) {
 if (!transaction.provider.wallet) {
 throw new VerifierError(
 TransactionErrorCode.WALLET_UNDEFINED,
 "getInstructions",
 "verifier zero: Payer(browserwallet, nodewallet) not defined",
 "verifier zero: Payer(wallet) not defined",
 );
 }
 if (!this.verifierProgram)
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
Streamline wallet#55

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 10 commits into

from

Mar 24, 2023
 Merged


Streamline wallet
#55
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
6de2110

added mockUseWallet

Mar 14, 2023
0af02e8

Jorrit add custom errors for transaction class and transaction parame…


ananas-block Mar 13, 2023
ff46ed4

minor changes

Mar 24, 2023
731d7fb

Revert "minor changes"

Mar 24, 2023
1696b84

minor changes

Mar 24, 2023
19c3098

added promise await in transaction

Mar 24, 2023
706b9b8

naming conventions

Mar 24, 2023
f2ef002

Revert "naming conventions"

Mar 24, 2023
f6bd5b8

naming conventions

Mar 24, 2023
921e7cc

method name changed

Mar 24, 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


5 changes: 5 additions & 0 deletions
build-sdk.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,3 +20,8 @@ pushd mock-app-verifier
rm -rf node_modules
yarn
popd

pushd relayer
rm -rf node_modules
yarn
popd

5 changes: 5 additions & 0 deletions
build.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,3 +15,8 @@ popd
pushd light-circuits
yarn install
popd

pushd relayer
yarn install
yarn run build
popd

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -71,13 +71,13 @@ export enum ProviderErrorCode {
 SOL_MERKLE_TREE_UNDEFINED = "SOL_MERKLE_TREE_UNDEFINED",
 ANCHOR_PROVIDER_UNDEFINED = "ANCHOR_PROVIDER_UNDEFINED",
 PROVIDER_UNDEFINED = "PROVIDER_UNDEFINED",
NODE_WALLET_AND_BROWSER_WALLET_UNDEFINED = "NODE_WALLET_AND_BROWSER_WALLET_UNDEFINED",
WALLET_UNDEFINED = "WALLET_UNDEFINED",
 NODE_WALLET_UNDEFINED = "NODE_WALLET_UNDEFINED",
 URL_UNDEFINED = "URL_UNDEFINED",
 CONNECTION_UNDEFINED = "CONNECTION_UNDEFINED",
 CONNECTION_DEFINED = "CONNECTION_DEFINED",
 KEYPAIR_UNDEFINED = "KEYPAIR_UNDEFINED",
NODE_WALLET_AND_BROWSER_WALLET_DEFINED = "NODE_WALLET_AND_BROWSER_WALLET_DEFINED",
WALLET_DEFINED = "WALLET_DEFINED",
 MERKLE_TREE_NOT_INITIALIZED = "MERKLE_TREE_NOT_INITIALIZED",
}

Expand Down

7 changes: 2 additions & 5 deletions
light-sdk-ts/src/merkleTree/solMerkleTree.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,15 +67,12 @@ export class SolMerkleTree {

 const mtFetched = await merkleTreeProgram.account.merkleTree.fetch(
 merkleTreePubkey,
 "confirmed",
 );

 const merkleTreeIndex = mtFetched.nextIndex;
 // console.log(
 // "getCompressedLeaves merkleTreeIndex",
 // merkleTreeIndex.toNumber(),
 // );

 merkleTreeProgram.account.twoLeavesBytesPda.all();
 // merkleTreeProgram.account.twoLeavesBytesPda

 let leavesAccounts: Array<{
 account: QueuedLeavesPda;
Expand Down

4 changes: 2 additions & 2 deletions
light-sdk-ts/src/test-utils/createAccounts.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -288,8 +288,8 @@ export async function createTestAccounts(
 );
 }

 let balanceUserToken = null;
 let userSplAccount = null;
 let balanceUserToken: null | any = null;
@SwenSchaeferjohannSwenSchaeferjohannMar 24, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

please make the type explicit
 let userSplAccount: PublicKey | null = null;
 try {
 let tokenCtx = TOKEN_REGISTRY.find((t) => t.symbol === "USDC");
 if (userTokenAccount) {
Expand Down

2 changes: 1 addition & 1 deletion
light-sdk-ts/src/test-utils/functionalCircuit.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,7 +40,7 @@ export async function functionalCircuitTest(
 outputUtxos: [deposit_utxo1],
 merkleTreePubkey: mockPubkey,
 sender: mockPubkey,
 senderFee: lightProvider.nodeWallet!.publicKey,
 senderFee: lightProvider.wallet!.publicKey,
 verifier: verifier,
 lookUpTable: mockPubkey,
 action: Action.SHIELD,
Expand Down

3 changes: 2 additions & 1 deletion
light-sdk-ts/src/test-utils/initLookUpTable.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@ import {
 SystemProgram,
 sendAndConfirmTransaction,
 Transaction,
 AccountInfo,
} from "@solana/web3.js";
import * as anchor from "@coral-xyz/anchor";
import { TOKEN_PROGRAM_ID } from "@solana/spl-token";
Expand DownExpand Up@@ -80,7 +81,7 @@ export async function initLookUpTable(
 recentSlot: number,
 extraAccounts?: Array<PublicKey>,
): Promise<PublicKey> {
 var lookUpTableInfoInit = null;
 var lookUpTableInfoInit: AccountInfo<Buffer> | null = null;
 if (lookupTableAddress != undefined) {
 lookUpTableInfoInit = await provider.connection.getAccountInfo(
 lookupTableAddress,
Expand Down

2 changes: 2 additions & 0 deletions
light-sdk-ts/src/test-utils/testChecks.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -126,6 +126,7 @@ export async function checkMerkleTreeBatchUpdateSuccess({
}) {
 var merkleTreeTmpStateAccount = await connection.getAccountInfo(
 merkleTreeUpdateState,
 "confirmed",
 );

 assert.equal(
Expand All@@ -136,6 +137,7 @@ export async function checkMerkleTreeBatchUpdateSuccess({

 var merkleTreeAccount = await merkleTreeProgram.account.merkleTree.fetch(
 merkle_tree_pubkey,
 "confirmed",
 );
 // Merkle tree is locked by merkleTreeUpdateState
 assert.equal(
Expand Down

86 changes: 45 additions & 41 deletions
light-sdk-ts/src/transaction.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ import {
 VersionedTransaction,
 TransactionSignature,
 TransactionInstruction,
 Transaction as SolanaTransaction,
} from "@solana/web3.js";
import * as anchor from "@coral-xyz/anchor";
import { TOKEN_PROGRAM_ID, getAccount } from "@solana/spl-token";
Expand All@@ -30,6 +31,7 @@ import {
 initLookUpTable,
 TransactionParametersErrorCode,
 Provider,
 ADMIN_AUTH_KEYPAIR,
} from "./index";
import { IDL_MERKLE_TREE_PROGRAM } from "./idls/index";
const snarkjs = require("snarkjs");
Expand DownExpand Up@@ -808,7 +810,7 @@ export class Transaction {
 "constructor",
 "Merkle tree not set in provider",
 );
 if (!provider.browserWallet && !provider.nodeWallet)
 if (!provider.wallet)
 throw new TransactionError(
 TransactionErrorCode.WALLET_UNDEFINED,
 "constructor",
Expand All@@ -829,10 +831,7 @@ export class Transaction {

 //TODO: change to check whether browser/node wallet are the same as signing address
 if (params.action === Action.SHIELD) {
 let wallet =
 this.provider.browserWallet !== undefined
 ? this.provider.browserWallet
 : this.provider.nodeWallet;
 let wallet = this.provider.wallet;
 if (
 wallet?.publicKey.toBase58() !==
 params.relayer.accounts.relayerPubkey.toBase58() &&
Expand DownExpand Up@@ -1103,7 +1102,7 @@ export class Transaction {
 IDL_MERKLE_TREE_PROGRAM,
 merkleTreeProgramId,
 // @ts-ignore
 this.provider.browserWallet && this.provider,
 this.provider.provider,
 );
 let root = Uint8Array.from(
 leInt2Buff(
Expand All@@ -1114,6 +1113,7 @@ export class Transaction {
 let merkle_tree_account_data =
 await this.merkleTreeProgram.account.merkleTree.fetch(
 this.provider.solMerkleTree.pubkey,
 "confirmed",
 );
 // @ts-ignore: unknown type error
 merkle_tree_account_data.roots.map((x: any, index: any) => {
Expand DownExpand Up@@ -1509,7 +1509,7 @@ export class Transaction {

 async sendTransaction(ix: any): Promise<TransactionSignature | undefined> {
 if (false) {
 // TODO: replace this with (this.provider.browserWallet.pubkey != new relayer... this.relayer
 // TODO: replace this with (this.provider.wallet.pubkey != new relayer... this.relayer
 // then we know that an actual relayer was passed in and that it's supposed to be sent to one.
 // we cant do that tho as we'd want to add the default relayer to the provider itself.
 // so just pass in a flag here "shield, unshield, transfer" -> so devs don't have to know that it goes to a relayer.
Expand DownExpand Up@@ -1592,18 +1592,7 @@ export class Transaction {
 let retries = 3;
 let res;
 while (retries > 0) {
 if (this.provider.browserWallet) {
 // TODO: versiontx??
 console.error("versioned tx might throw here");
 tx = await this.provider.browserWallet.signTransaction(tx);
 // throw new Error(
 // "versioned transaction in browser not implemented yet",
 // );
 } else {
 /** Just need to define relayer pubkey as signer a creation */
 tx.sign([this.provider.nodeWallet!]);
 }

 tx = await this.provider.wallet.signTransaction(tx);
 try {
 let serializedTx = tx.serialize();

Expand DownExpand Up@@ -1642,11 +1631,11 @@ export class Transaction {
 "",
 );

 if (!this.provider.nodeWallet && !this.provider.browserWallet)
 if (!this.provider.wallet)
 throw new TransactionError(
 TransactionErrorCode.WALLET_UNDEFINED,
 "sendAndConfirmTransaction",
 "Cannot use sendAndConfirmTransaction without payer or browserWallet",
 "Cannot use sendAndConfirmTransaction without wallet",
 );

 await this.getRootIndex();
Expand DownExpand Up@@ -1692,11 +1681,11 @@ export class Transaction {
 // TODO: deal with this: set own payer just for that? where is this used?
 // This is used by applications not the relayer
 async closeVerifierState(): Promise<TransactionSignature> {
 if (!this.provider.nodeWallet && !this.provider.browserWallet)
 if (!this.provider.wallet)
 throw new TransactionError(
 TransactionErrorCode.WALLET_UNDEFINED,
 "closeVerifierState",
 "Cannot use closeVerifierState without payer or browserWallet",
 "Cannot use closeVerifierState without wallet",
 );
 if (!this.params)
 throw new TransactionError(
Expand All@@ -1711,21 +1700,27 @@ export class Transaction {
 "",
 );
 if (this.appParams) {
 return await this.appParams?.verifier.verifierProgram.methods
 .closeVerifierState()
 .accounts({
 ...this.params.accounts,
 })
 .signers([this.provider.nodeWallet!]) // TODO: browserwallet? or only ever used by relayer?
 .rpc(confirmConfig);
 const transaction = new SolanaTransaction().add(
 await this.appParams?.verifier.verifierProgram.methods
 .closeVerifierState()
 .accounts({
 ...this.params.accounts,
 })
 .instruction(),
 );

 return await this.provider.wallet!.sendAndConfirmTransaction(transaction);
 } else {
 return await this.params?.verifier.verifierProgram.methods
 .closeVerifierState()
 .accounts({
 ...this.params.accounts,
 })
 .signers([this.provider.nodeWallet!]) // TODO: browserwallet? or only ever used by relayer?
 .rpc(confirmConfig);
 const transaction = new SolanaTransaction().add(
 await this.params?.verifier.verifierProgram.methods
 .closeVerifierState()
 .accounts({
 ...this.params.accounts,
 })
 .instruction(),
 );

 return await this.provider.wallet!.sendAndConfirmTransaction(transaction);
 }
 }

Expand DownExpand Up@@ -1913,14 +1908,12 @@ export class Transaction {
 "test values relayerRecipientAccountBalancePriorLastTx undefined",
 );
 }

 // Checking that nullifiers were inserted
 if (new BN(this.proofInput.publicAmount).toString() === "0") {
 this.testValues.is_token = false;
 } else {
 this.testValues.is_token = true;
 }

 for (
 var i = 0;
 i < this.remainingAccounts.nullifierPdaPubkeys?.length;
Expand All@@ -1946,6 +1939,7 @@ export class Transaction {
 leavesAccountData =
 await this.merkleTreeProgram.account.twoLeavesBytesPda.fetch(
 this.remainingAccounts.leavesPdaPubkeys[i].pubkey,
 "confirmed",
 );

 assert(
Expand All@@ -1963,7 +1957,6 @@ export class Transaction {
 this.provider.solMerkleTree.pubkey.toBase58(),
 "merkleTreePubkey not inserted correctly",
 );

 for (var j = 0; j < this.params.encryptedUtxos.length / 256; j++) {
 // console.log(j);

Expand DownExpand Up@@ -2035,14 +2028,18 @@ export class Transaction {

 try {
 const merkleTreeAfterUpdate =
 await this.merkleTreeProgram.account.merkleTree.fetch(MERKLE_TREE_KEY);
 await this.merkleTreeProgram.account.merkleTree.fetch(
 MERKLE_TREE_KEY,
 "confirmed",
 );
 console.log(
 "Number(merkleTreeAfterUpdate.nextQueuedIndex) ",
 Number(merkleTreeAfterUpdate.nextQueuedIndex),
 );
 leavesAccountData =
 await this.merkleTreeProgram.account.twoLeavesBytesPda.fetch(
 this.remainingAccounts.leavesPdaPubkeys[0].pubkey,
 "confirmed",
 );
 console.log(
 `${Number(leavesAccountData.leftLeafIndex)} + ${
Expand DownExpand Up@@ -2072,6 +2069,7 @@ export class Transaction {
 var recipientFeeAccountBalance =
 await this.provider.provider.connection.getBalance(
 this.params.accounts.recipientFee,
 "confirmed",
 );
 console.log(
 "testValues.recipientFeeBalancePriorTx: ",
Expand All@@ -2081,6 +2079,7 @@ export class Transaction {
 var senderFeeAccountBalance =
 await this.provider.provider.connection.getBalance(
 this.params.relayer.accounts.relayerPubkey,
 "confirmed",
 );
 assert(
 recipientFeeAccountBalance ==
Expand DownExpand Up@@ -2157,6 +2156,7 @@ export class Transaction {
 var senderFeeAccountBalance =
 await this.provider.provider.connection.getBalance(
 this.params.accounts.senderFee,
 "confirmed",
 );

 assert(
Expand All@@ -2182,11 +2182,13 @@ export class Transaction {
 ) {
 var relayerAccount = await this.provider.provider.connection.getBalance(
 this.params.relayer.accounts.relayerRecipient,
 "confirmed",
 );

 var recipientFeeAccount =
 await this.provider.provider.connection.getBalance(
 this.params.accounts.recipientFee,
 "confirmed",
 );

 // console.log("relayerAccount ", relayerAccount);
Expand DownExpand Up@@ -2269,11 +2271,13 @@ export class Transaction {

 var relayerAccount = await this.provider.provider.connection.getBalance(
 this.params.relayer.accounts.relayerRecipient,
 "confirmed",
 );

 var recipientFeeAccount =
 await this.provider.provider.connection.getBalance(
 this.params.accounts.recipientFee,
 "confirmed",
 );

 // console.log("relayerAccount ", relayerAccount);
Expand Down

7 changes: 2 additions & 5 deletions
light-sdk-ts/src/verifiers/verifierOne.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -111,14 +111,11 @@ export class VerifierOne implements Verifier {
 "getInstructions",
 "verifier one: params.encryptedUtxos undefined",
 );
 if (
 !transaction.provider.browserWallet &&
 !transaction.provider.nodeWallet
 ) {
 if (!transaction.provider.wallet) {
 throw new VerifierError(
 TransactionErrorCode.WALLET_UNDEFINED,
 "getInstructions",
 "verifier one: Payer(browserwallet, nodewallet) not defined",
 "verifier one: Payer(wallet) not defined",
 );
 }
 if (!this.verifierProgram)
Expand Down

7 changes: 2 additions & 5 deletions
light-sdk-ts/src/verifiers/verifierZero.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -114,14 +114,11 @@ export class VerifierZero implements Verifier {
 "getInstructions",
 "verifier zero: params.encryptedUtxos undefined",
 );
 if (
 !transaction.provider.browserWallet &&
 !transaction.provider.nodeWallet
 ) {
 if (!transaction.provider.wallet) {
 throw new VerifierError(
 TransactionErrorCode.WALLET_UNDEFINED,
 "getInstructions",
 "verifier zero: Payer(browserwallet, nodewallet) not defined",
 "verifier zero: Payer(wallet) not defined",
 );
 }
 if (!this.verifierProgram)
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
Streamline wallet#55

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 10 commits into

from

Mar 24, 2023
 Merged


Streamline wallet
#55
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
6de2110

added mockUseWallet

Mar 14, 2023
0af02e8

Jorrit add custom errors for transaction class and transaction parame…


ananas-block Mar 13, 2023
ff46ed4

minor changes

Mar 24, 2023
731d7fb

Revert "minor changes"

Mar 24, 2023
1696b84

minor changes

Mar 24, 2023
19c3098

added promise await in transaction

Mar 24, 2023
706b9b8

naming conventions

Mar 24, 2023
f2ef002

Revert "naming conventions"

Mar 24, 2023
f6bd5b8

naming conventions

Mar 24, 2023
921e7cc

method name changed

Mar 24, 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


5 changes: 5 additions & 0 deletions
build-sdk.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,3 +20,8 @@ pushd mock-app-verifier
rm -rf node_modules
yarn
popd

pushd relayer
rm -rf node_modules
yarn
popd

5 changes: 5 additions & 0 deletions
build.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,3 +15,8 @@ popd
pushd light-circuits
yarn install
popd

pushd relayer
yarn install
yarn run build
popd

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -71,13 +71,13 @@ export enum ProviderErrorCode {
 SOL_MERKLE_TREE_UNDEFINED = "SOL_MERKLE_TREE_UNDEFINED",
 ANCHOR_PROVIDER_UNDEFINED = "ANCHOR_PROVIDER_UNDEFINED",
 PROVIDER_UNDEFINED = "PROVIDER_UNDEFINED",
NODE_WALLET_AND_BROWSER_WALLET_UNDEFINED = "NODE_WALLET_AND_BROWSER_WALLET_UNDEFINED",
WALLET_UNDEFINED = "WALLET_UNDEFINED",
 NODE_WALLET_UNDEFINED = "NODE_WALLET_UNDEFINED",
 URL_UNDEFINED = "URL_UNDEFINED",
 CONNECTION_UNDEFINED = "CONNECTION_UNDEFINED",
 CONNECTION_DEFINED = "CONNECTION_DEFINED",
 KEYPAIR_UNDEFINED = "KEYPAIR_UNDEFINED",
NODE_WALLET_AND_BROWSER_WALLET_DEFINED = "NODE_WALLET_AND_BROWSER_WALLET_DEFINED",
WALLET_DEFINED = "WALLET_DEFINED",
 MERKLE_TREE_NOT_INITIALIZED = "MERKLE_TREE_NOT_INITIALIZED",
}

Expand Down

7 changes: 2 additions & 5 deletions
light-sdk-ts/src/merkleTree/solMerkleTree.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,15 +67,12 @@ export class SolMerkleTree {

 const mtFetched = await merkleTreeProgram.account.merkleTree.fetch(
 merkleTreePubkey,
 "confirmed",
 );

 const merkleTreeIndex = mtFetched.nextIndex;
 // console.log(
 // "getCompressedLeaves merkleTreeIndex",
 // merkleTreeIndex.toNumber(),
 // );

 merkleTreeProgram.account.twoLeavesBytesPda.all();
 // merkleTreeProgram.account.twoLeavesBytesPda

 let leavesAccounts: Array<{
 account: QueuedLeavesPda;
Expand Down

4 changes: 2 additions & 2 deletions
light-sdk-ts/src/test-utils/createAccounts.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -288,8 +288,8 @@ export async function createTestAccounts(
 );
 }

 let balanceUserToken = null;
 let userSplAccount = null;
 let balanceUserToken: null | any = null;
@SwenSchaeferjohannSwenSchaeferjohannMar 24, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

please make the type explicit
 let userSplAccount: PublicKey | null = null;
 try {
 let tokenCtx = TOKEN_REGISTRY.find((t) => t.symbol === "USDC");
 if (userTokenAccount) {
Expand Down

2 changes: 1 addition & 1 deletion
light-sdk-ts/src/test-utils/functionalCircuit.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,7 +40,7 @@ export async function functionalCircuitTest(
 outputUtxos: [deposit_utxo1],
 merkleTreePubkey: mockPubkey,
 sender: mockPubkey,
 senderFee: lightProvider.nodeWallet!.publicKey,
 senderFee: lightProvider.wallet!.publicKey,
 verifier: verifier,
 lookUpTable: mockPubkey,
 action: Action.SHIELD,
Expand Down

3 changes: 2 additions & 1 deletion
light-sdk-ts/src/test-utils/initLookUpTable.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@ import {
 SystemProgram,
 sendAndConfirmTransaction,
 Transaction,
 AccountInfo,
} from "@solana/web3.js";
import * as anchor from "@coral-xyz/anchor";
import { TOKEN_PROGRAM_ID } from "@solana/spl-token";
Expand DownExpand Up@@ -80,7 +81,7 @@ export async function initLookUpTable(
 recentSlot: number,
 extraAccounts?: Array<PublicKey>,
): Promise<PublicKey> {
 var lookUpTableInfoInit = null;
 var lookUpTableInfoInit: AccountInfo<Buffer> | null = null;
 if (lookupTableAddress != undefined) {
 lookUpTableInfoInit = await provider.connection.getAccountInfo(
 lookupTableAddress,
Expand Down

2 changes: 2 additions & 0 deletions
light-sdk-ts/src/test-utils/testChecks.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -126,6 +126,7 @@ export async function checkMerkleTreeBatchUpdateSuccess({
}) {
 var merkleTreeTmpStateAccount = await connection.getAccountInfo(
 merkleTreeUpdateState,
 "confirmed",
 );

 assert.equal(
Expand All@@ -136,6 +137,7 @@ export async function checkMerkleTreeBatchUpdateSuccess({

 var merkleTreeAccount = await merkleTreeProgram.account.merkleTree.fetch(
 merkle_tree_pubkey,
 "confirmed",
 );
 // Merkle tree is locked by merkleTreeUpdateState
 assert.equal(
Expand Down

86 changes: 45 additions & 41 deletions
light-sdk-ts/src/transaction.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ import {
 VersionedTransaction,
 TransactionSignature,
 TransactionInstruction,
 Transaction as SolanaTransaction,
} from "@solana/web3.js";
import * as anchor from "@coral-xyz/anchor";
import { TOKEN_PROGRAM_ID, getAccount } from "@solana/spl-token";
Expand All@@ -30,6 +31,7 @@ import {
 initLookUpTable,
 TransactionParametersErrorCode,
 Provider,
 ADMIN_AUTH_KEYPAIR,
} from "./index";
import { IDL_MERKLE_TREE_PROGRAM } from "./idls/index";
const snarkjs = require("snarkjs");
Expand DownExpand Up@@ -808,7 +810,7 @@ export class Transaction {
 "constructor",
 "Merkle tree not set in provider",
 );
 if (!provider.browserWallet && !provider.nodeWallet)
 if (!provider.wallet)
 throw new TransactionError(
 TransactionErrorCode.WALLET_UNDEFINED,
 "constructor",
Expand All@@ -829,10 +831,7 @@ export class Transaction {

 //TODO: change to check whether browser/node wallet are the same as signing address
 if (params.action === Action.SHIELD) {
 let wallet =
 this.provider.browserWallet !== undefined
 ? this.provider.browserWallet
 : this.provider.nodeWallet;
 let wallet = this.provider.wallet;
 if (
 wallet?.publicKey.toBase58() !==
 params.relayer.accounts.relayerPubkey.toBase58() &&
Expand DownExpand Up@@ -1103,7 +1102,7 @@ export class Transaction {
 IDL_MERKLE_TREE_PROGRAM,
 merkleTreeProgramId,
 // @ts-ignore
 this.provider.browserWallet && this.provider,
 this.provider.provider,
 );
 let root = Uint8Array.from(
 leInt2Buff(
Expand All@@ -1114,6 +1113,7 @@ export class Transaction {
 let merkle_tree_account_data =
 await this.merkleTreeProgram.account.merkleTree.fetch(
 this.provider.solMerkleTree.pubkey,
 "confirmed",
 );
 // @ts-ignore: unknown type error
 merkle_tree_account_data.roots.map((x: any, index: any) => {
Expand DownExpand Up@@ -1509,7 +1509,7 @@ export class Transaction {

 async sendTransaction(ix: any): Promise<TransactionSignature | undefined> {
 if (false) {
 // TODO: replace this with (this.provider.browserWallet.pubkey != new relayer... this.relayer
 // TODO: replace this with (this.provider.wallet.pubkey != new relayer... this.relayer
 // then we know that an actual relayer was passed in and that it's supposed to be sent to one.
 // we cant do that tho as we'd want to add the default relayer to the provider itself.
 // so just pass in a flag here "shield, unshield, transfer" -> so devs don't have to know that it goes to a relayer.
Expand DownExpand Up@@ -1592,18 +1592,7 @@ export class Transaction {
 let retries = 3;
 let res;
 while (retries > 0) {
 if (this.provider.browserWallet) {
 // TODO: versiontx??
 console.error("versioned tx might throw here");
 tx = await this.provider.browserWallet.signTransaction(tx);
 // throw new Error(
 // "versioned transaction in browser not implemented yet",
 // );
 } else {
 /** Just need to define relayer pubkey as signer a creation */
 tx.sign([this.provider.nodeWallet!]);
 }

 tx = await this.provider.wallet.signTransaction(tx);
 try {
 let serializedTx = tx.serialize();

Expand DownExpand Up@@ -1642,11 +1631,11 @@ export class Transaction {
 "",
 );

 if (!this.provider.nodeWallet && !this.provider.browserWallet)
 if (!this.provider.wallet)
 throw new TransactionError(
 TransactionErrorCode.WALLET_UNDEFINED,
 "sendAndConfirmTransaction",
 "Cannot use sendAndConfirmTransaction without payer or browserWallet",
 "Cannot use sendAndConfirmTransaction without wallet",
 );

 await this.getRootIndex();
Expand DownExpand Up@@ -1692,11 +1681,11 @@ export class Transaction {
 // TODO: deal with this: set own payer just for that? where is this used?
 // This is used by applications not the relayer
 async closeVerifierState(): Promise<TransactionSignature> {
 if (!this.provider.nodeWallet && !this.provider.browserWallet)
 if (!this.provider.wallet)
 throw new TransactionError(
 TransactionErrorCode.WALLET_UNDEFINED,
 "closeVerifierState",
 "Cannot use closeVerifierState without payer or browserWallet",
 "Cannot use closeVerifierState without wallet",
 );
 if (!this.params)
 throw new TransactionError(
Expand All@@ -1711,21 +1700,27 @@ export class Transaction {
 "",
 );
 if (this.appParams) {
 return await this.appParams?.verifier.verifierProgram.methods
 .closeVerifierState()
 .accounts({
 ...this.params.accounts,
 })
 .signers([this.provider.nodeWallet!]) // TODO: browserwallet? or only ever used by relayer?
 .rpc(confirmConfig);
 const transaction = new SolanaTransaction().add(
 await this.appParams?.verifier.verifierProgram.methods
 .closeVerifierState()
 .accounts({
 ...this.params.accounts,
 })
 .instruction(),
 );

 return await this.provider.wallet!.sendAndConfirmTransaction(transaction);
 } else {
 return await this.params?.verifier.verifierProgram.methods
 .closeVerifierState()
 .accounts({
 ...this.params.accounts,
 })
 .signers([this.provider.nodeWallet!]) // TODO: browserwallet? or only ever used by relayer?
 .rpc(confirmConfig);
 const transaction = new SolanaTransaction().add(
 await this.params?.verifier.verifierProgram.methods
 .closeVerifierState()
 .accounts({
 ...this.params.accounts,
 })
 .instruction(),
 );

 return await this.provider.wallet!.sendAndConfirmTransaction(transaction);
 }
 }

Expand DownExpand Up@@ -1913,14 +1908,12 @@ export class Transaction {
 "test values relayerRecipientAccountBalancePriorLastTx undefined",
 );
 }

 // Checking that nullifiers were inserted
 if (new BN(this.proofInput.publicAmount).toString() === "0") {
 this.testValues.is_token = false;
 } else {
 this.testValues.is_token = true;
 }

 for (
 var i = 0;
 i < this.remainingAccounts.nullifierPdaPubkeys?.length;
Expand All@@ -1946,6 +1939,7 @@ export class Transaction {
 leavesAccountData =
 await this.merkleTreeProgram.account.twoLeavesBytesPda.fetch(
 this.remainingAccounts.leavesPdaPubkeys[i].pubkey,
 "confirmed",
 );

 assert(
Expand All@@ -1963,7 +1957,6 @@ export class Transaction {
 this.provider.solMerkleTree.pubkey.toBase58(),
 "merkleTreePubkey not inserted correctly",
 );

 for (var j = 0; j < this.params.encryptedUtxos.length / 256; j++) {
 // console.log(j);

Expand DownExpand Up@@ -2035,14 +2028,18 @@ export class Transaction {

 try {
 const merkleTreeAfterUpdate =
 await this.merkleTreeProgram.account.merkleTree.fetch(MERKLE_TREE_KEY);
 await this.merkleTreeProgram.account.merkleTree.fetch(
 MERKLE_TREE_KEY,
 "confirmed",
 );
 console.log(
 "Number(merkleTreeAfterUpdate.nextQueuedIndex) ",
 Number(merkleTreeAfterUpdate.nextQueuedIndex),
 );
 leavesAccountData =
 await this.merkleTreeProgram.account.twoLeavesBytesPda.fetch(
 this.remainingAccounts.leavesPdaPubkeys[0].pubkey,
 "confirmed",
 );
 console.log(
 `${Number(leavesAccountData.leftLeafIndex)} + ${
Expand DownExpand Up@@ -2072,6 +2069,7 @@ export class Transaction {
 var recipientFeeAccountBalance =
 await this.provider.provider.connection.getBalance(
 this.params.accounts.recipientFee,
 "confirmed",
 );
 console.log(
 "testValues.recipientFeeBalancePriorTx: ",
Expand All@@ -2081,6 +2079,7 @@ export class Transaction {
 var senderFeeAccountBalance =
 await this.provider.provider.connection.getBalance(
 this.params.relayer.accounts.relayerPubkey,
 "confirmed",
 );
 assert(
 recipientFeeAccountBalance ==
Expand DownExpand Up@@ -2157,6 +2156,7 @@ export class Transaction {
 var senderFeeAccountBalance =
 await this.provider.provider.connection.getBalance(
 this.params.accounts.senderFee,
 "confirmed",
 );

 assert(
Expand All@@ -2182,11 +2182,13 @@ export class Transaction {
 ) {
 var relayerAccount = await this.provider.provider.connection.getBalance(
 this.params.relayer.accounts.relayerRecipient,
 "confirmed",
 );

 var recipientFeeAccount =
 await this.provider.provider.connection.getBalance(
 this.params.accounts.recipientFee,
 "confirmed",
 );

 // console.log("relayerAccount ", relayerAccount);
Expand DownExpand Up@@ -2269,11 +2271,13 @@ export class Transaction {

 var relayerAccount = await this.provider.provider.connection.getBalance(
 this.params.relayer.accounts.relayerRecipient,
 "confirmed",
 );

 var recipientFeeAccount =
 await this.provider.provider.connection.getBalance(
 this.params.accounts.recipientFee,
 "confirmed",
 );

 // console.log("relayerAccount ", relayerAccount);
Expand Down

7 changes: 2 additions & 5 deletions
light-sdk-ts/src/verifiers/verifierOne.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -111,14 +111,11 @@ export class VerifierOne implements Verifier {
 "getInstructions",
 "verifier one: params.encryptedUtxos undefined",
 );
 if (
 !transaction.provider.browserWallet &&
 !transaction.provider.nodeWallet
 ) {
 if (!transaction.provider.wallet) {
 throw new VerifierError(
 TransactionErrorCode.WALLET_UNDEFINED,
 "getInstructions",
 "verifier one: Payer(browserwallet, nodewallet) not defined",
 "verifier one: Payer(wallet) not defined",
 );
 }
 if (!this.verifierProgram)
Expand Down

7 changes: 2 additions & 5 deletions
light-sdk-ts/src/verifiers/verifierZero.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -114,14 +114,11 @@ export class VerifierZero implements Verifier {
 "getInstructions",
 "verifier zero: params.encryptedUtxos undefined",
 );
 if (
 !transaction.provider.browserWallet &&
 !transaction.provider.nodeWallet
 ) {
 if (!transaction.provider.wallet) {
 throw new VerifierError(
 TransactionErrorCode.WALLET_UNDEFINED,
 "getInstructions",
 "verifier zero: Payer(browserwallet, nodewallet) not defined",
 "verifier zero: Payer(wallet) not defined",
 );
 }
 if (!this.verifierProgram)
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
Streamline wallet#55

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 10 commits into

from

Mar 24, 2023
 Merged


Streamline wallet
#55
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
6de2110

added mockUseWallet

Mar 14, 2023
0af02e8

Jorrit add custom errors for transaction class and transaction parame…


ananas-block Mar 13, 2023
ff46ed4

minor changes

Mar 24, 2023
731d7fb

Revert "minor changes"

Mar 24, 2023
1696b84

minor changes

Mar 24, 2023
19c3098

added promise await in transaction

Mar 24, 2023
706b9b8

naming conventions

Mar 24, 2023
f2ef002

Revert "naming conventions"

Mar 24, 2023
f6bd5b8

naming conventions

Mar 24, 2023
921e7cc

method name changed

Mar 24, 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


5 changes: 5 additions & 0 deletions
build-sdk.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,3 +20,8 @@ pushd mock-app-verifier
rm -rf node_modules
yarn
popd

pushd relayer
rm -rf node_modules
yarn
popd

5 changes: 5 additions & 0 deletions
build.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,3 +15,8 @@ popd
pushd light-circuits
yarn install
popd

pushd relayer
yarn install
yarn run build
popd

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -71,13 +71,13 @@ export enum ProviderErrorCode {
 SOL_MERKLE_TREE_UNDEFINED = "SOL_MERKLE_TREE_UNDEFINED",
 ANCHOR_PROVIDER_UNDEFINED = "ANCHOR_PROVIDER_UNDEFINED",
 PROVIDER_UNDEFINED = "PROVIDER_UNDEFINED",
NODE_WALLET_AND_BROWSER_WALLET_UNDEFINED = "NODE_WALLET_AND_BROWSER_WALLET_UNDEFINED",
WALLET_UNDEFINED = "WALLET_UNDEFINED",
 NODE_WALLET_UNDEFINED = "NODE_WALLET_UNDEFINED",
 URL_UNDEFINED = "URL_UNDEFINED",
 CONNECTION_UNDEFINED = "CONNECTION_UNDEFINED",
 CONNECTION_DEFINED = "CONNECTION_DEFINED",
 KEYPAIR_UNDEFINED = "KEYPAIR_UNDEFINED",
NODE_WALLET_AND_BROWSER_WALLET_DEFINED = "NODE_WALLET_AND_BROWSER_WALLET_DEFINED",
WALLET_DEFINED = "WALLET_DEFINED",
 MERKLE_TREE_NOT_INITIALIZED = "MERKLE_TREE_NOT_INITIALIZED",
}

Expand Down

7 changes: 2 additions & 5 deletions
light-sdk-ts/src/merkleTree/solMerkleTree.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,15 +67,12 @@ export class SolMerkleTree {

 const mtFetched = await merkleTreeProgram.account.merkleTree.fetch(
 merkleTreePubkey,
 "confirmed",
 );

 const merkleTreeIndex = mtFetched.nextIndex;
 // console.log(
 // "getCompressedLeaves merkleTreeIndex",
 // merkleTreeIndex.toNumber(),
 // );

 merkleTreeProgram.account.twoLeavesBytesPda.all();
 // merkleTreeProgram.account.twoLeavesBytesPda

 let leavesAccounts: Array<{
 account: QueuedLeavesPda;
Expand Down

4 changes: 2 additions & 2 deletions
light-sdk-ts/src/test-utils/createAccounts.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -288,8 +288,8 @@ export async function createTestAccounts(
 );
 }

 let balanceUserToken = null;
 let userSplAccount = null;
 let balanceUserToken: null | any = null;
@SwenSchaeferjohannSwenSchaeferjohannMar 24, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

please make the type explicit
 let userSplAccount: PublicKey | null = null;
 try {
 let tokenCtx = TOKEN_REGISTRY.find((t) => t.symbol === "USDC");
 if (userTokenAccount) {
Expand Down

2 changes: 1 addition & 1 deletion
light-sdk-ts/src/test-utils/functionalCircuit.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,7 +40,7 @@ export async function functionalCircuitTest(
 outputUtxos: [deposit_utxo1],
 merkleTreePubkey: mockPubkey,
 sender: mockPubkey,
 senderFee: lightProvider.nodeWallet!.publicKey,
 senderFee: lightProvider.wallet!.publicKey,
 verifier: verifier,
 lookUpTable: mockPubkey,
 action: Action.SHIELD,
Expand Down

3 changes: 2 additions & 1 deletion
light-sdk-ts/src/test-utils/initLookUpTable.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@ import {
 SystemProgram,
 sendAndConfirmTransaction,
 Transaction,
 AccountInfo,
} from "@solana/web3.js";
import * as anchor from "@coral-xyz/anchor";
import { TOKEN_PROGRAM_ID } from "@solana/spl-token";
Expand DownExpand Up@@ -80,7 +81,7 @@ export async function initLookUpTable(
 recentSlot: number,
 extraAccounts?: Array<PublicKey>,
): Promise<PublicKey> {
 var lookUpTableInfoInit = null;
 var lookUpTableInfoInit: AccountInfo<Buffer> | null = null;
 if (lookupTableAddress != undefined) {
 lookUpTableInfoInit = await provider.connection.getAccountInfo(
 lookupTableAddress,
Expand Down

2 changes: 2 additions & 0 deletions
light-sdk-ts/src/test-utils/testChecks.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -126,6 +126,7 @@ export async function checkMerkleTreeBatchUpdateSuccess({
}) {
 var merkleTreeTmpStateAccount = await connection.getAccountInfo(
 merkleTreeUpdateState,
 "confirmed",
 );

 assert.equal(
Expand All@@ -136,6 +137,7 @@ export async function checkMerkleTreeBatchUpdateSuccess({

 var merkleTreeAccount = await merkleTreeProgram.account.merkleTree.fetch(
 merkle_tree_pubkey,
 "confirmed",
 );
 // Merkle tree is locked by merkleTreeUpdateState
 assert.equal(
Expand Down

86 changes: 45 additions & 41 deletions
light-sdk-ts/src/transaction.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ import {
 VersionedTransaction,
 TransactionSignature,
 TransactionInstruction,
 Transaction as SolanaTransaction,
} from "@solana/web3.js";
import * as anchor from "@coral-xyz/anchor";
import { TOKEN_PROGRAM_ID, getAccount } from "@solana/spl-token";
Expand All@@ -30,6 +31,7 @@ import {
 initLookUpTable,
 TransactionParametersErrorCode,
 Provider,
 ADMIN_AUTH_KEYPAIR,
} from "./index";
import { IDL_MERKLE_TREE_PROGRAM } from "./idls/index";
const snarkjs = require("snarkjs");
Expand DownExpand Up@@ -808,7 +810,7 @@ export class Transaction {
 "constructor",
 "Merkle tree not set in provider",
 );
 if (!provider.browserWallet && !provider.nodeWallet)
 if (!provider.wallet)
 throw new TransactionError(
 TransactionErrorCode.WALLET_UNDEFINED,
 "constructor",
Expand All@@ -829,10 +831,7 @@ export class Transaction {

 //TODO: change to check whether browser/node wallet are the same as signing address
 if (params.action === Action.SHIELD) {
 let wallet =
 this.provider.browserWallet !== undefined
 ? this.provider.browserWallet
 : this.provider.nodeWallet;
 let wallet = this.provider.wallet;
 if (
 wallet?.publicKey.toBase58() !==
 params.relayer.accounts.relayerPubkey.toBase58() &&
Expand DownExpand Up@@ -1103,7 +1102,7 @@ export class Transaction {
 IDL_MERKLE_TREE_PROGRAM,
 merkleTreeProgramId,
 // @ts-ignore
 this.provider.browserWallet && this.provider,
 this.provider.provider,
 );
 let root = Uint8Array.from(
 leInt2Buff(
Expand All@@ -1114,6 +1113,7 @@ export class Transaction {
 let merkle_tree_account_data =
 await this.merkleTreeProgram.account.merkleTree.fetch(
 this.provider.solMerkleTree.pubkey,
 "confirmed",
 );
 // @ts-ignore: unknown type error
 merkle_tree_account_data.roots.map((x: any, index: any) => {
Expand DownExpand Up@@ -1509,7 +1509,7 @@ export class Transaction {

 async sendTransaction(ix: any): Promise<TransactionSignature | undefined> {
 if (false) {
 // TODO: replace this with (this.provider.browserWallet.pubkey != new relayer... this.relayer
 // TODO: replace this with (this.provider.wallet.pubkey != new relayer... this.relayer
 // then we know that an actual relayer was passed in and that it's supposed to be sent to one.
 // we cant do that tho as we'd want to add the default relayer to the provider itself.
 // so just pass in a flag here "shield, unshield, transfer" -> so devs don't have to know that it goes to a relayer.
Expand DownExpand Up@@ -1592,18 +1592,7 @@ export class Transaction {
 let retries = 3;
 let res;
 while (retries > 0) {
 if (this.provider.browserWallet) {
 // TODO: versiontx??
 console.error("versioned tx might throw here");
 tx = await this.provider.browserWallet.signTransaction(tx);
 // throw new Error(
 // "versioned transaction in browser not implemented yet",
 // );
 } else {
 /** Just need to define relayer pubkey as signer a creation */
 tx.sign([this.provider.nodeWallet!]);
 }

 tx = await this.provider.wallet.signTransaction(tx);
 try {
 let serializedTx = tx.serialize();

Expand DownExpand Up@@ -1642,11 +1631,11 @@ export class Transaction {
 "",
 );

 if (!this.provider.nodeWallet && !this.provider.browserWallet)
 if (!this.provider.wallet)
 throw new TransactionError(
 TransactionErrorCode.WALLET_UNDEFINED,
 "sendAndConfirmTransaction",
 "Cannot use sendAndConfirmTransaction without payer or browserWallet",
 "Cannot use sendAndConfirmTransaction without wallet",
 );

 await this.getRootIndex();
Expand DownExpand Up@@ -1692,11 +1681,11 @@ export class Transaction {
 // TODO: deal with this: set own payer just for that? where is this used?
 // This is used by applications not the relayer
 async closeVerifierState(): Promise<TransactionSignature> {
 if (!this.provider.nodeWallet && !this.provider.browserWallet)
 if (!this.provider.wallet)
 throw new TransactionError(
 TransactionErrorCode.WALLET_UNDEFINED,
 "closeVerifierState",
 "Cannot use closeVerifierState without payer or browserWallet",
 "Cannot use closeVerifierState without wallet",
 );
 if (!this.params)
 throw new TransactionError(
Expand All@@ -1711,21 +1700,27 @@ export class Transaction {
 "",
 );
 if (this.appParams) {
 return await this.appParams?.verifier.verifierProgram.methods
 .closeVerifierState()
 .accounts({
 ...this.params.accounts,
 })
 .signers([this.provider.nodeWallet!]) // TODO: browserwallet? or only ever used by relayer?
 .rpc(confirmConfig);
 const transaction = new SolanaTransaction().add(
 await this.appParams?.verifier.verifierProgram.methods
 .closeVerifierState()
 .accounts({
 ...this.params.accounts,
 })
 .instruction(),
 );

 return await this.provider.wallet!.sendAndConfirmTransaction(transaction);
 } else {
 return await this.params?.verifier.verifierProgram.methods
 .closeVerifierState()
 .accounts({
 ...this.params.accounts,
 })
 .signers([this.provider.nodeWallet!]) // TODO: browserwallet? or only ever used by relayer?
 .rpc(confirmConfig);
 const transaction = new SolanaTransaction().add(
 await this.params?.verifier.verifierProgram.methods
 .closeVerifierState()
 .accounts({
 ...this.params.accounts,
 })
 .instruction(),
 );

 return await this.provider.wallet!.sendAndConfirmTransaction(transaction);
 }
 }

Expand DownExpand Up@@ -1913,14 +1908,12 @@ export class Transaction {
 "test values relayerRecipientAccountBalancePriorLastTx undefined",
 );
 }

 // Checking that nullifiers were inserted
 if (new BN(this.proofInput.publicAmount).toString() === "0") {
 this.testValues.is_token = false;
 } else {
 this.testValues.is_token = true;
 }

 for (
 var i = 0;
 i < this.remainingAccounts.nullifierPdaPubkeys?.length;
Expand All@@ -1946,6 +1939,7 @@ export class Transaction {
 leavesAccountData =
 await this.merkleTreeProgram.account.twoLeavesBytesPda.fetch(
 this.remainingAccounts.leavesPdaPubkeys[i].pubkey,
 "confirmed",
 );

 assert(
Expand All@@ -1963,7 +1957,6 @@ export class Transaction {
 this.provider.solMerkleTree.pubkey.toBase58(),
 "merkleTreePubkey not inserted correctly",
 );

 for (var j = 0; j < this.params.encryptedUtxos.length / 256; j++) {
 // console.log(j);

Expand DownExpand Up@@ -2035,14 +2028,18 @@ export class Transaction {

 try {
 const merkleTreeAfterUpdate =
 await this.merkleTreeProgram.account.merkleTree.fetch(MERKLE_TREE_KEY);
 await this.merkleTreeProgram.account.merkleTree.fetch(
 MERKLE_TREE_KEY,
 "confirmed",
 );
 console.log(
 "Number(merkleTreeAfterUpdate.nextQueuedIndex) ",
 Number(merkleTreeAfterUpdate.nextQueuedIndex),
 );
 leavesAccountData =
 await this.merkleTreeProgram.account.twoLeavesBytesPda.fetch(
 this.remainingAccounts.leavesPdaPubkeys[0].pubkey,
 "confirmed",
 );
 console.log(
 `${Number(leavesAccountData.leftLeafIndex)} + ${
Expand DownExpand Up@@ -2072,6 +2069,7 @@ export class Transaction {
 var recipientFeeAccountBalance =
 await this.provider.provider.connection.getBalance(
 this.params.accounts.recipientFee,
 "confirmed",
 );
 console.log(
 "testValues.recipientFeeBalancePriorTx: ",
Expand All@@ -2081,6 +2079,7 @@ export class Transaction {
 var senderFeeAccountBalance =
 await this.provider.provider.connection.getBalance(
 this.params.relayer.accounts.relayerPubkey,
 "confirmed",
 );
 assert(
 recipientFeeAccountBalance ==
Expand DownExpand Up@@ -2157,6 +2156,7 @@ export class Transaction {
 var senderFeeAccountBalance =
 await this.provider.provider.connection.getBalance(
 this.params.accounts.senderFee,
 "confirmed",
 );

 assert(
Expand All@@ -2182,11 +2182,13 @@ export class Transaction {
 ) {
 var relayerAccount = await this.provider.provider.connection.getBalance(
 this.params.relayer.accounts.relayerRecipient,
 "confirmed",
 );

 var recipientFeeAccount =
 await this.provider.provider.connection.getBalance(
 this.params.accounts.recipientFee,
 "confirmed",
 );

 // console.log("relayerAccount ", relayerAccount);
Expand DownExpand Up@@ -2269,11 +2271,13 @@ export class Transaction {

 var relayerAccount = await this.provider.provider.connection.getBalance(
 this.params.relayer.accounts.relayerRecipient,
 "confirmed",
 );

 var recipientFeeAccount =
 await this.provider.provider.connection.getBalance(
 this.params.accounts.recipientFee,
 "confirmed",
 );

 // console.log("relayerAccount ", relayerAccount);
Expand Down

7 changes: 2 additions & 5 deletions
light-sdk-ts/src/verifiers/verifierOne.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -111,14 +111,11 @@ export class VerifierOne implements Verifier {
 "getInstructions",
 "verifier one: params.encryptedUtxos undefined",
 );
 if (
 !transaction.provider.browserWallet &&
 !transaction.provider.nodeWallet
 ) {
 if (!transaction.provider.wallet) {
 throw new VerifierError(
 TransactionErrorCode.WALLET_UNDEFINED,
 "getInstructions",
 "verifier one: Payer(browserwallet, nodewallet) not defined",
 "verifier one: Payer(wallet) not defined",
 );
 }
 if (!this.verifierProgram)
Expand Down

7 changes: 2 additions & 5 deletions
light-sdk-ts/src/verifiers/verifierZero.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -114,14 +114,11 @@ export class VerifierZero implements Verifier {
 "getInstructions",
 "verifier zero: params.encryptedUtxos undefined",
 );
 if (
 !transaction.provider.browserWallet &&
 !transaction.provider.nodeWallet
 ) {
 if (!transaction.provider.wallet) {
 throw new VerifierError(
 TransactionErrorCode.WALLET_UNDEFINED,
 "getInstructions",
 "verifier zero: Payer(browserwallet, nodewallet) not defined",
 "verifier zero: Payer(wallet) not defined",
 );
 }
 if (!this.verifierProgram)
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
Streamline wallet#55

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 10 commits into

from

Mar 24, 2023
 Merged


Streamline wallet
#55
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
6de2110

added mockUseWallet

Mar 14, 2023
0af02e8

Jorrit add custom errors for transaction class and transaction parame…


ananas-block Mar 13, 2023
ff46ed4

minor changes

Mar 24, 2023
731d7fb

Revert "minor changes"

Mar 24, 2023
1696b84

minor changes

Mar 24, 2023
19c3098

added promise await in transaction

Mar 24, 2023
706b9b8

naming conventions

Mar 24, 2023
f2ef002

Revert "naming conventions"

Mar 24, 2023
f6bd5b8

naming conventions

Mar 24, 2023
921e7cc

method name changed

Mar 24, 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


5 changes: 5 additions & 0 deletions
build-sdk.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,3 +20,8 @@ pushd mock-app-verifier
rm -rf node_modules
yarn
popd

pushd relayer
rm -rf node_modules
yarn
popd

5 changes: 5 additions & 0 deletions
build.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,3 +15,8 @@ popd
pushd light-circuits
yarn install
popd

pushd relayer
yarn install
yarn run build
popd

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -71,13 +71,13 @@ export enum ProviderErrorCode {
 SOL_MERKLE_TREE_UNDEFINED = "SOL_MERKLE_TREE_UNDEFINED",
 ANCHOR_PROVIDER_UNDEFINED = "ANCHOR_PROVIDER_UNDEFINED",
 PROVIDER_UNDEFINED = "PROVIDER_UNDEFINED",
NODE_WALLET_AND_BROWSER_WALLET_UNDEFINED = "NODE_WALLET_AND_BROWSER_WALLET_UNDEFINED",
WALLET_UNDEFINED = "WALLET_UNDEFINED",
 NODE_WALLET_UNDEFINED = "NODE_WALLET_UNDEFINED",
 URL_UNDEFINED = "URL_UNDEFINED",
 CONNECTION_UNDEFINED = "CONNECTION_UNDEFINED",
 CONNECTION_DEFINED = "CONNECTION_DEFINED",
 KEYPAIR_UNDEFINED = "KEYPAIR_UNDEFINED",
NODE_WALLET_AND_BROWSER_WALLET_DEFINED = "NODE_WALLET_AND_BROWSER_WALLET_DEFINED",
WALLET_DEFINED = "WALLET_DEFINED",
 MERKLE_TREE_NOT_INITIALIZED = "MERKLE_TREE_NOT_INITIALIZED",
}

Expand Down

7 changes: 2 additions & 5 deletions
light-sdk-ts/src/merkleTree/solMerkleTree.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,15 +67,12 @@ export class SolMerkleTree {

 const mtFetched = await merkleTreeProgram.account.merkleTree.fetch(
 merkleTreePubkey,
 "confirmed",
 );

 const merkleTreeIndex = mtFetched.nextIndex;
 // console.log(
 // "getCompressedLeaves merkleTreeIndex",
 // merkleTreeIndex.toNumber(),
 // );

 merkleTreeProgram.account.twoLeavesBytesPda.all();
 // merkleTreeProgram.account.twoLeavesBytesPda

 let leavesAccounts: Array<{
 account: QueuedLeavesPda;
Expand Down

4 changes: 2 additions & 2 deletions
light-sdk-ts/src/test-utils/createAccounts.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -288,8 +288,8 @@ export async function createTestAccounts(
 );
 }

 let balanceUserToken = null;
 let userSplAccount = null;
 let balanceUserToken: null | any = null;
@SwenSchaeferjohannSwenSchaeferjohannMar 24, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

please make the type explicit
 let userSplAccount: PublicKey | null = null;
 try {
 let tokenCtx = TOKEN_REGISTRY.find((t) => t.symbol === "USDC");
 if (userTokenAccount) {
Expand Down

2 changes: 1 addition & 1 deletion
light-sdk-ts/src/test-utils/functionalCircuit.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,7 +40,7 @@ export async function functionalCircuitTest(
 outputUtxos: [deposit_utxo1],
 merkleTreePubkey: mockPubkey,
 sender: mockPubkey,
 senderFee: lightProvider.nodeWallet!.publicKey,
 senderFee: lightProvider.wallet!.publicKey,
 verifier: verifier,
 lookUpTable: mockPubkey,
 action: Action.SHIELD,
Expand Down

3 changes: 2 additions & 1 deletion
light-sdk-ts/src/test-utils/initLookUpTable.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@ import {
 SystemProgram,
 sendAndConfirmTransaction,
 Transaction,
 AccountInfo,
} from "@solana/web3.js";
import * as anchor from "@coral-xyz/anchor";
import { TOKEN_PROGRAM_ID } from "@solana/spl-token";
Expand DownExpand Up@@ -80,7 +81,7 @@ export async function initLookUpTable(
 recentSlot: number,
 extraAccounts?: Array<PublicKey>,
): Promise<PublicKey> {
 var lookUpTableInfoInit = null;
 var lookUpTableInfoInit: AccountInfo<Buffer> | null = null;
 if (lookupTableAddress != undefined) {
 lookUpTableInfoInit = await provider.connection.getAccountInfo(
 lookupTableAddress,
Expand Down

2 changes: 2 additions & 0 deletions
light-sdk-ts/src/test-utils/testChecks.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -126,6 +126,7 @@ export async function checkMerkleTreeBatchUpdateSuccess({
}) {
 var merkleTreeTmpStateAccount = await connection.getAccountInfo(
 merkleTreeUpdateState,
 "confirmed",
 );

 assert.equal(
Expand All@@ -136,6 +137,7 @@ export async function checkMerkleTreeBatchUpdateSuccess({

 var merkleTreeAccount = await merkleTreeProgram.account.merkleTree.fetch(
 merkle_tree_pubkey,
 "confirmed",
 );
 // Merkle tree is locked by merkleTreeUpdateState
 assert.equal(
Expand Down

86 changes: 45 additions & 41 deletions
light-sdk-ts/src/transaction.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ import {
 VersionedTransaction,
 TransactionSignature,
 TransactionInstruction,
 Transaction as SolanaTransaction,
} from "@solana/web3.js";
import * as anchor from "@coral-xyz/anchor";
import { TOKEN_PROGRAM_ID, getAccount } from "@solana/spl-token";
Expand All@@ -30,6 +31,7 @@ import {
 initLookUpTable,
 TransactionParametersErrorCode,
 Provider,
 ADMIN_AUTH_KEYPAIR,
} from "./index";
import { IDL_MERKLE_TREE_PROGRAM } from "./idls/index";
const snarkjs = require("snarkjs");
Expand DownExpand Up@@ -808,7 +810,7 @@ export class Transaction {
 "constructor",
 "Merkle tree not set in provider",
 );
 if (!provider.browserWallet && !provider.nodeWallet)
 if (!provider.wallet)
 throw new TransactionError(
 TransactionErrorCode.WALLET_UNDEFINED,
 "constructor",
Expand All@@ -829,10 +831,7 @@ export class Transaction {

 //TODO: change to check whether browser/node wallet are the same as signing address
 if (params.action === Action.SHIELD) {
 let wallet =
 this.provider.browserWallet !== undefined
 ? this.provider.browserWallet
 : this.provider.nodeWallet;
 let wallet = this.provider.wallet;
 if (
 wallet?.publicKey.toBase58() !==
 params.relayer.accounts.relayerPubkey.toBase58() &&
Expand DownExpand Up@@ -1103,7 +1102,7 @@ export class Transaction {
 IDL_MERKLE_TREE_PROGRAM,
 merkleTreeProgramId,
 // @ts-ignore
 this.provider.browserWallet && this.provider,
 this.provider.provider,
 );
 let root = Uint8Array.from(
 leInt2Buff(
Expand All@@ -1114,6 +1113,7 @@ export class Transaction {
 let merkle_tree_account_data =
 await this.merkleTreeProgram.account.merkleTree.fetch(
 this.provider.solMerkleTree.pubkey,
 "confirmed",
 );
 // @ts-ignore: unknown type error
 merkle_tree_account_data.roots.map((x: any, index: any) => {
Expand DownExpand Up@@ -1509,7 +1509,7 @@ export class Transaction {

 async sendTransaction(ix: any): Promise<TransactionSignature | undefined> {
 if (false) {
 // TODO: replace this with (this.provider.browserWallet.pubkey != new relayer... this.relayer
 // TODO: replace this with (this.provider.wallet.pubkey != new relayer... this.relayer
 // then we know that an actual relayer was passed in and that it's supposed to be sent to one.
 // we cant do that tho as we'd want to add the default relayer to the provider itself.
 // so just pass in a flag here "shield, unshield, transfer" -> so devs don't have to know that it goes to a relayer.
Expand DownExpand Up@@ -1592,18 +1592,7 @@ export class Transaction {
 let retries = 3;
 let res;
 while (retries > 0) {
 if (this.provider.browserWallet) {
 // TODO: versiontx??
 console.error("versioned tx might throw here");
 tx = await this.provider.browserWallet.signTransaction(tx);
 // throw new Error(
 // "versioned transaction in browser not implemented yet",
 // );
 } else {
 /** Just need to define relayer pubkey as signer a creation */
 tx.sign([this.provider.nodeWallet!]);
 }

 tx = await this.provider.wallet.signTransaction(tx);
 try {
 let serializedTx = tx.serialize();

Expand DownExpand Up@@ -1642,11 +1631,11 @@ export class Transaction {
 "",
 );

 if (!this.provider.nodeWallet && !this.provider.browserWallet)
 if (!this.provider.wallet)
 throw new TransactionError(
 TransactionErrorCode.WALLET_UNDEFINED,
 "sendAndConfirmTransaction",
 "Cannot use sendAndConfirmTransaction without payer or browserWallet",
 "Cannot use sendAndConfirmTransaction without wallet",
 );

 await this.getRootIndex();
Expand DownExpand Up@@ -1692,11 +1681,11 @@ export class Transaction {
 // TODO: deal with this: set own payer just for that? where is this used?
 // This is used by applications not the relayer
 async closeVerifierState(): Promise<TransactionSignature> {
 if (!this.provider.nodeWallet && !this.provider.browserWallet)
 if (!this.provider.wallet)
 throw new TransactionError(
 TransactionErrorCode.WALLET_UNDEFINED,
 "closeVerifierState",
 "Cannot use closeVerifierState without payer or browserWallet",
 "Cannot use closeVerifierState without wallet",
 );
 if (!this.params)
 throw new TransactionError(
Expand All@@ -1711,21 +1700,27 @@ export class Transaction {
 "",
 );
 if (this.appParams) {
 return await this.appParams?.verifier.verifierProgram.methods
 .closeVerifierState()
 .accounts({
 ...this.params.accounts,
 })
 .signers([this.provider.nodeWallet!]) // TODO: browserwallet? or only ever used by relayer?
 .rpc(confirmConfig);
 const transaction = new SolanaTransaction().add(
 await this.appParams?.verifier.verifierProgram.methods
 .closeVerifierState()
 .accounts({
 ...this.params.accounts,
 })
 .instruction(),
 );

 return await this.provider.wallet!.sendAndConfirmTransaction(transaction);
 } else {
 return await this.params?.verifier.verifierProgram.methods
 .closeVerifierState()
 .accounts({
 ...this.params.accounts,
 })
 .signers([this.provider.nodeWallet!]) // TODO: browserwallet? or only ever used by relayer?
 .rpc(confirmConfig);
 const transaction = new SolanaTransaction().add(
 await this.params?.verifier.verifierProgram.methods
 .closeVerifierState()
 .accounts({
 ...this.params.accounts,
 })
 .instruction(),
 );

 return await this.provider.wallet!.sendAndConfirmTransaction(transaction);
 }
 }

Expand DownExpand Up@@ -1913,14 +1908,12 @@ export class Transaction {
 "test values relayerRecipientAccountBalancePriorLastTx undefined",
 );
 }

 // Checking that nullifiers were inserted
 if (new BN(this.proofInput.publicAmount).toString() === "0") {
 this.testValues.is_token = false;
 } else {
 this.testValues.is_token = true;
 }

 for (
 var i = 0;
 i < this.remainingAccounts.nullifierPdaPubkeys?.length;
Expand All@@ -1946,6 +1939,7 @@ export class Transaction {
 leavesAccountData =
 await this.merkleTreeProgram.account.twoLeavesBytesPda.fetch(
 this.remainingAccounts.leavesPdaPubkeys[i].pubkey,
 "confirmed",
 );

 assert(
Expand All@@ -1963,7 +1957,6 @@ export class Transaction {
 this.provider.solMerkleTree.pubkey.toBase58(),
 "merkleTreePubkey not inserted correctly",
 );

 for (var j = 0; j < this.params.encryptedUtxos.length / 256; j++) {
 // console.log(j);

Expand DownExpand Up@@ -2035,14 +2028,18 @@ export class Transaction {

 try {
 const merkleTreeAfterUpdate =
 await this.merkleTreeProgram.account.merkleTree.fetch(MERKLE_TREE_KEY);
 await this.merkleTreeProgram.account.merkleTree.fetch(
 MERKLE_TREE_KEY,
 "confirmed",
 );
 console.log(
 "Number(merkleTreeAfterUpdate.nextQueuedIndex) ",
 Number(merkleTreeAfterUpdate.nextQueuedIndex),
 );
 leavesAccountData =
 await this.merkleTreeProgram.account.twoLeavesBytesPda.fetch(
 this.remainingAccounts.leavesPdaPubkeys[0].pubkey,
 "confirmed",
 );
 console.log(
 `${Number(leavesAccountData.leftLeafIndex)} + ${
Expand DownExpand Up@@ -2072,6 +2069,7 @@ export class Transaction {
 var recipientFeeAccountBalance =
 await this.provider.provider.connection.getBalance(
 this.params.accounts.recipientFee,
 "confirmed",
 );
 console.log(
 "testValues.recipientFeeBalancePriorTx: ",
Expand All@@ -2081,6 +2079,7 @@ export class Transaction {
 var senderFeeAccountBalance =
 await this.provider.provider.connection.getBalance(
 this.params.relayer.accounts.relayerPubkey,
 "confirmed",
 );
 assert(
 recipientFeeAccountBalance ==
Expand DownExpand Up@@ -2157,6 +2156,7 @@ export class Transaction {
 var senderFeeAccountBalance =
 await this.provider.provider.connection.getBalance(
 this.params.accounts.senderFee,
 "confirmed",
 );

 assert(
Expand All@@ -2182,11 +2182,13 @@ export class Transaction {
 ) {
 var relayerAccount = await this.provider.provider.connection.getBalance(
 this.params.relayer.accounts.relayerRecipient,
 "confirmed",
 );

 var recipientFeeAccount =
 await this.provider.provider.connection.getBalance(
 this.params.accounts.recipientFee,
 "confirmed",
 );

 // console.log("relayerAccount ", relayerAccount);
Expand DownExpand Up@@ -2269,11 +2271,13 @@ export class Transaction {

 var relayerAccount = await this.provider.provider.connection.getBalance(
 this.params.relayer.accounts.relayerRecipient,
 "confirmed",
 );

 var recipientFeeAccount =
 await this.provider.provider.connection.getBalance(
 this.params.accounts.recipientFee,
 "confirmed",
 );

 // console.log("relayerAccount ", relayerAccount);
Expand Down

7 changes: 2 additions & 5 deletions
light-sdk-ts/src/verifiers/verifierOne.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -111,14 +111,11 @@ export class VerifierOne implements Verifier {
 "getInstructions",
 "verifier one: params.encryptedUtxos undefined",
 );
 if (
 !transaction.provider.browserWallet &&
 !transaction.provider.nodeWallet
 ) {
 if (!transaction.provider.wallet) {
 throw new VerifierError(
 TransactionErrorCode.WALLET_UNDEFINED,
 "getInstructions",
 "verifier one: Payer(browserwallet, nodewallet) not defined",
 "verifier one: Payer(wallet) not defined",
 );
 }
 if (!this.verifierProgram)
Expand Down

7 changes: 2 additions & 5 deletions
light-sdk-ts/src/verifiers/verifierZero.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -114,14 +114,11 @@ export class VerifierZero implements Verifier {
 "getInstructions",
 "verifier zero: params.encryptedUtxos undefined",
 );
 if (
 !transaction.provider.browserWallet &&
 !transaction.provider.nodeWallet
 ) {
 if (!transaction.provider.wallet) {
 throw new VerifierError(
 TransactionErrorCode.WALLET_UNDEFINED,
 "getInstructions",
 "verifier zero: Payer(browserwallet, nodewallet) not defined",
 "verifier zero: Payer(wallet) not defined",
 );
 }
 if (!this.verifierProgram)
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
Streamline wallet#55

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 10 commits into

from

Mar 24, 2023
 Merged


Streamline wallet
#55
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
6de2110

added mockUseWallet

Mar 14, 2023
0af02e8

Jorrit add custom errors for transaction class and transaction parame…


ananas-block Mar 13, 2023
ff46ed4

minor changes

Mar 24, 2023
731d7fb

Revert "minor changes"

Mar 24, 2023
1696b84

minor changes

Mar 24, 2023
19c3098

added promise await in transaction

Mar 24, 2023
706b9b8

naming conventions

Mar 24, 2023
f2ef002

Revert "naming conventions"

Mar 24, 2023
f6bd5b8

naming conventions

Mar 24, 2023
921e7cc

method name changed

Mar 24, 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


5 changes: 5 additions & 0 deletions
build-sdk.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,3 +20,8 @@ pushd mock-app-verifier
rm -rf node_modules
yarn
popd

pushd relayer
rm -rf node_modules
yarn
popd

5 changes: 5 additions & 0 deletions
build.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,3 +15,8 @@ popd
pushd light-circuits
yarn install
popd

pushd relayer
yarn install
yarn run build
popd

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -71,13 +71,13 @@ export enum ProviderErrorCode {
 SOL_MERKLE_TREE_UNDEFINED = "SOL_MERKLE_TREE_UNDEFINED",
 ANCHOR_PROVIDER_UNDEFINED = "ANCHOR_PROVIDER_UNDEFINED",
 PROVIDER_UNDEFINED = "PROVIDER_UNDEFINED",
NODE_WALLET_AND_BROWSER_WALLET_UNDEFINED = "NODE_WALLET_AND_BROWSER_WALLET_UNDEFINED",
WALLET_UNDEFINED = "WALLET_UNDEFINED",
 NODE_WALLET_UNDEFINED = "NODE_WALLET_UNDEFINED",
 URL_UNDEFINED = "URL_UNDEFINED",
 CONNECTION_UNDEFINED = "CONNECTION_UNDEFINED",
 CONNECTION_DEFINED = "CONNECTION_DEFINED",
 KEYPAIR_UNDEFINED = "KEYPAIR_UNDEFINED",
NODE_WALLET_AND_BROWSER_WALLET_DEFINED = "NODE_WALLET_AND_BROWSER_WALLET_DEFINED",
WALLET_DEFINED = "WALLET_DEFINED",
 MERKLE_TREE_NOT_INITIALIZED = "MERKLE_TREE_NOT_INITIALIZED",
}

Expand Down

7 changes: 2 additions & 5 deletions
light-sdk-ts/src/merkleTree/solMerkleTree.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,15 +67,12 @@ export class SolMerkleTree {

 const mtFetched = await merkleTreeProgram.account.merkleTree.fetch(
 merkleTreePubkey,
 "confirmed",
 );

 const merkleTreeIndex = mtFetched.nextIndex;
 // console.log(
 // "getCompressedLeaves merkleTreeIndex",
 // merkleTreeIndex.toNumber(),
 // );

 merkleTreeProgram.account.twoLeavesBytesPda.all();
 // merkleTreeProgram.account.twoLeavesBytesPda

 let leavesAccounts: Array<{
 account: QueuedLeavesPda;
Expand Down

4 changes: 2 additions & 2 deletions
light-sdk-ts/src/test-utils/createAccounts.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -288,8 +288,8 @@ export async function createTestAccounts(
 );
 }

 let balanceUserToken = null;
 let userSplAccount = null;
 let balanceUserToken: null | any = null;
@SwenSchaeferjohannSwenSchaeferjohannMar 24, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

please make the type explicit
 let userSplAccount: PublicKey | null = null;
 try {
 let tokenCtx = TOKEN_REGISTRY.find((t) => t.symbol === "USDC");
 if (userTokenAccount) {
Expand Down

2 changes: 1 addition & 1 deletion
light-sdk-ts/src/test-utils/functionalCircuit.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,7 +40,7 @@ export async function functionalCircuitTest(
 outputUtxos: [deposit_utxo1],
 merkleTreePubkey: mockPubkey,
 sender: mockPubkey,
 senderFee: lightProvider.nodeWallet!.publicKey,
 senderFee: lightProvider.wallet!.publicKey,
 verifier: verifier,
 lookUpTable: mockPubkey,
 action: Action.SHIELD,
Expand Down

3 changes: 2 additions & 1 deletion
light-sdk-ts/src/test-utils/initLookUpTable.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@ import {
 SystemProgram,
 sendAndConfirmTransaction,
 Transaction,
 AccountInfo,
} from "@solana/web3.js";
import * as anchor from "@coral-xyz/anchor";
import { TOKEN_PROGRAM_ID } from "@solana/spl-token";
Expand DownExpand Up@@ -80,7 +81,7 @@ export async function initLookUpTable(
 recentSlot: number,
 extraAccounts?: Array<PublicKey>,
): Promise<PublicKey> {
 var lookUpTableInfoInit = null;
 var lookUpTableInfoInit: AccountInfo<Buffer> | null = null;
 if (lookupTableAddress != undefined) {
 lookUpTableInfoInit = await provider.connection.getAccountInfo(
 lookupTableAddress,
Expand Down

2 changes: 2 additions & 0 deletions
light-sdk-ts/src/test-utils/testChecks.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -126,6 +126,7 @@ export async function checkMerkleTreeBatchUpdateSuccess({
}) {
 var merkleTreeTmpStateAccount = await connection.getAccountInfo(
 merkleTreeUpdateState,
 "confirmed",
 );

 assert.equal(
Expand All@@ -136,6 +137,7 @@ export async function checkMerkleTreeBatchUpdateSuccess({

 var merkleTreeAccount = await merkleTreeProgram.account.merkleTree.fetch(
 merkle_tree_pubkey,
 "confirmed",
 );
 // Merkle tree is locked by merkleTreeUpdateState
 assert.equal(
Expand Down

86 changes: 45 additions & 41 deletions
light-sdk-ts/src/transaction.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ import {
 VersionedTransaction,
 TransactionSignature,
 TransactionInstruction,
 Transaction as SolanaTransaction,
} from "@solana/web3.js";
import * as anchor from "@coral-xyz/anchor";
import { TOKEN_PROGRAM_ID, getAccount } from "@solana/spl-token";
Expand All@@ -30,6 +31,7 @@ import {
 initLookUpTable,
 TransactionParametersErrorCode,
 Provider,
 ADMIN_AUTH_KEYPAIR,
} from "./index";
import { IDL_MERKLE_TREE_PROGRAM } from "./idls/index";
const snarkjs = require("snarkjs");
Expand DownExpand Up@@ -808,7 +810,7 @@ export class Transaction {
 "constructor",
 "Merkle tree not set in provider",
 );
 if (!provider.browserWallet && !provider.nodeWallet)
 if (!provider.wallet)
 throw new TransactionError(
 TransactionErrorCode.WALLET_UNDEFINED,
 "constructor",
Expand All@@ -829,10 +831,7 @@ export class Transaction {

 //TODO: change to check whether browser/node wallet are the same as signing address
 if (params.action === Action.SHIELD) {
 let wallet =
 this.provider.browserWallet !== undefined
 ? this.provider.browserWallet
 : this.provider.nodeWallet;
 let wallet = this.provider.wallet;
 if (
 wallet?.publicKey.toBase58() !==
 params.relayer.accounts.relayerPubkey.toBase58() &&
Expand DownExpand Up@@ -1103,7 +1102,7 @@ export class Transaction {
 IDL_MERKLE_TREE_PROGRAM,
 merkleTreeProgramId,
 // @ts-ignore
 this.provider.browserWallet && this.provider,
 this.provider.provider,
 );
 let root = Uint8Array.from(
 leInt2Buff(
Expand All@@ -1114,6 +1113,7 @@ export class Transaction {
 let merkle_tree_account_data =
 await this.merkleTreeProgram.account.merkleTree.fetch(
 this.provider.solMerkleTree.pubkey,
 "confirmed",
 );
 // @ts-ignore: unknown type error
 merkle_tree_account_data.roots.map((x: any, index: any) => {
Expand DownExpand Up@@ -1509,7 +1509,7 @@ export class Transaction {

 async sendTransaction(ix: any): Promise<TransactionSignature | undefined> {
 if (false) {
 // TODO: replace this with (this.provider.browserWallet.pubkey != new relayer... this.relayer
 // TODO: replace this with (this.provider.wallet.pubkey != new relayer... this.relayer
 // then we know that an actual relayer was passed in and that it's supposed to be sent to one.
 // we cant do that tho as we'd want to add the default relayer to the provider itself.
 // so just pass in a flag here "shield, unshield, transfer" -> so devs don't have to know that it goes to a relayer.
Expand DownExpand Up@@ -1592,18 +1592,7 @@ export class Transaction {
 let retries = 3;
 let res;
 while (retries > 0) {
 if (this.provider.browserWallet) {
 // TODO: versiontx??
 console.error("versioned tx might throw here");
 tx = await this.provider.browserWallet.signTransaction(tx);
 // throw new Error(
 // "versioned transaction in browser not implemented yet",
 // );
 } else {
 /** Just need to define relayer pubkey as signer a creation */
 tx.sign([this.provider.nodeWallet!]);
 }

 tx = await this.provider.wallet.signTransaction(tx);
 try {
 let serializedTx = tx.serialize();

Expand DownExpand Up@@ -1642,11 +1631,11 @@ export class Transaction {
 "",
 );

 if (!this.provider.nodeWallet && !this.provider.browserWallet)
 if (!this.provider.wallet)
 throw new TransactionError(
 TransactionErrorCode.WALLET_UNDEFINED,
 "sendAndConfirmTransaction",
 "Cannot use sendAndConfirmTransaction without payer or browserWallet",
 "Cannot use sendAndConfirmTransaction without wallet",
 );

 await this.getRootIndex();
Expand DownExpand Up@@ -1692,11 +1681,11 @@ export class Transaction {
 // TODO: deal with this: set own payer just for that? where is this used?
 // This is used by applications not the relayer
 async closeVerifierState(): Promise<TransactionSignature> {
 if (!this.provider.nodeWallet && !this.provider.browserWallet)
 if (!this.provider.wallet)
 throw new TransactionError(
 TransactionErrorCode.WALLET_UNDEFINED,
 "closeVerifierState",
 "Cannot use closeVerifierState without payer or browserWallet",
 "Cannot use closeVerifierState without wallet",
 );
 if (!this.params)
 throw new TransactionError(
Expand All@@ -1711,21 +1700,27 @@ export class Transaction {
 "",
 );
 if (this.appParams) {
 return await this.appParams?.verifier.verifierProgram.methods
 .closeVerifierState()
 .accounts({
 ...this.params.accounts,
 })
 .signers([this.provider.nodeWallet!]) // TODO: browserwallet? or only ever used by relayer?
 .rpc(confirmConfig);
 const transaction = new SolanaTransaction().add(
 await this.appParams?.verifier.verifierProgram.methods
 .closeVerifierState()
 .accounts({
 ...this.params.accounts,
 })
 .instruction(),
 );

 return await this.provider.wallet!.sendAndConfirmTransaction(transaction);
 } else {
 return await this.params?.verifier.verifierProgram.methods
 .closeVerifierState()
 .accounts({
 ...this.params.accounts,
 })
 .signers([this.provider.nodeWallet!]) // TODO: browserwallet? or only ever used by relayer?
 .rpc(confirmConfig);
 const transaction = new SolanaTransaction().add(
 await this.params?.verifier.verifierProgram.methods
 .closeVerifierState()
 .accounts({
 ...this.params.accounts,
 })
 .instruction(),
 );

 return await this.provider.wallet!.sendAndConfirmTransaction(transaction);
 }
 }

Expand DownExpand Up@@ -1913,14 +1908,12 @@ export class Transaction {
 "test values relayerRecipientAccountBalancePriorLastTx undefined",
 );
 }

 // Checking that nullifiers were inserted
 if (new BN(this.proofInput.publicAmount).toString() === "0") {
 this.testValues.is_token = false;
 } else {
 this.testValues.is_token = true;
 }

 for (
 var i = 0;
 i < this.remainingAccounts.nullifierPdaPubkeys?.length;
Expand All@@ -1946,6 +1939,7 @@ export class Transaction {
 leavesAccountData =
 await this.merkleTreeProgram.account.twoLeavesBytesPda.fetch(
 this.remainingAccounts.leavesPdaPubkeys[i].pubkey,
 "confirmed",
 );

 assert(
Expand All@@ -1963,7 +1957,6 @@ export class Transaction {
 this.provider.solMerkleTree.pubkey.toBase58(),
 "merkleTreePubkey not inserted correctly",
 );

 for (var j = 0; j < this.params.encryptedUtxos.length / 256; j++) {
 // console.log(j);

Expand DownExpand Up@@ -2035,14 +2028,18 @@ export class Transaction {

 try {
 const merkleTreeAfterUpdate =
 await this.merkleTreeProgram.account.merkleTree.fetch(MERKLE_TREE_KEY);
 await this.merkleTreeProgram.account.merkleTree.fetch(
 MERKLE_TREE_KEY,
 "confirmed",
 );
 console.log(
 "Number(merkleTreeAfterUpdate.nextQueuedIndex) ",
 Number(merkleTreeAfterUpdate.nextQueuedIndex),
 );
 leavesAccountData =
 await this.merkleTreeProgram.account.twoLeavesBytesPda.fetch(
 this.remainingAccounts.leavesPdaPubkeys[0].pubkey,
 "confirmed",
 );
 console.log(
 `${Number(leavesAccountData.leftLeafIndex)} + ${
Expand DownExpand Up@@ -2072,6 +2069,7 @@ export class Transaction {
 var recipientFeeAccountBalance =
 await this.provider.provider.connection.getBalance(
 this.params.accounts.recipientFee,
 "confirmed",
 );
 console.log(
 "testValues.recipientFeeBalancePriorTx: ",
Expand All@@ -2081,6 +2079,7 @@ export class Transaction {
 var senderFeeAccountBalance =
 await this.provider.provider.connection.getBalance(
 this.params.relayer.accounts.relayerPubkey,
 "confirmed",
 );
 assert(
 recipientFeeAccountBalance ==
Expand DownExpand Up@@ -2157,6 +2156,7 @@ export class Transaction {
 var senderFeeAccountBalance =
 await this.provider.provider.connection.getBalance(
 this.params.accounts.senderFee,
 "confirmed",
 );

 assert(
Expand All@@ -2182,11 +2182,13 @@ export class Transaction {
 ) {
 var relayerAccount = await this.provider.provider.connection.getBalance(
 this.params.relayer.accounts.relayerRecipient,
 "confirmed",
 );

 var recipientFeeAccount =
 await this.provider.provider.connection.getBalance(
 this.params.accounts.recipientFee,
 "confirmed",
 );

 // console.log("relayerAccount ", relayerAccount);
Expand DownExpand Up@@ -2269,11 +2271,13 @@ export class Transaction {

 var relayerAccount = await this.provider.provider.connection.getBalance(
 this.params.relayer.accounts.relayerRecipient,
 "confirmed",
 );

 var recipientFeeAccount =
 await this.provider.provider.connection.getBalance(
 this.params.accounts.recipientFee,
 "confirmed",
 );

 // console.log("relayerAccount ", relayerAccount);
Expand Down

7 changes: 2 additions & 5 deletions
light-sdk-ts/src/verifiers/verifierOne.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -111,14 +111,11 @@ export class VerifierOne implements Verifier {
 "getInstructions",
 "verifier one: params.encryptedUtxos undefined",
 );
 if (
 !transaction.provider.browserWallet &&
 !transaction.provider.nodeWallet
 ) {
 if (!transaction.provider.wallet) {
 throw new VerifierError(
 TransactionErrorCode.WALLET_UNDEFINED,
 "getInstructions",
 "verifier one: Payer(browserwallet, nodewallet) not defined",
 "verifier one: Payer(wallet) not defined",
 );
 }
 if (!this.verifierProgram)
Expand Down

7 changes: 2 additions & 5 deletions
light-sdk-ts/src/verifiers/verifierZero.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -114,14 +114,11 @@ export class VerifierZero implements Verifier {
 "getInstructions",
 "verifier zero: params.encryptedUtxos undefined",
 );
 if (
 !transaction.provider.browserWallet &&
 !transaction.provider.nodeWallet
 ) {
 if (!transaction.provider.wallet) {
 throw new VerifierError(
 TransactionErrorCode.WALLET_UNDEFINED,
 "getInstructions",
 "verifier zero: Payer(browserwallet, nodewallet) not defined",
 "verifier zero: Payer(wallet) not defined",
 );
 }
 if (!this.verifierProgram)
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
Streamline wallet#55

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 10 commits into

from

Mar 24, 2023
 Merged


Streamline wallet
#55
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


10 commits


Select commit
Hold shift + click to select a range
6de2110

added mockUseWallet

Mar 14, 2023
0af02e8

Jorrit add custom errors for transaction class and transaction parame…


ananas-block Mar 13, 2023
ff46ed4

minor changes

Mar 24, 2023
731d7fb

Revert "minor changes"

Mar 24, 2023
1696b84

minor changes

Mar 24, 2023
19c3098

added promise await in transaction

Mar 24, 2023
706b9b8

naming conventions

Mar 24, 2023
f2ef002

Revert "naming conventions"

Mar 24, 2023
f6bd5b8

naming conventions

Mar 24, 2023
921e7cc

method name changed

Mar 24, 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


5 changes: 5 additions & 0 deletions
build-sdk.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,3 +20,8 @@ pushd mock-app-verifier
rm -rf node_modules
yarn
popd

pushd relayer
rm -rf node_modules
yarn
popd

5 changes: 5 additions & 0 deletions
build.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,3 +15,8 @@ popd
pushd light-circuits
yarn install
popd

pushd relayer
yarn install
yarn run build
popd

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -71,13 +71,13 @@ export enum ProviderErrorCode {
 SOL_MERKLE_TREE_UNDEFINED = "SOL_MERKLE_TREE_UNDEFINED",
 ANCHOR_PROVIDER_UNDEFINED = "ANCHOR_PROVIDER_UNDEFINED",
 PROVIDER_UNDEFINED = "PROVIDER_UNDEFINED",
NODE_WALLET_AND_BROWSER_WALLET_UNDEFINED = "NODE_WALLET_AND_BROWSER_WALLET_UNDEFINED",
WALLET_UNDEFINED = "WALLET_UNDEFINED",
 NODE_WALLET_UNDEFINED = "NODE_WALLET_UNDEFINED",
 URL_UNDEFINED = "URL_UNDEFINED",
 CONNECTION_UNDEFINED = "CONNECTION_UNDEFINED",
 CONNECTION_DEFINED = "CONNECTION_DEFINED",
 KEYPAIR_UNDEFINED = "KEYPAIR_UNDEFINED",
NODE_WALLET_AND_BROWSER_WALLET_DEFINED = "NODE_WALLET_AND_BROWSER_WALLET_DEFINED",
WALLET_DEFINED = "WALLET_DEFINED",
 MERKLE_TREE_NOT_INITIALIZED = "MERKLE_TREE_NOT_INITIALIZED",
}

Expand Down

7 changes: 2 additions & 5 deletions
light-sdk-ts/src/merkleTree/solMerkleTree.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,15 +67,12 @@ export class SolMerkleTree {

 const mtFetched = await merkleTreeProgram.account.merkleTree.fetch(
 merkleTreePubkey,
 "confirmed",
 );

 const merkleTreeIndex = mtFetched.nextIndex;
 // console.log(
 // "getCompressedLeaves merkleTreeIndex",
 // merkleTreeIndex.toNumber(),
 // );

 merkleTreeProgram.account.twoLeavesBytesPda.all();
 // merkleTreeProgram.account.twoLeavesBytesPda

 let leavesAccounts: Array<{
 account: QueuedLeavesPda;
Expand Down

4 changes: 2 additions & 2 deletions
light-sdk-ts/src/test-utils/createAccounts.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -288,8 +288,8 @@ export async function createTestAccounts(
 );
 }

 let balanceUserToken = null;
 let userSplAccount = null;
 let balanceUserToken: null | any = null;
@SwenSchaeferjohannSwenSchaeferjohannMar 24, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

please make the type explicit
 let userSplAccount: PublicKey | null = null;
 try {
 let tokenCtx = TOKEN_REGISTRY.find((t) => t.symbol === "USDC");
 if (userTokenAccount) {
Expand Down

2 changes: 1 addition & 1 deletion
light-sdk-ts/src/test-utils/functionalCircuit.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,7 +40,7 @@ export async function functionalCircuitTest(
 outputUtxos: [deposit_utxo1],
 merkleTreePubkey: mockPubkey,
 sender: mockPubkey,
 senderFee: lightProvider.nodeWallet!.publicKey,
 senderFee: lightProvider.wallet!.publicKey,
 verifier: verifier,
 lookUpTable: mockPubkey,
 action: Action.SHIELD,
Expand Down

3 changes: 2 additions & 1 deletion
light-sdk-ts/src/test-utils/initLookUpTable.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@ import {
 SystemProgram,
 sendAndConfirmTransaction,
 Transaction,
 AccountInfo,
} from "@solana/web3.js";
import * as anchor from "@coral-xyz/anchor";
import { TOKEN_PROGRAM_ID } from "@solana/spl-token";
Expand DownExpand Up@@ -80,7 +81,7 @@ export async function initLookUpTable(
 recentSlot: number,
 extraAccounts?: Array<PublicKey>,
): Promise<PublicKey> {
 var lookUpTableInfoInit = null;
 var lookUpTableInfoInit: AccountInfo<Buffer> | null = null;
 if (lookupTableAddress != undefined) {
 lookUpTableInfoInit = await provider.connection.getAccountInfo(
 lookupTableAddress,
Expand Down

2 changes: 2 additions & 0 deletions
light-sdk-ts/src/test-utils/testChecks.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -126,6 +126,7 @@ export async function checkMerkleTreeBatchUpdateSuccess({
}) {
 var merkleTreeTmpStateAccount = await connection.getAccountInfo(
 merkleTreeUpdateState,
 "confirmed",
 );

 assert.equal(
Expand All@@ -136,6 +137,7 @@ export async function checkMerkleTreeBatchUpdateSuccess({

 var merkleTreeAccount = await merkleTreeProgram.account.merkleTree.fetch(
 merkle_tree_pubkey,
 "confirmed",
 );
 // Merkle tree is locked by merkleTreeUpdateState
 assert.equal(
Expand Down

86 changes: 45 additions & 41 deletions
light-sdk-ts/src/transaction.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@ import {
 VersionedTransaction,
 TransactionSignature,
 TransactionInstruction,
 Transaction as SolanaTransaction,
} from "@solana/web3.js";
import * as anchor from "@coral-xyz/anchor";
import { TOKEN_PROGRAM_ID, getAccount } from "@solana/spl-token";
Expand All@@ -30,6 +31,7 @@ import {
 initLookUpTable,
 TransactionParametersErrorCode,
 Provider,
 ADMIN_AUTH_KEYPAIR,
} from "./index";
import { IDL_MERKLE_TREE_PROGRAM } from "./idls/index";
const snarkjs = require("snarkjs");
Expand DownExpand Up@@ -808,7 +810,7 @@ export class Transaction {
 "constructor",
 "Merkle tree not set in provider",
 );
 if (!provider.browserWallet && !provider.nodeWallet)
 if (!provider.wallet)
 throw new TransactionError(
 TransactionErrorCode.WALLET_UNDEFINED,
 "constructor",
Expand All@@ -829,10 +831,7 @@ export class Transaction {

 //TODO: change to check whether browser/node wallet are the same as signing address
 if (params.action === Action.SHIELD) {
 let wallet =
 this.provider.browserWallet !== undefined
 ? this.provider.browserWallet
 : this.provider.nodeWallet;
 let wallet = this.provider.wallet;
 if (
 wallet?.publicKey.toBase58() !==
 params.relayer.accounts.relayerPubkey.toBase58() &&
Expand DownExpand Up@@ -1103,7 +1102,7 @@ export class Transaction {
 IDL_MERKLE_TREE_PROGRAM,
 merkleTreeProgramId,
 // @ts-ignore
 this.provider.browserWallet && this.provider,
 this.provider.provider,
 );
 let root = Uint8Array.from(
 leInt2Buff(
Expand All@@ -1114,6 +1113,7 @@ export class Transaction {
 let merkle_tree_account_data =
 await this.merkleTreeProgram.account.merkleTree.fetch(
 this.provider.solMerkleTree.pubkey,
 "confirmed",
 );
 // @ts-ignore: unknown type error
 merkle_tree_account_data.roots.map((x: any, index: any) => {
Expand DownExpand Up@@ -1509,7 +1509,7 @@ export class Transaction {

 async sendTransaction(ix: any): Promise<TransactionSignature | undefined> {
 if (false) {
 // TODO: replace this with (this.provider.browserWallet.pubkey != new relayer... this.relayer
 // TODO: replace this with (this.provider.wallet.pubkey != new relayer... this.relayer
 // then we know that an actual relayer was passed in and that it's supposed to be sent to one.
 // we cant do that tho as we'd want to add the default relayer to the provider itself.
 // so just pass in a flag here "shield, unshield, transfer" -> so devs don't have to know that it goes to a relayer.
Expand DownExpand Up@@ -1592,18 +1592,7 @@ export class Transaction {
 let retries = 3;
 let res;
 while (retries > 0) {
 if (this.provider.browserWallet) {
 // TODO: versiontx??
 console.error("versioned tx might throw here");
 tx = await this.provider.browserWallet.signTransaction(tx);
 // throw new Error(
 // "versioned transaction in browser not implemented yet",
 // );
 } else {
 /** Just need to define relayer pubkey as signer a creation */
 tx.sign([this.provider.nodeWallet!]);
 }

 tx = await this.provider.wallet.signTransaction(tx);
 try {
 let serializedTx = tx.serialize();

Expand DownExpand Up@@ -1642,11 +1631,11 @@ export class Transaction {
 "",
 );

 if (!this.provider.nodeWallet && !this.provider.browserWallet)
 if (!this.provider.wallet)
 throw new TransactionError(
 TransactionErrorCode.WALLET_UNDEFINED,
 "sendAndConfirmTransaction",
 "Cannot use sendAndConfirmTransaction without payer or browserWallet",
 "Cannot use sendAndConfirmTransaction without wallet",
 );

 await this.getRootIndex();
Expand DownExpand Up@@ -1692,11 +1681,11 @@ export class Transaction {
 // TODO: deal with this: set own payer just for that? where is this used?
 // This is used by applications not the relayer
 async closeVerifierState(): Promise<TransactionSignature> {
 if (!this.provider.nodeWallet && !this.provider.browserWallet)
 if (!this.provider.wallet)
 throw new TransactionError(
 TransactionErrorCode.WALLET_UNDEFINED,
 "closeVerifierState",
 "Cannot use closeVerifierState without payer or browserWallet",
 "Cannot use closeVerifierState without wallet",
 );
 if (!this.params)
 throw new TransactionError(
Expand All@@ -1711,21 +1700,27 @@ export class Transaction {
 "",
 );
 if (this.appParams) {
 return await this.appParams?.verifier.verifierProgram.methods
 .closeVerifierState()
 .accounts({
 ...this.params.accounts,
 })
 .signers([this.provider.nodeWallet!]) // TODO: browserwallet? or only ever used by relayer?
 .rpc(confirmConfig);
 const transaction = new SolanaTransaction().add(
 await this.appParams?.verifier.verifierProgram.methods
 .closeVerifierState()
 .accounts({
 ...this.params.accounts,
 })
 .instruction(),
 );

 return await this.provider.wallet!.sendAndConfirmTransaction(transaction);
 } else {
 return await this.params?.verifier.verifierProgram.methods
 .closeVerifierState()
 .accounts({
 ...this.params.accounts,
 })
 .signers([this.provider.nodeWallet!]) // TODO: browserwallet? or only ever used by relayer?
 .rpc(confirmConfig);
 const transaction = new SolanaTransaction().add(
 await this.params?.verifier.verifierProgram.methods
 .closeVerifierState()
 .accounts({
 ...this.params.accounts,
 })
 .instruction(),
 );

 return await this.provider.wallet!.sendAndConfirmTransaction(transaction);
 }
 }

Expand DownExpand Up@@ -1913,14 +1908,12 @@ export class Transaction {
 "test values relayerRecipientAccountBalancePriorLastTx undefined",
 );
 }

 // Checking that nullifiers were inserted
 if (new BN(this.proofInput.publicAmount).toString() === "0") {
 this.testValues.is_token = false;
 } else {
 this.testValues.is_token = true;
 }

 for (
 var i = 0;
 i < this.remainingAccounts.nullifierPdaPubkeys?.length;
Expand All@@ -1946,6 +1939,7 @@ export class Transaction {
 leavesAccountData =
 await this.merkleTreeProgram.account.twoLeavesBytesPda.fetch(
 this.remainingAccounts.leavesPdaPubkeys[i].pubkey,
 "confirmed",
 );

 assert(
Expand All@@ -1963,7 +1957,6 @@ export class Transaction {
 this.provider.solMerkleTree.pubkey.toBase58(),
 "merkleTreePubkey not inserted correctly",
 );

 for (var j = 0; j < this.params.encryptedUtxos.length / 256; j++) {
 // console.log(j);

Expand DownExpand Up@@ -2035,14 +2028,18 @@ export class Transaction {

 try {
 const merkleTreeAfterUpdate =
 await this.merkleTreeProgram.account.merkleTree.fetch(MERKLE_TREE_KEY);
 await this.merkleTreeProgram.account.merkleTree.fetch(
 MERKLE_TREE_KEY,
 "confirmed",
 );
 console.log(
 "Number(merkleTreeAfterUpdate.nextQueuedIndex) ",
 Number(merkleTreeAfterUpdate.nextQueuedIndex),
 );
 leavesAccountData =
 await this.merkleTreeProgram.account.twoLeavesBytesPda.fetch(
 this.remainingAccounts.leavesPdaPubkeys[0].pubkey,
 "confirmed",
 );
 console.log(
 `${Number(leavesAccountData.leftLeafIndex)} + ${
Expand DownExpand Up@@ -2072,6 +2069,7 @@ export class Transaction {
 var recipientFeeAccountBalance =
 await this.provider.provider.connection.getBalance(
 this.params.accounts.recipientFee,
 "confirmed",
 );
 console.log(
 "testValues.recipientFeeBalancePriorTx: ",
Expand All@@ -2081,6 +2079,7 @@ export class Transaction {
 var senderFeeAccountBalance =
 await this.provider.provider.connection.getBalance(
 this.params.relayer.accounts.relayerPubkey,
 "confirmed",
 );
 assert(
 recipientFeeAccountBalance ==
Expand DownExpand Up@@ -2157,6 +2156,7 @@ export class Transaction {
 var senderFeeAccountBalance =
 await this.provider.provider.connection.getBalance(
 this.params.accounts.senderFee,
 "confirmed",
 );

 assert(
Expand All@@ -2182,11 +2182,13 @@ export class Transaction {
 ) {
 var relayerAccount = await this.provider.provider.connection.getBalance(
 this.params.relayer.accounts.relayerRecipient,
 "confirmed",
 );

 var recipientFeeAccount =
 await this.provider.provider.connection.getBalance(
 this.params.accounts.recipientFee,
 "confirmed",
 );

 // console.log("relayerAccount ", relayerAccount);
Expand DownExpand Up@@ -2269,11 +2271,13 @@ export class Transaction {

 var relayerAccount = await this.provider.provider.connection.getBalance(
 this.params.relayer.accounts.relayerRecipient,
 "confirmed",
 );

 var recipientFeeAccount =
 await this.provider.provider.connection.getBalance(
 this.params.accounts.recipientFee,
 "confirmed",
 );

 // console.log("relayerAccount ", relayerAccount);
Expand Down

7 changes: 2 additions & 5 deletions
light-sdk-ts/src/verifiers/verifierOne.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -111,14 +111,11 @@ export class VerifierOne implements Verifier {
 "getInstructions",
 "verifier one: params.encryptedUtxos undefined",
 );
 if (
 !transaction.provider.browserWallet &&
 !transaction.provider.nodeWallet
 ) {
 if (!transaction.provider.wallet) {
 throw new VerifierError(
 TransactionErrorCode.WALLET_UNDEFINED,
 "getInstructions",
 "verifier one: Payer(browserwallet, nodewallet) not defined",
 "verifier one: Payer(wallet) not defined",
 );
 }
 if (!this.verifierProgram)
Expand Down

7 changes: 2 additions & 5 deletions
light-sdk-ts/src/verifiers/verifierZero.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -114,14 +114,11 @@ export class VerifierZero implements Verifier {
 "getInstructions",
 "verifier zero: params.encryptedUtxos undefined",
 );
 if (
 !transaction.provider.browserWallet &&
 !transaction.provider.nodeWallet
 ) {
 if (!transaction.provider.wallet) {
 throw new VerifierError(
 TransactionErrorCode.WALLET_UNDEFINED,
 "getInstructions",
 "verifier zero: Payer(browserwallet, nodewallet) not defined",
 "verifier zero: Payer(wallet) not defined",
 );
 }
 if (!this.verifierProgram)
Expand Down
Loading