CAD-2772 rebase on master initialize txInsCollateral and txAuxScriptData

IntersectMBO · Jun 8, 2021 · 55b7fac · 55b7fac
1 parent 7082dbf
commit 55b7fac
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/bench/tx-generator/src/Cardano/Benchmarking/GeneratorTx/SizedMetadata.hs b/bench/tx-generator/src/Cardano/Benchmarking/GeneratorTx/SizedMetadata.hs
@@ -102,11 +102,13 @@ dummyTxSizeInEra metadata = case makeTransactionBody dummyTx of
   dummyTx = TxBodyContent {
       txIns = [( TxIn "dbaff4e270cfb55612d9e2ac4658a27c79da4a5271c6f90853042d1403733810" (TxIx 0)
                , BuildTxWith $ KeyWitness KeyWitnessForSpending )]
+    , txInsCollateral = TxInsCollateralNone
     , txOuts = []
     , txFee = mkFee 0
     , txValidityRange = (TxValidityNoLowerBound, mkValidityUpperBound 0)
     , txMetadata = metadata
     , txAuxScripts = TxAuxScriptsNone
+    , txAuxScriptData = TxAuxScriptDataNone
     , txExtraKeyWits = TxExtraKeyWitnessesNone
     , txProtocolParams = BuildTxWith Nothing
     , txWithdrawals = TxWithdrawalsNone

diff --git a/bench/tx-generator/src/Cardano/Benchmarking/GeneratorTx/Tx.hs b/bench/tx-generator/src/Cardano/Benchmarking/GeneratorTx/Tx.hs
@@ -67,11 +67,13 @@ mkGenesisTransaction key _payloadSize ttl fee txins txouts
  where
   txBodyContent = TxBodyContent {
       txIns = zip txins $ repeat $ BuildTxWith $ KeyWitness KeyWitnessForSpending
+    , txInsCollateral = TxInsCollateralNone
     , txOuts = txouts
     , txFee = fees
     , txValidityRange = (TxValidityNoLowerBound, validityUpperBound)
     , txMetadata = TxMetadataNone
     , txAuxScripts = TxAuxScriptsNone
+    , txAuxScriptData = TxAuxScriptDataNone
     , txExtraKeyWits = TxExtraKeyWitnessesNone
     , txProtocolParams = BuildTxWith Nothing
     , txWithdrawals = TxWithdrawalsNone
@@ -106,11 +108,13 @@ mkTransaction key metadata ttl fee txins txouts
  where
   txBodyContent = TxBodyContent {
       txIns = zip txins $ repeat $ BuildTxWith $ KeyWitness KeyWitnessForSpending
+    , txInsCollateral = TxInsCollateralNone
     , txOuts = txouts
     , txFee = mkFee fee
     , txValidityRange = (TxValidityNoLowerBound, mkValidityUpperBound ttl)
     , txMetadata = metadata
     , txAuxScripts = TxAuxScriptsNone
+    , txAuxScriptData = TxAuxScriptDataNone
     , txExtraKeyWits = TxExtraKeyWitnessesNone
     , txProtocolParams = BuildTxWith Nothing
     , txWithdrawals = TxWithdrawalsNone

diff --git a/bench/tx-generator/src/Cardano/Benchmarking/Wallet.hs b/bench/tx-generator/src/Cardano/Benchmarking/Wallet.hs
@@ -105,11 +105,13 @@ genTx key networkId inFunds outValues
  where
   txBodyContent = TxBodyContent {
       txIns = map (\f -> (getFundTxIn f, BuildTxWith $ KeyWitness KeyWitnessForSpending)) inFunds
+    , txInsCollateral = TxInsCollateralNone
     , txOuts = map mkTxOut outValues
     , txFee = mkFee 0
     , txValidityRange = (TxValidityNoLowerBound, upperBound)
     , txMetadata = TxMetadataNone
     , txAuxScripts = TxAuxScriptsNone
+    , txAuxScriptData = TxAuxScriptDataNone
     , txExtraKeyWits = TxExtraKeyWitnessesNone
     , txProtocolParams = BuildTxWith Nothing
     , txWithdrawals = TxWithdrawalsNone