Merge pull request ethereum#241 from pirapira/message_call_failure_ta…

…kes_gas Make sure that message call consumes all gas when exceptional halting…
pirapira · Mar 14, 2017 · d2232ff · d2232ff
2 parents e5eff48 + 185781a
commit d2232ff
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/Paper.tex b/Paper.tex
@@ -769,7 +769,11 @@ \section{Message Call} \label{ch:call}
 \boldsymbol{\sigma} & \text{if} \quad \boldsymbol{\sigma}^{**} = \varnothing \\
 \boldsymbol{\sigma}^{**} & \text{otherwise}
 \end{cases} \\
-(\boldsymbol{\sigma}^{**}, g', \mathbf{s}, \mathbf{o}) & \equiv & \begin{cases}
+g' & \equiv & \begin{cases}
+0 & \text{if} \quad \boldsymbol{\sigma}^{**} = \varnothing \\
+g^{**} & \text{otherwise}
+\end{cases} \\
+(\boldsymbol{\sigma}^{**}, g^{**}, \mathbf{s}, \mathbf{o}) & \equiv & \begin{cases}
 \Xi_{\mathtt{ECREC}}(\boldsymbol{\sigma}_1, g, I) & \text{if} \quad r = 1 \\
 \Xi_{\mathtt{SHA256}}(\boldsymbol{\sigma}_1, g, I) & \text{if} \quad r = 2 \\
 \Xi_{\mathtt{RIP160}}(\boldsymbol{\sigma}_1, g, I) & \text{if} \quad r = 3 \\