Try #2899:

cardano-foundation · Sep 16, 2021 · 5419d61 · 5419d61
2 parents 5a4940f + 9c5218b
commit 5419d61
Show file tree

Hide file tree

Showing 4 changed files with 193 additions and 20 deletions.
diff --git a/lib/core-integration/src/Test/Integration/Framework/DSL.hs b/lib/core-integration/src/Test/Integration/Framework/DSL.hs
@@ -679,7 +679,7 @@ maximumCollateralInputCountByEra = \case
     ApiAllegra -> 0
     ApiMary    -> 0
     -- value from alonzo-genesis.yaml:
-    ApiAlonzo  -> 1
+    ApiAlonzo  -> 3
 
 --
 -- Helpers

diff --git a/lib/core-integration/src/Test/Integration/Scenario/API/Shelley/CoinSelections.hs b/lib/core-integration/src/Test/Integration/Scenario/API/Shelley/CoinSelections.hs
@@ -342,7 +342,7 @@ spec = describe "SHELLEY_COIN_SELECTION" $ do
         \Single output with excessively high number of assets." $
         \ctx -> runResourceT $ do
             let adaQuantity = Quantity . minUTxOValue $ _mainEra ctx
-            let assetCount = 1024
+            let assetCount = 1280
             let policyId = UnsafeTokenPolicyId $
                     Hash "1234567890123456789012345678"
             let tokenNames = UnsafeTokenName . T.encodeUtf8 . T.singleton <$>

diff --git a/lib/core-integration/src/Test/Integration/Scenario/API/Shelley/Network.hs b/lib/core-integration/src/Test/Integration/Scenario/API/Shelley/Network.hs
@@ -13,6 +13,8 @@ import Prelude
 
 import Cardano.Wallet.Api.Types
     ( ApiEpochInfo, ApiEra (..), ApiNetworkParameters (..) )
+import Cardano.Wallet.Primitive.Types
+    ( ExecutionUnitPrices (..) )
 import Data.List
     ( (\\) )
 import Data.Quantity
@@ -68,12 +70,15 @@ spec = describe "SHELLEY_NETWORK" $ do
 
         let knownEras = [minBound .. _mainEra ctx]
         let unknownEras = [minBound .. maxBound] \\ knownEras
-
+        -- exec prices values from alonzo-genesis.yml
+        let execUnitPrices = Just (ExecutionUnitPrices
+                                      {priceExecutionSteps = 577 % 10000,
+                                       priceExecutionMemory = 721 % 10000000})
         let checkExecutionUnitPricesPresence
                 :: ApiEra
                 -> ((HTTP.Status, Either RequestException ApiNetworkParameters) -> IO ())
             checkExecutionUnitPricesPresence = \case
-                ApiAlonzo -> expectField #executionUnitPrices (`shouldNotBe` Nothing)
+                ApiAlonzo -> expectField #executionUnitPrices (`shouldBe` execUnitPrices)
                 _ -> expectField #executionUnitPrices (`shouldBe` Nothing)
 
         verify r $
@@ -86,7 +91,7 @@ spec = describe "SHELLEY_NETWORK" $ do
             , expectField #activeSlotCoefficient (`shouldBe` Quantity 50.0)
             , expectField #maximumCollateralInputCount
                   (`shouldBe` maximumCollateralInputCountByEra (_mainEra ctx))
-            , expectField #maximumTokenBundleSize (`shouldBe` Quantity 4000)
+            , expectField #maximumTokenBundleSize (`shouldBe` Quantity 5000)
             , checkExecutionUnitPricesPresence (_mainEra ctx)
             ]
             ++ map (expectEraField (`shouldNotBe` Nothing)) knownEras

diff --git a/lib/shelley/test/data/cardano-node-shelley/alonzo-genesis.yaml b/lib/shelley/test/data/cardano-node-shelley/alonzo-genesis.yaml
@@ -1,19 +1,187 @@
-# Originally taken from https://hydra.iohk.io/build/6782523/download/1/index.html
+# Originally taken from https://hydra.iohk.io/build/7578887/download/1/index.html
 
-adaPerUTxOWord: 34482 # Gets us close to a 1 ada minUTxOValue
-
-# Probably needs to be sanity-checked if we start using plutus scripts in
-# our integration tests:
+lovelacePerUTxOWord: 34482
 executionPrices:
-  prMem: 1
-  prSteps: 1
+  prSteps:
+    numerator: 721
+    denominator: 10000000
+  prMem:
+    numerator: 577
+    denominator: 10000
 maxTxExUnits:
-  exUnitsMem: 1
-  exUnitsSteps: 1
+  exUnitsMem: 10000000
+  exUnitsSteps: 10000000000
 maxBlockExUnits:
-  exUnitsMem: 1
-  exUnitsSteps: 1
-
-maxValueSize: 4000
-collateralPercentage: 100
-maxCollateralInputs: 1
+  exUnitsMem: 50000000
+  exUnitsSteps: 40000000000
+maxValueSize: 5000
+collateralPercentage: 150
+maxCollateralInputs: 3
+costModels:
+  PlutusV1:
+    sha2_256-memory-arguments: 4
+    equalsString-cpu-arguments-constant: 1000
+    cekDelayCost-exBudgetMemory: 100
+    lessThanEqualsByteString-cpu-arguments-intercept: 103599
+    divideInteger-memory-arguments-minimum: 1
+    appendByteString-cpu-arguments-slope: 621
+    blake2b-cpu-arguments-slope: 29175
+    iData-cpu-arguments: 150000
+    encodeUtf8-cpu-arguments-slope: 1000
+    unBData-cpu-arguments: 150000
+    multiplyInteger-cpu-arguments-intercept: 61516
+    cekConstCost-exBudgetMemory: 100
+    nullList-cpu-arguments: 150000
+    equalsString-cpu-arguments-intercept: 150000
+    trace-cpu-arguments: 150000
+    mkNilData-memory-arguments: 32
+    lengthOfByteString-cpu-arguments: 150000
+    cekBuiltinCost-exBudgetCPU: 29773
+    bData-cpu-arguments: 150000
+    subtractInteger-cpu-arguments-slope: 0
+    unIData-cpu-arguments: 150000
+    consByteString-memory-arguments-intercept: 0
+    divideInteger-memory-arguments-slope: 1
+    divideInteger-cpu-arguments-model-arguments-slope: 118
+    listData-cpu-arguments: 150000
+    headList-cpu-arguments: 150000
+    chooseData-memory-arguments: 32
+    equalsInteger-cpu-arguments-intercept: 136542
+    sha3_256-cpu-arguments-slope: 82363
+    sliceByteString-cpu-arguments-slope: 5000
+    unMapData-cpu-arguments: 150000
+    lessThanInteger-cpu-arguments-intercept: 179690
+    mkCons-cpu-arguments: 150000
+    appendString-memory-arguments-intercept: 0
+    modInteger-cpu-arguments-model-arguments-slope: 118
+    ifThenElse-cpu-arguments: 1
+    mkNilPairData-cpu-arguments: 150000
+    lessThanEqualsInteger-cpu-arguments-intercept: 145276
+    addInteger-memory-arguments-slope: 1
+    chooseList-memory-arguments: 32
+    constrData-memory-arguments: 32
+    decodeUtf8-cpu-arguments-intercept: 150000
+    equalsData-memory-arguments: 1
+    subtractInteger-memory-arguments-slope: 1
+    appendByteString-memory-arguments-intercept: 0
+    lengthOfByteString-memory-arguments: 4
+    headList-memory-arguments: 32
+    listData-memory-arguments: 32
+    consByteString-cpu-arguments-intercept: 150000
+    unIData-memory-arguments: 32
+    remainderInteger-memory-arguments-minimum: 1
+    bData-memory-arguments: 32
+    lessThanByteString-cpu-arguments-slope: 248
+    encodeUtf8-memory-arguments-intercept: 0
+    cekStartupCost-exBudgetCPU: 100
+    multiplyInteger-memory-arguments-intercept: 0
+    unListData-memory-arguments: 32
+    remainderInteger-cpu-arguments-model-arguments-slope: 118
+    cekVarCost-exBudgetCPU: 29773
+    remainderInteger-memory-arguments-slope: 1
+    cekForceCost-exBudgetCPU: 29773
+    sha2_256-cpu-arguments-slope: 29175
+    equalsInteger-memory-arguments: 1
+    indexByteString-memory-arguments: 1
+    addInteger-memory-arguments-intercept: 1
+    chooseUnit-cpu-arguments: 150000
+    sndPair-cpu-arguments: 150000
+    cekLamCost-exBudgetCPU: 29773
+    fstPair-cpu-arguments: 150000
+    quotientInteger-memory-arguments-minimum: 1
+    decodeUtf8-cpu-arguments-slope: 1000
+    lessThanInteger-memory-arguments: 1
+    lessThanEqualsInteger-cpu-arguments-slope: 1366
+    fstPair-memory-arguments: 32
+    modInteger-memory-arguments-intercept: 0
+    unConstrData-cpu-arguments: 150000
+    lessThanEqualsInteger-memory-arguments: 1
+    chooseUnit-memory-arguments: 32
+    sndPair-memory-arguments: 32
+    addInteger-cpu-arguments-intercept: 197209
+    decodeUtf8-memory-arguments-slope: 8
+    equalsData-cpu-arguments-intercept: 150000
+    mapData-cpu-arguments: 150000
+    mkPairData-cpu-arguments: 150000
+    quotientInteger-cpu-arguments-constant: 148000
+    consByteString-memory-arguments-slope: 1
+    cekVarCost-exBudgetMemory: 100
+    indexByteString-cpu-arguments: 150000
+    unListData-cpu-arguments: 150000
+    equalsInteger-cpu-arguments-slope: 1326
+    cekStartupCost-exBudgetMemory: 100
+    subtractInteger-cpu-arguments-intercept: 197209
+    divideInteger-cpu-arguments-model-arguments-intercept: 425507
+    divideInteger-memory-arguments-intercept: 0
+    cekForceCost-exBudgetMemory: 100
+    blake2b-cpu-arguments-intercept: 2477736
+    remainderInteger-cpu-arguments-constant: 148000
+    tailList-cpu-arguments: 150000
+    encodeUtf8-cpu-arguments-intercept: 150000
+    equalsString-cpu-arguments-slope: 1000
+    lessThanByteString-memory-arguments: 1
+    multiplyInteger-cpu-arguments-slope: 11218
+    appendByteString-cpu-arguments-intercept: 396231
+    lessThanEqualsByteString-cpu-arguments-slope: 248
+    modInteger-memory-arguments-slope: 1
+    addInteger-cpu-arguments-slope: 0
+    equalsData-cpu-arguments-slope: 10000
+    decodeUtf8-memory-arguments-intercept: 0
+    chooseList-cpu-arguments: 150000
+    constrData-cpu-arguments: 150000
+    equalsByteString-memory-arguments: 1
+    cekApplyCost-exBudgetCPU: 29773
+    quotientInteger-memory-arguments-slope: 1
+    verifySignature-cpu-arguments-intercept: 3345831
+    unMapData-memory-arguments: 32
+    mkCons-memory-arguments: 32
+    sliceByteString-memory-arguments-slope: 1
+    sha3_256-memory-arguments: 4
+    ifThenElse-memory-arguments: 1
+    mkNilPairData-memory-arguments: 32
+    equalsByteString-cpu-arguments-slope: 247
+    appendString-cpu-arguments-intercept: 150000
+    quotientInteger-cpu-arguments-model-arguments-slope: 118
+    cekApplyCost-exBudgetMemory: 100
+    equalsString-memory-arguments: 1
+    multiplyInteger-memory-arguments-slope: 1
+    cekBuiltinCost-exBudgetMemory: 100
+    remainderInteger-memory-arguments-intercept: 0
+    sha2_256-cpu-arguments-intercept: 2477736
+    remainderInteger-cpu-arguments-model-arguments-intercept: 425507
+    lessThanEqualsByteString-memory-arguments: 1
+    tailList-memory-arguments: 32
+    mkNilData-cpu-arguments: 150000
+    chooseData-cpu-arguments: 150000
+    unBData-memory-arguments: 32
+    blake2b-memory-arguments: 4
+    iData-memory-arguments: 32
+    nullList-memory-arguments: 32
+    cekDelayCost-exBudgetCPU: 29773
+    subtractInteger-memory-arguments-intercept: 1
+    lessThanByteString-cpu-arguments-intercept: 103599
+    consByteString-cpu-arguments-slope: 1000
+    appendByteString-memory-arguments-slope: 1
+    trace-memory-arguments: 32
+    divideInteger-cpu-arguments-constant: 148000
+    cekConstCost-exBudgetCPU: 29773
+    encodeUtf8-memory-arguments-slope: 8
+    quotientInteger-cpu-arguments-model-arguments-intercept: 425507
+    mapData-memory-arguments: 32
+    appendString-cpu-arguments-slope: 1000
+    modInteger-cpu-arguments-constant: 148000
+    verifySignature-cpu-arguments-slope: 1
+    unConstrData-memory-arguments: 32
+    quotientInteger-memory-arguments-intercept: 0
+    equalsByteString-cpu-arguments-constant: 150000
+    sliceByteString-memory-arguments-intercept: 0
+    mkPairData-memory-arguments: 32
+    equalsByteString-cpu-arguments-intercept: 112536
+    appendString-memory-arguments-slope: 1
+    lessThanInteger-cpu-arguments-slope: 497
+    modInteger-cpu-arguments-model-arguments-intercept: 425507
+    modInteger-memory-arguments-minimum: 1
+    sha3_256-cpu-arguments-intercept: 0
+    verifySignature-memory-arguments: 1
+    cekLamCost-exBudgetMemory: 100
+    sliceByteString-cpu-arguments-intercept: 150000