Skip to content
This repository has been archived by the owner on Dec 2, 2024. It is now read-only.

Commit

Permalink
PLT-774: Collateral output (#740)
Browse files Browse the repository at this point in the history
* Update the contributing guide (#729)

* next-node is the new merge (ends PLT-558) (#745)

* SCP-3855: update node dep (#449)

* Update Cardano node et al. dependencies for the Vasil HF

* The Cardano node version will only work on a network with the Vasil release.

* Solve some compile issues

* wip: recovering instances for types from plutus-ledger-api

* wip

* plutus-ledger compiles

* plutus-ledger-constraints compiles

* Fixed warnings in Ledger.Tx.CardanoAPI for fields introduced by the Babbage era. Also adapted hashing functions for PlutusV1 scripts to work on PlutusV2

* Fixed warnings in Ledger.Tx.CardanoAPITemp and added implementation to undefined value

* plutus-contract compiles

* Added alonzoGenesisDefaults implementation (copied from cardano-node because it was deleted over there) to Ledger.Validation

* plutus-chain-index-core compiles

* Fixed compilation errors in playground-common and plutus-contract

* Fix compile errors in plutus-example

* Fix compile errors in plutus-pab

* Fix compile errors in plutus-playground-server

* WIP on plutus-use-cases

* Split Tx.Orphans into multiple Orphans

* Fix compilation errors on plutus-use-cases

* fix compilation issues

* Update nix

* fix formatting

* Remove wrongly commited files

* Update purescript modules

* Commented test on plutus-ledger temporarely until cardano-node is updated

* Update cardano-wallet with fixes for haddock

* Fix plutus-playground-client purescript imports

* Fix warnings in plutus-example

* Fix plutus-uniswap cabal

* Try to turn-off haddock for cardano-wallet

* [plutus-contract]: fix golden tests and commented test until cardano-node is updated

* Add cardano-cli/.../genesis.alonzo.spec.json to fix plutus-example

* Fix comment link to PR

* Comment out the test properly

* Update scripts/protocol-parameters with fresh plutusV1 cost parameters

Co-authored-by: Konstantinos Lambrou-Latreille <[email protected]>

* [chain-index]: export all servant client functions (#492)

* Fix playground client

* Fix streaming

* Fix purescript

* Create separate directories for v1 and v2 plutus scripts (#486)

* Reorganize the plutus-example library to distinguish clearly between V1
and V2 scripts.

* plutus-example reorganization
create v2 example script

* Modify the ScriptContextChecker module to be more generic

* Propagate the changes to the plutus-example apps and tests

* Update required-redeemer.plutus to also check for an inline datum of 42
and to check for an inline datum of 42 in the reference inputs

* Add PlutusV2 minting and staking scripts (#528)

* [chain-index]: add inline datums support and update cardano-node (#488)

* PLT-484 Upgraded cardano-node version to the official 1.35.0 release. (#551)

* Also upgraded cardano-wallet, plutus et al. versions that work with v1.35.0 of the node.

* Updated golden tests in plutus-use-cases and plutus-contract

* Updated version of components to 1.0.0 with cardano-node (#560)

* Updated the cardano-node bundled with plutus-apps to v1.35.0

* Updated version of all components in their respective cabal files to 1.0.0

* Update cardano-node dependency to 1.35.1

* Updated cardano-wallet, plutus and cardano-ledger to match the node
  version.

* Add script equivalence context test for the V2 context. (#588)

* Remove withIsCardanoEra workaround. (#607)

* BlockInMode now carries a IsCardanoEra constraint

* Increase the delay of awaiting in plutus-pab-executables tests (#565)

Set slot's length to 1s for awaiting tx/out status tests to make them stable

* [PLT-81] plutus-chain-index: support inline scripts when querying TxOut of a TxOutRef (#613)

* Make plutus-ledger-api version explicit in Ledger.Tx

* Make pattern match explicit

* Reorder ScriptChainIndexTxOut fields

To highlight they are the same as PublicKeyChainIndexTxOut.

* Add datum to both branches of ChainIndexTxOut

- Unfortunately we need to rename the fields because they have now
  different types.
- In the PublicKeyChainIndexTxOut case, the output datum is optional and
  we can use plutus-ledger-api OutputDatum type.
- In the ScriptChainIndexTxOut case, the output datum is required,
  nothing changes here but the name.

* Add ReferenceScript to ChainIndexTxOut

* Remove old comment

* Rename _ciTxOutDatumPublicKey and _ciTxOutDatumScript into _ciTxOutPublicKeyDatum and _ciTxOutScriptDatum

* Introduce fromReferenceScript

* Add comments to ChainIndexTxOut

* Add minting context equivalent test plutus script (#631)

* Add missing record field `localTxMonitoringClient` (#617)

* PLT-568: Switch to Babbage era (#614)

* Make Babbage the default era for the emulator

* Clean up

* Accept changes in test output

* Workaround for parseBabbageEraInCardanoModeTx

* Fix minAda calculation

* [next-node]: Bump wallet, plutus, ledger, node (#616)

* Bump cardano-node to 1.35.2 and rest of dependencies based on cardano-wallet

* Use '[TxIn]' instead of 'Set TxIn' in 'data Tx' (#623)

* [plutus-ledger]: Use '[TxIn]' instead of 'Set TxIn' in 'data Tx'.
* Add a property test to check Ord instances of TxIn.
* Sort the inputs in fromOnChainTx
* Sort the inputs in `Emulator.Wallet`
* Fix the review notes and the problem with getInput in StateMachine tests

* PLT-445 Add `mustReferencePubKeyOutput` in constraints library (#640)

* PLT-445 Add mustReferencePubKeyOutput in constraints library

* Added the mustReferencePubKeyOutput constraint in
  plutus-ledger-constraints

* Added a test case for the mustReferencePubKeyOutput

* Refactored Ledger.Tx.CardanoAPI to work with PlutusV2 alongside PlutusV1 scripts in the tx inputs.

* Use existing unitRedeemer

* Move TxIn and TxInType to Ledger.Tx

* Add plutus version to ConsumeScriptAddress constructor

* Add costModelParams for PlutusScriptV2

* Fix error codes.

* Renamed mkTxInfo to mkPV1TxInfo, added test for plutus-tx-constraints without implementation and commented for now the off-chain validation in Ledger.Index

* Implement reference inputs in makeTransactionBody'

* Fixed failing test cases for Ledger.Constraints.mustReferencePubKeyOutput

* Add MustUseOutputAsCollateral

* Fix V2 tests. But issues with V1 tests.

* Disable tests

* WIP

* Remove unused code

* PR feedback

* Remove unused code.

* Clean up

* Added additional info in TODO

* Add Arbitrary instances

* Convert plutus-ledger-constraint tests to PV2

* Fixed test in plutus-ledger-constraints

* Fixed PS generator error in playground

* Fix build

* Fix PS

* Fix PS

* More support of plutus version in constraints libs

* Default to PlutusV1 for now

Co-authored-by: Sjoerd Visscher <[email protected]>
Co-authored-by: Sjoerd Visscher <[email protected]>

* Update cardano-node to 1.35.3-rc1 with deps (#647)

* Upgraded to a cardano-wallet compatible with node 1.35.3-rc1 (#657)

* Reorganized dependencies based on cardano-wallet's cabal.project

* Added the new 'protocolParamUTxOCostPerByte' in 'Ledger.Params' which replaces 'protocolParamUTxOCostPerWord'

* Fixed the `Plutus.Contract.Wallet.mkMintingRedeemers` which triggered an error if the redeemers in the tx contained spending redeemers.

* Simplify MustReferencePubKeyOutput to MustReferenceOutput (#661)

* Replace LedgerPlutusVersion with Language type (#662)

* PLT-494: PlutusV2 TypedValidators (#666)

* Move common code to Plutus.Script.Utils.Typed

* Enable V2 TypedValidators

* Enable and fix reference output tests

* Update cardano-node 1.35.3-rc1 -> 1.35.3 (#669)

* PLT-448: inline scripts in constraint libraries (#678)

* Add inline script support to plutus-tx-constraints.

* Add mustOutputInlineValidator and mustOutputInlineMintingPolicy

* Add documentation

* Check there's no inline script in V1

* Fix wrong minAdaTxOut use

* Update renderGuess.txt

* Naming

* PLT-738: Include plutus language versions with scripts (#681)

* Store Plutus language versions in chain-index

* Introduce Versioned scripts

Remove openapi3 as a dependency of plutus-script-utils

* Add hashing for versioned scripts

* PLT-454: mustUseOutputAsCollateral (#690)

* Finish mustUseOutputAsCollateral implementation

* Add testcase

* Add documentation

* Add missing fields to Ledger.Tx.Internal.Tx (#468)

Add missing fields to Ledger.Tx.Internal.Tx.

  * Add certificates and withdrawals to Tx.

  * Move script witnesses to txScripts.

  * Modify TxIn type, rename to TxInput.

  * Put redeemers together with minting scripts.

  * Translate withdrawals in toCardanoTxBody.

  * Export redeemers for signing with wallet.

* Add tests for mustIncludeDatum tx constraint (#700)

* Add tests for mustIncludeDatum tx constraint (3 failing tests need fix)

* run checks

* Add tests for MustPayToPubKeyAddress tx constraint (#701)

* Add tests for mustSpendScriptOutput and mustSpendScriptOutputWithMatchingDatumAndValue tx constraints (#706)

* Add tests for mustSpendScriptOutput and mustSpendScriptOutputWithMatchingDatumAndValue tx constraints

* Fixed the 'Ledger.Constraints.OffChain.typedValidatorLookups' lookup
function so that it adds the validator inside the 'TypedValidator' in
the 'slOtherScripts' lookup value.

Co-authored-by: Konstantinos Lambrou-Latreille <[email protected]>

* plutus-contract emulator: Change the tx output representation of EmulatorTx to use Cardano.Api.TxOut (#698)

* First draft done for plutus-ledger

* plutus-ledger-constraints use Cardano.Tx

* use C.Tx in plutus-tx-constraints

* plutus-chain-index uses C.TxOut

* Forgot to add file

* Fixing my mess with CardanoAPI

* encoding via plutus.TxOut (can't work, no NetworkId)

* Fix code for the use cases

* Fix a bug in balanceTx

* Fix 0 ada outputs error

* Dirty fix for the uniswap check

* Use Cardano.Tx txId

* fix uniswap test

* Fix double satisfaction

* Fix Marconi

* Add TxOut typeclasses

* Remove unused imports

* Fix failing tests

* Clean import

* Fix pab

* Fix golden values

* Fix golden test

* Fix more plutus packages

* Rmove useless param from ChainIndex.Lib

* Fik playground

* Remove commented code

* Include several fixes following Konstantinos' review

* Add a Pretty TxOut and clean uniswap

* Remove useless stuff in playground

* error in generators display the original cause

* Fix imports

* prettier pretty

* Fix golden tests

* Fix uniswap

* Fix golden tests

* Restore deleted constraints

* Integrate more Sjoerd's comments

* Add tests for mustPayToOtherScript tx constraint (#710)

* Add tests for mustPayToOtherScript tx constraint and 2 more for mustPayToPubKeyAddress

* Fix failing test and reference two PLT tickets

* Refactored MustMint tests to use minting policies and added tests for token burning (#719)

* MustSpendScriptOutput and MustSpendScriptOutputWithMatchingDatumAndValue check the redeemer's presence (#723)

* Add inline datum supports for mustPayToPubKey and mustPayToOtherScript (#721)

* Incremental change for datum

* Work but no inlining

* First working inline datum with V2

* Add tests for inline datum

* add smart constructors for inline datum

* fix PAB

* fixing tx-constraints

* clean up tests

* Address some of Konstantinos' comments

* Separate test group for plutus v2

* Refactor tests in MustPayToPubKeyAddress to ease version handling

* Code clean up

* Code clean up

* Fix unused imports

* Add a way to switch to cardano constraints in MustPayToOtherAddress tests

* more clean up

* PR feedbacks

* Remove dead code

* Add refactoring for MustPayToOtherScript tests

* typo

* clean test suites

* Clean up imports

* Fix some false-positives MustSpendScriptOutput tests using versioned minting policies (#725)

* Fix some false-positives MustSpendScriptOutput tests and refactor to use minting policies

* Use Versioned MintingPolicy and add tests for V2 scripts for MustSpendScriptOutput

* Further refactoring

* Improve onchain check for MustSpendScriptOutput and MustSpendScriptOutputWithMatchingDatumAndValue constraints

* tidy up onchain check

* PLT-448: must spend script output with reference (#716)

* Add ownAddress (singular)

* Support reference scripts in TxIn

* Add mustSpendScriptOutputWithReference

* Test using reference scripts

* Fix merge issues

* Direct conversion from ChainIndexTxOut to the new TxOut

* Push Versioned inside Either

* Accept test outputs

* Fix reference script support in ledger-constraints

* Fix comments

* Add ownAddress (singular)

* Support reference scripts in TxIn

* Add mustSpendScriptOutputWithReference

* Test using reference scripts

* Fix merge issues

* Direct conversion from ChainIndexTxOut to the new TxOut

* Push Versioned inside Either

* Accept test outputs

* Fix reference script support in ledger-constraints

* Fix comments

* PR feedback

* More PR feedback

* Fix merge issues

* PLT-807 Change behavior of MustPayToPubKeyAddress and MustPayToOtherScript w.r.t datum in transaction body (#705)

* Changed `MustPayToPubKeyAddress` and `MustPayToOtherScript` so that
  the user needs to explicitly specify if he wants:
    * the datum to only be included as a hash in the transaction
      output
    * the datum to be included as a hash in the transaction output
      as well as in the transaction body
    * the datum to be inlined in the transaction output

* Changed the name of the constraint `MustIncludeDatum` to
  `MustIncludeDatumInTx` and `MustHashDatum` to
  `MustIncludeDatumInTxWithHash`. These constraint don't modify the
  transaction anymore, but simply check that the datum is part of the
  transaction body.

* Added a note on the 'Plutus.Contract.Oracle' module explaining why it
  doesn't work in it's current form.

* Commented out failing test cases in `plutus-use-cases` that use the
  'Plutus.Contract.Oracle' module.

* PLT-511: collateral output in chain index (#730)

* Add collateral output support to chain index

* Generate invalid transactions in tests too

* PR feedback

* PLT-990 Removed Plutus.Contract.Wallet.finalize as we instead set the validity range of a transaction directly in `plutus-ledger-constraints` (since we now have access to the `SlotConfig`) (#741)

* Update the contributing guide (#729)

Co-authored-by: Evgenii Akentev <[email protected]>
Co-authored-by: Konstantinos Lambrou-Latreille <[email protected]>
Co-authored-by: Jordan Millar <[email protected]>
Co-authored-by: Andrea Bedini <[email protected]>
Co-authored-by: Markus Läll <[email protected]>
Co-authored-by: Sjoerd Visscher <[email protected]>
Co-authored-by: Sjoerd Visscher <[email protected]>
Co-authored-by: Jamie Bertram <[email protected]>
Co-authored-by: Karol Ochman-Milarski <[email protected]>
Co-authored-by: James <[email protected]>
Co-authored-by: Ziyang Liu <[email protected]>

* Revert "next-node is the new merge (ends PLT-558) (#745)" (#746)

This reverts commit dc3f549.

* chore(deps): bump nixbuild/nix-quick-install-action from 17 to 18 (#743)

Bumps [nixbuild/nix-quick-install-action](https://github.com/nixbuild/nix-quick-install-action) from 17 to 18.
- [Release notes](https://github.com/nixbuild/nix-quick-install-action/releases)
- [Changelog](https://github.com/nixbuild/nix-quick-install-action/blob/master/RELEASE)
- [Commits](nixbuild/nix-quick-install-action@v17...v18)

---
updated-dependencies:
- dependency-name: nixbuild/nix-quick-install-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Add proper ToJSON instance for unit test results (#744)

* Add collateral output fields

* Add collateral balancing tests

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: Ziyang Liu <[email protected]>
Co-authored-by: Nicolas B <[email protected]>
Co-authored-by: Evgenii Akentev <[email protected]>
Co-authored-by: Konstantinos Lambrou-Latreille <[email protected]>
Co-authored-by: Jordan Millar <[email protected]>
Co-authored-by: Andrea Bedini <[email protected]>
Co-authored-by: Markus Läll <[email protected]>
Co-authored-by: Jamie Bertram <[email protected]>
Co-authored-by: Karol Ochman-Milarski <[email protected]>
Co-authored-by: James <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Ulf Norell <[email protected]>
  • Loading branch information
13 people committed Nov 8, 2022
1 parent 97b4c1d commit d917c4c
Show file tree
Hide file tree
Showing 5 changed files with 260 additions and 1 deletion.
1 change: 1 addition & 0 deletions plutus-contract/test/Spec/Balancing.hs
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,7 @@ balanceTxnCollateralTest name count outputLovelace =
(Value.scale 100 ff <> Ada.lovelaceValueOf outputLovelace)
lookups = Tx.Constraints.unspentOutputs utxos
utx1 <- mkTxConstraints @Void lookups constraints1
-- utx1 = either (error . show) id $ L.Constraints.mkTx @Void lookups constraints1
submitTxConfirmed utx1

trace = do
Expand Down
126 changes: 125 additions & 1 deletion plutus-use-cases/test/Spec/crowdfundingEmulatorTestOutput.txt
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,11 @@ Slot 1: W[2]: Balancing an unbalanced transaction:
Requires signatures:
Utxo index:
Slot 1: W[2]: Finished balancing:
<<<<<<< HEAD
Tx f22ad19506e8360e3fa3deb52c23cd9df14b78639828a18762ed99493c14cdfe:
=======
Tx 44ec5da42a6248423e49f52418911a38241a3dbc425e4eebfc9029655710e91d:
>>>>>>> 7f2d304fd (PLT-774: Collateral output (#740))
{inputs:
- 43ba666cc8a22a04b63a3b605ce14146dfa5ed999986625ad90c1bc16dabdd84!20

Expand All @@ -56,18 +60,39 @@ Slot 1: W[2]: Finished balancing:
- Value (Map [(,Map [("",10000000)])]) addressed to
ScriptCredential: 016307ebfed4ec71e34605fbc2151a22e9eaa310ce3aed53bc481450 (no staking credential)
with datum hash 77ab184b7537cd4b1dc3730f6a8a76a3d3aad1642fae9d769aa5dae40be38b51
<<<<<<< HEAD
- Value (Map [(,Map [("",9823763)])]) addressed to
PubKeyCredential: 80a4f45b56b88d1139da23bc4c3c75ec6d32943c087f250b86193ca7 (no staking credential)
mint: Value (Map [])
fee: Value (Map [(,Map [("",176237)])])
=======
- Value (Map [(,Map [("",9815623)])]) addressed to
PubKeyCredential: 80a4f45b56b88d1139da23bc4c3c75ec6d32943c087f250b86193ca7 (no staking credential)
return collateral:
- Value (Map [(,Map [("",9723434)])]) addressed to
PubKeyCredential: 80a4f45b56b88d1139da23bc4c3c75ec6d32943c087f250b86193ca7 (no staking credential)
total collateral: Value (Map [(,Map [("",276566)])])
mint: Value (Map [])
fee: Value (Map [(,Map [("",184377)])])
>>>>>>> 7f2d304fd (PLT-774: Collateral output (#740))
validity range: Interval {ivFrom = LowerBound NegInf True, ivTo = UpperBound (Finite (Slot {getSlot = 20})) False}
data:
( 77ab184b7537cd4b1dc3730f6a8a76a3d3aad1642fae9d769aa5dae40be38b51
, "\128\164\244[V\184\141\DC19\218#\188L<u\236m2\148<\b\DEL%\v\134\EM<\167" )
redeemers:}
<<<<<<< HEAD
Slot 1: W[2]: Signing tx: f22ad19506e8360e3fa3deb52c23cd9df14b78639828a18762ed99493c14cdfe
Slot 1: W[2]: Submitting tx: f22ad19506e8360e3fa3deb52c23cd9df14b78639828a18762ed99493c14cdfe
Slot 1: W[2]: TxSubmit: f22ad19506e8360e3fa3deb52c23cd9df14b78639828a18762ed99493c14cdfe
=======
Slot 1: 00000000-0000-4000-8000-000000000003 {Wallet W[4]}:
Receive endpoint call on 'contribute' for Object (fromList [("contents",Array [Object (fromList [("getEndpointDescription",String "contribute")]),Object (fromList [("unEndpointValue",Object (fromList [("contribValue",Object (fromList [("getValue",Array [Array [Object (fromList [("unCurrencySymbol",String "")]),Array [Array [Object (fromList [("unTokenName",String "")]),Number 2500000.0]]]])]))]))])]),("tag",String "ExposeEndpointResp")])
Slot 1: 00000000-0000-4000-8000-000000000003 {Wallet W[4]}:
Contract log: String "Contributing Value (Map [(,Map [(\"\",2500000)])])"
Slot 1: W[2]: Signing tx: 44ec5da42a6248423e49f52418911a38241a3dbc425e4eebfc9029655710e91d
Slot 1: W[2]: Submitting tx: 44ec5da42a6248423e49f52418911a38241a3dbc425e4eebfc9029655710e91d
Slot 1: W[2]: TxSubmit: 44ec5da42a6248423e49f52418911a38241a3dbc425e4eebfc9029655710e91d
>>>>>>> 7f2d304fd (PLT-774: Collateral output (#740))
Slot 1: W[3]: Balancing an unbalanced transaction:
Tx:
Tx 2af78a497f8337036d66de2f386a82e89330b7a9efb4f6c1564a578789d31340:
Expand All @@ -89,7 +114,11 @@ Slot 1: W[3]: Balancing an unbalanced transaction:
Requires signatures:
Utxo index:
Slot 1: W[3]: Finished balancing:
<<<<<<< HEAD
Tx e7b3a7188ad64c00b7b48f75af4359fdcffa03b6b998f6896618194c5018b951:
=======
Tx d1105c090a831de239c7e2be238e5839c941ca5b24f6cd2b6aa3c9e712e9f2c8:
>>>>>>> 7f2d304fd (PLT-774: Collateral output (#740))
{inputs:
- 43ba666cc8a22a04b63a3b605ce14146dfa5ed999986625ad90c1bc16dabdd84!0

Expand All @@ -101,18 +130,35 @@ Slot 1: W[3]: Finished balancing:
- Value (Map [(,Map [("",10000000)])]) addressed to
ScriptCredential: 016307ebfed4ec71e34605fbc2151a22e9eaa310ce3aed53bc481450 (no staking credential)
with datum hash 2cc2afd267462229babbc139837611310e4307bd6c7e870049c22fb02c2ad122
<<<<<<< HEAD
- Value (Map [(,Map [("",9823763)])]) addressed to
PubKeyCredential: 2e0ad60c3207248cecd47dbde3d752e0aad141d6b8f81ac2c6eca27c (no staking credential)
mint: Value (Map [])
fee: Value (Map [(,Map [("",176237)])])
=======
- Value (Map [(,Map [("",9815623)])]) addressed to
PubKeyCredential: 2e0ad60c3207248cecd47dbde3d752e0aad141d6b8f81ac2c6eca27c (no staking credential)
return collateral:
- Value (Map [(,Map [("",9723434)])]) addressed to
PubKeyCredential: 2e0ad60c3207248cecd47dbde3d752e0aad141d6b8f81ac2c6eca27c (no staking credential)
total collateral: Value (Map [(,Map [("",276566)])])
mint: Value (Map [])
fee: Value (Map [(,Map [("",184377)])])
>>>>>>> 7f2d304fd (PLT-774: Collateral output (#740))
validity range: Interval {ivFrom = LowerBound NegInf True, ivTo = UpperBound (Finite (Slot {getSlot = 20})) False}
data:
( 2cc2afd267462229babbc139837611310e4307bd6c7e870049c22fb02c2ad122
, ".\n\214\f2\a$\140\236\212}\189\227\215R\224\170\209A\214\184\248\SUB\194\198\236\162|" )
redeemers:}
<<<<<<< HEAD
Slot 1: W[3]: Signing tx: e7b3a7188ad64c00b7b48f75af4359fdcffa03b6b998f6896618194c5018b951
Slot 1: W[3]: Submitting tx: e7b3a7188ad64c00b7b48f75af4359fdcffa03b6b998f6896618194c5018b951
Slot 1: W[3]: TxSubmit: e7b3a7188ad64c00b7b48f75af4359fdcffa03b6b998f6896618194c5018b951
=======
Slot 1: W[3]: Signing tx: d1105c090a831de239c7e2be238e5839c941ca5b24f6cd2b6aa3c9e712e9f2c8
Slot 1: W[3]: Submitting tx: d1105c090a831de239c7e2be238e5839c941ca5b24f6cd2b6aa3c9e712e9f2c8
Slot 1: W[3]: TxSubmit: d1105c090a831de239c7e2be238e5839c941ca5b24f6cd2b6aa3c9e712e9f2c8
>>>>>>> 7f2d304fd (PLT-774: Collateral output (#740))
Slot 1: W[4]: Balancing an unbalanced transaction:
Tx:
Tx 3b0e529aa25b8106a65a739c8547d5273e278a22bc07d6262c7e14ddd2e5ba6c:
Expand All @@ -134,7 +180,11 @@ Slot 1: W[4]: Balancing an unbalanced transaction:
Requires signatures:
Utxo index:
Slot 1: W[4]: Finished balancing:
<<<<<<< HEAD
Tx dd5fe9c105905d0fde03fded09d9ffc26138e1dcbc982978f6828e9117b6aa58:
=======
Tx a67f656d33fdc4f1d818e744b343c33163d04deb2e5d08637590d03c2e79071b:
>>>>>>> 7f2d304fd (PLT-774: Collateral output (#740))
{inputs:
- 43ba666cc8a22a04b63a3b605ce14146dfa5ed999986625ad90c1bc16dabdd84!10

Expand All @@ -144,32 +194,62 @@ Slot 1: W[4]: Finished balancing:
- Value (Map [(,Map [("",2500000)])]) addressed to
ScriptCredential: 016307ebfed4ec71e34605fbc2151a22e9eaa310ce3aed53bc481450 (no staking credential)
with datum hash 63f4305deedb48449f218150b39eceb8d5951aa680e28a414024bc4c04758969
<<<<<<< HEAD
- Value (Map [(,Map [("",7329791)])]) addressed to
PubKeyCredential: 557d23c0a533b4d295ac2dc14b783a7efc293bc23ede88a6fefd203d (no staking credential)
mint: Value (Map [])
fee: Value (Map [(,Map [("",170209)])])
=======
- Value (Map [(,Map [("",7321651)])]) addressed to
PubKeyCredential: 557d23c0a533b4d295ac2dc14b783a7efc293bc23ede88a6fefd203d (no staking credential)
return collateral:
- Value (Map [(,Map [("",9732476)])]) addressed to
PubKeyCredential: 557d23c0a533b4d295ac2dc14b783a7efc293bc23ede88a6fefd203d (no staking credential)
total collateral: Value (Map [(,Map [("",267524)])])
mint: Value (Map [])
fee: Value (Map [(,Map [("",178349)])])
>>>>>>> 7f2d304fd (PLT-774: Collateral output (#740))
validity range: Interval {ivFrom = LowerBound NegInf True, ivTo = UpperBound (Finite (Slot {getSlot = 20})) False}
data:
( 63f4305deedb48449f218150b39eceb8d5951aa680e28a414024bc4c04758969
, "U}#\192\165\&3\180\210\149\172-\193Kx:~\252);\194>\222\136\166\254\253 =" )
redeemers:}
<<<<<<< HEAD
Slot 1: W[4]: Signing tx: dd5fe9c105905d0fde03fded09d9ffc26138e1dcbc982978f6828e9117b6aa58
Slot 1: W[4]: Submitting tx: dd5fe9c105905d0fde03fded09d9ffc26138e1dcbc982978f6828e9117b6aa58
Slot 1: W[4]: TxSubmit: dd5fe9c105905d0fde03fded09d9ffc26138e1dcbc982978f6828e9117b6aa58
Slot 1: TxnValidate dd5fe9c105905d0fde03fded09d9ffc26138e1dcbc982978f6828e9117b6aa58 [ ]
Slot 1: TxnValidate e7b3a7188ad64c00b7b48f75af4359fdcffa03b6b998f6896618194c5018b951 [ ]
Slot 1: TxnValidate f22ad19506e8360e3fa3deb52c23cd9df14b78639828a18762ed99493c14cdfe [ ]
=======
Slot 1: W[4]: Signing tx: a67f656d33fdc4f1d818e744b343c33163d04deb2e5d08637590d03c2e79071b
Slot 1: W[4]: Submitting tx: a67f656d33fdc4f1d818e744b343c33163d04deb2e5d08637590d03c2e79071b
Slot 1: W[4]: TxSubmit: a67f656d33fdc4f1d818e744b343c33163d04deb2e5d08637590d03c2e79071b
Slot 1: TxnValidate a67f656d33fdc4f1d818e744b343c33163d04deb2e5d08637590d03c2e79071b
Slot 1: TxnValidate d1105c090a831de239c7e2be238e5839c941ca5b24f6cd2b6aa3c9e712e9f2c8
Slot 1: TxnValidate 44ec5da42a6248423e49f52418911a38241a3dbc425e4eebfc9029655710e91d
>>>>>>> 7f2d304fd (PLT-774: Collateral output (#740))
Slot 20: 00000000-0000-4000-8000-000000000000 {Wallet W[1]}:
Contract log: String "Collecting funds"
Slot 20: W[1]: Balancing an unbalanced transaction:
Tx:
<<<<<<< HEAD
Tx 3d0d7fbe8bf2c3081406a59bcaa85cc9245fee6ac86cd1d36df9d88548d9b0cc:
{inputs:
- f22ad19506e8360e3fa3deb52c23cd9df14b78639828a18762ed99493c14cdfe!0
<>
- e7b3a7188ad64c00b7b48f75af4359fdcffa03b6b998f6896618194c5018b951!0
<>
- dd5fe9c105905d0fde03fded09d9ffc26138e1dcbc982978f6828e9117b6aa58!0
=======
Tx 8bdc128e4d390bd7da6e25ed61050ca7f91f674418d8604cfe356f2b21a5a8f5:
{inputs:
- d1105c090a831de239c7e2be238e5839c941ca5b24f6cd2b6aa3c9e712e9f2c8!0
<>
- a67f656d33fdc4f1d818e744b343c33163d04deb2e5d08637590d03c2e79071b!0
<>
- 44ec5da42a6248423e49f52418911a38241a3dbc425e4eebfc9029655710e91d!0
>>>>>>> 7f2d304fd (PLT-774: Collateral output (#740))
<>
reference inputs:
collateral inputs:
Expand All @@ -192,6 +272,7 @@ Slot 20: W[1]: Balancing an unbalanced transaction:
Requires signatures:
a2c20c77887ace1cd986193e4e75babd8993cfd56995cd5cfce609c2
Utxo index:
<<<<<<< HEAD
( dd5fe9c105905d0fde03fded09d9ffc26138e1dcbc982978f6828e9117b6aa58!0
, - Value (Map [(,Map [("",2500000)])]) addressed to
ScriptCredential: 016307ebfed4ec71e34605fbc2151a22e9eaa310ce3aed53bc481450 (no staking credential)
Expand All @@ -212,12 +293,35 @@ Slot 20: W[1]: Finished balancing:
- e7b3a7188ad64c00b7b48f75af4359fdcffa03b6b998f6896618194c5018b951!0

- f22ad19506e8360e3fa3deb52c23cd9df14b78639828a18762ed99493c14cdfe!0
=======
( 44ec5da42a6248423e49f52418911a38241a3dbc425e4eebfc9029655710e91d!0
, - Value (Map [(,Map [("",10000000)])]) addressed to
ScriptCredential: dbf5886c23bd2aade401340003b0c45a44d40aab13b18c6f739d6937 (no staking credential)
with datum hash 77ab184b7537cd4b1dc3730f6a8a76a3d3aad1642fae9d769aa5dae40be38b51 )
( a67f656d33fdc4f1d818e744b343c33163d04deb2e5d08637590d03c2e79071b!0
, - Value (Map [(,Map [("",2500000)])]) addressed to
ScriptCredential: dbf5886c23bd2aade401340003b0c45a44d40aab13b18c6f739d6937 (no staking credential)
with datum hash 63f4305deedb48449f218150b39eceb8d5951aa680e28a414024bc4c04758969 )
( d1105c090a831de239c7e2be238e5839c941ca5b24f6cd2b6aa3c9e712e9f2c8!0
, - Value (Map [(,Map [("",10000000)])]) addressed to
ScriptCredential: dbf5886c23bd2aade401340003b0c45a44d40aab13b18c6f739d6937 (no staking credential)
with datum hash 2cc2afd267462229babbc139837611310e4307bd6c7e870049c22fb02c2ad122 )
Slot 20: W[1]: Finished balancing:
Tx 77275b36feb7e278b4d21350576b2ab4cff4a15f191b848ae8916e207397db77:
{inputs:
- 44ec5da42a6248423e49f52418911a38241a3dbc425e4eebfc9029655710e91d!0

- a67f656d33fdc4f1d818e744b343c33163d04deb2e5d08637590d03c2e79071b!0

- d1105c090a831de239c7e2be238e5839c941ca5b24f6cd2b6aa3c9e712e9f2c8!0
>>>>>>> 7f2d304fd (PLT-774: Collateral output (#740))

reference inputs:
collateral inputs:
- 43ba666cc8a22a04b63a3b605ce14146dfa5ed999986625ad90c1bc16dabdd84!50

outputs:
<<<<<<< HEAD
- Value (Map [(,Map [("",22030230)])]) addressed to
PubKeyCredential: a2c20c77887ace1cd986193e4e75babd8993cfd56995cd5cfce609c2 (no staking credential)
return collateral:
Expand All @@ -227,6 +331,17 @@ Slot 20: W[1]: Finished balancing:
mint: Value (Map [])
fee: Value (Map [(,Map [("",469770)])])
validity range: Interval {ivFrom = LowerBound (Finite (Slot {getSlot = 20})) True, ivTo = UpperBound (Finite (Slot {getSlot = 30})) False}
=======
- Value (Map [(,Map [("",22029613)])]) addressed to
PubKeyCredential: a2c20c77887ace1cd986193e4e75babd8993cfd56995cd5cfce609c2 (no staking credential)
return collateral:
- Value (Map [(,Map [("",9294419)])]) addressed to
PubKeyCredential: a2c20c77887ace1cd986193e4e75babd8993cfd56995cd5cfce609c2 (no staking credential)
total collateral: Value (Map [(,Map [("",705581)])])
mint: Value (Map [])
fee: Value (Map [(,Map [("",470387)])])
validity range: Interval {ivFrom = LowerBound (Finite (Slot {getSlot = 20})) True, ivTo = UpperBound (Finite (Slot {getSlot = 29})) False}
>>>>>>> 7f2d304fd (PLT-774: Collateral output (#740))
data:
( 2cc2afd267462229babbc139837611310e4307bd6c7e870049c22fb02c2ad122
, ".\n\214\f2\a$\140\236\212}\189\227\215R\224\170\209A\214\184\248\SUB\194\198\236\162|" )
Expand All @@ -235,9 +350,18 @@ Slot 20: W[1]: Finished balancing:
( 77ab184b7537cd4b1dc3730f6a8a76a3d3aad1642fae9d769aa5dae40be38b51
, "\128\164\244[V\184\141\DC19\218#\188L<u\236m2\148<\b\DEL%\v\134\EM<\167" )
redeemers:}
<<<<<<< HEAD
Slot 20: W[1]: Signing tx: 8847f6867d48315673c259fd391c83f7e88f2f88bf20d5bf5a32fea19511fb24
Slot 20: W[1]: Submitting tx: 8847f6867d48315673c259fd391c83f7e88f2f88bf20d5bf5a32fea19511fb24
Slot 20: W[1]: TxSubmit: 8847f6867d48315673c259fd391c83f7e88f2f88bf20d5bf5a32fea19511fb24
Slot 20: 00000000-0000-4000-8000-000000000000 {Wallet W[1]}:
Contract instance stopped (no errors)
Slot 20: TxnValidate 8847f6867d48315673c259fd391c83f7e88f2f88bf20d5bf5a32fea19511fb24 [ ]
Slot 20: TxnValidate 8847f6867d48315673c259fd391c83f7e88f2f88bf20d5bf5a32fea19511fb24 [ ]
=======
Slot 20: W[1]: Signing tx: 77275b36feb7e278b4d21350576b2ab4cff4a15f191b848ae8916e207397db77
Slot 20: W[1]: Submitting tx: 77275b36feb7e278b4d21350576b2ab4cff4a15f191b848ae8916e207397db77
Slot 20: W[1]: TxSubmit: 77275b36feb7e278b4d21350576b2ab4cff4a15f191b848ae8916e207397db77
Slot 20: 00000000-0000-4000-8000-000000000000 {Wallet W[1]}:
Contract instance stopped (no errors)
Slot 20: TxnValidate 77275b36feb7e278b4d21350576b2ab4cff4a15f191b848ae8916e207397db77
>>>>>>> 7f2d304fd (PLT-774: Collateral output (#740))
Loading

0 comments on commit d917c4c

Please sign in to comment.