add SharedWallet to Sqlite.TH

cardano-foundation · Apr 8, 2021 · 6dec62f · 6dec62f
1 parent 1dcdf51
commit 6dec62f
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 4 deletions.
diff --git a/lib/core/src/Cardano/Wallet/Api/Types.hs b/lib/core/src/Cardano/Wallet/Api/Types.hs
@@ -1084,7 +1084,7 @@ data ApiPendingSharedWallet = ApiPendingSharedWallet
     } deriving (Eq, Generic, Show)
       deriving anyclass NFData
 
-data ApiSharedWallet = ApiSharedWallet
+newtype ApiSharedWallet = ApiSharedWallet
     { wallet :: Either ApiPendingSharedWallet ApiActiveSharedWallet
     } deriving (Eq, Generic, Show)
       deriving anyclass NFData

diff --git a/lib/core/src/Cardano/Wallet/DB/Sqlite/TH.hs b/lib/core/src/Cardano/Wallet/DB/Sqlite/TH.hs
@@ -27,6 +27,8 @@ module Cardano.Wallet.DB.Sqlite.TH where
 
 import Prelude
 
+import Cardano.Address.Script
+    ( Cosigner, Script )
 import Cardano.Slotting.Slot
     ( SlotNo )
 import Cardano.Wallet.DB.Sqlite.Types
@@ -373,4 +375,21 @@ RndStatePendingAddress
         rndStatePendingAddressAddress
     Foreign Wallet OnDeleteCascade rnd_state_pending_address rndStatePendingAddressWalletId
     deriving Show Generic
+
+-- Shared Wallet
+SharedWallet
+    sharedWalletWalletId                 W.WalletId                sql=wallet_id
+    sharedWalletCreationTime             UTCTime                   sql=creation_time
+    sharedWalletUpdateTime               UTCTime Maybe             sql=update_time
+    sharedWalletName                     Text                      sql=name
+    sharedWalletAccountXPub              B8.ByteString             sql=account_xpub
+    sharedWalletAccountIndex             Word32                    sql=account_ix
+    sharedWalletScriptGap                W.AddressPoolGap          sql=pool_gap
+    sharedWalletPaymentScript            (Script Cosigner)         sql=payment_script
+    sharedWalletDelegationScript         (Script Cosigner) Maybe   sql=delegation_script
+    sharedWalletGenesisHash              BlockId                   sql=genesis_hash
+    sharedWalletGenesisStart             UTCTime                   sql=genesis_start
+
+    Primary sharedWalletWalletId
+    deriving Show Generic
 |]
diff --git a/lib/core/src/Cardano/Wallet/DB/Sqlite/Types.hs b/lib/core/src/Cardano/Wallet/DB/Sqlite/Types.hs
@@ -23,7 +23,7 @@ module Cardano.Wallet.DB.Sqlite.Types where
 import Prelude
 
 import Cardano.Address.Script
-    ( KeyHash (..), ScriptHash (..) )
+    ( Cosigner, KeyHash (..), Script, ScriptHash (..) )
 import Cardano.Api.Typed
     ( TxMetadataJsonSchema (..)
     , displayError
@@ -501,6 +501,23 @@ instance PersistField KeyHash where
 instance PersistFieldSql KeyHash where
     sqlType _ = sqlType (Proxy @Text)
 
+----------------------------------------------------------------------------
+-- Script Cosigner
+
+instance PersistField (Script Cosigner) where
+    toPersistValue =
+        toPersistValue .
+        decodeUtf8 .
+        BL.toStrict .
+        Aeson.encode .
+        toJSON
+    fromPersistValue =
+        (left T.pack . Aeson.eitherDecode . BL.fromStrict . encodeUtf8) <=<
+        fromPersistValue
+
+instance PersistFieldSql (Script Cosigner) where
+    sqlType _ = sqlType (Proxy @Text)
+
 ----------------------------------------------------------------------------
 -- AddressPoolGap
 

diff --git a/lib/core/test/unit/Cardano/Wallet/Api/TypesSpec.hs b/lib/core/test/unit/Cardano/Wallet/Api/TypesSpec.hs
@@ -1119,9 +1119,9 @@ instance Arbitrary (Script Cosigner) where
 
 instance Arbitrary ScriptTemplate where
     arbitrary = do
-        script <- arbitrary `suchThat` (\s -> length (retrieveAllCosigners s) > 0)
+        script <- arbitrary `suchThat` (\s -> not (null (retrieveAllCosigners s)))
         let scriptCosigners = retrieveAllCosigners script
-        cosignersSubset <- sublistOf scriptCosigners `suchThat` (\cs -> length cs > 0)
+        cosignersSubset <- sublistOf scriptCosigners `suchThat` (\cs -> not (null cs))
         let xpubGen = fromJust . xpubFromBytes . BS.pack <$> vectorOf 64 arbitrary
         xpubs <- vectorOf (length cosignersSubset) xpubGen
         pure $ ScriptTemplate (Map.fromList $ zip cosignersSubset xpubs) script