@@ -33,9 +33,9 @@ \section{UTxO}
33
33
& \fun {feesOK} : \PParams \to \Tx \to \UTxO \to \Bool \\
34
34
& \fun {feesOK}~\var {pp}~tx~utxo = \\
35
35
&~~ \minfee {pp}{tx} \leq \txfee {tx} \wedge (\fun {txrdmrs}~tx \neq \Nothing \Rightarrow \\
36
- &~~~~~~~~~~\forall (a, \wcard , \wcard ) \in \fun {range}~(\fun {collInputs}~tx \restrictdom \var {utxo}), a \in \AddrVKey \\
36
+ &~~~~~~~~~~\forall (a, \wcard , \wcard , \wcard ) \in \fun {range}~(\fun {collInputs}~tx \restrictdom \var {utxo}), a \in \AddrVKey \\
37
37
&~~~~~~\wedge \fun {adaOnly}~\var {balance} \\
38
- &~~~~~~\wedge \var {balance} \geq \hldiff {\lceil \ txfee {txb} * \fun {collateralPercent}~pp / 100 \rceil } \\
38
+ &~~~~~~\wedge \var {balance} \geq \hldiff {\txfee {txb} * \fun {collateralPercent}~pp / 100} \\
39
39
&~~~~~~\wedge \hldiff {(\fun {txcoll}~tx \neq \Nothing ) \Rightarrow \var {balance} = \fun {txcoll}~tx} \\
40
40
&~~~~~~\wedge \fun {collInputs}~{tx} \neq \emptyset ) \\
41
41
&~~ \where \\
@@ -196,8 +196,8 @@ \section{UTxO}
196
196
\forall txout \in \hldiff {\fun {allOuts}~txb},\\
197
197
\fun {serSize}~(\fun {getValue}~txout) \leq \fun {maxValSize}~pp \\ ~
198
198
\\
199
- \forall (\wcard\mapsto (a,~\wcard )) \in \hldiff {\fun {allOuts}~txb}, a \in \AddrBS \Rightarrow \fun {bootstrapAttrsSize}~a \leq 64 \\
200
- \forall (\wcard\mapsto (a,~\wcard )) \in \hldiff {\fun {allOuts}~txb}, \fun {netId}~a = \NetworkId
199
+ \forall (\wcard\mapsto (a,~\wcard , \wcard , \wcard )) \in \hldiff {\fun {allOuts}~txb}, a \in \AddrBS \Rightarrow \fun {bootstrapAttrsSize}~a \leq 64 \\
200
+ \forall (\wcard\mapsto (a,~\wcard , \wcard , \wcard )) \in \hldiff {\fun {allOuts}~txb}, \fun {netId}~a = \NetworkId
201
201
\\
202
202
\forall (a\mapsto\wcard ) \in \txwdrls {txb}, \fun {netId}~a = \NetworkId \\
203
203
(\fun {txnetworkid}~\var {txb} = \NetworkId ) \vee (\fun {txnetworkid}~\var {txb} = \Nothing )
@@ -290,7 +290,7 @@ \section{UTxO}
290
290
\var {inputHashes}\leteq \left \{ h \, \middle |
291
291
{
292
292
\begin {array }{l}
293
- (a, \_ , h) \in \range (\var {utxo}|_{\fun {spendInputs}~tx}) \\
293
+ (a, \_ , h, \_ ) \in \range (\var {utxo}|_{\fun {spendInputs}~tx}) \\
294
294
\fun {isTwoPhaseScriptAddress}~tx~\hldiff {utxo}~a \\
295
295
\end {array }
296
296
}
@@ -299,7 +299,7 @@ \section{UTxO}
299
299
\forall \var {s} \in (\fun {txscripts}~txw~\hldiff {utxo~\var {neededHashes}}) \cap \ScriptPhOne ,
300
300
\fun {validateScript}~\var {s}~\var {tx}\\ ~\\
301
301
\var {neededHashes} - \hldiff {\dom (\fun {refScripts}~tx~utxo)} = \dom (\fun {txwitscripts}~txw) \\ ~\\
302
- \var {inputHashes} \subseteq _{\{ h \mid (\wcard , \wcard , h)\in\fun {allOuts}~tx \cup \hldiff {\var {utxo}~(\fun {refInputs}~{tx})}\} } \dom (\fun {txdats}~{txw}) \\ ~\\
302
+ \var {inputHashes} \subseteq _{\{ h \mid (\wcard , \wcard , h, \wcard )\in\fun {allOuts}~tx \cup \hldiff {\var {utxo}~(\fun {refInputs}~{tx})}\} } \dom (\fun {txdats}~{txw}) \\ ~\\
303
303
\\ ~\\
304
304
\dom (\fun {txrdmrs}~tx) = \left \{ \fun {rdptr}~txb~sp \, \middle |
305
305
{
0 commit comments