WIP

IntersectMBO · Jul 31, 2024 · c4f3c7b · c4f3c7b
1 parent fbd4f0c
commit c4f3c7b
Show file tree

Hide file tree

Showing 10 changed files with 993 additions and 361 deletions.
diff --git a/cardano-api/cardano-api.cabal b/cardano-api/cardano-api.cabal
@@ -123,7 +123,7 @@ library internal
     Cardano.Api.Orphans
     Cardano.Api.Pretty
     Cardano.Api.Protocol
-    Cardano.Api.Protocol.Version
+    Cardano.Api.Protocol.AvailableEras
     Cardano.Api.ProtocolParameters
     Cardano.Api.Query
     Cardano.Api.Query.Expr
@@ -132,6 +132,8 @@ library internal
     Cardano.Api.ReexposeNetwork
     Cardano.Api.Rewards
     Cardano.Api.Script
+    Cardano.Api.Experimental.Eras
+    Cardano.Api.Experimental.Tx
     Cardano.Api.ScriptData
     Cardano.Api.SerialiseBech32
     Cardano.Api.SerialiseCBOR
@@ -237,7 +239,6 @@ library
     Cardano.Api.ChainSync.Client
     Cardano.Api.ChainSync.ClientPipelined
     Cardano.Api.Crypto.Ed25519Bip32
-    Cardano.Api.Experimental
     Cardano.Api.Ledger
     Cardano.Api.Network
     Cardano.Api.Shelley

diff --git a/cardano-api/internal/Cardano/Api/Convenience/Construction.hs b/cardano-api/internal/Cardano/Api/Convenience/Construction.hs
@@ -17,6 +17,9 @@ where
 import           Cardano.Api.Address
 import           Cardano.Api.Certificate
 import           Cardano.Api.Eon.ShelleyBasedEra
+import           Cardano.Api.Eras
+import           Cardano.Api.Experimental.Eras (sbeToEra)
+import           Cardano.Api.Experimental.Tx
 import           Cardano.Api.Fees
 import           Cardano.Api.ProtocolParameters
 import           Cardano.Api.Query
@@ -31,6 +34,7 @@ import qualified Cardano.Ledger.Keys as L
 
 import qualified Data.List as List
 import qualified Data.Map.Strict as Map
+import           Data.Maybe
 import           Data.Set (Set)
 import qualified Data.Set as Set
 import           Data.Text (Text)
@@ -72,7 +76,9 @@ constructBalancedTx
   stakeDelegDeposits
   drepDelegDeposits
   shelleyWitSigningKeys = do
-    BalancedTxBody _ txbody _txBalanceOutput _fee <-
+    let availableEra = fromMaybe (error "TODO") $ sbeToEra sbe
+
+    BalancedTxBody _ unsignedTx _txBalanceOutput _fee <-
       makeTransactionBodyAutoBalance
         sbe
         systemStart
@@ -86,8 +92,13 @@ constructBalancedTx
         changeAddr
         mOverrideWits
 
-    let keyWits = map (makeShelleyKeyWitness sbe txbody) shelleyWitSigningKeys
-    return $ makeSignedTransaction keyWits txbody
+    let alternateKeyWits = map (makeKeyWitness availableEra unsignedTx) shelleyWitSigningKeys
+        signedTx = signTx availableEra [] alternateKeyWits unsignedTx
+
+    caseShelleyToAlonzoOrBabbageEraOnwards
+      (const $ error "constructBalancedTx: TODO Fail")
+      (\w -> return $ ShelleyTx sbe $ obtainShimConstraints w signedTx)
+      sbe
 
 data TxInsExistError
   = TxInsDoNotExist [TxIn]

diff --git a/cardano-api/internal/Cardano/Api/Experimental/Eras.hs b/cardano-api/internal/Cardano/Api/Experimental/Eras.hs
@@ -0,0 +1,16 @@
+module Cardano.Api.Experimental.Eras
+  ( -- * New Era interface
+    BabbageEra
+  , ConwayEra
+  , Era (..)
+  , UseEra
+  , AvailableErasToSbe
+  , SbeToAvailableEras
+  , ToConstrainedEra
+  , useEra
+  , protocolVersionToSbe
+  , sbeToEra
+  )
+where
+
+import           Cardano.Api.Protocol.AvailableEras