Streamline wallet by sleepyqadir · Pull Request #55 · Lightprotocol/light-protocol

sleepyqadir · 2023-03-22T08:24:22Z

this pr currently in draft

Streamline Wallet
- just checks with the provider
- the interface is consistent for both the browser wallet and node wallet
- changes to the transaction class etc for a unified interface across browser/native env
- support of spl approve

…ters (#38) * implemented custom errors in transaction class not tested * added getAssetPubkeys tests and fixed the fn * added no u64 errors * completed deposit tests for transaction parameters * added functional TransactionParameters tests * transaction parameters tests work clean functional + errors * removed transaction class errors after refactor * removed prints * fixed verifiers for tx params refactor * functional tests except user class run * user class functional tests run * adapted circuit tests * verifier two functional test runs * verifier two tests runs * adapted remaining system programs tests * fixed tests after rebase add custom errors transaction, utxo, verifier classes (#41) * added custom errors transaction, utxo, verifier classes * relaxed version requirement on solana web3.js logs for the testing changes: added the update merkle tree call commitment changed in the leaves account data added the update merkle tree call Co-authored-by: Abdul Qadir Shaikh <sleepyqadir@Abduls-MacBook-Air.local> deleted groth16-solana and replaced by crates.io import light-verifier-sdk: Provide program keys in bs58 format Use our light-macros crate to provide program IDs to light-verifier-sdk in bs58 format (which gets converted to bytes during compilation time). Thanks to that, we also don't have to use the deprecated `Pubkey::new()` associated method. add custom errors account (#44) * added account custom errors * removed sdk build errors fixed transaction config ID (#46) relayer commander for tests fixed: socket i/o timeout issue command added Add Github Actions CI jobs (#32) * Add Github Actions CI jobs * Fix cargo fmt issues * tests: Provide output UTXOs as transaction parameters ata shield unshield pass in upd (WIP) (#45) * ata shield unshield pass in upd enabled: unshield, transfer user.getBalance:permissioned balances even if 0 added balance checks and todos to unshield user test unshield -> getTxparams refactor + getRelayer call transfer -> getTxParams &tested * tests run: disabled leafindex check in getUnspentUtxos tho * tests all running * remove console logs * removed index checker in getUnspentUtxos * clean function params getUnspentUtxos sub module fetched rm light-macros cleans the logs removed the unused relayer script removed extra consols useWallet changes resolved failing test updated the wait time and verifierZero call reverted the script change added script for running the browser wallet tests fix loopless of browser command switch to docker solana validator changes: script changes changes: added build and install script for relayer fixed typescript issues in relayer remove for unbound issue cleanups added relayer custom errors (#49) * added relayer custom errors * increased relayer fee in mock-verifier tests rebase from main re added the removed package-lock.json resolve long changes Jorrit refactor createOutUtxos (#50) * renamed amount, extraSolAmount, account * renamed Action.DEPOSIT, WITHDRAWAL, to SHIELD, UNSHIELD * added error tests * fixed errors * removed commented code * renamed test * fixed user tests * added comment * made errors custom * improved shielded recipients check for transfer * renamed tests Jorrit add custom errors provider (#47) * added custom errors provider and tests * fixed rebase conflicts and added a check in createUtxos * unskipped a test action enum checking with finalized user and provider class refactored transaction and verifier refactored spl support and check changed provider changes and ts errors fixed changes: errors handles and conditions remove seperate static calls checks changes reset the test scripts hot fixes in provider for failing test-caes fixes: user tests cases light-sdk test cases fixups verifier tests fixups nodeWallet sign message changes long changes reverted Jorrit refactor select in utxos (#54) * selectInUtxos functional tests with 2 inputs + custom errors + some error tests * added failed utxo combination and 3 in utxo tests * tests pass with refactored selectInUtxos and createUtxos * removed commented code * fixed sort Refactored user and add custom errors (#56) * refactored user class, and added custom errors * resolved rebase errors reverted commits

This reverts commit ff46ed4.

light-sdk-ts/src/transaction.ts

ananas-block · 2023-03-24T15:46:10Z

light-sdk-ts/src/wallet/useWallet.ts

+import { sign } from "tweetnacl";
+
+// Mock Solana web3 library
+class Provider {


this could be quite useful to build more functions such as request utxos, request balance, etc. we will want the wallets to support.
Maybe we should move some stuff from the user, to separate what will be in a wallet and what will be accessible in the application.

cc @SwenSchaeferjohann

@sleepyqadir we already have a provider class, what do you think about calling it Wallet?

Yeah Wallet makes more sense, changed it to the Wallet

Regarding more functions, yes we can add them for sure

ananas-block · 2023-03-24T15:48:55Z

light-sdk-ts/src/wallet/useWallet.ts

+        transaction,
+        [this._keypair, ...signers],
+        {
+          commitment: "confirmed",


We should make this flexible with default "confirmed", we can add it in the constructor

constructor(...,commitment?: string = "confirmed) this.commitment = commitment;

SwenSchaeferjohann

lgtm! besides some optional/informational comments and a few e..g renamings that i consider useful to change

SwenSchaeferjohann · 2023-03-24T15:43:05Z

light-sdk-ts/src/test-utils/createAccounts.ts


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


please make the type explicit

light-sdk-ts/src/transaction.ts

SwenSchaeferjohann · 2023-03-24T15:48:55Z

light-sdk-ts/src/wallet/provider.ts

  signTransaction: (transaction: any) => Promise<any>;
  sendAndConfirmTransaction: (transaction: any) => Promise<any>;
  publicKey: PublicKey;
+  node_wallet?: boolean;


please rename to isNodeWallet to adhere to naming conventions for bools in es6

light-sdk-ts/src/wallet/user.ts

SwenSchaeferjohann · 2023-03-24T15:51:29Z

light-sdk-ts/tests/provider.test.ts

has this test file been formatted?

SwenSchaeferjohann · 2023-03-24T15:52:56Z

light-system-programs/tests/merkle_tree_tests.ts

-    let lightProvider = await Provider.native(ADMIN_AUTH_KEYPAIR);
-
-
+    let lightProvider = await Provider.initialize(ADMIN_AUTH_KEYPAIR);


.init would be BE/AE-agnostic ..

Didn't get it

in british english it would be initialise, vs AE american initialize, thus swen is suggesting to just do init instead.
I am ok with that

SwenSchaeferjohann · 2023-03-24T15:53:49Z

relayer/runScript.sh

 #!/bin/bash -e
-../../solana/validator/solana-test-validator     --reset     --limit-ledger-size 500000000 --faucet-port 9002 --rpc-port 8899  --bpf-program J1RRetZ4ujphU75LP8RadjXMf3sA12yC2R44CF7PmU7i ../light-system-programs/target/deploy/verifier_program_zero.so     --bpf-program JA5cjkRJ1euVi9xLWsCJVzsRzEkT8vcC4rqw9sVAo5d6 ../light-system-programs/target/deploy/merkle_tree_program.so     --bpf-program 3KS2k14CmtnuVv2fvYcvdrNgC94Y11WETBpMUGgXyWZL ../light-system-programs/target/deploy/verifier_program_one.so --bpf-program noopb9bkMVfRPU8AsbpTUg8AQkHtKwMYZiFUjNRtMmV ../../solana/web3.js/test/fixtures/noop-program/solana_sbf_rust_noop.so --bpf-program Fg6PaFpoGXkYsidMpWTK6W2BeZ7FEfcYkg476zPFsLnS ../light-system-programs/target/deploy/verifier_program.so --quiet & 
-sleep 7 
+../../solana/validator/solana-test-validator     --reset     --limit-ledger-size 500000000 --faucet-port 9002 --rpc-port 8899  --bpf-program J1RRetZ4ujphU75LP8RadjXMf3sA12yC2R44CF7PmU7i ../light-system-programs/target/deploy/verifier_program_zero.so     --bpf-program JA5cjkRJ1euVi9xLWsCJVzsRzEkT8vcC4rqw9sVAo5d6 ../light-system-programs/target/deploy/merkle_tree_program.so     --bpf-program 3KS2k14CmtnuVv2fvYcvdrNgC94Y11WETBpMUGgXyWZL ../light-system-programs/target/deploy/verifier_program_one.so --bpf-program noopb9bkMVfRPU8AsbpTUg8AQkHtKwMYZiFUjNRtMmV ../../solana/web3.js/test/fixtures/noop-program/solana_sbf_rust_noop.so --bpf-program Fg6PaFpoGXkYsidMpWTK6W2BeZ7FEfcYkg476zPFsLnS ../light-system-programs/target/deploy/verifier_program_storage.so --quiet & 


curious why did this change ?

verifier_program build as verifier_program_storage

but this should already be the case before your commits weird

SwenSchaeferjohann · 2023-03-24T15:54:08Z

relayer/tsconfig.json

    "moduleResolution": "node",
    "rootDirs": ["src", "generated"],
    "baseUrl": "src",
+    "skipLibCheck": true,


what does this do/ why do we want to skip it?

I was trying to resolve the conflicts inside the node_modules, forgot to remove it

ananas-block · 2023-03-24T15:49:58Z

light-sdk-ts/src/wallet/user.ts

-          // change to bigint
-          publicAmountSpl.toNumber(),
-          [this.provider.nodeWallet!],
+        const transaction = new createTransaction().add(


same with createTransaction vs solanaTransaction here

ananas-block · 2023-03-24T15:52:45Z

light-system-programs/tests/provider.test.ts

-    assert.equal(lightProviderMock.browserWallet, undefined);
-    assert.equal(lightProviderMock.nodeWallet?.publicKey.toBase58(), mockKeypair.publicKey.toBase58());
+    const lightProviderMock = await LightProvider.initialize(mockKeypair);
+    assert.equal(lightProviderMock.wallet.node_wallet, true);


is this correct?
why is node_wallet === true?

Yeah,

lastly we check that the lightProviderMock is initialized with the native and contains the node wallet, but now we have a similar kind of wallet except node wallet contains the node_wallet true

then isNodeWallet would be better naming right?
if this variable is always a boolean pls rename lmk in case I misunderstood

ah saw this is fixed already

ananas-block · 2023-03-24T15:54:23Z

yarn.lock

why does this exist?

ananas-block · 2023-03-24T15:55:12Z

light-sdk-ts/src/wallet/useWallet.ts

+}
+
+// Mock useWallet hook
+export const useWallet = (


can we make this a static function of the above class (now provider)?

Yes, I guess, should I do it this way,?

ananas-block · 2023-03-24T15:56:35Z

light-sdk-ts/src/wallet/useWallet.ts

+    signMessage: provider.signMessage,
+    signTransaction: provider.signTransaction,
+    signAllTransactions: provider.signAllTransactions,
+    node_wallet,


why don't you return the provider object?

because, it is how we get the methods from the useWallet in the browser, separately

ananas-block

once test ci errors are resolved and the change initialize to init as Swen suggested,
looks good to me

This reverts commit 706b9b8.

* added mockUseWallet * Jorrit add custom errors for transaction class and transaction parameters (Lightprotocol#38) * implemented custom errors in transaction class not tested * added getAssetPubkeys tests and fixed the fn * added no u64 errors * completed deposit tests for transaction parameters * added functional TransactionParameters tests * transaction parameters tests work clean functional + errors * removed transaction class errors after refactor * removed prints * fixed verifiers for tx params refactor * functional tests except user class run * user class functional tests run * adapted circuit tests * verifier two functional test runs * verifier two tests runs * adapted remaining system programs tests * fixed tests after rebase add custom errors transaction, utxo, verifier classes (Lightprotocol#41) * added custom errors transaction, utxo, verifier classes * relaxed version requirement on solana web3.js logs for the testing changes: added the update merkle tree call commitment changed in the leaves account data added the update merkle tree call Co-authored-by: Abdul Qadir Shaikh <sleepyqadir@Abduls-MacBook-Air.local> deleted groth16-solana and replaced by crates.io import light-verifier-sdk: Provide program keys in bs58 format Use our light-macros crate to provide program IDs to light-verifier-sdk in bs58 format (which gets converted to bytes during compilation time). Thanks to that, we also don't have to use the deprecated `Pubkey::new()` associated method. add custom errors account (Lightprotocol#44) * added account custom errors * removed sdk build errors fixed transaction config ID (Lightprotocol#46) relayer commander for tests fixed: socket i/o timeout issue command added Add Github Actions CI jobs (Lightprotocol#32) * Add Github Actions CI jobs * Fix cargo fmt issues * tests: Provide output UTXOs as transaction parameters ata shield unshield pass in upd (WIP) (Lightprotocol#45) * ata shield unshield pass in upd enabled: unshield, transfer user.getBalance:permissioned balances even if 0 added balance checks and todos to unshield user test unshield -> getTxparams refactor + getRelayer call transfer -> getTxParams &tested * tests run: disabled leafindex check in getUnspentUtxos tho * tests all running * remove console logs * removed index checker in getUnspentUtxos * clean function params getUnspentUtxos sub module fetched rm light-macros cleans the logs removed the unused relayer script removed extra consols useWallet changes resolved failing test updated the wait time and verifierZero call reverted the script change added script for running the browser wallet tests fix loopless of browser command switch to docker solana validator changes: script changes changes: added build and install script for relayer fixed typescript issues in relayer remove for unbound issue cleanups added relayer custom errors (Lightprotocol#49) * added relayer custom errors * increased relayer fee in mock-verifier tests rebase from main re added the removed package-lock.json resolve long changes Jorrit refactor createOutUtxos (Lightprotocol#50) * renamed amount, extraSolAmount, account * renamed Action.DEPOSIT, WITHDRAWAL, to SHIELD, UNSHIELD * added error tests * fixed errors * removed commented code * renamed test * fixed user tests * added comment * made errors custom * improved shielded recipients check for transfer * renamed tests Jorrit add custom errors provider (Lightprotocol#47) * added custom errors provider and tests * fixed rebase conflicts and added a check in createUtxos * unskipped a test action enum checking with finalized user and provider class refactored transaction and verifier refactored spl support and check changed provider changes and ts errors fixed changes: errors handles and conditions remove seperate static calls checks changes reset the test scripts hot fixes in provider for failing test-caes fixes: user tests cases light-sdk test cases fixups verifier tests fixups nodeWallet sign message changes long changes reverted Jorrit refactor select in utxos (Lightprotocol#54) * selectInUtxos functional tests with 2 inputs + custom errors + some error tests * added failed utxo combination and 3 in utxo tests * tests pass with refactored selectInUtxos and createUtxos * removed commented code * fixed sort Refactored user and add custom errors (Lightprotocol#56) * refactored user class, and added custom errors * resolved rebase errors reverted commits * minor changes * Revert "minor changes" This reverts commit ff46ed4. * minor changes * added promise await in transaction * naming conventions * Revert "naming conventions" This reverts commit 706b9b8. * naming conventions * method name changed --------- Co-authored-by: Abdul Qadir Shaikh <sleepyqadir@Abduls-MacBook-Air.local> Co-authored-by: ananas-block <58553958+ananas-block@users.noreply.github.com>

SwenSchaeferjohann marked this pull request as draft March 23, 2023 13:56

sleepyqadir force-pushed the abdul-streamline-wallet branch 2 times, most recently from 398ad3e to 8cc85a6 Compare March 24, 2023 06:47

Abdul Qadir Shaikh and others added 2 commits March 24, 2023 11:49

added mockUseWallet

6de2110

sleepyqadir force-pushed the abdul-streamline-wallet branch from 8cc85a6 to 0af02e8 Compare March 24, 2023 06:58

Abdul Qadir Shaikh added 4 commits March 24, 2023 14:35

minor changes

ff46ed4

Revert "minor changes"

731d7fb

This reverts commit ff46ed4.

minor changes

1696b84

added promise await in transaction

19c3098

sleepyqadir marked this pull request as ready for review March 24, 2023 12:21

sleepyqadir requested review from SwenSchaeferjohann and ananas-block March 24, 2023 13:08

ananas-block reviewed Mar 24, 2023

View reviewed changes

light-sdk-ts/src/transaction.ts Outdated Show resolved Hide resolved

ananas-block reviewed Mar 24, 2023

View reviewed changes

SwenSchaeferjohann reviewed Mar 24, 2023

View reviewed changes

ananas-block requested changes Mar 24, 2023

View reviewed changes

naming conventions

706b9b8

sleepyqadir requested review from SwenSchaeferjohann and ananas-block March 24, 2023 17:30

ananas-block reviewed Mar 24, 2023

View reviewed changes

Abdul Qadir Shaikh added 3 commits March 24, 2023 22:46

Revert "naming conventions"

f2ef002

This reverts commit 706b9b8.

naming conventions

f6bd5b8

method name changed

921e7cc

ananas-block approved these changes Mar 24, 2023

View reviewed changes

SwenSchaeferjohann approved these changes Mar 24, 2023

View reviewed changes

SwenSchaeferjohann merged commit f7d0181 into main Mar 24, 2023

SwenSchaeferjohann deleted the abdul-streamline-wallet branch March 24, 2023 20:15

		let lightProvider = await Provider.native(ADMIN_AUTH_KEYPAIR);


		let lightProvider = await Provider.initialize(ADMIN_AUTH_KEYPAIR);

Conversation

sleepyqadir commented Mar 22, 2023

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

SwenSchaeferjohann left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ananas-block Mar 24, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ananas-block Mar 24, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

sleepyqadir Mar 24, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ananas-block left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

ananas-block Mar 24, 2023 •

edited

Loading

ananas-block Mar 24, 2023 •

edited

Loading

sleepyqadir Mar 24, 2023 •

edited

Loading