Skip to content

Commit 043f684

Browse files
committed
Bump api and cli
Use always succeeds instead
1 parent d004d34 commit 043f684

File tree

3 files changed

+13
-10
lines changed

3 files changed

+13
-10
lines changed

cabal.project

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ if impl (ghc >= 9.12)
7878
source-repository-package
7979
type: git
8080
location: https://github.com/IntersectMBO/cardano-api.git
81-
tag: 597d4717fc51595305b5ba6fbf7ec39427214d12
82-
--sha256: sha256-klUKFbN5x25q72okX6yUpZ1zRS64KnvKlbq/Btw3ilw=
81+
tag: 32310d48b17daa6f2942dff63372389987812f58
82+
--sha256: sha256-Kl/nUvzQ+O0LjIGECpd5AS5GnMuXIpDp1hH5Kz1irsc=
8383
subdir: cardano-api
8484

8585

@@ -89,6 +89,6 @@ source-repository-package
8989
source-repository-package
9090
type: git
9191
location: https://github.com/IntersectMBO/cardano-cli.git
92-
tag: 9460503d94187455bda7fbf8669021974a80d3aa
93-
--sha256: sha256-klUKFbN5x25q72okX6yUpZ1zRS64KnvKlbq/Btw3ilw=
92+
tag: de2b268e656e64c5ef211a2a8607043e311ba2a2
93+
--sha256: sha256-bCPtVGFxqvM/ihkdKjXp39AHMo1yd04kwTujMLJ1fMo=
9494
subdir: cardano-cli

cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Plutus/Scripts.hs

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ import qualified Hedgehog.Extras as H
4444
-- Voting NO
4545
-- Proposing NO
4646
-- Execute me with:
47-
-- @DISABLE_RETRIES=1 cabal run cardano-testnet-test -- -p "/Spec.hs.Spec.Ledger Events.Plutus.Scripts/"@
47+
-- @DISABLE_RETRIES=1 cabal run cardano-testnet-test -- -p "/PlutusV3 purposes/"@
4848
hprop_plutus_purposes_v3 :: Property
4949
hprop_plutus_purposes_v3 = integrationWorkspace "all-plutus-script-purposes" $ \tempAbsBasePath' -> H.runWithDefaultWatchdog_ $ do
5050
conf@Conf { tempAbsPath } <- mkConf tempAbsBasePath'
@@ -190,11 +190,12 @@ hprop_plutus_purposes_v3 = integrationWorkspace "all-plutus-script-purposes" $ \
190190
]
191191

192192
H.success
193-
193+
-- TODO: Left off here. The transaction has a v3 script but you are reading a v2 script!
194+
-- The hash is also different inside the transaction!
194195

195196
-- |
196197
-- Execute me with:
197-
-- @DISABLE_RETRIES=1 cabal test cardano-testnet-test --test-options '-p "/PlutusV2 Create transaction with two script certs/"'@
198+
-- @DISABLE_RETRIES=1 cabal test cardano-testnet-test --test-options '-p "/PlutusV2 transaction with two script certs/"'@
198199
hprop_tx_two_script_certs_v2 :: Property
199200
hprop_tx_two_script_certs_v2 = integrationWorkspace "tx-2-script-certs" $ \tempAbsBasePath' -> H.runWithDefaultWatchdog_ $ do
200201
conf@Conf { tempAbsPath } <- mkConf tempAbsBasePath'
@@ -229,7 +230,7 @@ hprop_tx_two_script_certs_v2 = integrationWorkspace "tx-2-script-certs" $ \tempA
229230
txin <- T.unpack . renderTxIn <$> findLargestUtxoForPaymentKey epochStateView sbe wallet0
230231

231232
plutusScript <- H.note $ work </> "always-succeeds-script.plutusV2"
232-
H.writeFile plutusScript $ T.unpack plutusV2StakeScript
233+
H.writeFile plutusScript $ T.unpack plutusV3Script
233234

234235
scriptStakeRegistrationCertificate
235236
<- H.note $ work </> "script-stake-registration-certificate"
@@ -257,7 +258,9 @@ hprop_tx_two_script_certs_v2 = integrationWorkspace "tx-2-script-certs" $ \tempA
257258
let txbody = work </> "two-certs-tx-body"
258259
tx = work </> "two-certs-tx"
259260
txout = mconcat [ utxoAddr, "+", show @Int 2_000_000 ]
260-
261+
262+
s <- execCli' execConfig [anyEraToString anyEra, "transaction", "policyid", "--script-file", plutusScript]
263+
H.note_ $ "Script hash: " <> s
261264
let txBuildArgs =
262265
[ anyEraToString anyEra, "transaction", "build"
263266
, "--change-address", T.unpack $ paymentKeyInfoAddr wallet0

cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/CommitteeAddNew.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ hprop_constitutional_committee_add_new = integrationWorkspace "constitutional-co
157157
-- TODO: Left off here. No certificate was in transaction!
158158
stakeCertTx <- execCli' execConfig
159159
["debug", "transaction"
160-
, "view", "--output-json", "--tx-file", stakeCertTxSignedFp
160+
, "view", "--output-json", "--tx-body-file", stakeCertTxBodyFp
161161
]
162162

163163
H.note_ $ "Stake registration transaction: " <> stakeCertTx

0 commit comments

Comments
 (0)