Withdrawals as part of core and API transactions

lib/byron/src/Cardano/Wallet/Byron.hs

@@ -60,7 +60,7 @@ import Cardano.Wallet.Api
 import Cardano.Wallet.Api.Server
     ( HostPreference, Listen (..), ListenError (..), TlsConfiguration )
 import Cardano.Wallet.Api.Types
-    ( ApiStakePool, DecodeAddress, EncodeAddress )
+    ( ApiStakePool, DecodeAddress, EncodeAddress, EncodeStakeAddress )
 import Cardano.Wallet.Byron.Api.Server
     ( server )
 import Cardano.Wallet.Byron.Compatibility
@@ -157,6 +157,7 @@ data SomeNetworkDiscriminant where
             , PaymentAddress n ByronKey
             , DecodeAddress n
             , EncodeAddress n
+            , EncodeStakeAddress n
             , MaxSizeOf Address n IcarusKey
             , MaxSizeOf Address n ByronKey
             )
@@ -242,6 +243,7 @@ serveWallet
             , PaymentAddress n ByronKey
             , DecodeAddress n
             , EncodeAddress n
+            , EncodeStakeAddress n
             )
         => Proxy n
         -> Socket

lib/byron/src/Cardano/Wallet/Byron/Api/Server.hs

@@ -153,7 +153,7 @@ server byron icarus ntp =
     transactions :: Server (Transactions n)
     transactions =
              (\_ _ _ -> throwError err501)
-        :<|> (\_ _ _ _ -> throwError err501)
+        :<|> (\_ _ _ _ _ -> throwError err501)
         :<|> (\_ _ _ -> throwError err501)
         :<|> (\_ _ -> throwError err501)
         :<|> (\_ _ -> throwError err501)
@@ -246,8 +246,8 @@ server byron icarus ntp =
              )
         :<|>
              (\wid r0 r1 s -> withLegacyLayer wid
-                (byron , listTransactions byron wid r0 r1 s)
-                (icarus, listTransactions icarus wid r0 r1 s)
+                (byron , listTransactions byron wid Nothing r0 r1 s)
+                (icarus, listTransactions icarus wid Nothing r0 r1 s)
              )
         :<|>
             (\wid tx -> withLegacyLayer wid

lib/byron/src/Cardano/Wallet/Byron/Compatibility.hs

@@ -2,6 +2,7 @@
 {-# LANGUAGE DataKinds #-}
 {-# LANGUAGE DuplicateRecordFields #-}
 {-# LANGUAGE FlexibleContexts #-}
+{-# LANGUAGE FlexibleInstances #-}
 {-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE NamedFieldPuns #-}
 {-# LANGUAGE NumericUnderscores #-}
@@ -86,7 +87,11 @@ import Cardano.Crypto
 import Cardano.Crypto.ProtocolMagic
     ( ProtocolMagicId, unProtocolMagicId )
 import Cardano.Wallet.Api.Types
-    ( DecodeAddress (..), EncodeAddress (..) )
+    ( DecodeAddress (..)
+    , DecodeStakeAddress (..)
+    , EncodeAddress (..)
+    , EncodeStakeAddress (..)
+    )
 import Cardano.Wallet.Primitive.AddressDerivation
     ( NetworkDiscriminant (..) )
 import Cardano.Wallet.Primitive.AddressDerivation.Byron
@@ -355,6 +360,9 @@ fromTxAux txAux = case taTx txAux of
 
         , outputs =
             fromTxOut <$> NE.toList outputs
+
+        , withdrawals =
+            mempty
         }
 
 fromTxIn :: TxIn -> W.TxIn
@@ -496,6 +504,14 @@ fromProtocolMagicId = W.ProtocolMagic . fromIntegral . unProtocolMagicId
                       Address Encoding / Decoding
 -------------------------------------------------------------------------------}
 
+instance {-# OVERLAPS #-} EncodeStakeAddress n where
+    encodeStakeAddress = error
+        "encodeStakeAddress: there's no such thing as stake address in Byron"
+
+instance {-# OVERLAPS #-} DecodeStakeAddress n where
+    decodeStakeAddress = error
+        "decodeStakeAddress: there's no such thing as stake address in Byron"
+
 instance EncodeAddress 'Mainnet where
     encodeAddress =
         gEncodeAddress

lib/byron/src/Cardano/Wallet/Byron/Launch.hs

@@ -1,4 +1,5 @@
 {-# LANGUAGE DataKinds #-}
+{-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE GADTs #-}
 {-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE NamedFieldPuns #-}

lib/byron/src/Cardano/Wallet/Byron/Transaction.hs

@@ -128,7 +128,7 @@ newTransactionLayer _proxy protocolMagic = TransactionLayer
         witnesses <- forM (CS.inputs cs) $ \(_, TxOut addr _) ->
             mkWitness protocolMagic sigData <$> lookupPrivateKey addr
         pure
-            ( Tx (Hash sigData) (second coin <$> CS.inputs cs) (CS.outputs cs)
+            ( Tx (Hash sigData) (second coin <$> CS.inputs cs) (CS.outputs cs) mempty
             , SealedTx $ CBOR.toStrictByteString $ CBOR.encodeSignedTx tx witnesses
             )
       where
@@ -190,6 +190,7 @@ newTransactionLayer _proxy protocolMagic = TransactionLayer
                     -- FIXME Do not require Tx to have resolvedInputs
                     , resolvedInputs = (,Coin 0) <$> inps
                     , outputs = outs
+                    , withdrawals = mempty
                     }
                 , SealedTx bytes
                 )
@@ -243,7 +244,7 @@ genesisBlockFromTxOuts gp outs = Block
     }
   where
     mkTx out@(TxOut (Address bytes) _) =
-        Tx (Hash $ blake2b256 bytes) [] [out]
+        Tx (Hash $ blake2b256 bytes) [] [out] mempty
 
 dummyAddress
     :: forall (n :: NetworkDiscriminant). (MaxSizeOf Address n ByronKey)

lib/byron/test/integration/Test/Integration/Byron/Scenario/API/Migrations.hs

@@ -20,6 +20,7 @@ import Cardano.Wallet.Api.Types
     , ApiTransaction
     , ApiWalletMigrationInfo
     , DecodeAddress (..)
+    , DecodeStakeAddress (..)
     , EncodeAddress (..)
     , WalletStyle (..)
     )
@@ -68,6 +69,7 @@ spec
         , PaymentAddress n ByronKey
         , EncodeAddress n
         , DecodeAddress n
+        , DecodeStakeAddress n
         )
     => SpecWith (Context t)
 spec = do
@@ -87,6 +89,7 @@ spec = do
 scenario_MIGRATE_01
     :: forall (n :: NetworkDiscriminant) t.
         ( DecodeAddress n
+        , DecodeStakeAddress n
         , EncodeAddress n
         , PaymentAddress n ByronKey
         )
@@ -107,6 +110,7 @@ scenario_MIGRATE_01 fixtureSource = it title $ \ctx -> do
 scenario_MIGRATE_02
     :: forall (n :: NetworkDiscriminant) t.
         ( DecodeAddress n
+        , DecodeStakeAddress n
         , EncodeAddress n
         , PaymentAddress n ByronKey
         )

lib/byron/test/integration/Test/Integration/Byron/Scenario/API/Transactions.hs

@@ -25,6 +25,7 @@ import Cardano.Wallet.Api.Types
     , ApiTxId (ApiTxId)
     , ApiUtxoStatistics
     , DecodeAddress (..)
+    , DecodeStakeAddress (..)
     , EncodeAddress (..)
     , Iso8601Time (..)
     , WalletStyle (..)
@@ -110,6 +111,7 @@ spec
         , PaymentAddress n ByronKey
         , EncodeAddress n
         , DecodeAddress n
+        , DecodeStakeAddress n
         )
     => SpecWith (Context t)
 spec = do
@@ -175,6 +177,7 @@ spec = do
 scenario_TRANS_CREATE_01_02
     :: forall (n :: NetworkDiscriminant) t.
         ( DecodeAddress n
+        , DecodeStakeAddress n
         , EncodeAddress n
         )
     => (Context t -> IO ApiByronWallet)
@@ -260,6 +263,7 @@ scenario_TRANS_CREATE_01_02 fixtureSource fixtures = it title $ \ctx -> do
 scenario_TRANS_ESTIMATE_01_02
     :: forall (n :: NetworkDiscriminant) t.
         ( DecodeAddress n
+        , DecodeStakeAddress n
         , EncodeAddress n
         )
     => (Context t -> IO ApiByronWallet)
@@ -292,6 +296,7 @@ scenario_TRANS_ESTIMATE_01_02 fixtureSource fixtures = it title $ \ctx -> do
 scenario_TRANS_CREATE_04b
     :: forall (n :: NetworkDiscriminant) t.
         ( DecodeAddress n
+        , DecodeStakeAddress n
         , EncodeAddress n
         , PaymentAddress n IcarusKey
         )
@@ -314,6 +319,7 @@ scenario_TRANS_CREATE_04b = it title $ \ctx -> do
 scenario_TRANS_CREATE_04c
     :: forall (n :: NetworkDiscriminant) t.
         ( DecodeAddress n
+        , DecodeStakeAddress n
         , EncodeAddress n
         , PaymentAddress n IcarusKey
         )
@@ -336,6 +342,7 @@ scenario_TRANS_CREATE_04c = it title $ \ctx -> do
 scenario_TRANS_CREATE_04d
     :: forall (n :: NetworkDiscriminant) t.
         ( DecodeAddress n
+        , DecodeStakeAddress n
         , EncodeAddress n
         , PaymentAddress n IcarusKey
         )
@@ -358,6 +365,7 @@ scenario_TRANS_CREATE_04d = it title $ \ctx -> do
 scenario_TRANS_ESTIMATE_04b
     :: forall (n :: NetworkDiscriminant) t.
         ( DecodeAddress n
+        , DecodeStakeAddress n
         , EncodeAddress n
         , PaymentAddress n IcarusKey
         )
@@ -385,6 +393,7 @@ scenario_TRANS_ESTIMATE_04b = it title $ \ctx -> do
 scenario_TRANS_ESTIMATE_04c
     :: forall (n :: NetworkDiscriminant) t.
         ( DecodeAddress n
+        , DecodeStakeAddress n
         , EncodeAddress n
         , PaymentAddress n IcarusKey
         )
@@ -407,6 +416,7 @@ scenario_TRANS_ESTIMATE_04c = it title $ \ctx -> do
 scenario_TRANS_CREATE_07
     :: forall (n :: NetworkDiscriminant) t.
         ( DecodeAddress n
+        , DecodeStakeAddress n
         , EncodeAddress n
         , PaymentAddress n ByronKey
         )
@@ -429,6 +439,7 @@ scenario_TRANS_CREATE_07 = it title $ \ctx -> do
 scenario_RESTORE_01
     :: forall (n :: NetworkDiscriminant) t.
         ( DecodeAddress n
+        , DecodeStakeAddress n
         , EncodeAddress n
         , PaymentAddress n ByronKey
         )
@@ -506,6 +517,7 @@ scenario_RESTORE_01 fixtureSource = it title $ \ctx -> do
 scenario_RESTORE_02
     :: forall (n :: NetworkDiscriminant) t.
         ( DecodeAddress n
+        , DecodeStakeAddress n
         , EncodeAddress n
         )
     => (Context t -> IO (ApiByronWallet, [Address]))
@@ -563,6 +575,7 @@ scenario_RESTORE_02 fixtureTarget = it title $ \ctx -> do
 scenario_RESTORE_03
     :: forall (n :: NetworkDiscriminant) t.
         ( DecodeAddress n
+        , DecodeStakeAddress n
         , EncodeAddress n
         )
     => (Context t -> IO (ApiByronWallet, [Address]))
@@ -603,6 +616,7 @@ scenario_RESTORE_03 fixtureTarget = it title $ \ctx -> do
 scenario_TRANS_UTXO_01
     :: forall (n :: NetworkDiscriminant) t.
         ( DecodeAddress n
+        , DecodeStakeAddress n
         , EncodeAddress n
         )
     => (Context t -> IO ApiByronWallet)
@@ -648,6 +662,7 @@ scenario_TRANS_UTXO_01 fixtureSource fixtureTarget = it title $ \ctx -> do
 scenario_TRANS_REG_1670
     :: forall (n :: NetworkDiscriminant) t.
         ( DecodeAddress n
+        , DecodeStakeAddress n
         , EncodeAddress n
         , PaymentAddress n IcarusKey
         )
@@ -698,12 +713,12 @@ scenario_TRANS_REG_1670 fixture = it title $ \ctx -> do
 
     -- ACTION
     rTxsFromDate <- request @[ApiTransaction n] ctx
-        (Link.listTransactions' @'Byron wSrc (Just start) Nothing Nothing)
+        (Link.listTransactions' @'Byron wSrc Nothing (Just start) Nothing Nothing)
         Default
         Empty
 
     rTxsAll <- request @[ApiTransaction n] ctx
-        (Link.listTransactions' @'Byron wSrc Nothing Nothing Nothing)
+        (Link.listTransactions' @'Byron wSrc Nothing Nothing Nothing Nothing)
         Default
         Empty
 
@@ -725,6 +740,7 @@ scenario_TRANS_REG_1670 fixture = it title $ \ctx -> do
     verifyTxInputsAndOutputs
         :: forall (d :: NetworkDiscriminant).
             ( DecodeAddress d
+            , DecodeStakeAddress d
             , EncodeAddress d
             , PaymentAddress d IcarusKey
             )
@@ -749,6 +765,7 @@ scenario_TRANS_REG_1670 fixture = it title $ \ctx -> do
 fixtureCantCoverFee
     :: forall (n :: NetworkDiscriminant) t.
         ( DecodeAddress n
+        , DecodeStakeAddress n
         , EncodeAddress n
         , PaymentAddress n IcarusKey
         )
@@ -766,6 +783,7 @@ fixtureCantCoverFee ctx = do
 fixtureNotEnoughMoney
     :: forall (n :: NetworkDiscriminant) t.
         ( DecodeAddress n
+        , DecodeStakeAddress n
         , EncodeAddress n
         , PaymentAddress n IcarusKey
         )
@@ -782,6 +800,7 @@ fixtureNotEnoughMoney ctx = do
 fixtureWrongPassphrase
     :: forall (n :: NetworkDiscriminant) t.
         ( DecodeAddress n
+        , DecodeStakeAddress n
         , EncodeAddress n
         , PaymentAddress n IcarusKey
         )
@@ -797,6 +816,7 @@ fixtureWrongPassphrase ctx = do
 fixtureDeletedWallet
     :: forall (n :: NetworkDiscriminant) t.
         ( DecodeAddress n
+        , DecodeStakeAddress n
         , EncodeAddress n
         , PaymentAddress n ByronKey
         )
@@ -833,6 +853,7 @@ mkPayment addr_ amnt = [json|
 postByronTransaction
     :: forall (n :: NetworkDiscriminant) t.
         ( DecodeAddress n
+        , DecodeStakeAddress n
         )
     => Context t
         -- A surrounding API context