Change Era from BabbageEra to ConwayEra (#1338)

cardano-scaling · Sep 5, 2024 · 1fdcb86 · 1fdcb86
1 parent d110064
commit 1fdcb86
Show file tree

Hide file tree

Showing 49 changed files with 43,397 additions and 42,757 deletions.
diff --git a/docs/package.json b/docs/package.json
@@ -10,8 +10,8 @@
     "build": "yarn prepare && docusaurus build",
     "build-dev": "yarn prepare && docusaurus build --no-minify -l en",
     "start": "yarn dummy-spec && docusaurus start",
-    "validate:inputs": "./validate-api.js publish '/' '../hydra-node/golden/ReasonablySized (ClientInput (Tx BabbageEra)).json'",
-    "validate:outputs": "./validate-api.js subscribe '/' '../hydra-node/golden/ReasonablySized (TimedServerOutput (Tx BabbageEra)).json'",
+    "validate:inputs": "./validate-api.js publish '/' '../hydra-node/golden/ReasonablySized (ClientInput (Tx ConwayEra)).json'",
+    "validate:outputs": "./validate-api.js subscribe '/' '../hydra-node/golden/ReasonablySized (TimedServerOutput (Tx ConwayEra)).json'",
     "validate": "yarn validate:inputs && yarn validate:outputs",
     "swizzle": "docusaurus swizzle",
     "deploy": "docusaurus deploy",

diff --git a/hydra-cardano-api/src/Cardano/Api/UTxO.hs b/hydra-cardano-api/src/Cardano/Api/UTxO.hs
@@ -22,7 +22,7 @@ import Data.Text (Text)
 import Data.Text qualified as T
 import Prelude
 
-type Era = BabbageEra
+type Era = ConwayEra
 
 type UTxO = UTxO' (TxOut CtxUTxO Era)
 

diff --git a/hydra-cardano-api/src/Hydra/Cardano/Api/Prelude.hs b/hydra-cardano-api/src/Hydra/Cardano/Api/Prelude.hs
@@ -53,7 +53,7 @@ import Data.Typeable (Typeable)
 import GHC.Stack (HasCallStack)
 import Test.QuickCheck (Arbitrary (..), Gen)
 
-type Era = BabbageEra
+type Era = ConwayEra
 
 -- | Currently supported ledger era.
 type LedgerEra = ShelleyLedgerEra Era

diff --git a/hydra-cardano-api/src/Hydra/Cardano/Api/TxBody.hs b/hydra-cardano-api/src/Hydra/Cardano/Api/TxBody.hs
@@ -3,7 +3,12 @@ module Hydra.Cardano.Api.TxBody where
 import Hydra.Cardano.Api.Prelude
 
 import Cardano.Ledger.Alonzo.TxWits qualified as Ledger
-import Cardano.Ledger.Api (AlonzoPlutusPurpose (..), AsItem (..), AsIx, PlutusPurpose)
+import Cardano.Ledger.Api (
+  AsItem (..),
+  AsIx,
+  ConwayPlutusPurpose (..),
+  PlutusPurpose,
+ )
 import Cardano.Ledger.Babbage.Core (redeemerPointer)
 import Cardano.Ledger.BaseTypes (strictMaybeToMaybe)
 import Cardano.Ledger.Core qualified as Ledger
@@ -23,7 +28,7 @@ findRedeemerSpending ::
   TxIn ->
   Maybe a
 findRedeemerSpending (getTxBody -> ShelleyTxBody _ body _ scriptData _ _) txIn = do
-  ptr <- strictMaybeToMaybe $ redeemerPointer body (AlonzoSpending . AsItem $ toLedgerTxIn txIn)
+  ptr <- strictMaybeToMaybe $ redeemerPointer body (ConwaySpending . AsItem $ toLedgerTxIn txIn)
   lookupRedeemer ptr scriptData
 
 findRedeemerMinting ::
@@ -32,7 +37,7 @@ findRedeemerMinting ::
   PolicyId ->
   Maybe a
 findRedeemerMinting (getTxBody -> ShelleyTxBody _ body _ scriptData _ _) pid = do
-  ptr <- strictMaybeToMaybe $ redeemerPointer body (AlonzoMinting . AsItem $ toLedgerPolicyID pid)
+  ptr <- strictMaybeToMaybe $ redeemerPointer body (ConwayMinting . AsItem $ toLedgerPolicyID pid)
   lookupRedeemer ptr scriptData
 
 findScriptMinting ::

diff --git a/hydra-chain-observer/src/Hydra/ChainObserver.hs b/hydra-chain-observer/src/Hydra/ChainObserver.hs
@@ -22,12 +22,9 @@ import Hydra.Cardano.Api (
   Tx,
   UTxO,
   connectToLocalNode,
-  convertConwayTx,
-  fromLedgerTx,
   getChainPoint,
   getTxBody,
   getTxId,
-  toLedgerTx,
   pattern Block,
  )
 import Hydra.Cardano.Api.Prelude (TxId)
@@ -175,16 +172,14 @@ chainSyncClient tracer networkId startingPoint observerHandler =
       { recvMsgRollForward = \blockInMode _tip -> ChainSyncClient $ do
           let receivedTxIds = case blockInMode of
                 BlockInMode ConwayEra (Block _ conwayTxs) -> getTxId . getTxBody <$> conwayTxs
-                BlockInMode BabbageEra (Block _ babbageTxs) -> getTxId . getTxBody <$> babbageTxs
                 _ -> []
 
               (BlockInMode _ (Block bh@(BlockHeader _ _ blockNo) _)) = blockInMode
               point = getChainPoint bh
           traceWith tracer RollForward{point, receivedTxIds}
 
           let txs = case blockInMode of
-                BlockInMode ConwayEra (Block _ conwayTxs) -> map (fromLedgerTx . convertConwayTx . toLedgerTx) conwayTxs
-                BlockInMode BabbageEra (Block _ babbageTxs) -> babbageTxs
+                BlockInMode ConwayEra (Block _ conwayTxs) -> conwayTxs
                 _ -> []
 
               (utxo', observations) = observeAll networkId utxo txs

diff --git a/hydra-cluster/config/devnet/cardano-node.json b/hydra-cluster/config/devnet/cardano-node.json
@@ -18,6 +18,7 @@
   "TestMaryHardForkAtEpoch": 0,
   "TestAlonzoHardForkAtEpoch": 0,
   "TestBabbageHardForkAtEpoch": 0,
+  "TestConwayHardForkAtEpoch": 0,
 
   "RequiresNetworkMagic": "RequiresNoMagic",
 

diff --git a/hydra-cluster/config/devnet/genesis-conway.json b/hydra-cluster/config/devnet/genesis-conway.json
@@ -293,5 +293,260 @@
       "numerator": 2,
       "denominator": 3
     }
-  }
+  },
+  "minFeeRefScriptCostPerByte": 0,
+  "plutusV3CostModel": [
+    100788,
+    420,
+    1,
+    1,
+    1000,
+    173,
+    0,
+    1,
+    1000,
+    59957,
+    4,
+    1,
+    11183,
+    32,
+    201305,
+    8356,
+    4,
+    16000,
+    100,
+    16000,
+    100,
+    16000,
+    100,
+    16000,
+    100,
+    16000,
+    100,
+    16000,
+    100,
+    100,
+    100,
+    16000,
+    100,
+    94375,
+    32,
+    132994,
+    32,
+    61462,
+    4,
+    72010,
+    178,
+    0,
+    1,
+    22151,
+    32,
+    91189,
+    769,
+    4,
+    2,
+    85848,
+    123203,
+    7305,
+    -900,
+    1716,
+    549,
+    57,
+    85848,
+    0,
+    1,
+    1,
+    1000,
+    42921,
+    4,
+    2,
+    24548,
+    29498,
+    38,
+    1,
+    898148,
+    27279,
+    1,
+    51775,
+    558,
+    1,
+    39184,
+    1000,
+    60594,
+    1,
+    141895,
+    32,
+    83150,
+    32,
+    15299,
+    32,
+    76049,
+    1,
+    13169,
+    4,
+    22100,
+    10,
+    28999,
+    74,
+    1,
+    28999,
+    74,
+    1,
+    43285,
+    552,
+    1,
+    44749,
+    541,
+    1,
+    33852,
+    32,
+    68246,
+    32,
+    72362,
+    32,
+    7243,
+    32,
+    7391,
+    32,
+    11546,
+    32,
+    85848,
+    123203,
+    7305,
+    -900,
+    1716,
+    549,
+    57,
+    85848,
+    0,
+    1,
+    90434,
+    519,
+    0,
+    1,
+    74433,
+    32,
+    85848,
+    123203,
+    7305,
+    -900,
+    1716,
+    549,
+    57,
+    85848,
+    0,
+    1,
+    1,
+    85848,
+    123203,
+    7305,
+    -900,
+    1716,
+    549,
+    57,
+    85848,
+    0,
+    1,
+    955506,
+    213312,
+    0,
+    2,
+    270652,
+    22588,
+    4,
+    1457325,
+    64566,
+    4,
+    20467,
+    1,
+    4,
+    0,
+    141992,
+    32,
+    100788,
+    420,
+    1,
+    1,
+    81663,
+    32,
+    59498,
+    32,
+    20142,
+    32,
+    24588,
+    32,
+    20744,
+    32,
+    25933,
+    32,
+    24623,
+    32,
+    43053543,
+    10,
+    53384111,
+    14333,
+    10,
+    43574283,
+    26308,
+    10,
+    16000,
+    100,
+    16000,
+    100,
+    962335,
+    18,
+    2780678,
+    6,
+    442008,
+    1,
+    52538055,
+    3756,
+    18,
+    267929,
+    18,
+    76433006,
+    8868,
+    18,
+    52948122,
+    18,
+    1995836,
+    36,
+    3227919,
+    12,
+    901022,
+    1,
+    166917843,
+    4307,
+    36,
+    284546,
+    36,
+    158221314,
+    26549,
+    36,
+    74698472,
+    36,
+    333849714,
+    1,
+    254006273,
+    72,
+    2174038,
+    72,
+    2261318,
+    64571,
+    4,
+    207616,
+    8310,
+    4,
+    1293828,
+    28716,
+    63,
+    0,
+    1,
+    1006041,
+    43623,
+    251,
+    0,
+    1
+  ],
+  "extraPraosEntropy": null
 }