Add additional wallet primitives and wallet layer primitives #29

KtorZ · 2019-03-05T15:38:40Z

Issue Number

Overview

I have added a few more primitive operations to the wallet and some corresponding tests
I have removed some unnecessary instances, in particular on the 'Coin' type

Comments

KtorZ · 2019-03-05T15:40:31Z

src/Cardano/Wallet/Primitive.hs

@@ -176,6 +230,25 @@ instance Dom UTxO where
    type DomElem UTxO = TxIn
    dom (UTxO utxo) = Map.keysSet utxo

+balance :: UTxO -> Integer


NOTE: balance isn't giving back a Coin because this may overflow. Hence, we'll have to handle that properly whenever we make use of that.

Anviking · 2019-03-06T14:19:14Z

src/Cardano/Wallet/Primitive.hs

+-- same time, and this little abstraction can buy us this without introducing
+-- too much overhead.
+class IsOurs s where
+    isOurs :: Address -> s -> (Bool, s)


I never quite understood why we need state for this. Is it to keep track of the number unused addresses as we discover them?

The state is necessary for sequential derivation, but useless for the random one. For the sequential derivation, we have to keep track of a pool of addresses. The edge of the pool contains a given number (the address pool gap) of consecutive undiscovered / unused addresses. When we discover an address within this edge, we extend the pool to always keep gap consecutive undiscovered addresses at the edge. So, the process of looking an address up is intrinsically stateful: previous lookups matter, and the order in which you've done them matters too.

With the random address scheme / legacy scheme of cardano-sl, we do not "discover" address so-to-speak, we decrypt them as they contain a encrypted payload. If we are able to decrypt the payload, it means the address is ours. Given the passphrase, the operation is stateless and the addresses you've looked up before won't change anything to the answer.

Anviking · 2019-03-06T14:30:40Z

src/Cardano/Wallet/Primitive.hs

-    mempty  = minBound
-    mconcat = foldr (<>) mempty
+isValidCoin :: Coin -> Bool
+isValidCoin c = c >= minBound && c <= maxBound


Hm sure.

Where will this be used? Could Coin be a more abstract type here? Maybe not.

That's is mostly for testing now, and, generally speaking, since we don't have any smart-constructor on Coin, we are kinda free to put any value we want inside a Coin. So, in practice, we may need to verify this. This is dubious however, I admit.

test/unit/Cardano/Wallet/PrimitiveSpec.hs

Anviking

LGTM, I think, but haven't wrapped my head around everything

jonathanknowles · 2019-03-07T00:43:43Z

test/unit/Cardano/Wallet/PrimitiveSpec.hs

+        it "2.1.8) (dom u ⋃ ins) ⋪ (u ⋃ v) = (ins ⋃ dom u) ⋪ v"
+            (checkCoverage prop_2_1_8)
+        it "2.1.9) ins⋪ u = (dom u \\ ins)⊲ u"
+            (checkCoverage prop_2_1_9)


[3] Adding ticking function test and downloading block logic [3] Block syncer working ok plus additional tests [3] Cleaning the code [3] cabal fix [3] Complete refactoring to the review [3] Final refactoring [3] cabal fix [3] hlint and weeding [3] add killing thread at the end of test [3] Replace IORef with MVar refactoring #1 | inline intermediate functions to see more clearly + remove debug console prints refactoring #2 | review indentation of 'where' clause refactoring #3 | inline loop and remove test intrumentation from test logic refactoring #4 | define generator for ticking args in a declarative manner refactoring #5 | purify tickingFunctionTest and make it a monadic property refactoring #6 | review naming in Arbitrary TickingArgs refactoring #7 | use guards in mkConsecutiveTestBlocks refactoring #8 | define single block generator from previous block refactoring #9 | use 'fromPreviousBlock' and start loop with an already initialize list refactoring #10 | purify mkConsecutiveTestBlocks by defining a test hash function refactoring #11 | switch argument positions in mkConsecutiveTestBlocks refactoring #12 | replace loop with built-in list 'iterate' refactoring #13 | define Arbitrary instance for creating consecutive blocks refactoring #14 | replace mkConsecutiveBlocks with a property parameter refactoring #15 | use 'newMVar' instead or 'newEmptyMVar' + 'putMVar' refactoring #16 | remove unecessary IO in 'writeToIORefAction' refactoring #17 | replace takeMVar + putMVar with modifyMVar refactoring #18 | review naming for 'writeToIORefAction' --> 'reader' refactoring #19 | use a 'Map.lookup' instead of 'List.filter' + pattern-match refactoring #20 | remove 'BlocksConsumed' wrapper refactoring #21 | generalize reader with polymorphic parametrism refactoring #22 | review pushNextBlocks indentation refactoring #23 | group case pattern matches using tuple refactoring #24 | remove 'Hash BlockHeader' from the block to inject refactoring #25 | use synchronization lock instead of computed times refactoring #26 | Move generation of duplicated blocks onto 'Arbitrary Blocks' refactoring #27 | remove 'chunkSizes' in a favor of inline random selection refactoring #28 | remove 'DeliveryMode' in favor of the most general case refactoring #29 | cleanup wrapper types refactoring #30 | generalize pushNextBlocks with parametric polymorphism refactoring #31 | rename pushNextBlocks to 'writer' refactoring #32 | define reader on Block instead of BlockHeaderHash refactoring #33 | replace old reader with reader' refactoring #34 | move creation of writer MVar inside writer action refactoring #35 | remove header hash from 'Blocks' refactoring #36 | rename 'consecutiveBlocks' into 'blocks' refactoring #37 | re-organize module to separate effectful logic from declarations refactoring #38 | move waiting logic into dedicated function refactoring #39 | move 'done' and 'readerChan' initialization into reader and writer refactoring #40 | use Millisecond instead of Second for shorter tests refactoring #41 | Move creation of blocks from writer to 'Arbitrary Blocks' [3] fix line width [3] aligning the code with other code changes

[3] Adding ticking function test and downloading block logic [3] Block syncer working ok plus additional tests [3] Cleaning the code [3] cabal fix [3] Complete refactoring to the review [3] Final refactoring [3] cabal fix [3] hlint and weeding [3] add killing thread at the end of test [3] Replace IORef with MVar refactoring #1 | inline intermediate functions to see more clearly + remove debug console prints refactoring #2 | review indentation of 'where' clause refactoring #3 | inline loop and remove test intrumentation from test logic refactoring #4 | define generator for ticking args in a declarative manner refactoring #5 | purify tickingFunctionTest and make it a monadic property refactoring #6 | review naming in Arbitrary TickingArgs refactoring #7 | use guards in mkConsecutiveTestBlocks refactoring #8 | define single block generator from previous block refactoring #9 | use 'fromPreviousBlock' and start loop with an already initialize list refactoring #10 | purify mkConsecutiveTestBlocks by defining a test hash function refactoring #11 | switch argument positions in mkConsecutiveTestBlocks refactoring #12 | replace loop with built-in list 'iterate' refactoring #13 | define Arbitrary instance for creating consecutive blocks refactoring #14 | replace mkConsecutiveBlocks with a property parameter refactoring #15 | use 'newMVar' instead or 'newEmptyMVar' + 'putMVar' refactoring #16 | remove unecessary IO in 'writeToIORefAction' refactoring #17 | replace takeMVar + putMVar with modifyMVar refactoring #18 | review naming for 'writeToIORefAction' --> 'reader' refactoring #19 | use a 'Map.lookup' instead of 'List.filter' + pattern-match refactoring #20 | remove 'BlocksConsumed' wrapper refactoring #21 | generalize reader with polymorphic parametrism refactoring #22 | review pushNextBlocks indentation refactoring #23 | group case pattern matches using tuple refactoring #24 | remove 'Hash BlockHeader' from the block to inject refactoring #25 | use synchronization lock instead of computed times refactoring #26 | Move generation of duplicated blocks onto 'Arbitrary Blocks' refactoring #27 | remove 'chunkSizes' in a favor of inline random selection refactoring #28 | remove 'DeliveryMode' in favor of the most general case refactoring #29 | cleanup wrapper types refactoring #30 | generalize pushNextBlocks with parametric polymorphism refactoring #31 | rename pushNextBlocks to 'writer' refactoring #32 | define reader on Block instead of BlockHeaderHash refactoring #33 | replace old reader with reader' refactoring #34 | move creation of writer MVar inside writer action refactoring #35 | remove header hash from 'Blocks' refactoring #36 | rename 'consecutiveBlocks' into 'blocks' refactoring #37 | re-organize module to separate effectful logic from declarations refactoring #38 | move waiting logic into dedicated function refactoring #39 | move 'done' and 'readerChan' initialization into reader and writer refactoring #40 | use Millisecond instead of Second for shorter tests refactoring #41 | Move creation of blocks from writer to 'Arbitrary Blocks' [3] fix line width [3] aligning the code with other code changes [3] hlint suggestion

[3] Adding ticking function test and downloading block logic [3] Block syncer working ok plus additional tests [3] Cleaning the code [3] cabal fix [3] Complete refactoring to the review [3] Final refactoring [3] cabal fix [3] hlint and weeding [3] add killing thread at the end of test [3] Replace IORef with MVar refactoring #1 | inline intermediate functions to see more clearly + remove debug console prints refactoring #2 | review indentation of 'where' clause refactoring #3 | inline loop and remove test intrumentation from test logic refactoring #4 | define generator for ticking args in a declarative manner refactoring #5 | purify tickingFunctionTest and make it a monadic property refactoring #6 | review naming in Arbitrary TickingArgs refactoring #7 | use guards in mkConsecutiveTestBlocks refactoring #8 | define single block generator from previous block refactoring #9 | use 'fromPreviousBlock' and start loop with an already initialize list refactoring #10 | purify mkConsecutiveTestBlocks by defining a test hash function refactoring #11 | switch argument positions in mkConsecutiveTestBlocks refactoring #12 | replace loop with built-in list 'iterate' refactoring #13 | define Arbitrary instance for creating consecutive blocks refactoring #14 | replace mkConsecutiveBlocks with a property parameter refactoring #15 | use 'newMVar' instead or 'newEmptyMVar' + 'putMVar' refactoring #16 | remove unecessary IO in 'writeToIORefAction' refactoring #17 | replace takeMVar + putMVar with modifyMVar refactoring #18 | review naming for 'writeToIORefAction' --> 'reader' refactoring #19 | use a 'Map.lookup' instead of 'List.filter' + pattern-match refactoring #20 | remove 'BlocksConsumed' wrapper refactoring #21 | generalize reader with polymorphic parametrism refactoring #22 | review pushNextBlocks indentation refactoring #23 | group case pattern matches using tuple refactoring #24 | remove 'Hash BlockHeader' from the block to inject refactoring #25 | use synchronization lock instead of computed times refactoring #26 | Move generation of duplicated blocks onto 'Arbitrary Blocks' refactoring #27 | remove 'chunkSizes' in a favor of inline random selection refactoring #28 | remove 'DeliveryMode' in favor of the most general case refactoring #29 | cleanup wrapper types refactoring #30 | generalize pushNextBlocks with parametric polymorphism refactoring #31 | rename pushNextBlocks to 'writer' refactoring #32 | define reader on Block instead of BlockHeaderHash refactoring #33 | replace old reader with reader' refactoring #34 | move creation of writer MVar inside writer action refactoring #35 | remove header hash from 'Blocks' refactoring #36 | rename 'consecutiveBlocks' into 'blocks' refactoring #37 | re-organize module to separate effectful logic from declarations refactoring #38 | move waiting logic into dedicated function refactoring #39 | move 'done' and 'readerChan' initialization into reader and writer refactoring #40 | use Millisecond instead of Second for shorter tests refactoring #41 | Move creation of blocks from writer to 'Arbitrary Blocks' [3] fix line width [3] aligning the code with other code changes [3] hlint suggestion [3] add .weeder.yaml to omit duplicateMaybes and groups to be announce during weeder execution [3] undo weeder ignore file plus remove pragma and unnecessary exports

[3] Adding ticking function test and downloading block logic [3] Block syncer working ok plus additional tests [3] Cleaning the code [3] cabal fix [3] Complete refactoring to the review [3] Final refactoring [3] cabal fix [3] hlint and weeding [3] add killing thread at the end of test [3] Replace IORef with MVar refactoring #1 | inline intermediate functions to see more clearly + remove debug console prints refactoring #2 | review indentation of 'where' clause refactoring #3 | inline loop and remove test intrumentation from test logic refactoring #4 | define generator for ticking args in a declarative manner refactoring #5 | purify tickingFunctionTest and make it a monadic property refactoring #6 | review naming in Arbitrary TickingArgs refactoring #7 | use guards in mkConsecutiveTestBlocks refactoring #8 | define single block generator from previous block refactoring #9 | use 'fromPreviousBlock' and start loop with an already initialize list refactoring #10 | purify mkConsecutiveTestBlocks by defining a test hash function refactoring #11 | switch argument positions in mkConsecutiveTestBlocks refactoring #12 | replace loop with built-in list 'iterate' refactoring #13 | define Arbitrary instance for creating consecutive blocks refactoring #14 | replace mkConsecutiveBlocks with a property parameter refactoring #15 | use 'newMVar' instead or 'newEmptyMVar' + 'putMVar' refactoring #16 | remove unecessary IO in 'writeToIORefAction' refactoring #17 | replace takeMVar + putMVar with modifyMVar refactoring #18 | review naming for 'writeToIORefAction' --> 'reader' refactoring #19 | use a 'Map.lookup' instead of 'List.filter' + pattern-match refactoring #20 | remove 'BlocksConsumed' wrapper refactoring #21 | generalize reader with polymorphic parametrism refactoring #22 | review pushNextBlocks indentation refactoring #23 | group case pattern matches using tuple refactoring #24 | remove 'Hash BlockHeader' from the block to inject refactoring #25 | use synchronization lock instead of computed times refactoring #26 | Move generation of duplicated blocks onto 'Arbitrary Blocks' refactoring #27 | remove 'chunkSizes' in a favor of inline random selection refactoring #28 | remove 'DeliveryMode' in favor of the most general case refactoring #29 | cleanup wrapper types refactoring #30 | generalize pushNextBlocks with parametric polymorphism refactoring #31 | rename pushNextBlocks to 'writer' refactoring #32 | define reader on Block instead of BlockHeaderHash refactoring #33 | replace old reader with reader' refactoring #34 | move creation of writer MVar inside writer action refactoring #35 | remove header hash from 'Blocks' refactoring #36 | rename 'consecutiveBlocks' into 'blocks' refactoring #37 | re-organize module to separate effectful logic from declarations refactoring #38 | move waiting logic into dedicated function refactoring #39 | move 'done' and 'readerChan' initialization into reader and writer refactoring #40 | use Millisecond instead of Second for shorter tests refactoring #41 | Move creation of blocks from writer to 'Arbitrary Blocks' [3] fix line width [3] aligning the code with other code changes [3] hlint suggestion [3] add .weeder.yaml to omit duplicateMaybes and groups to be announce during weeder execution [3] undo weeder ignore file plus remove pragma and unnecessary exports [3] remove not needed imports

KtorZ self-assigned this Mar 5, 2019

KtorZ requested a review from Anviking March 5, 2019 15:38

KtorZ mentioned this pull request Mar 5, 2019

Define type primitives needed to represent a wallet #20

Closed

KtorZ commented Mar 5, 2019

View reviewed changes

KtorZ force-pushed the KtorZ/#20/moar-primitive-types branch 2 times, most recently from ce91898 to 04b0e55 Compare March 6, 2019 09:07

KtorZ mentioned this pull request Mar 6, 2019

Wrap code in PrimitiveSpec to comply with code width rule. #33

Closed

Anviking reviewed Mar 6, 2019

View reviewed changes

Anviking approved these changes Mar 6, 2019

View reviewed changes

jonathanknowles reviewed Mar 7, 2019

View reviewed changes

KtorZ force-pushed the KtorZ/#20/moar-primitive-types branch from 2b06dbb to aeb39ad Compare March 7, 2019 07:33

Add additional wallet primitives and wallet layer primitives

b0da7ad

KtorZ force-pushed the KtorZ/#20/moar-primitive-types branch from aeb39ad to b0da7ad Compare March 7, 2019 07:45

KtorZ mentioned this pull request Mar 7, 2019

Compute TxId #34

Merged

3 tasks

KtorZ merged commit 5ed2c74 into master Mar 7, 2019

KtorZ deleted the KtorZ/#20/moar-primitive-types branch March 8, 2019 09:07

KtorZ added a commit that referenced this pull request Mar 11, 2019

refactoring #29 | cleanup wrapper types

43e0c9b

tperrelli mentioned this pull request Sep 11, 2021

cardano-wallet: create/restore a new wallet error #2890

Closed

3 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add additional wallet primitives and wallet layer primitives #29

Add additional wallet primitives and wallet layer primitives #29

KtorZ commented Mar 5, 2019 •

edited by jonathanknowles

Loading

KtorZ Mar 5, 2019

Anviking Mar 6, 2019

KtorZ Mar 6, 2019

Anviking Mar 6, 2019

KtorZ Mar 6, 2019

Anviking left a comment •

edited

Loading

jonathanknowles Mar 7, 2019

Add additional wallet primitives and wallet layer primitives #29

Add additional wallet primitives and wallet layer primitives #29

Conversation

KtorZ commented Mar 5, 2019 • edited by jonathanknowles Loading

Issue Number

Overview

Comments

KtorZ Mar 5, 2019

Choose a reason for hiding this comment

Anviking Mar 6, 2019

Choose a reason for hiding this comment

KtorZ Mar 6, 2019

Choose a reason for hiding this comment

Anviking Mar 6, 2019

Choose a reason for hiding this comment

KtorZ Mar 6, 2019

Choose a reason for hiding this comment

Anviking left a comment • edited Loading

Choose a reason for hiding this comment

jonathanknowles Mar 7, 2019

Choose a reason for hiding this comment

KtorZ commented Mar 5, 2019 •

edited by jonathanknowles

Loading

Anviking left a comment •

edited

Loading