status-im
/
dagger-contracts
mirror of https://github.com/status-im/dagger-contracts.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update to solidity 0.8.8

This commit is contained in:
Mark Spanbroek 2024-01-18 08:56:15 +01:00 committed by markspanbroek
parent 3e3f2307d8
commit bf64de7e50
2 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
contracts/verifiers/local/verifier_groth.sol
View File

@ -9,7 +9,8 @@
// fixed linter warnings // fixed linter warnings
// added requiere error messages // added requiere error messages
// //
pragma solidity ^0.5.0; // SPDX-License-Identifier: MIT
pragma solidity ^0.8.8;
library Pairing { library Pairing {
struct G1Point { struct G1Point {
uint X; uint X;
@ -20,11 +21,11 @@ library Pairing {
uint[2] X; uint[2] X;
uint[2] Y; uint[2] Y;
} }
/// @return the generator of G1 /// The generator of G1
function P1() internal pure returns (G1Point memory) { function P1() internal pure returns (G1Point memory) {
return G1Point(1, 2); return G1Point(1, 2);
} }
/// @return the generator of G2 /// The generator of G2
function P2() internal pure returns (G2Point memory) { function P2() internal pure returns (G2Point memory) {
// Original code point // Original code point
return G2Point( return G2Point(
@ -44,7 +45,7 @@ library Pairing {
); );
*/ */
} }
/// @return the negation of p, i.e. p.addition(p.negate()) should be zero. /// The negation of p, i.e. p.addition(p.negate()) should be zero.
function negate(G1Point memory p) internal pure returns (G1Point memory) { function negate(G1Point memory p) internal pure returns (G1Point memory) {
// The prime q in the base field F_q for G1 // The prime q in the base field F_q for G1
uint q = 21888242871839275222246405745257275088696311157297823662689037894645226208583; uint q = 21888242871839275222246405745257275088696311157297823662689037894645226208583;
@ -52,7 +53,7 @@ library Pairing {
return G1Point(0, 0); return G1Point(0, 0);
return G1Point(p.X, q - (p.Y % q)); return G1Point(p.X, q - (p.Y % q));
} }
/// @return the sum of two points of G1 /// The sum of two points of G1
function addition(G1Point memory p1, G1Point memory p2) internal view returns (G1Point memory r) { function addition(G1Point memory p1, G1Point memory p2) internal view returns (G1Point memory r) {
uint[4] memory input; uint[4] memory input;
input[0] = p1.X; input[0] = p1.X;
@ -62,13 +63,13 @@ library Pairing {
bool success; bool success;
// solium-disable-next-line security/no-inline-assembly // solium-disable-next-line security/no-inline-assembly
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 // Use "invalid" to make gas estimation work
switch success case 0 { invalid() } switch success case 0 { invalid() }
} }
require(success,"pairing-add-failed"); require(success,"pairing-add-failed");
} }
/// @return the product of a point on G1 and a scalar, i.e. /// The product of a point on G1 and a scalar, i.e.
/// p == p.scalar_mul(1) and p.addition(p) == p.scalar_mul(2) for all points p. /// p == p.scalar_mul(1) and p.addition(p) == p.scalar_mul(2) for all points p.
function scalar_mul(G1Point memory p, uint s) internal view returns (G1Point memory r) { function scalar_mul(G1Point memory p, uint s) internal view returns (G1Point memory r) {
uint[3] memory input; uint[3] memory input;
@ -78,13 +79,13 @@ library Pairing {
bool success; bool success;
// solium-disable-next-line security/no-inline-assembly // solium-disable-next-line security/no-inline-assembly
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 // Use "invalid" to make gas estimation work
switch success case 0 { invalid() } switch success case 0 { invalid() }
} }
require (success,"pairing-mul-failed"); require (success,"pairing-mul-failed");
} }
/// @return the result of computing the pairing check /// The result of computing the pairing check
/// e(p1[0], p2[0]) * .... * e(p1[n], p2[n]) == 1 /// e(p1[0], p2[0]) * .... * e(p1[n], p2[n]) == 1
/// For example pairing([P1(), P1().negate()], [P2(), P2()]) should /// For example pairing([P1(), P1().negate()], [P2(), P2()]) should
/// return true. /// return true.
@ -106,7 +107,7 @@ library Pairing {
bool success; bool success;
// solium-disable-next-line security/no-inline-assembly // solium-disable-next-line security/no-inline-assembly
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 // Use "invalid" to make gas estimation work
switch success case 0 { invalid() } switch success case 0 { invalid() }
} }

21
verifier/template/verifier_groth.sol
View File

@ -9,7 +9,8 @@
// fixed linter warnings // fixed linter warnings
// added requiere error messages // added requiere error messages
// //
pragma solidity ^0.5.0; // SPDX-License-Identifier: MIT
pragma solidity ^0.8.8;
library Pairing { library Pairing {
struct G1Point { struct G1Point {
uint X; uint X;
@ -20,11 +21,11 @@ library Pairing {
uint[2] X; uint[2] X;
uint[2] Y; uint[2] Y;
} }
/// @return the generator of G1 /// The generator of G1
function P1() internal pure returns (G1Point memory) { function P1() internal pure returns (G1Point memory) {
return G1Point(1, 2); return G1Point(1, 2);
} }
/// @return the generator of G2 /// The generator of G2
function P2() internal pure returns (G2Point memory) { function P2() internal pure returns (G2Point memory) {
// Original code point // Original code point
return G2Point( return G2Point(
@ -44,7 +45,7 @@ library Pairing {
); );
*/ */
} }
/// @return the negation of p, i.e. p.addition(p.negate()) should be zero. /// The negation of p, i.e. p.addition(p.negate()) should be zero.
function negate(G1Point memory p) internal pure returns (G1Point memory) { function negate(G1Point memory p) internal pure returns (G1Point memory) {
// The prime q in the base field F_q for G1 // The prime q in the base field F_q for G1
uint q = 21888242871839275222246405745257275088696311157297823662689037894645226208583; uint q = 21888242871839275222246405745257275088696311157297823662689037894645226208583;
@ -52,7 +53,7 @@ library Pairing {
return G1Point(0, 0); return G1Point(0, 0);
return G1Point(p.X, q - (p.Y % q)); return G1Point(p.X, q - (p.Y % q));
} }
/// @return the sum of two points of G1 /// The sum of two points of G1
function addition(G1Point memory p1, G1Point memory p2) internal view returns (G1Point memory r) { function addition(G1Point memory p1, G1Point memory p2) internal view returns (G1Point memory r) {
uint[4] memory input; uint[4] memory input;
input[0] = p1.X; input[0] = p1.X;
@ -62,13 +63,13 @@ library Pairing {
bool success; bool success;
// solium-disable-next-line security/no-inline-assembly // solium-disable-next-line security/no-inline-assembly
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 // Use "invalid" to make gas estimation work
switch success case 0 { invalid() } switch success case 0 { invalid() }
} }
require(success,"pairing-add-failed"); require(success,"pairing-add-failed");
} }
/// @return the product of a point on G1 and a scalar, i.e. /// The product of a point on G1 and a scalar, i.e.
/// p == p.scalar_mul(1) and p.addition(p) == p.scalar_mul(2) for all points p. /// p == p.scalar_mul(1) and p.addition(p) == p.scalar_mul(2) for all points p.
function scalar_mul(G1Point memory p, uint s) internal view returns (G1Point memory r) { function scalar_mul(G1Point memory p, uint s) internal view returns (G1Point memory r) {
uint[3] memory input; uint[3] memory input;
@ -78,13 +79,13 @@ library Pairing {
bool success; bool success;
// solium-disable-next-line security/no-inline-assembly // solium-disable-next-line security/no-inline-assembly
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 // Use "invalid" to make gas estimation work
switch success case 0 { invalid() } switch success case 0 { invalid() }
} }
require (success,"pairing-mul-failed"); require (success,"pairing-mul-failed");
} }
/// @return the result of computing the pairing check /// The result of computing the pairing check
/// e(p1[0], p2[0]) * .... * e(p1[n], p2[n]) == 1 /// e(p1[0], p2[0]) * .... * e(p1[n], p2[n]) == 1
/// For example pairing([P1(), P1().negate()], [P2(), P2()]) should /// For example pairing([P1(), P1().negate()], [P2(), P2()]) should
/// return true. /// return true.
@ -106,7 +107,7 @@ library Pairing {
bool success; bool success;
// solium-disable-next-line security/no-inline-assembly // solium-disable-next-line security/no-inline-assembly
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 // Use "invalid" to make gas estimation work
switch success case 0 { invalid() } switch success case 0 { invalid() }
} }