Skip to content
This repository was archived by the owner on Dec 2, 2024. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
b7ad431
First draft done for plutus-ledger
berewt Sep 2, 2022
b83b581
plutus-ledger-constraints use Cardano.Tx
berewt Sep 5, 2022
5aebafc
use C.Tx in plutus-tx-constraints
berewt Sep 5, 2022
7254551
plutus-chain-index uses C.TxOut
berewt Sep 5, 2022
4be8dae
Forgot to add file
berewt Sep 6, 2022
74e92bd
Fixing my mess with CardanoAPI
berewt Sep 6, 2022
af27776
encoding via plutus.TxOut (can't work, no NetworkId)
berewt Sep 6, 2022
bfb14b6
Fix code for the use cases
berewt Sep 6, 2022
24f67e7
Merge branch 'next-node' into cardano-txout
berewt Sep 6, 2022
310dee9
Fix a bug in balanceTx
berewt Sep 7, 2022
822f246
Fix 0 ada outputs error
berewt Sep 7, 2022
b766775
Dirty fix for the uniswap check
berewt Sep 8, 2022
59943eb
Use Cardano.Tx txId
berewt Sep 8, 2022
4bbc0af
fix uniswap test
berewt Sep 9, 2022
29c847b
Merge branch 'next-node' into cardano-txout
berewt Sep 12, 2022
8bafd0c
Fix double satisfaction
berewt Sep 12, 2022
894d71c
Fix Marconi
berewt Sep 12, 2022
1b858a9
Add TxOut typeclasses
berewt Sep 12, 2022
ec73205
Remove unused imports
berewt Sep 12, 2022
b874c49
Fix failing tests
berewt Sep 13, 2022
d73532d
Clean import
berewt Sep 13, 2022
aa5d5ab
Fix pab
berewt Sep 13, 2022
0b7ca8b
Fix golden values
berewt Sep 13, 2022
3ad460c
Fix golden test
berewt Sep 13, 2022
ea406b2
Merge branch 'next-node' into cardano-txout
berewt Sep 13, 2022
1f5f6fe
Fix more plutus packages
berewt Sep 13, 2022
85ab824
Rmove useless param from ChainIndex.Lib
berewt Sep 13, 2022
9448325
Fik playground
berewt Sep 14, 2022
695c585
Remove commented code
berewt Sep 14, 2022
4be2698
Include several fixes following Konstantinos' review
berewt Sep 14, 2022
4b3f359
Add a Pretty TxOut and clean uniswap
berewt Sep 14, 2022
48f0d05
Remove useless stuff in playground
berewt Sep 14, 2022
ed75e26
error in generators display the original cause
berewt Sep 14, 2022
c4ed8b3
Fix imports
berewt Sep 14, 2022
0746ba3
prettier pretty
berewt Sep 15, 2022
f4b632e
Fix golden tests
berewt Sep 15, 2022
07b69c3
Fix uniswap
berewt Sep 15, 2022
c3b7fbf
Fix golden tests
berewt Sep 15, 2022
6e31cc5
Restore deleted constraints
berewt Sep 16, 2022
fe8b6eb
Integrate more Sjoerd's comments
berewt Sep 19, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix code for the use cases
  • Loading branch information
berewt committed Sep 6, 2022
commit bfb14b68c5962af6b142ab6c80efd9e60d3fe11c
4 changes: 3 additions & 1 deletion plutus-contract/test/Spec/Balancing.hs
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,9 @@ balanceTxnMinAda2 =
wallet2Contract :: Contract () EmptySchema ContractError ()
wallet2Contract = do
utxos <- utxosAt someAddress
let txOutRef = head (Map.keys utxos)
let txOutRef = case (Map.keys utxos) of
(x:_) -> x
[] -> error "can't find given address"
lookups = L.Constraints.unspentOutputs utxos
<> L.Constraints.plutusV1OtherScript someValidator
<> L.Constraints.plutusV1MintingPolicy mps
Expand Down
2 changes: 1 addition & 1 deletion plutus-use-cases/src/Plutus/Contracts/PubKey.hs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import GHC.Generics (Generic)
import Ledger hiding (initialise, to)
import Ledger.Typed.Scripts (TypedValidator)
import Ledger.Typed.Scripts qualified as Scripts
import Plutus.V1.Ledger.Contexts as V
import Plutus.V1.Ledger.Contexts qualified as V
import PlutusTx qualified

import Ledger.Constraints qualified as Constraints
Expand Down