From 21bd15db9de61302a4999650332752814151e562 Mon Sep 17 00:00:00 2001 From: Koh Wei Jie Date: Thu, 6 Feb 2020 16:51:13 +0800 Subject: [PATCH] restored Solidity tweaks by poma (solc 0.6.0, gas(), and docstrings) --- phase2/src/verifier_groth.sol | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/phase2/src/verifier_groth.sol b/phase2/src/verifier_groth.sol index f01b989..0dc1549 100644 --- a/phase2/src/verifier_groth.sol +++ b/phase2/src/verifier_groth.sol @@ -17,7 +17,7 @@ // 2019 OKIMS -pragma solidity ^0.5.0; +pragma solidity ^0.6.0; library Pairing { @@ -48,7 +48,7 @@ library Pairing { } /* - * @return The sum of two points of G1 + * @return r the sum of two points of G1 */ function plus( G1Point memory p1, @@ -64,7 +64,7 @@ library Pairing { // solium-disable-next-line security/no-inline-assembly assembly { - success := staticcall(sub(gas, 2000), 6, input, 0xc0, r, 0x60) + success := staticcall(sub(gas(), 2000), 6, input, 0xc0, r, 0x60) // Use "invalid" to make gas estimation work switch success case 0 { invalid() } } @@ -73,7 +73,7 @@ library Pairing { } /* - * @return The product of a point on G1 and a scalar, i.e. + * @return r the product of a point on G1 and a scalar, i.e. * p == p.scalar_mul(1) and p.plus(p) == p.scalar_mul(2) for all * points p. */ @@ -86,7 +86,7 @@ library Pairing { bool success; // solium-disable-next-line security/no-inline-assembly assembly { - success := staticcall(sub(gas, 2000), 7, input, 0x80, r, 0x60) + success := staticcall(sub(gas(), 2000), 7, input, 0x80, r, 0x60) // Use "invalid" to make gas estimation work switch success case 0 { invalid() } } @@ -130,7 +130,7 @@ library Pairing { // solium-disable-next-line security/no-inline-assembly assembly { - success := staticcall(sub(gas, 2000), 8, add(input, 0x20), mul(inputSize, 0x20), out, 0x20) + success := staticcall(sub(gas(), 2000), 8, add(input, 0x20), mul(inputSize, 0x20), out, 0x20) // Use "invalid" to make gas estimation work switch success case 0 { invalid() } }