Skip to content

Refactored user and add custom errors - #56

Merged
SwenSchaeferjohann merged 2 commits into
mainfrom
jorrit-refactor-user
Mar 23, 2023
Merged

Refactored user and add custom errors#56
SwenSchaeferjohann merged 2 commits into
mainfrom
jorrit-refactor-user

Conversation

@ananas-block

@ananas-blockananas-block commented Mar 23, 2023

Copy link
Copy Markdown
Contributor

No description provided.

@sleepyqadir

sleepyqadir commented Mar 23, 2023

Copy link
Copy Markdown
Contributor

Looks good on my end

SwenSchaeferjohann
SwenSchaeferjohann reviewed Mar 23, 2023
View reviewed changes
Comment threadlight-sdk-ts/src/wallet/user.ts
splAmount: new BN(amount.toString()),
account: recipient,
solAmount: parsedSolAmount,
splAmount: parsedSplAmount,

@SwenSchaeferjohannSwenSchaeferjohannMar 23, 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.

so at transfer we dont pass public amounts at all and instead just define the amounts via the shieldedRecipients right? looks good

@ananas-blockananas-blockMar 23, 2023

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

exactly, I tried to make it as explicit as possible

@ananas-blockananas-blockMar 23, 2023

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

maybe we could even call it shielded amount

@SwenSchaeferjohann
SwenSchaeferjohann merged commit cdad7b7 into mainMar 23, 2023
@SwenSchaeferjohann
SwenSchaeferjohann deleted the jorrit-refactor-user branch March 23, 2023 14:14
sleepyqadir pushed a commit that referenced this pull request Mar 24, 2023
Abdul Qadir ShaikhAbdul Qadir Shaikh
transaction and verifier refactored
398ad3e
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
@ananas-blockAbdul Qadir Shaikh
Jorrit add custom errors for transaction class and transaction parame…
8cc85a6
…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
@ananas-blockAbdul Qadir Shaikh
Jorrit add custom errors for transaction class and transaction parame…
0af02e8
…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
@sleepyqadirAbdul Qadir Shaikh@ananas-block
Streamline wallet (#55)
f7d0181
* 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>
vadorovsky pushed a commit to vadorovsky/light-protocol that referenced this pull request May 1, 2024
@ananas-block
Refactored user and add custom errors (Lightprotocol#56)
3a7ed3a
* refactored user class, and added custom errors
* resolved rebase errors
vadorovsky pushed a commit to vadorovsky/light-protocol that referenced this pull request May 1, 2024
@sleepyqadirAbdul Qadir Shaikh@ananas-block
Streamline wallet (Lightprotocol#55)
94e79e9
* 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>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@SwenSchaeferjohannSwenSchaeferjohannSwenSchaeferjohann approved these changes
@sleepyqadirsleepyqadirAwaiting requested review from sleepyqadir

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@ananas-block@sleepyqadir@SwenSchaeferjohann