Merge #2680

2680: Update cardano-node to 1.27.0. r=Anviking a=jonathanknowles # Issue Number ADP-914 # Overview Updates the dependencies of `cardano-wallet` to include version 1.27.0 of `cardano-node`. Co-authored-by: Jonathan Knowles <jonathan.knowles@iohk.io> Co-authored-by: Johannes Lund <johannes.lund@iohk.io>
cardano-foundation · Jun 8, 2021 · 1a75c82 · 1a75c82
2 parents e426116 + 3e0622e
commit 1a75c82
Show file tree

Hide file tree

Showing 63 changed files with 553 additions and 341 deletions.
diff --git a/README.md b/README.md
@@ -70,7 +70,7 @@ See **Installation Instructions** for each available [release](https://github.co
 >
 > | cardano-wallet | cardano-node (compatible versions) | SMASH (compatible versions)
 > | --- | --- | ---
-> | `master` branch | [1.26.2](https://github.com/input-output-hk/cardano-node/releases/tag/1.26.2) | [1.4.0](https://github.com/input-output-hk/smash/releases/tag/1.4.0)
+> | `master` branch | [1.27.0](https://github.com/input-output-hk/cardano-node/releases/tag/1.27.0) | [1.4.0](https://github.com/input-output-hk/smash/releases/tag/1.4.0)
 > | [v2021-05-26](https://github.com/input-output-hk/cardano-wallet/releases/tag/v2021-05-26) | [1.26.2](https://github.com/input-output-hk/cardano-node/releases/tag/1.26.2) | [1.4.0](https://github.com/input-output-hk/smash/releases/tag/1.4.0)
 > | [v2021-04-28](https://github.com/input-output-hk/cardano-wallet/releases/tag/v2021-04-28) | [1.26.2](https://github.com/input-output-hk/cardano-node/releases/tag/1.26.2) | [1.4.0](https://github.com/input-output-hk/smash/releases/tag/1.4.0)
 > | [v2021-04-08](https://github.com/input-output-hk/cardano-wallet/releases/tag/v2021-04-08) | [1.25.1](https://github.com/input-output-hk/cardano-node/releases/tag/1.25.1) | [1.3.0](https://github.com/input-output-hk/smash/releases/tag/1.3.0)

diff --git a/cabal.project b/cabal.project
@@ -28,12 +28,13 @@ source-repository-package
 source-repository-package
     type: git
     location: https://github.com/input-output-hk/cardano-base
-    tag: 101e7752cf4b23fd0b411736f523b8f6c43f6bc2
+    tag: 47db5b818ca4fa051f2e44cdf5e7c5c18c1fb0bf
     subdir: binary
             binary/test
             cardano-crypto-class
             cardano-crypto-praos
             cardano-crypto-tests
+            strict-containers
             slotting
 
 source-repository-package
@@ -44,7 +45,7 @@ source-repository-package
 source-repository-package
     type: git
     location: https://github.com/input-output-hk/cardano-ledger-specs
-    tag: 2e0e7b625492e5e0182464247f4c26d6949ab6f7
+    tag: e8f19bcc9c8f405131cb95ca6ada26b2b4eac638
     subdir: byron/chain/executable-spec
             byron/crypto
             byron/crypto/test
@@ -57,23 +58,21 @@ source-repository-package
             shelley/chain-and-ledger/dependencies/non-integer
             shelley/chain-and-ledger/executable-spec
             shelley/chain-and-ledger/shelley-spec-ledger-test
+            cardano-ledger-core
 
 source-repository-package
     type: git
     location: https://github.com/input-output-hk/cardano-node
-    tag: 3531289c9f79eab7ac5d3272ce6e6821504fec4c
+    tag: 8fe46140a52810b6ca456be01d652ca08fe730bf
     subdir: cardano-api
-            cardano-api/test
             cardano-cli
             cardano-config
             cardano-node
-            cardano-node-chairman
-            hedgehog-extras
 
 source-repository-package
     type: git
     location: https://github.com/input-output-hk/cardano-prelude
-    tag: ee4e7b547a991876e6b05ba542f4e62909f4a571
+    tag: bb4ed71ba8e587f672d06edf9d2e376f4b055555
     subdir: cardano-prelude
             cardano-prelude-test
 
@@ -90,7 +89,7 @@ source-repository-package
 source-repository-package
     type: git
     location: https://github.com/input-output-hk/iohk-monitoring-framework
-    tag: f6ab0631275d04dff1b990283bbf9671093e7505
+    tag: 808724ff8a19a33d0ed06f9ef59fbd900b08553c
     subdir: contra-tracer
             iohk-monitoring
             plugins/backend-aggregation
@@ -103,7 +102,7 @@ source-repository-package
 source-repository-package
     type: git
     location: https://github.com/input-output-hk/ouroboros-network
-    tag: 7f90c8c59ffc7d61a4e161e886d8962a9c26787a
+    tag: 9b279c7548ee549e1ed755cd1acb69b6e69d0c7b
     subdir: cardano-client
             io-sim
             io-sim-classes
@@ -115,6 +114,7 @@ source-repository-package
             ouroboros-consensus-mock
             ouroboros-consensus-shelley
             ouroboros-network
+            ouroboros-network-testing
             ouroboros-network-framework
             typed-protocols
             typed-protocols-examples

diff --git a/lib/shelley/cardano-wallet.cabal b/lib/shelley/cardano-wallet.cabal
@@ -44,6 +44,7 @@ library
     , cardano-crypto-wrapper
     , cardano-wallet-launcher
     , cardano-ledger-byron
+    , cardano-ledger-core
     , cardano-ledger-shelley-ma
     , cardano-slotting
     , cardano-wallet-cli
@@ -206,9 +207,10 @@ test-suite unit
     , cardano-addresses
     , cardano-api
     , cardano-crypto-class
+    , cardano-ledger-core
+    , cardano-wallet
     , cardano-wallet-core
     , cardano-wallet-test-utils
-    , cardano-wallet
     , containers
     , contra-tracer
     , fmt

diff --git a/lib/shelley/src/Cardano/Wallet/Shelley/Compatibility.hs b/lib/shelley/src/Cardano/Wallet/Shelley/Compatibility.hs
@@ -264,6 +264,8 @@ import Ouroboros.Network.Point
     ( WithOrigin (..) )
 import Shelley.Spec.Ledger.BaseTypes
     ( interval0, strictMaybeToMaybe, urlToText )
+import Shelley.Spec.Ledger.Serialization
+    ( ToCBORGroup )
 import Type.Reflection
     ( Typeable, typeRep )
 
@@ -278,6 +280,7 @@ import qualified Cardano.Chain.Common as Byron
 import qualified Cardano.Crypto.Hash as Crypto
 import qualified Cardano.Ledger.Core as SL.Core
 import qualified Cardano.Ledger.Crypto as SL
+import qualified Cardano.Ledger.Era as Ledger.Era
 import qualified Cardano.Ledger.SafeHash as SafeHash
 import qualified Cardano.Ledger.Shelley as SL
 import qualified Cardano.Ledger.Shelley.Constraints as SL
@@ -309,6 +312,7 @@ import qualified Ouroboros.Network.Block as O
 import qualified Ouroboros.Network.Point as Point
 import qualified Shelley.Spec.Ledger.Address as SL
 import qualified Shelley.Spec.Ledger.API as SL
+import qualified Shelley.Spec.Ledger.API as SLAPI
 import qualified Shelley.Spec.Ledger.BaseTypes as SL
 import qualified Shelley.Spec.Ledger.BlockChain as SL
 import qualified Shelley.Spec.Ledger.Credential as SL
@@ -433,7 +437,7 @@ toCardanoBlockHeader gp = \case
         toShelleyBlockHeader (W.getGenesisBlockHash gp) blk
 
 toShelleyBlockHeader
-    :: Era e
+    :: (Era e, ToCBORGroup (Ledger.Era.TxSeq e))
     => W.Hash "Genesis"
     -> ShelleyBlock e
     -> W.BlockHeader
@@ -453,7 +457,9 @@ toShelleyBlockHeader genesisHash blk =
                     SL.bheaderPrev header
             }
 
-getProducer :: Era e => ShelleyBlock e -> W.PoolId
+getProducer
+    :: (Era e, ToCBORGroup (Ledger.Era.TxSeq e))
+    => ShelleyBlock e -> W.PoolId
 getProducer (ShelleyBlock (SL.Block (SL.BHeader header _) _) _) =
     fromPoolKeyHash $ SL.hashKey (SL.bheaderVk header)
 
@@ -597,7 +603,7 @@ fromMaxTxSize =
     Quantity . fromIntegral
 
 fromShelleyPParams
-    :: forall era. W.EraInfo Bound -> SL.PParams era -> W.ProtocolParameters
+    :: forall era. W.EraInfo Bound -> SLAPI.PParams era -> W.ProtocolParameters
 fromShelleyPParams eraInfo pp = W.ProtocolParameters
     { decentralizationLevel =
         decentralizationLevelFromPParams pp
@@ -635,7 +641,7 @@ fromShelleyPParams eraInfo pp = W.ProtocolParameters
 -- convert it into a percentage.
 --
 decentralizationLevelFromPParams
-    :: SL.PParams era
+    :: SLAPI.PParams era
     -> W.DecentralizationLevel
 decentralizationLevelFromPParams pp =
     W.DecentralizationLevel $ fromUnitInterval
@@ -645,7 +651,7 @@ decentralizationLevelFromPParams pp =
     d = SL._d pp
 
 txParametersFromPParams
-    :: SL.PParams era
+    :: SLAPI.PParams era
     -> W.TxParameters
 txParametersFromPParams pp = W.TxParameters
     { getFeePolicy = W.LinearFee
@@ -658,17 +664,17 @@ txParametersFromPParams pp = W.TxParameters
     naturalToDouble = fromIntegral
 
 desiredNumberOfStakePoolsFromPParams
-    :: SL.PParams era
+    :: SLAPI.PParams era
     -> Word16
 desiredNumberOfStakePoolsFromPParams pp = fromIntegral (SL._nOpt pp)
 
 minimumUTxOvalueFromPParams
-    :: SL.PParams era
+    :: SLAPI.PParams era
     -> W.Coin
 minimumUTxOvalueFromPParams = toWalletCoin . SL._minUTxOValue
 
 stakeKeyDepositFromPParams
-    :: SL.PParams era
+    :: SLAPI.PParams era
     -> W.Coin
 stakeKeyDepositFromPParams = toWalletCoin . SL._keyDeposit
 
@@ -780,7 +786,10 @@ fromNonMyopicMemberRewards =
     . Map.mapKeys (bimap fromShelleyCoin fromStakeCredential)
     . O.unNonMyopicMemberRewards
 
-optimumNumberOfPools :: forall era. (SL.PParams era ~ SL.Core.PParams era) => SL.Core.PParams era -> Int
+optimumNumberOfPools
+    :: forall era. (SLAPI.PParams era ~ SL.Core.PParams era)
+    => SL.Core.PParams era
+    -> Int
 optimumNumberOfPools = unsafeConvert . SL._nOpt
   where
     -- A value of ~100 can be expected, so should be fine.
@@ -809,9 +818,9 @@ fromShelleyTxOut
     :: ( SL.ShelleyBased era
        , SL.Core.Value era ~ SL.Coin
        )
-    => SL.TxOut era
+    => SLAPI.TxOut era
     -> W.TxOut
-fromShelleyTxOut (SL.TxOut addr amount) = W.TxOut
+fromShelleyTxOut (SLAPI.TxOut addr amount) = W.TxOut
     (fromShelleyAddress addr)
     (TokenBundle.fromCoin $ fromShelleyCoin amount)
 
@@ -834,7 +843,7 @@ toShelleyCoin (W.Coin c) = SL.Coin $ safeCast c
 
 -- NOTE: For resolved inputs we have to pass in a dummy value of 0.
 fromShelleyTx
-    :: SL.Tx (Cardano.ShelleyLedgerEra ShelleyEra)
+    :: SLAPI.Tx (Cardano.ShelleyLedgerEra ShelleyEra)
     -> ( W.Tx
        , [W.DelegationCertificate]
        , [W.PoolCertificate]
@@ -854,7 +863,7 @@ fromShelleyTx tx =
     SL.Tx bod@(SL.TxBody ins outs certs wdrls fee _ _ _) _ mmd = tx
 
 fromAllegraTx
-    :: SL.Tx (Cardano.ShelleyLedgerEra AllegraEra)
+    :: SLAPI.Tx (Cardano.ShelleyLedgerEra AllegraEra)
     -> ( W.Tx
        , [W.DelegationCertificate]
        , [W.PoolCertificate]
@@ -879,7 +888,7 @@ fromAllegraTx tx =
     toSLMetadata (MA.AuxiliaryData blob _scripts) = SL.Metadata blob
 
 fromMaryTx
-    :: SL.Tx (Cardano.ShelleyLedgerEra MaryEra)
+    :: SLAPI.Tx (Cardano.ShelleyLedgerEra MaryEra)
     -> ( W.Tx
        , [W.DelegationCertificate]
        , [W.PoolCertificate]
@@ -905,7 +914,7 @@ fromMaryTx tx =
     toSLMetadata (MA.AuxiliaryData blob _scripts) = SL.Metadata blob
 
     fromMaryTxOut
-         :: SL.TxOut (Cardano.ShelleyLedgerEra MaryEra)
+         :: SLAPI.TxOut (Cardano.ShelleyLedgerEra MaryEra)
          -> W.TxOut
     fromMaryTxOut (SL.TxOut addr value) =
         W.TxOut (fromShelleyAddress addr) $
@@ -1085,7 +1094,7 @@ unsealShelleyTx wrap = wrap
 
 sealShelleyTx
     :: forall era b c. (O.ShelleyBasedEra (Cardano.ShelleyLedgerEra era))
-    => (SL.Tx (Cardano.ShelleyLedgerEra era) -> (W.Tx, b, c))
+    => (SLAPI.Tx (Cardano.ShelleyLedgerEra era) -> (W.Tx, b, c))
     -> Cardano.Tx era
     -> (W.Tx, W.SealedTx)
 sealShelleyTx fromTx (Cardano.ShelleyTx _era tx) =

diff --git a/lib/shelley/src/Cardano/Wallet/Shelley/Launch/Cluster.hs b/lib/shelley/src/Cardano/Wallet/Shelley/Launch/Cluster.hs
@@ -354,11 +354,22 @@ cliConfig tr = cliConfigBase tr Nothing
 -- | A quick helper to interact with the 'cardano-cli'. Assumes the cardano-cli
 -- is available in PATH.
 cli :: Tracer IO ClusterLog -> [String] -> IO ()
-cli tr = cliConfig tr >=> void . readProcessStdout_
+cli tr = cliConfig tr >=> void . readProcessStdoutOrFail
 
 cliLine :: Tracer IO ClusterLog -> [String] -> IO String
 cliLine tr = cliConfig tr >=>
-    fmap (BL8.unpack . getFirstLine) . readProcessStdout_
+    fmap (BL8.unpack . getFirstLine) . readProcessStdoutOrFail
+
+readProcessStdoutOrFail :: ProcessConfig () () () -> IO BL.ByteString
+readProcessStdoutOrFail processConfig = do
+    (st, out, err) <- readProcess processConfig
+    case st of
+        ExitSuccess -> pure out
+        ExitFailure _ -> throwIO $ userError $ mconcat
+            [ "command failed: "
+            , BL8.unpack err
+            ]
+
 
 getFirstLine :: BL8.ByteString -> BL8.ByteString
 getFirstLine = BL8.takeWhile (\c -> c /= '\r' && c /= '\n')
@@ -520,7 +531,7 @@ withCluster tr dir LocalClusterConfig{..} onClusterStart =
             waitForSocket tr bftSocket
 
             (rawTx, faucetPrv) <- prepareKeyRegistration tr dir
-            tx <- signTx tr dir rawTx [] [faucetPrv]
+            tx <- signTx tr dir rawTx [faucetPrv]
             submitTx tr bftSocket "pre-registered stake key" tx
 
             waitGroup <- newChan
@@ -770,7 +781,7 @@ setupStakePoolData tr dir name params url pledgeAmt mRetirementEpoch = do
             ]
     (rawTx, faucetPrv) <- preparePoolRegistration
         tr dir stakePub certificates pledgeAmt
-    tx <- signTx tr dir rawTx [] [faucetPrv, stakePrv, opPrv]
+    tx <- signTx tr dir rawTx [faucetPrv, stakePrv, opPrv]
 
     let cfg = CardanoNodeConfig
             { nodeDir = dir
@@ -1283,6 +1294,9 @@ sendFaucet tr conn dir what targets = do
 
     let targetAssets = concatMap (snd . TokenBundle.toFlatList . fst . snd) targets
 
+    scripts <- forM (nub $ concatMap (map snd . snd . snd) targets) $
+        writeMonetaryPolicyScriptFile dir
+
     cli tr $
         [ "transaction", "build-raw"
         , "--tx-in", faucetInput
@@ -1293,14 +1307,13 @@ sendFaucet tr conn dir what targets = do
         , "--out-file", file
         ] ++
         concatMap (uncurry mkOutput . fmap fst) targets ++
-        mkMint targetAssets
+        mkMint targetAssets ++
+        (concatMap (\f -> ["--minting-script-file", f]) scripts)
 
     policyKeys <- forM (nub $ concatMap (snd . snd) targets) $
         \(skey, keyHash) -> writePolicySigningKey dir keyHash skey
-    scripts <- forM (nub $ concatMap (map snd . snd . snd) targets) $
-        writeMonetaryPolicyScriptFile dir
 
-    tx <- signTx tr dir file scripts (faucetPrv:policyKeys)
+    tx <- signTx tr dir file (faucetPrv:policyKeys)
     submitTx tr conn (what ++ " faucet tx") tx
 
 batch :: Int -> [a] -> ([a] -> IO b) -> IO ()
@@ -1343,7 +1356,7 @@ moveInstantaneousRewardsTo tr conn dir targets = do
     testData <- getShelleyTestDataPath
     let bftPrv = testData </> "bft-leader" <> ".skey"
 
-    tx <- signTx tr dir file [] [faucetPrv, bftPrv]
+    tx <- signTx tr dir file [faucetPrv, bftPrv]
     submitTx tr conn "MIR certificates" tx
   where
     mkVerificationKey
@@ -1434,18 +1447,16 @@ signTx
     :: Tracer IO ClusterLog
     -> FilePath -- ^ Output directory
     -> FilePath -- ^ Tx body file
-    -> [FilePath] -- ^ Script files
     -> [FilePath] -- ^ Signing keys for witnesses
     -> IO FilePath
-signTx tr dir rawTx scripts keys = do
+signTx tr dir rawTx keys = do
     let file = dir </> "tx.signed"
     cli tr $
         [ "transaction", "sign"
         , "--tx-body-file", rawTx
         , "--mainnet"
         , "--out-file", file
         ]
-        ++ concatMap (\s -> ["--script-file", s]) scripts
         ++ concatMap (\key -> ["--signing-key-file", key]) keys
     pure file