Skip to content

Commit

Permalink
Convert more Value to Lovelace (#5698)
Browse files Browse the repository at this point in the history 
Fixes #5696
  • Loading branch information
@michaelpj
michaelpj authored Jan 4, 2024
1 parent c776fe7 commit 7e891f2
Show file tree
Hide file tree
Showing 10 changed files with 135 additions and 297 deletions.
4 changes: 2 additions & 2 deletions plutus-benchmark/script-contexts/test/9.6/checkScriptContext1-20.eval.golden
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
({cpu: 383549775
| mem: 1183463})
({cpu: 383342775
| mem: 1182563})
4 changes: 2 additions & 2 deletions plutus-benchmark/script-contexts/test/9.6/checkScriptContext1-4.eval.golden
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
({cpu: 115410543
| mem: 359239})
({cpu: 115203543
| mem: 358339})
195 changes: 56 additions & 139 deletions plutus-benchmark/script-contexts/test/9.6/checkScriptContext1.pir.golden
View file
Original file line number Diff line number Diff line change
Expand Up @@ -266,55 +266,6 @@
{all dead. dead})
{all dead. dead})
{all dead. dead}
!`$fUnsafeFromDataMap_$cunsafeFromBuiltinData` :
all k v.
(\a -> data -> a) k ->
(\a -> data -> a) v ->
data ->
(\k v -> List (Tuple2 k v)) k v
= /\k v ->
\(`$dUnsafeFromData` : (\a -> data -> a) k)
(`$dUnsafeFromData` : (\a -> data -> a) v) ->
letrec
!go : list (pair data data) -> List (Tuple2 k v)
= \(l : list (pair data data)) ->
chooseList
{pair data data}
{Unit -> List (Tuple2 k v)}
l
(\(ds : Unit) -> Nil {Tuple2 k v})
(\(ds : Unit) ->
let
!tup : pair data data = headList {pair data data} l
in
Cons
{Tuple2 k v}
(Tuple2
{k}
{v}
(`$dUnsafeFromData` (fstPair {data} {data} tup))
(`$dUnsafeFromData` (sndPair {data} {data} tup)))
(go (tailList {pair data data} l)))
Unit
in
\(d : data) -> go (unMapData d)
~`$fUnsafeFromDataValue` :
data -> (\k v -> List (Tuple2 k v)) bytestring integer
= `$fUnsafeFromDataMap_$cunsafeFromBuiltinData`
{bytestring}
{integer}
unBData
unIData
~`$fUnsafeFromDataValue` :
data ->
(\k v -> List (Tuple2 k v))
bytestring
((\k v -> List (Tuple2 k v)) bytestring integer)
= `$fUnsafeFromDataMap_$cunsafeFromBuiltinData`
{bytestring}
{(\k v -> List (Tuple2 k v)) bytestring integer}
unBData
`$fUnsafeFromDataValue`
!`$fUnsafeFromDataMaybe_$cunsafeFromBuiltinData` :
all a. (\a -> data -> a) a -> data -> Maybe a
= /\a ->
Expand Down Expand Up @@ -342,40 +293,12 @@
TxCertDelegStaking : Credential -> Delegatee -> TxCert
TxCertPoolRegister : bytestring -> bytestring -> TxCert
TxCertPoolRetire : bytestring -> integer -> TxCert
TxCertRegDRep :
Credential ->
(\k v -> List (Tuple2 k v))
bytestring
((\k v -> List (Tuple2 k v)) bytestring integer) ->
TxCert
TxCertRegDeleg :
Credential ->
Delegatee ->
(\k v -> List (Tuple2 k v))
bytestring
((\k v -> List (Tuple2 k v)) bytestring integer) ->
TxCert
TxCertRegStaking :
Credential ->
Maybe
((\k v -> List (Tuple2 k v))
bytestring
((\k v -> List (Tuple2 k v)) bytestring integer)) ->
TxCert
TxCertRegDRep : Credential -> integer -> TxCert
TxCertRegDeleg : Credential -> Delegatee -> integer -> TxCert
TxCertRegStaking : Credential -> Maybe integer -> TxCert
TxCertResignColdCommittee : Credential -> TxCert
TxCertUnRegDRep :
Credential ->
(\k v -> List (Tuple2 k v))
bytestring
((\k v -> List (Tuple2 k v)) bytestring integer) ->
TxCert
TxCertUnRegStaking :
Credential ->
Maybe
((\k v -> List (Tuple2 k v))
bytestring
((\k v -> List (Tuple2 k v)) bytestring integer)) ->
TxCert
TxCertUnRegDRep : Credential -> integer -> TxCert
TxCertUnRegStaking : Credential -> Maybe integer -> TxCert
TxCertUpdateDRep : Credential -> TxCert
!`$fUnsafeFromDataScriptContext_$cunsafeFromBuiltinData` :
data -> TxCert
Expand All @@ -393,10 +316,8 @@
(`$fUnsafeFromDataCredential_$cunsafeFromBuiltinData`
(headList {data} args))
(`$fUnsafeFromDataMaybe_$cunsafeFromBuiltinData`
{(\k v -> List (Tuple2 k v))
bytestring
((\k v -> List (Tuple2 k v)) bytestring integer)}
`$fUnsafeFromDataValue`
{integer}
unIData
(headList {data} (tailList {data} args))))
(/\dead ->
ifThenElse
Expand All @@ -407,10 +328,8 @@
(`$fUnsafeFromDataCredential_$cunsafeFromBuiltinData`
(headList {data} args))
(`$fUnsafeFromDataMaybe_$cunsafeFromBuiltinData`
{(\k v -> List (Tuple2 k v))
bytestring
((\k v -> List (Tuple2 k v)) bytestring integer)}
`$fUnsafeFromDataValue`
{integer}
unIData
(headList {data} (tailList {data} args))))
(/\dead ->
ifThenElse
Expand All @@ -435,14 +354,7 @@
(headList {data} args))
(`$fUnsafeFromDataDelegatee_$cunsafeFromBuiltinData`
(headList {data} l))
(`$fUnsafeFromDataMap_$cunsafeFromBuiltinData`
{bytestring}
{(\k v -> List (Tuple2 k v))
bytestring
integer}
unBData
`$fUnsafeFromDataValue`
(headList {data} (tailList {data} l))))
(unIData (headList {data} (tailList {data} l))))
(/\dead ->
ifThenElse
{all dead. TxCert}
Expand All @@ -451,13 +363,7 @@
TxCertRegDRep
(`$fUnsafeFromDataCredential_$cunsafeFromBuiltinData`
(headList {data} args))
(`$fUnsafeFromDataMap_$cunsafeFromBuiltinData`
{bytestring}
{(\k v -> List (Tuple2 k v))
bytestring
integer}
unBData
`$fUnsafeFromDataValue`
(unIData
(headList
{data}
(tailList {data} args))))
Expand All @@ -477,13 +383,7 @@
TxCertUnRegDRep
(`$fUnsafeFromDataCredential_$cunsafeFromBuiltinData`
(headList {data} args))
(`$fUnsafeFromDataMap_$cunsafeFromBuiltinData`
{bytestring}
{(\k v -> List (Tuple2 k v))
bytestring
integer}
unBData
`$fUnsafeFromDataValue`
(unIData
(headList
{data}
(tailList {data} args))))
Expand Down Expand Up @@ -668,6 +568,45 @@
{all dead. dead})
{all dead. dead})
{all dead. dead}
!`$fUnsafeFromDataMap_$cunsafeFromBuiltinData` :
all k v.
(\a -> data -> a) k ->
(\a -> data -> a) v ->
data ->
(\k v -> List (Tuple2 k v)) k v
= /\k v ->
\(`$dUnsafeFromData` : (\a -> data -> a) k)
(`$dUnsafeFromData` : (\a -> data -> a) v) ->
letrec
!go : list (pair data data) -> List (Tuple2 k v)
= \(l : list (pair data data)) ->
chooseList
{pair data data}
{Unit -> List (Tuple2 k v)}
l
(\(ds : Unit) -> Nil {Tuple2 k v})
(\(ds : Unit) ->
let
!tup : pair data data = headList {pair data data} l
in
Cons
{Tuple2 k v}
(Tuple2
{k}
{v}
(`$dUnsafeFromData` (fstPair {data} {data} tup))
(`$dUnsafeFromData` (sndPair {data} {data} tup)))
(go (tailList {pair data data} l)))
Unit
in
\(d : data) -> go (unMapData d)
~`$fUnsafeFromDataValue` :
data -> (\k v -> List (Tuple2 k v)) bytestring integer
= `$fUnsafeFromDataMap_$cunsafeFromBuiltinData`
{bytestring}
{integer}
unBData
unIData
!`$fUnsafeFromDataTxOut_$cunsafeFromBuiltinData` :
data -> TxOut
= \(eta : data) ->
Expand Down Expand Up @@ -825,21 +764,12 @@
ParameterChange :
Maybe GovernanceActionId -> data -> Maybe bytestring -> GovernanceAction
TreasuryWithdrawals :
(\k v -> List (Tuple2 k v))
Credential
((\k v -> List (Tuple2 k v))
bytestring
((\k v -> List (Tuple2 k v)) bytestring integer)) ->
(\k v -> List (Tuple2 k v)) Credential integer ->
Maybe bytestring ->
GovernanceAction
data ProposalProcedure | ProposalProcedure_match where
ProposalProcedure :
(\k v -> List (Tuple2 k v))
bytestring
((\k v -> List (Tuple2 k v)) bytestring integer) ->
Credential ->
GovernanceAction ->
ProposalProcedure
integer -> Credential -> GovernanceAction -> ProposalProcedure
data Vote | Vote_match where
Abstain : Vote
VoteNo : Vote
Expand Down Expand Up @@ -1111,14 +1041,7 @@
!l : list data = tailList {data} args
in
ProposalProcedure
(`$fUnsafeFromDataMap_$cunsafeFromBuiltinData`
{bytestring}
{(\k v -> List (Tuple2 k v))
bytestring
integer}
unBData
`$fUnsafeFromDataValue`
(headList {data} args))
(unIData (headList {data} args))
(`$fUnsafeFromDataCredential_$cunsafeFromBuiltinData`
(headList {data} l))
(let
Expand Down Expand Up @@ -1202,15 +1125,9 @@
TreasuryWithdrawals
(`$fUnsafeFromDataMap_$cunsafeFromBuiltinData`
{Credential}
{(\k v ->
List (Tuple2 k v))
bytestring
((\k v ->
List (Tuple2 k v))
bytestring
integer)}
{integer}
`$fUnsafeFromDataCredential_$cunsafeFromBuiltinData`
`$fUnsafeFromDataValue`
unIData
(headList {data} args))
(`$fUnsafeFromDataMaybe_$cunsafeFromBuiltinData`
{bytestring}
Expand Down
2 changes: 1 addition & 1 deletion plutus-benchmark/script-contexts/test/9.6/checkScriptContext1.size.golden
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2851
2816
4 changes: 2 additions & 2 deletions plutus-benchmark/script-contexts/test/9.6/checkScriptContext2-20.eval.golden
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
({cpu: 367085286
| mem: 1133020})
({cpu: 366878286
| mem: 1132120})
4 changes: 2 additions & 2 deletions plutus-benchmark/script-contexts/test/9.6/checkScriptContext2-4.eval.golden
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
({cpu: 110345686
| mem: 344028})
({cpu: 110138686
| mem: 343128})
Loading

1 comment on commit 7e891f2

@github-actions
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Performance Alert ⚠️

Possible performance regression was detected for benchmark 'Plutus Benchmarks'.
Benchmark result of this commit is worse than the previous benchmark result exceeding threshold 1.05.

Benchmark suite Current: 7e891f2 Previous: c776fe7 Ratio
validation-decode-future-increase-margin-3 330.4 μs 307.4 μs 1.07
validation-decode-future-pay-out-2 326.2 μs 301.3 μs 1.08
validation-decode-future-pay-out-3 325.2 μs 301.3 μs 1.08
validation-decode-future-settle-early-2 327.4 μs 300.4 μs 1.09
validation-decode-future-settle-early-3 333.4 μs 302.9 μs 1.10
validation-decode-multisig-sm-1 580.4 μs 545.9 μs 1.06
validation-decode-multisig-sm-2 574.7 μs 547.2 μs 1.05
validation-decode-multisig-sm-4 585.4 μs 545.1 μs 1.07
validation-decode-multisig-sm-8 590.6 μs 546 μs 1.08
validation-decode-multisig-sm-10 607.5 μs 572.3 μs 1.06
validation-decode-stablecoin_2-3 852.3 μs 809.4 μs 1.05

This comment was automatically generated by workflow using github-action-benchmark.

CC: @input-output-hk/plutus-core

Please sign in to comment.