Skip to content

Commit

Permalink
Fix
Browse files Browse the repository at this point in the history
  • Loading branch information
@michaelpj
michaelpj committed Jun 8, 2021
1 parent a23968c commit 49960d1
Show file tree
Hide file tree
Showing 3 changed files with 51 additions and 51 deletions.
2 changes: 1 addition & 1 deletion plutus-playground-server/usecases/Crowdfunding.hs
View file
Expand Up @@ -30,7 +30,7 @@ import qualified Ledger.Interval as Interval
import qualified Ledger.Scripts as Scripts
import Ledger.Slot (Slot, SlotRange)
import qualified Ledger.TimeSlot as TimeSlot
import qualified Ledger.Typed.Scripts as Scripts
import qualified Ledger.Typed.Scripts as Scripts hiding (validatorHash)
import Ledger.Value (Value)
import Playground.Contract
import Plutus.Contract
Expand Down
4 changes: 2 additions & 2 deletions plutus-playground-server/usecases/Starter.hs
View file
Expand Up @@ -27,7 +27,7 @@ module Starter where
-- * redeem

import Control.Monad (void)
import Ledger (Address, ScriptContext, scriptAddress)
import Ledger (Address, ScriptContext)
import qualified Ledger.Constraints as Constraints
import qualified Ledger.Typed.Scripts as Scripts
import Ledger.Value (Value)
Expand All @@ -51,7 +51,7 @@ validateSpend _myDataValue _myRedeemerValue _ = error () -- Please provide an im

-- | The address of the contract (the hash of its validator script).
contractAddress :: Address
contractAddress = Script.validatorAddress starterInstance
contractAddress = Scripts.validatorAddress starterInstance

data Starter
instance Scripts.ValidatorTypes Starter where
Expand Down
96 changes: 48 additions & 48 deletions plutus-use-cases/test/Spec/renderGuess.txt
View file
Expand Up @@ -101,11 +101,11 @@ Balances Carried Forward:
Ada: Lovelace: 100000000

==== Slot #1, Tx #0 ====
TxId: 61459f3df63cab719fc3f39ff8421664d20da13bdd3f04ce61bf42ca5fb16d76
TxId: 4b42bb92ea6de18e2b3c0153618c713ed9c01b76eeabb8dbe4cb14073df47374
Fee: Ada: Lovelace: 10
Forge: -
Signatures PubKey: d75a980182b10ab7d54bfed3c964073a0ee172f3...
Signature: 584035411149327591f1f58d9298a38f853ab7ac...
Signature: 5840d0148584c9c7045cbded8a315df71a29a753...
Inputs:
---- Input 0 ----
Destination: PubKeyHash: 21fe31dfa154a261626bf854046fd2271b7bed4b... (Wallet 1)
Expand Down Expand Up @@ -175,18 +175,18 @@ Balances Carried Forward:
Ada: Lovelace: 8

==== Slot #2, Tx #0 ====
TxId: 8f7fa2645c2c43534f64b4672b3d8a28eebd7e91de2d1794db08913548f1a89e
Fee: Ada: Lovelace: 20957
Forge: d1970901878f8ae6aa6085a561b6fe3d4e7d98a8c032ac9b114177d553e5336a: guess: 1
TxId: 9d63f1e34178459b0a4f1d921a0acbd55ba74658d4781773387107bafd66f474
Fee: Ada: Lovelace: 20996
Forge: 42a8817ce0ffa47192c8a67e620841cabf7b556ab3b412a0910a9ac84d564dcd: guess: 1
Signatures PubKey: d75a980182b10ab7d54bfed3c964073a0ee172f3...
Signature: 5840c451e9660cc1441dd6393c73159495b969c9...
Signature: 584040e56ab2e0747e7038ae8d677a7b60fdaa68...
Inputs:
---- Input 0 ----
Destination: PubKeyHash: 21fe31dfa154a261626bf854046fd2271b7bed4b... (Wallet 1)
Value:
Ada: Lovelace: 99999982
Source:
Tx: 61459f3df63cab719fc3f39ff8421664d20da13bdd3f04ce61bf42ca5fb16d76
Tx: 4b42bb92ea6de18e2b3c0153618c713ed9c01b76eeabb8dbe4cb14073df47374
Output #0


Expand All @@ -195,7 +195,7 @@ Inputs:
Value:
Ada: Lovelace: 8
Source:
Tx: 61459f3df63cab719fc3f39ff8421664d20da13bdd3f04ce61bf42ca5fb16d76
Tx: 4b42bb92ea6de18e2b3c0153618c713ed9c01b76eeabb8dbe4cb14073df47374
Output #1
Script: 593d000100003320033200200332002003332002...

Expand All @@ -204,13 +204,13 @@ Outputs:
---- Output 0 ----
Destination: PubKeyHash: 21fe31dfa154a261626bf854046fd2271b7bed4b... (Wallet 1)
Value:
Ada: Lovelace: 99979025
d1970901878f8ae6aa6085a561b6fe3d4e7d98a8c032ac9b114177d553e5336a: -
Ada: Lovelace: 99978986
42a8817ce0ffa47192c8a67e620841cabf7b556ab3b412a0910a9ac84d564dcd: -

---- Output 1 ----
Destination: PubKeyHash: 21fe31dfa154a261626bf854046fd2271b7bed4b... (Wallet 1)
Value:
d1970901878f8ae6aa6085a561b6fe3d4e7d98a8c032ac9b114177d553e5336a: guess: 1
42a8817ce0ffa47192c8a67e620841cabf7b556ab3b412a0910a9ac84d564dcd: guess: 1
Ada: -

---- Output 2 ----
Expand All @@ -222,8 +222,8 @@ Outputs:
Balances Carried Forward:
PubKeyHash: 21fe31dfa154a261626bf854046fd2271b7bed4b... (Wallet 1)
Value:
Ada: Lovelace: 99979025
d1970901878f8ae6aa6085a561b6fe3d4e7d98a8c032ac9b114177d553e5336a: guess: 1
Ada: Lovelace: 99978986
42a8817ce0ffa47192c8a67e620841cabf7b556ab3b412a0910a9ac84d564dcd: guess: 1

PubKeyHash: 39f713d0a644253f04529421b9f51b9b08979d08... (Wallet 2)
Value:
Expand Down Expand Up @@ -266,29 +266,29 @@ Balances Carried Forward:
Ada: Lovelace: 8

==== Slot #3, Tx #0 ====
TxId: d93c4fb96c9892b432408a85c79c5cc8f7d2030771e8d02922cec6291b57e4b8
TxId: 359fd426392a6ef0e770033041df4fd7481cf365d401958f4aeb330a3e6176c1
Fee: Ada: Lovelace: 10
Forge: -
Signatures PubKey: d75a980182b10ab7d54bfed3c964073a0ee172f3...
Signature: 58402c4040f3f66ffbacd936925e3586a91ea470...
Signature: 58401dd5cbbd25ce56de509436650409bef828d2...
Inputs:
---- Input 0 ----
Destination: PubKeyHash: 21fe31dfa154a261626bf854046fd2271b7bed4b... (Wallet 1)
Value:
Ada: Lovelace: 99979025
d1970901878f8ae6aa6085a561b6fe3d4e7d98a8c032ac9b114177d553e5336a: -
Ada: Lovelace: 99978986
42a8817ce0ffa47192c8a67e620841cabf7b556ab3b412a0910a9ac84d564dcd: -
Source:
Tx: 8f7fa2645c2c43534f64b4672b3d8a28eebd7e91de2d1794db08913548f1a89e
Tx: 9d63f1e34178459b0a4f1d921a0acbd55ba74658d4781773387107bafd66f474
Output #0


---- Input 1 ----
Destination: PubKeyHash: 21fe31dfa154a261626bf854046fd2271b7bed4b... (Wallet 1)
Value:
d1970901878f8ae6aa6085a561b6fe3d4e7d98a8c032ac9b114177d553e5336a: guess: 1
42a8817ce0ffa47192c8a67e620841cabf7b556ab3b412a0910a9ac84d564dcd: guess: 1
Ada: -
Source:
Tx: 8f7fa2645c2c43534f64b4672b3d8a28eebd7e91de2d1794db08913548f1a89e
Tx: 9d63f1e34178459b0a4f1d921a0acbd55ba74658d4781773387107bafd66f474
Output #1


Expand All @@ -297,25 +297,25 @@ Outputs:
---- Output 0 ----
Destination: PubKeyHash: 39f713d0a644253f04529421b9f51b9b08979d08... (Wallet 2)
Value:
d1970901878f8ae6aa6085a561b6fe3d4e7d98a8c032ac9b114177d553e5336a: guess: 1
42a8817ce0ffa47192c8a67e620841cabf7b556ab3b412a0910a9ac84d564dcd: guess: 1

---- Output 1 ----
Destination: PubKeyHash: 21fe31dfa154a261626bf854046fd2271b7bed4b... (Wallet 1)
Value:
Ada: Lovelace: 99979015
d1970901878f8ae6aa6085a561b6fe3d4e7d98a8c032ac9b114177d553e5336a: guess: 0
Ada: Lovelace: 99978976
42a8817ce0ffa47192c8a67e620841cabf7b556ab3b412a0910a9ac84d564dcd: guess: 0


Balances Carried Forward:
PubKeyHash: 21fe31dfa154a261626bf854046fd2271b7bed4b... (Wallet 1)
Value:
Ada: Lovelace: 99979015
d1970901878f8ae6aa6085a561b6fe3d4e7d98a8c032ac9b114177d553e5336a: guess: 0
Ada: Lovelace: 99978976
42a8817ce0ffa47192c8a67e620841cabf7b556ab3b412a0910a9ac84d564dcd: guess: 0

PubKeyHash: 39f713d0a644253f04529421b9f51b9b08979d08... (Wallet 2)
Value:
Ada: Lovelace: 100000000
d1970901878f8ae6aa6085a561b6fe3d4e7d98a8c032ac9b114177d553e5336a: guess: 1
42a8817ce0ffa47192c8a67e620841cabf7b556ab3b412a0910a9ac84d564dcd: guess: 1

PubKeyHash: 75d264df8f4b72686438783c8524673d2a5ae9ac... (Wallet 5)
Value:
Expand Down Expand Up @@ -354,22 +354,31 @@ Balances Carried Forward:
Ada: Lovelace: 8

==== Slot #4, Tx #0 ====
TxId: f3c4fc8ecbb56918876a3defb333dcaf475e70ee0de8fef09702c3d781289c07
Fee: Ada: Lovelace: 22264
Forge: d1970901878f8ae6aa6085a561b6fe3d4e7d98a8c032ac9b114177d553e5336a: guess: 0
TxId: 69a6b06ee4128f16c8a240d9429dc557ee5debc97c00ed1afb90a11820622a1f
Fee: Ada: Lovelace: 21661
Forge: 42a8817ce0ffa47192c8a67e620841cabf7b556ab3b412a0910a9ac84d564dcd: guess: 0
Signatures PubKey: 3d4017c3e843895a92b70aa74d1b7ebc9c982ccf...
Signature: 5840d1a8a6038af413ffeffd6cb1c2759dc072c8...
Signature: 5840c5cf61cde8f180997b8dd6631e1ec4e657dc...
Inputs:
---- Input 0 ----
Destination: PubKeyHash: 39f713d0a644253f04529421b9f51b9b08979d08... (Wallet 2)
Value:
42a8817ce0ffa47192c8a67e620841cabf7b556ab3b412a0910a9ac84d564dcd: guess: 1
Source:
Tx: 359fd426392a6ef0e770033041df4fd7481cf365d401958f4aeb330a3e6176c1
Output #0


---- Input 1 ----
Destination: Script: a1229b3c233b276767017e5f0682e323b695808699bc81d3aaf8695b3674b515
Value:
Ada: Lovelace: 8
Source:
Tx: 8f7fa2645c2c43534f64b4672b3d8a28eebd7e91de2d1794db08913548f1a89e
Tx: 9d63f1e34178459b0a4f1d921a0acbd55ba74658d4781773387107bafd66f474
Output #2
Script: 593d000100003320033200200332002003332002...

---- Input 1 ----
---- Input 2 ----
Destination: PubKeyHash: 39f713d0a644253f04529421b9f51b9b08979d08... (Wallet 2)
Value:
Ada: Lovelace: 100000000
Expand All @@ -378,27 +387,18 @@ Inputs:
Output #1


---- Input 2 ----
Destination: PubKeyHash: 39f713d0a644253f04529421b9f51b9b08979d08... (Wallet 2)
Value:
d1970901878f8ae6aa6085a561b6fe3d4e7d98a8c032ac9b114177d553e5336a: guess: 1
Source:
Tx: d93c4fb96c9892b432408a85c79c5cc8f7d2030771e8d02922cec6291b57e4b8
Output #0



Outputs:
---- Output 0 ----
Destination: PubKeyHash: 39f713d0a644253f04529421b9f51b9b08979d08... (Wallet 2)
Value:
Ada: Lovelace: 99977739
d1970901878f8ae6aa6085a561b6fe3d4e7d98a8c032ac9b114177d553e5336a: guess: 0
42a8817ce0ffa47192c8a67e620841cabf7b556ab3b412a0910a9ac84d564dcd: guess: 0
Ada: Lovelace: 99978342

---- Output 1 ----
Destination: PubKeyHash: 39f713d0a644253f04529421b9f51b9b08979d08... (Wallet 2)
Value:
d1970901878f8ae6aa6085a561b6fe3d4e7d98a8c032ac9b114177d553e5336a: guess: 1
42a8817ce0ffa47192c8a67e620841cabf7b556ab3b412a0910a9ac84d564dcd: guess: 1
Ada: -

---- Output 2 ----
Expand All @@ -410,13 +410,13 @@ Outputs:
Balances Carried Forward:
PubKeyHash: 21fe31dfa154a261626bf854046fd2271b7bed4b... (Wallet 1)
Value:
Ada: Lovelace: 99979015
d1970901878f8ae6aa6085a561b6fe3d4e7d98a8c032ac9b114177d553e5336a: guess: 0
Ada: Lovelace: 99978976
42a8817ce0ffa47192c8a67e620841cabf7b556ab3b412a0910a9ac84d564dcd: guess: 0

PubKeyHash: 39f713d0a644253f04529421b9f51b9b08979d08... (Wallet 2)
Value:
Ada: Lovelace: 99977739
d1970901878f8ae6aa6085a561b6fe3d4e7d98a8c032ac9b114177d553e5336a: guess: 1
Ada: Lovelace: 99978342
42a8817ce0ffa47192c8a67e620841cabf7b556ab3b412a0910a9ac84d564dcd: guess: 1

PubKeyHash: 75d264df8f4b72686438783c8524673d2a5ae9ac... (Wallet 5)
Value:
Expand Down

0 comments on commit 49960d1

Please sign in to comment.