Simplify blockfrost setup

Signed-off-by: Sasha Bogicevic <[email protected]>

Author: v0d1ch

hydra-node/hydra-node.cabal

@@ -58,7 +58,6 @@ library
     Hydra.Chain
     Hydra.Chain.Blockfrost
     Hydra.Chain.Blockfrost.Client
-    Hydra.Chain.Blockfrost.Wallet
     Hydra.Chain.CardanoClient
     Hydra.Chain.Direct
     Hydra.Chain.Direct.Handlers
@@ -67,7 +66,6 @@ library
     Hydra.Chain.Direct.Wallet
     Hydra.Chain.Offline
     Hydra.Chain.ScriptRegistry
-    Hydra.Chain.Wallet
     Hydra.Events
     Hydra.Events.FileBased
     Hydra.HeadLogic

hydra-node/src/Hydra/Chain/Blockfrost.hs

@@ -24,7 +24,11 @@ import Hydra.Chain.Blockfrost.Client (
 import Hydra.Chain.Direct.Handlers (
   DirectChainLog (..),
  )
-import Hydra.Chain.Direct.Wallet (TinyWallet (..), WalletInfoOnChain (..), newTinyWallet)
+import Hydra.Chain.Direct.Wallet (
+  TinyWallet (..),
+  WalletInfoOnChain (..),
+  newTinyWallet,
+ )
 import Hydra.Logging (Tracer)
 import Hydra.Node.Util (
   readKeyPair,
@@ -39,9 +43,9 @@ mkTinyWallet ::
 mkTinyWallet tracer config = do
   keyPair@(_, sk) <- readKeyPair cardanoSigningKey
   prj <- Blockfrost.projectFromFile projectPath
-  Blockfrost.Genesis{_genesisSystemStart, _genesisNetworkMagic} <- runBlockfrostM prj queryGenesis
+  genesis@Blockfrost.Genesis{_genesisSystemStart, _genesisNetworkMagic} <- runBlockfrostM prj queryGenesis
   let networkId = toCardanoNetworkId _genesisNetworkMagic
-  let queryEpochInfo = toEpochInfo <$> runBlockfrostM prj mkEraHistory
+  let queryEpochInfo = pure $ toEpochInfo $ mkEraHistory genesis
   -- NOTE: we don't need to provide address here since it is derived from the
   -- keypair but we still want to keep the same wallet api.
   let queryWalletInfo queryPoint _address = runBlockfrostM prj $ do

hydra-node/src/Hydra/Chain/Direct.hs

@@ -83,12 +83,12 @@ import Hydra.Chain.Direct.TimeHandle (queryTimeHandle)
 import Hydra.Chain.Direct.Util (
   readKeyPair,
  )
-import Hydra.Chain.Direct.Wallet (newTinyWallet)
-import Hydra.Chain.ScriptRegistry (queryScriptRegistry)
-import Hydra.Chain.Wallet (
+import Hydra.Chain.Direct.Wallet (
   TinyWallet (..),
   WalletInfoOnChain (..),
+  newTinyWallet,
  )
+import Hydra.Chain.ScriptRegistry (queryScriptRegistry)
 import Hydra.Logging (Tracer, traceWith)
 import Hydra.Node.Util (readKeyPair)
 import Hydra.Options (DirectChainConfig (..))

hydra-node/src/Hydra/Chain/Direct/Handlers.hs

@@ -57,7 +57,7 @@ import Hydra.Chain.Direct.State (
   recover,
  )
 import Hydra.Chain.Direct.TimeHandle (TimeHandle (..))
-import Hydra.Chain.Wallet (
+import Hydra.Chain.Direct.Wallet (
   ErrCoverFee (..),
   TinyWallet (..),
   TinyWalletLog,

hydra-node/src/Hydra/Chain/Direct/Wallet.hs

@@ -55,6 +55,9 @@ import Cardano.Ledger.Babbage.TxBody qualified as Babbage
 import Cardano.Ledger.Babbage.UTxO (getReferenceScripts)
 import Cardano.Ledger.BaseTypes qualified as Ledger
 import Cardano.Ledger.Coin (Coin (..))
+import Cardano.Ledger.Core (
+  TxUpgradeError,
+ )
 import Cardano.Ledger.Core qualified as Core
 import Cardano.Ledger.Core qualified as Ledger
 import Cardano.Ledger.Hashes (EraIndependentTxBody, HashAnnotated, hashAnnotated)
@@ -72,9 +75,13 @@ import Data.Ratio ((%))
 import Data.Sequence.Strict ((|>))
 import Data.Set qualified as Set
 import Hydra.Cardano.Api (
+  BlockHeader,
+  ChainPoint,
+  LedgerEra,
   NetworkId,
   PaymentCredential (PaymentCredentialByKey),
   PaymentKey,
+  ShelleyAddr,
   SigningKey,
   StakeAddressReference (NoStakeAddress),
   VerificationKey,
@@ -91,20 +98,49 @@ import Hydra.Cardano.Api (
  )
 import Hydra.Cardano.Api qualified as Api
 import Hydra.Chain.CardanoClient (QueryPoint (..))
-import Hydra.Chain.Wallet (
-  Address,
-  ChainQuery,
-  ChangeError (..),
-  ErrCoverFee (..),
-  TinyWallet (..),
-  TinyWalletLog (..),
-  TxIn,
-  TxOut,
-  WalletInfoOnChain (..),
- )
 import Hydra.Ledger.Cardano ()
 import Hydra.Logging (Tracer, traceWith)
 
+type Address = Ledger.Addr StandardCrypto
+type TxIn = Ledger.TxIn StandardCrypto
+type TxOut = Ledger.TxOut LedgerEra
+
+-- | A 'TinyWallet' is a small abstraction of a wallet with basic UTXO
+-- management. The wallet is assumed to have only one address, and only one UTXO
+-- at that address. It can sign transactions and keeps track of its UTXO behind
+-- the scene.
+--
+-- The wallet is connecting to the node initially and when asked to 'reset'.
+-- Otherwise it can be fed blocks via 'update' as the chain rolls forward.
+data TinyWallet m = TinyWallet
+  { getUTxO :: STM m (Map TxIn TxOut)
+  -- ^ Return all known UTxO addressed to this wallet.
+  , getSeedInput :: STM m (Maybe Api.TxIn)
+  -- ^ Returns the /seed input/
+  -- This is the special input needed by `Direct` chain component to initialise
+  -- a head
+  , sign :: Api.Tx -> Api.Tx
+  , coverFee ::
+      UTxO ->
+      Api.Tx ->
+      m (Either ErrCoverFee Api.Tx)
+  , reset :: m ()
+  -- ^ Re-initializ wallet against the latest tip of the node and start to
+  -- ignore 'update' calls until reaching that tip.
+  , update :: BlockHeader -> [Api.Tx] -> m ()
+  -- ^ Update the wallet state given a block and list of txs. May be ignored if
+  -- wallet is still initializing.
+  }
+
+data WalletInfoOnChain = WalletInfoOnChain
+  { walletUTxO :: Map TxIn TxOut
+  , systemStart :: SystemStart
+  , tip :: ChainPoint
+  -- ^ Latest point on chain the wallet knows of.
+  }
+
+type ChainQuery m = QueryPoint -> Api.Address ShelleyAddr -> m WalletInfoOnChain
+
 -- | Create a new tiny wallet handle.
 newTinyWallet ::
   -- | A tracer for logging
@@ -193,6 +229,19 @@ getTxId ::
   Ledger.TxId
 getTxId tx = Ledger.TxId $ hashAnnotated (body tx)
 
+-- | This are all the error that can happen during coverFee.
+data ErrCoverFee
+  = ErrNotEnoughFunds ChangeError
+  | ErrNoFuelUTxOFound
+  | ErrUnknownInput {input :: TxIn}
+  | ErrScriptExecutionFailed {redeemerPointer :: Text, scriptFailure :: Text}
+  | ErrTranslationError (ContextError LedgerEra)
+  | ErrConwayUpgradeError (TxUpgradeError Conway)
+  deriving stock (Show)
+
+data ChangeError = ChangeError {inputBalance :: Coin, outputBalance :: Coin}
+  deriving stock (Show)
+
 -- | Cover fee for a transaction body using the given UTXO set. This calculate
 -- necessary fees and augments inputs / outputs / collateral accordingly to
 -- cover for the transaction cost and get the change back.
@@ -387,3 +436,21 @@ estimateScriptsCost pparams systemStart epochInfo utxo tx = do
           { redeemerPointer = show ptr
           , scriptFailure = show failure
           }
+
+--
+-- Logs
+--
+
+data TinyWalletLog
+  = BeginInitialize
+  | EndInitialize {initialUTxO :: Api.UTxO, tip :: ChainPoint}
+  | BeginUpdate {point :: ChainPoint}
+  | EndUpdate {newUTxO :: Api.UTxO}
+  | SkipUpdate {point :: ChainPoint}
+  deriving stock (Eq, Generic, Show)
+
+deriving anyclass instance ToJSON TinyWalletLog
+
+instance Arbitrary TinyWalletLog where
+  arbitrary = genericArbitrary
+  shrink = genericShrink

hydra-node/src/Hydra/Chain/Wallet.hs

@@ -43,18 +43,16 @@ import Hydra.Cardano.Api.Pretty (renderTx)
 import Hydra.Cardano.Api.Tx (signTx, toLedgerTx)
 import Hydra.Chain.CardanoClient (QueryPoint (..))
 import Hydra.Chain.Direct.Wallet (
-  applyTxs,
-  coverFee_,
-  findLargestUTxO,
-  newTinyWallet,
- )
-import Hydra.Chain.Wallet (
   Address,
   ChainQuery,
   TinyWallet (..),
   TxIn,
   TxOut,
   WalletInfoOnChain (..),
+  applyTxs,
+  coverFee_,
+  findLargestUTxO,
+  newTinyWallet,
  )
 import Test.Hydra.Tx.Fixture qualified as Fixture
 import Test.Hydra.Tx.Gen (genKeyPair, genOneUTxOFor, genSigningKey)

hydra-node/test/Hydra/Chain/Direct/WalletSpec.hs

@@ -55,7 +55,7 @@ import Hydra.Chain.Direct.Handlers (
  )
 import Hydra.Chain.Direct.State (ChainContext (..), initialChainState)
 import Hydra.Chain.Direct.TimeHandle (TimeHandle, mkTimeHandle)
-import Hydra.Chain.Wallet (TinyWallet (..))
+import Hydra.Chain.Direct.Wallet (TinyWallet (..))
 import Hydra.HeadLogic (
   ClosedState (..),
   HeadState (..),