Jorrit refactor createOutUtxos#50
Merged
SwenSchaeferjohann merged 11 commits intomainfrom Mar 20, 2023
Merged
Conversation
vadorovsky
approved these changes
Mar 19, 2023
Contributor
vadorovsky
left a comment
vadorovsky
left a comment
There was a problem hiding this comment.
Nice, I like the SHIELD/UNSHIELD naming, definitely cleaner than DEPOSIT/WITHDRAWAL :)
SwenSchaeferjohann
requested changes
Mar 19, 2023
light-sdk-ts/src/wallet/user.ts
Outdated
| return txParams; | ||
| } else if (action === Action.TRANSFER) { | ||
| if (!recipientShieldedPublicKey) | ||
| if (!shieldedRecipients) |
Contributor
There was a problem hiding this comment.
this will not throw if an empty array is provided
Contributor
There was a problem hiding this comment.
@ananas-block maybe it's more defensive to do
(!shieldedRecipients || shieldedRecipients.length === 0)
here? what do you think?
light-sdk-ts/src/wallet/user.ts
Outdated
| amount, | ||
| action: Action.DEPOSIT, //"SHIELD", | ||
| action: Action.SHIELD, //Action.SHIELD, | ||
| extraSolAmount, |
Contributor
There was a problem hiding this comment.
this call still uses extraSolAmount whereas the other calls don't. it seems like this call should not work
Contributor
Author
There was a problem hiding this comment.
also noticed that I didn't handle the deposit at all in createOutUtxos, added that today, now the transfer doesn't work anymore though
Contributor
There was a problem hiding this comment.
i presume this is resolved now with the latest changes
Contributor
Author
|
added user tests to test.sh all running now @SwenSchaeferjohann |
Contributor
SwenSchaeferjohann
left a comment
SwenSchaeferjohann
left a comment
There was a problem hiding this comment.
code changes lgtm
SwenSchaeferjohann
approved these changes
Mar 20, 2023
light-sdk-ts/src/wallet/user.ts
Outdated
| return txParams; | ||
| } else if (action === Action.TRANSFER) { | ||
| if (!recipientShieldedPublicKey) | ||
| if (!shieldedRecipients) |
Contributor
There was a problem hiding this comment.
@ananas-block maybe it's more defensive to do
(!shieldedRecipients || shieldedRecipients.length === 0)
here? what do you think?
light-sdk-ts/src/wallet/user.ts
Outdated
| amount, | ||
| action: Action.DEPOSIT, //"SHIELD", | ||
| action: Action.SHIELD, //Action.SHIELD, | ||
| extraSolAmount, |
Contributor
There was a problem hiding this comment.
i presume this is resolved now with the latest changes
Contributor
Author
|
all DEPOSIT s are renamed now |
ananas-block
force-pushed
the
jorrit-refactor-create-out-utxos
branch
from
4285aff to
8d3120b
Compare
SwenSchaeferjohann
approved these changes
Mar 20, 2023
sleepyqadir
pushed a commit
that referenced
this pull request
Mar 24, 2023
logs for the testing changes: added the update merkle tree call commitment changed in the leaves account data 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 spl support for browser and 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 spl unshield and transfer tests reset the script action reset
sleepyqadir
pushed a commit
that referenced
this pull request
Mar 24, 2023
…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
sleepyqadir
pushed a commit
that referenced
this pull request
Mar 24, 2023
…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
SwenSchaeferjohann
pushed a commit
that referenced
this pull request
Mar 24, 2023
* added mockUseWallet * Jorrit add custom errors for transaction class and transaction parameters (#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 * 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>
sergeytimoshin
pushed a commit
to sergeytimoshin/light-protocol
that referenced
this pull request
Feb 20, 2024
logs for the testing changes: added the update merkle tree call commitment changed in the leaves account data 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 spl support for browser and 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 spl unshield and transfer tests reset the script action reset
vadorovsky
pushed a commit
to vadorovsky/light-protocol
that referenced
this pull request
May 1, 2024
* 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
vadorovsky
pushed a commit
to vadorovsky/light-protocol
that referenced
this pull request
May 1, 2024
* 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>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
rewrote createOutUtxos: