Skip to content

Commit

Permalink
chore: update solidity version and cli fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
0xmad committed Jan 17, 2025
1 parent 919907d commit e9fd8b0
Show file tree
Hide file tree
Showing 69 changed files with 132 additions and 130 deletions.
124 changes: 62 additions & 62 deletions packages/cli/ts/index.ts

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/contracts/contracts/MACI.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.20;
pragma solidity ^0.8.28;

import { IPollFactory } from "./interfaces/IPollFactory.sol";
import { IMessageProcessorFactory } from "./interfaces/IMPFactory.sol";
Expand Down
2 changes: 1 addition & 1 deletion packages/contracts/contracts/MessageProcessor.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.20;
pragma solidity ^0.8.28;

import { IMACI } from "./interfaces/IMACI.sol";
import { Ownable } from "@openzeppelin/contracts/access/Ownable.sol";
Expand Down
2 changes: 1 addition & 1 deletion packages/contracts/contracts/MessageProcessorFactory.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.20;
pragma solidity ^0.8.28;

import { Params } from "./utilities/Params.sol";
import { DomainObjs } from "./utilities/DomainObjs.sol";
Expand Down
2 changes: 1 addition & 1 deletion packages/contracts/contracts/Poll.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.20;
pragma solidity ^0.8.28;

import { Params } from "./utilities/Params.sol";
import { SnarkCommon } from "./crypto/SnarkCommon.sol";
Expand Down
2 changes: 1 addition & 1 deletion packages/contracts/contracts/PollFactory.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.20;
pragma solidity ^0.8.28;

import { Params } from "./utilities/Params.sol";
import { DomainObjs } from "./utilities/DomainObjs.sol";
Expand Down
2 changes: 1 addition & 1 deletion packages/contracts/contracts/Tally.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.20;
pragma solidity ^0.8.28;

import { IMACI } from "./interfaces/IMACI.sol";
import { Hasher } from "./crypto/Hasher.sol";
Expand Down
2 changes: 1 addition & 1 deletion packages/contracts/contracts/TallyFactory.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.20;
pragma solidity ^0.8.28;

import { Tally } from "./Tally.sol";
import { ITallyFactory } from "./interfaces/ITallyFactory.sol";
Expand Down
4 changes: 3 additions & 1 deletion packages/contracts/contracts/VkRegistry.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.20;
pragma solidity ^0.8.28;

import { SnarkCommon } from "./crypto/SnarkCommon.sol";
import { Ownable } from "@openzeppelin/contracts/access/Ownable.sol";
Expand Down Expand Up @@ -43,6 +43,7 @@ contract VkRegistry is Ownable(msg.sender), DomainObjs, SnarkCommon, IVkRegistry
function isPollVkSet(uint256 _sig) public view returns (bool isSet) {
isSet = pollVkSet[_sig];
}

/// @notice Check if the process verifying key is set
/// @param _sig The signature
/// @param _mode QV or Non-QV
Expand All @@ -65,6 +66,7 @@ contract VkRegistry is Ownable(msg.sender), DomainObjs, SnarkCommon, IVkRegistry
function genPollVkSig(uint256 _stateTreeDepth, uint256 _voteOptionTreeDepth) public pure returns (uint256 sig) {
sig = (_stateTreeDepth << 64) + _voteOptionTreeDepth;
}

/// @notice generate the signature for the process verifying key
/// @param _stateTreeDepth The state tree depth
/// @param _voteOptionTreeDepth The vote option tree depth
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.20;
pragma solidity ^0.8.28;

import { Hasher } from "../crypto/Hasher.sol";

Expand Down
2 changes: 1 addition & 1 deletion packages/contracts/contracts/crypto/BabyJubJub.sol
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// https://eips.ethereum.org/EIPS/eip-2494#implementation

// SPDX-License-Identifier: MIT
pragma solidity ^0.8.20;
pragma solidity ^0.8.28;

library CurveBabyJubJub {
// Curve parameters
Expand Down
2 changes: 1 addition & 1 deletion packages/contracts/contracts/crypto/Hasher.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.20;
pragma solidity ^0.8.28;

import { SnarkConstants } from "./SnarkConstants.sol";
import { PoseidonT3 } from "./PoseidonT3.sol";
Expand Down
2 changes: 1 addition & 1 deletion packages/contracts/contracts/crypto/Pairing.sol
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

// 2019 OKIMS

pragma solidity ^0.8.20;
pragma solidity ^0.8.28;

/// @title Pairing
/// @notice A library implementing the alt_bn128 elliptic curve operations.
Expand Down
2 changes: 1 addition & 1 deletion packages/contracts/contracts/crypto/PoseidonT3.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.20;
pragma solidity ^0.8.28;

/// @notice A library which provides functions for computing Pedersen hashes.
library PoseidonT3 {
Expand Down
2 changes: 1 addition & 1 deletion packages/contracts/contracts/crypto/PoseidonT4.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.20;
pragma solidity ^0.8.28;

/// @notice A library which provides functions for computing Pedersen hashes.
library PoseidonT4 {
Expand Down
2 changes: 1 addition & 1 deletion packages/contracts/contracts/crypto/PoseidonT5.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.20;
pragma solidity ^0.8.28;

/// @notice A library which provides functions for computing Pedersen hashes.
library PoseidonT5 {
Expand Down
2 changes: 1 addition & 1 deletion packages/contracts/contracts/crypto/PoseidonT6.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.20;
pragma solidity ^0.8.28;

/// @notice A library which provides functions for computing Pedersen hashes.
library PoseidonT6 {
Expand Down
2 changes: 1 addition & 1 deletion packages/contracts/contracts/crypto/SnarkCommon.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.20;
pragma solidity ^0.8.28;
import { Pairing } from "./Pairing.sol";

/// @title SnarkCommon
Expand Down
2 changes: 1 addition & 1 deletion packages/contracts/contracts/crypto/SnarkConstants.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.20;
pragma solidity ^0.8.28;

/// @title SnarkConstants
/// @notice This contract contains constants related to the SNARK
Expand Down
2 changes: 1 addition & 1 deletion packages/contracts/contracts/crypto/Verifier.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.20;
pragma solidity ^0.8.28;

import { Pairing } from "./Pairing.sol";
import { SnarkConstants } from "./SnarkConstants.sol";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.20;
pragma solidity ^0.8.28;

import { Ownable } from "@openzeppelin/contracts/access/Ownable.sol";

Expand Down
2 changes: 1 addition & 1 deletion packages/contracts/contracts/gatekeepers/EASGatekeeper.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.20;
pragma solidity ^0.8.28;

import { Ownable } from "@openzeppelin/contracts/access/Ownable.sol";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.20;
pragma solidity ^0.8.28;

import { SignUpGatekeeper } from "./SignUpGatekeeper.sol";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.20;
pragma solidity ^0.8.28;

import { Ownable } from "@openzeppelin/contracts/access/Ownable.sol";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.20;
pragma solidity ^0.8.28;

import { Ownable } from "@openzeppelin/contracts/access/Ownable.sol";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.20;
pragma solidity ^0.8.28;

import { HatsGatekeeperBase } from "./HatsGatekeeperBase.sol";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.20;
pragma solidity ^0.8.28;

import { HatsGatekeeperBase } from "./HatsGatekeeperBase.sol";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.20;
pragma solidity ^0.8.28;

import { Ownable } from "@openzeppelin/contracts/access/Ownable.sol";
import { MerkleProof } from "@openzeppelin/contracts/utils/cryptography/MerkleProof.sol";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.20;
pragma solidity ^0.8.28;

import { Ownable } from "@openzeppelin/contracts/access/Ownable.sol";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.20;
pragma solidity ^0.8.28;

/// @title SignUpGatekeeper
/// @notice A gatekeeper contract which allows users to sign up for a poll.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.20;
pragma solidity ^0.8.28;

import { Ownable } from "@openzeppelin/contracts/access/Ownable.sol";
import { ERC721 } from "@openzeppelin/contracts/token/ERC721/ERC721.sol";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.20;
pragma solidity ^0.8.28;

interface IAnonAadhaar {
function verifyAnonAadhaarProof(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.20;
pragma solidity ^0.8.28;

/// @title IEAS
/// @notice An interface to the EAS contract.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL
pragma solidity ^0.8.20;
pragma solidity ^0.8.28;

/// @dev A struct storing a passport credential
struct Credential {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.20;
pragma solidity ^0.8.28;

/// @title IHats
/// @notice Minimal interface for the Hats Protocol contract
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//SPDX-License-Identifier: MIT
pragma solidity ^0.8.20;
pragma solidity ^0.8.28;

/// @title Semaphore contract interface.
interface ISemaphore {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.20;
pragma solidity ^0.8.28;

import { IAnonAadhaar } from "../interfaces/IAnonAadhaar.sol";

Expand Down
2 changes: 1 addition & 1 deletion packages/contracts/contracts/gatekeepers/mocks/MockEAS.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.20;
pragma solidity ^0.8.28;

import { IEAS } from "../interfaces/IEAS.sol";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.20;
pragma solidity ^0.8.28;

/// @title MockGitcoinPassportDecoder
/// @notice A mock contract to test the GitcoinPassportDecoder gatekeeper
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.20;
pragma solidity ^0.8.28;

/// @title MockHatsProtocol
/// @notice A mock contract to test the HatsProtocolSingle gatekeeper
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.20;
pragma solidity ^0.8.28;

import { ISemaphore } from "../interfaces/ISemaphore.sol";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.20;
pragma solidity ^0.8.28;

import { ERC721 } from "@openzeppelin/contracts/token/ERC721/ERC721.sol";
import { Ownable } from "@openzeppelin/contracts/access/Ownable.sol";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.20;
pragma solidity ^0.8.28;

import { Ownable } from "@openzeppelin/contracts/access/Ownable.sol";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
along with snarkJS. If not, see <https://www.gnu.org/licenses/>.
*/

pragma solidity ^0.8.20;
pragma solidity ^0.8.28;

contract ZupassGroth16Verifier {
// Scalar field size
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.20;
pragma solidity ^0.8.28;

import { InitialVoiceCreditProxy } from "./InitialVoiceCreditProxy.sol";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.20;
pragma solidity ^0.8.28;

/// @title InitialVoiceCreditProxy
/// @notice This contract is the base contract for
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.20;
pragma solidity ^0.8.28;

/// @title IInitialVoiceCreditProxy
/// @notice InitialVoiceCreditProxy interface
Expand Down
2 changes: 1 addition & 1 deletion packages/contracts/contracts/interfaces/IMACI.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.20;
pragma solidity ^0.8.28;

/// @title IMACI
/// @notice MACI interface
Expand Down
2 changes: 1 addition & 1 deletion packages/contracts/contracts/interfaces/IMPFactory.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.20;
pragma solidity ^0.8.28;

import { DomainObjs } from "../utilities/DomainObjs.sol";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.20;
pragma solidity ^0.8.28;

/// @title IMessageProcessor
/// @notice MessageProcessor interface
Expand Down
2 changes: 1 addition & 1 deletion packages/contracts/contracts/interfaces/IPoll.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.20;
pragma solidity ^0.8.28;

import { DomainObjs } from "../utilities/DomainObjs.sol";
import { IMACI } from "./IMACI.sol";
Expand Down
2 changes: 1 addition & 1 deletion packages/contracts/contracts/interfaces/IPollFactory.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.20;
pragma solidity ^0.8.28;

import { Params } from "../utilities/Params.sol";
import { DomainObjs } from "../utilities/DomainObjs.sol";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.20;
pragma solidity ^0.8.28;

/// @title ISignUpGatekeeper
/// @notice SignUpGatekeeper interface
Expand Down
2 changes: 1 addition & 1 deletion packages/contracts/contracts/interfaces/ITally.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.20;
pragma solidity ^0.8.28;

/// @title ITally
/// @notice Tally interface
Expand Down
2 changes: 1 addition & 1 deletion packages/contracts/contracts/interfaces/ITallyFactory.sol
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.20;
pragma solidity ^0.8.28;

import { DomainObjs } from "../utilities/DomainObjs.sol";

Expand Down
Loading

0 comments on commit e9fd8b0

Please sign in to comment.