Discovering in shared wallets #2675
Merged
Conversation
This file contains 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
paweljakubas
force-pushed
the
paweljakubas/adp-927/discovering-in-shared-wallets
branch
3 times, most recently
from
05fba1f to
f4a7a8d
Compare
|
@piotr-iohk could you confirm the two issues in the ticket are fixed now, please :-) |
rvl
approved these changes
May 28, 2021
| , DerivationIndex $ getIndex coinType | ||
| , DerivationIndex $ getIndex accIx | ||
| , DerivationIndex $ getIndex utxoExternal | ||
| , DerivationIndex $ getIndex addrIx |
There was a problem hiding this comment.
This Index / DerivationIndex stuff ... not confusing at all!
| wid = WalletId $ digest $ publicKey rootXPrv | ||
| pTemplate = scriptTemplateFromSelf (getRawKey accXPub) $ body ^. #paymentScriptTemplate | ||
| dTemplateM = scriptTemplateFromSelf (getRawKey accXPub) <$> body ^. #delegationScriptTemplate | ||
| wName = getApiT (body ^. #name) | ||
| accXPub = publicKey $ deriveAccountPrivateKey pwd rootXPrv accIx | ||
| accXPub = publicKey $ deriveAccountPrivateKey pwd rootXPrv (Index $ getDerivationIndex ix) |
There was a problem hiding this comment.
this is just code reshuffling allowing to use guardHardened above. No logic was changed
Looks good now! 👍 Both cannot be reproduced. |
|
bors r+ |
iohk-bors bot
added a commit
that referenced
this pull request
May 28, 2021
2675: Discovering in shared wallets r=paweljakubas a=paweljakubas # Issue Number <!-- Put here a reference to the issue that this PR relates to and which requirements it tackles. Jira issues of the form ADP- will be auto-linked. --> adp-927 # Overview <!-- Detail in a few bullet points the work accomplished in this PR --> - [x] Adding the integration test showing the case - [x] implement IsOurs and enable discovery - [x] introduce hardened index guard outlawing improper ix in account when creating wallet - [x] investigated another chain follower error for active shared wallet. It turn out there is very subtle error in sqlite handler when inserting the cosigner. Before that all cosigners were deleted which is incorrect, only cosigner row for a given credential and walid should be deleted. Otherwise, payment cosigners are deleted when delegation template is present and reading (selecting) is erroneous. # Comments <!-- Additional comments or screenshots to attach if any --> <!-- Don't forget to: ✓ Self-review your changes to make sure nothing unexpected slipped through ✓ Assign yourself to the PR ✓ Assign one or several reviewer(s) ✓ Jira will detect and link to this PR once created, but you can also link this PR in the description of the corresponding ticket ✓ Acknowledge any changes required to the Wiki ✓ Finally, in the PR description delete any empty sections and all text commented in <!--, so that this text does not appear in merge commit messages. --> Co-authored-by: Pawel Jakubas <[email protected]>
|
Build failed: |
|
bors r+ |
iohk-bors bot
added a commit
that referenced
this pull request
May 28, 2021
2675: Discovering in shared wallets r=Anviking a=paweljakubas # Issue Number <!-- Put here a reference to the issue that this PR relates to and which requirements it tackles. Jira issues of the form ADP- will be auto-linked. --> adp-927 # Overview <!-- Detail in a few bullet points the work accomplished in this PR --> - [x] Adding the integration test showing the case - [x] implement IsOurs and enable discovery - [x] introduce hardened index guard outlawing improper ix in account when creating wallet - [x] investigated another chain follower error for active shared wallet. It turn out there is very subtle error in sqlite handler when inserting the cosigner. Before that all cosigners were deleted which is incorrect, only cosigner row for a given credential and walid should be deleted. Otherwise, payment cosigners are deleted when delegation template is present and reading (selecting) is erroneous. # Comments <!-- Additional comments or screenshots to attach if any --> <!-- Don't forget to: ✓ Self-review your changes to make sure nothing unexpected slipped through ✓ Assign yourself to the PR ✓ Assign one or several reviewer(s) ✓ Jira will detect and link to this PR once created, but you can also link this PR in the description of the corresponding ticket ✓ Acknowledge any changes required to the Wiki ✓ Finally, in the PR description delete any empty sections and all text commented in <!--, so that this text does not appear in merge commit messages. --> Co-authored-by: Pawel Jakubas <[email protected]>
paweljakubas
force-pushed
the
paweljakubas/adp-927/discovering-in-shared-wallets
branch
from
2a152eb to
bdd2b4b
Compare
|
Canceled. |
|
bors r+ |
iohk-bors bot
added a commit
that referenced
this pull request
May 28, 2021
2675: Discovering in shared wallets r=paweljakubas a=paweljakubas # Issue Number <!-- Put here a reference to the issue that this PR relates to and which requirements it tackles. Jira issues of the form ADP- will be auto-linked. --> adp-927 # Overview <!-- Detail in a few bullet points the work accomplished in this PR --> - [x] Adding the integration test showing the case - [x] implement IsOurs and enable discovery - [x] introduce hardened index guard outlawing improper ix in account when creating wallet - [x] investigated another chain follower error for active shared wallet. It turn out there is very subtle error in sqlite handler when inserting the cosigner. Before that all cosigners were deleted which is incorrect, only cosigner row for a given credential and walid should be deleted. Otherwise, payment cosigners are deleted when delegation template is present and reading (selecting) is erroneous. # Comments <!-- Additional comments or screenshots to attach if any --> <!-- Don't forget to: ✓ Self-review your changes to make sure nothing unexpected slipped through ✓ Assign yourself to the PR ✓ Assign one or several reviewer(s) ✓ Jira will detect and link to this PR once created, but you can also link this PR in the description of the corresponding ticket ✓ Acknowledge any changes required to the Wiki ✓ Finally, in the PR description delete any empty sections and all text commented in <!--, so that this text does not appear in merge commit messages. --> Co-authored-by: Pawel Jakubas <[email protected]>
|
Build failed: |
|
spotted in integration testing: |
|
bors retry |
|
Build succeeded: |
iohk-bors
bot
deleted the
paweljakubas/adp-927/discovering-in-shared-wallets
branch
WilliamKingNoel-Bot
pushed a commit
that referenced
this pull request
May 28, 2021
2675: Discovering in shared wallets r=paweljakubas a=paweljakubas # Issue Number <!-- Put here a reference to the issue that this PR relates to and which requirements it tackles. Jira issues of the form ADP- will be auto-linked. --> adp-927 # Overview <!-- Detail in a few bullet points the work accomplished in this PR --> - [x] Adding the integration test showing the case - [x] implement IsOurs and enable discovery - [x] introduce hardened index guard outlawing improper ix in account when creating wallet - [x] investigated another chain follower error for active shared wallet. It turn out there is very subtle error in sqlite handler when inserting the cosigner. Before that all cosigners were deleted which is incorrect, only cosigner row for a given credential and walid should be deleted. Otherwise, payment cosigners are deleted when delegation template is present and reading (selecting) is erroneous. # Comments <!-- Additional comments or screenshots to attach if any --> <!-- Don't forget to: ✓ Self-review your changes to make sure nothing unexpected slipped through ✓ Assign yourself to the PR ✓ Assign one or several reviewer(s) ✓ Jira will detect and link to this PR once created, but you can also link this PR in the description of the corresponding ticket ✓ Acknowledge any changes required to the Wiki ✓ Finally, in the PR description delete any empty sections and all text commented in <!--, so that this text does not appear in merge commit messages. --> Co-authored-by: Pawel Jakubas <[email protected]> 33629a0
11 tasks
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Issue Number
adp-927
Overview
Comments