fix error about maci-contracts module not found

clrfund · Nov 17, 2023 · 0ce2299 · 0ce2299
1 parent be3a9a5
commit 0ce2299
Show file tree

Hide file tree

Showing 13 changed files with 143 additions and 144 deletions.
diff --git a/contracts/contracts/ClrFund.sol b/contracts/contracts/ClrFund.sol
@@ -6,10 +6,10 @@ import '@openzeppelin/contracts/token/ERC20/ERC20.sol';
 import '@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol';
 import '@openzeppelin/contracts/utils/structs/EnumerableSet.sol';
 
-import {SignUpGatekeeper} from "maci-contracts/contracts/gatekeepers/SignUpGatekeeper.sol";
-import {InitialVoiceCreditProxy} from "maci-contracts/contracts/initialVoiceCreditProxy/InitialVoiceCreditProxy.sol";
-import {PollFactory} from 'maci-contracts/contracts/Poll.sol';
-import {Params} from 'maci-contracts/contracts/Params.sol';
+import {SignUpGatekeeper} from "@clrfund/maci-contracts/contracts/gatekeepers/SignUpGatekeeper.sol";
+import {InitialVoiceCreditProxy} from "@clrfund/maci-contracts/contracts/initialVoiceCreditProxy/InitialVoiceCreditProxy.sol";
+import {PollFactory} from '@clrfund/maci-contracts/contracts/Poll.sol';
+import {Params} from '@clrfund/maci-contracts/contracts/Params.sol';
 
 import './MACIFactory.sol';
 import './userRegistry/IUserRegistry.sol';

diff --git a/contracts/contracts/ClrFundDeployer.sol b/contracts/contracts/ClrFundDeployer.sol
@@ -5,8 +5,8 @@ pragma solidity 0.8.10;
 import './MACIFactory.sol';
 import './ClrFund.sol';
 import {CloneFactory} from './CloneFactory.sol';
-import {SignUpGatekeeper} from "maci-contracts/contracts/gatekeepers/SignUpGatekeeper.sol";
-import {InitialVoiceCreditProxy} from "maci-contracts/contracts/initialVoiceCreditProxy/InitialVoiceCreditProxy.sol";
+import {SignUpGatekeeper} from "@clrfund/maci-contracts/contracts/gatekeepers/SignUpGatekeeper.sol";
+import {InitialVoiceCreditProxy} from "@clrfund/maci-contracts/contracts/initialVoiceCreditProxy/InitialVoiceCreditProxy.sol";
 
 contract ClrFundParams {
     struct Templates {

diff --git a/contracts/contracts/FundingRound.sol b/contracts/contracts/FundingRound.sol
@@ -6,12 +6,12 @@ import '@openzeppelin/contracts/access/Ownable.sol';
 import '@openzeppelin/contracts/token/ERC20/ERC20.sol';
 import '@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol';
 
-import {DomainObjs} from 'maci-contracts/contracts/DomainObjs.sol';
-import {MACI} from 'maci-contracts/contracts/MACI.sol';
-import {Poll} from 'maci-contracts/contracts/Poll.sol';
-import {Tally} from 'maci-contracts/contracts/Tally.sol';
-import {SignUpGatekeeper} from "maci-contracts/contracts/gatekeepers/SignUpGatekeeper.sol";
-import {InitialVoiceCreditProxy} from "maci-contracts/contracts/initialVoiceCreditProxy/InitialVoiceCreditProxy.sol";
+import {DomainObjs} from '@clrfund/maci-contracts/contracts/DomainObjs.sol';
+import {MACI} from '@clrfund/maci-contracts/contracts/MACI.sol';
+import {Poll} from '@clrfund/maci-contracts/contracts/Poll.sol';
+import {Tally} from '@clrfund/maci-contracts/contracts/Tally.sol';
+import {SignUpGatekeeper} from "@clrfund/maci-contracts/contracts/gatekeepers/SignUpGatekeeper.sol";
+import {InitialVoiceCreditProxy} from "@clrfund/maci-contracts/contracts/initialVoiceCreditProxy/InitialVoiceCreditProxy.sol";
 
 import './userRegistry/IUserRegistry.sol';
 import './recipientRegistry/IRecipientRegistry.sol';

diff --git a/contracts/contracts/MACIFactory.sol b/contracts/contracts/MACIFactory.sol
@@ -2,17 +2,17 @@
 
 pragma solidity ^0.8.10;
 
-import {MACI} from 'maci-contracts/contracts/MACI.sol';
-import {Poll, PollFactory} from 'maci-contracts/contracts/Poll.sol';
-import {SignUpGatekeeper} from 'maci-contracts/contracts/gatekeepers/SignUpGatekeeper.sol';
-import {InitialVoiceCreditProxy} from 'maci-contracts/contracts/initialVoiceCreditProxy/InitialVoiceCreditProxy.sol';
-import {TopupCredit} from 'maci-contracts/contracts/TopupCredit.sol';
-import {VkRegistry} from 'maci-contracts/contracts/VkRegistry.sol';
-import {SnarkCommon} from 'maci-contracts/contracts/crypto/SnarkCommon.sol';
+import {MACI} from '@clrfund/maci-contracts/contracts/MACI.sol';
+import {Poll, PollFactory} from '@clrfund/maci-contracts/contracts/Poll.sol';
+import {SignUpGatekeeper} from '@clrfund/maci-contracts/contracts/gatekeepers/SignUpGatekeeper.sol';
+import {InitialVoiceCreditProxy} from '@clrfund/maci-contracts/contracts/initialVoiceCreditProxy/InitialVoiceCreditProxy.sol';
+import {TopupCredit} from '@clrfund/maci-contracts/contracts/TopupCredit.sol';
+import {VkRegistry} from '@clrfund/maci-contracts/contracts/VkRegistry.sol';
+import {SnarkCommon} from '@clrfund/maci-contracts/contracts/crypto/SnarkCommon.sol';
 import {Ownable} from '@openzeppelin/contracts/access/Ownable.sol';
-import {Params} from 'maci-contracts/contracts/Params.sol';
+import {Params} from '@clrfund/maci-contracts/contracts/Params.sol';
 import {PollFactoryCreator} from './PollFactoryCreator.sol';
-import {IPubKey} from 'maci-contracts/contracts/DomainObjs.sol';
+import {IPubKey} from '@clrfund/maci-contracts/contracts/DomainObjs.sol';
 
 contract MACIFactory is Ownable, Params, SnarkCommon, IPubKey {
   // Constants

diff --git a/contracts/contracts/PollFactoryCreator.sol b/contracts/contracts/PollFactoryCreator.sol
@@ -2,7 +2,7 @@
 
 pragma solidity 0.8.10;
 
-import {PollFactory} from 'maci-contracts/contracts/Poll.sol';
+import {PollFactory} from '@clrfund/maci-contracts/contracts/Poll.sol';
 
 library PollFactoryCreator {
    function create() external returns (PollFactory pollFactory) {

diff --git a/contracts/contracts/VkRegistryCreator.sol b/contracts/contracts/VkRegistryCreator.sol
@@ -2,7 +2,7 @@
 
 pragma solidity 0.8.10;
 
-import {VkRegistry} from 'maci-contracts/contracts/VkRegistry.sol';
+import {VkRegistry} from '@clrfund/maci-contracts/contracts/VkRegistry.sol';
 
 library VkRegistryCreator {
    function create() public returns (VkRegistry vkRegistry) {

diff --git a/contracts/hardhat.config.ts b/contracts/hardhat.config.ts
@@ -181,7 +181,7 @@ task(
       const artifact = JSON.parse(
         fs
           .readFileSync(
-            `./node_modules/maci-contracts/artifacts/contracts/crypto/Hasher.sol/${contractName}.json`
+            `./node_modules/@clrfund/maci-contracts/artifacts/contracts/crypto/Hasher.sol/${contractName}.json`
           )
           .toString()
       )

diff --git a/contracts/maci.d.ts b/contracts/maci.d.ts
@@ -1 +1 @@
-declare module 'maci-contracts'
+declare module '@clrfund/maci-contracts'
diff --git a/contracts/package.json b/contracts/package.json
@@ -22,14 +22,14 @@
     "clean": "rm -rf cache && rm -rf build"
   },
   "dependencies": {
+    "@clrfund/maci-contracts": "^1.1.7",
     "@openzeppelin/contracts": "4.9.0",
     "dotenv": "^8.2.0",
-    "maci-contracts": "npm:@clrfund/maci-contracts@^1.1.7",
     "solidity-rlp": "2.0.8"
   },
   "devDependencies": {
-    "@clrfund/maci-circuits": "^1.1.7",
     "@clrfund/common": "^0.0.1",
+    "@clrfund/maci-circuits": "^1.1.7",
     "@clrfund/maci-cli": "^1.1.7",
     "@ethereum-waffle/mock-contract": "^3.4.4",
     "@kleros/gtcr-encoder": "^1.4.0",

diff --git a/contracts/scripts/get-bytecode.ts b/contracts/scripts/get-bytecode.ts
@@ -10,8 +10,8 @@ async function main() {
   let result: string
   if (poseidonT3Address && poseidonT6Address) {
     result = linkBytecode(artifact.deployedBytecode, {
-      'maci-contracts/sol/Poseidon.sol:PoseidonT3': poseidonT3Address,
-      'maci-contracts/sol/Poseidon.sol:PoseidonT6': poseidonT6Address,
+      '@clrfund/maci-contracts/sol/Poseidon.sol:PoseidonT3': poseidonT3Address,
+      '@clrfund/maci-contracts/sol/Poseidon.sol:PoseidonT6': poseidonT6Address,
     })
   } else {
     result = artifact.deployedBytecode

diff --git a/contracts/utils/deployment.ts b/contracts/utils/deployment.ts
@@ -75,7 +75,7 @@ type PoseidonName = 'PoseidonT3' | 'PoseidonT4' | 'PoseidonT5' | 'PoseidonT6'
  * read the artifact content and pass to the getContractFactory function
  *
  * NOTE: there are 2 copies of the Poseidon artifacts, the one in the build/contracts
- * folder has the actual contract bytecode, the other one in the build/contracts/maci-contracts
+ * folder has the actual contract bytecode, the other one in the build/contracts/@clrfund/maci-contracts
  * only has the library interface. If the wrong bytecode is used to deploy the contract,
  * the hash functions will always return 0.
  *

diff --git a/vue-app/src/api/abi.ts b/vue-app/src/api/abi.ts
@@ -2,7 +2,7 @@ import { abi as ERC20 } from '../../../contracts/build/contracts/@openzeppelin/c
 import { abi as FundingRoundFactory } from '../../../contracts/build/contracts/contracts/ClrFund.sol/ClrFund.json'
 import { abi as FundingRound } from '../../../contracts/build/contracts/contracts/FundingRound.sol/FundingRound.json'
 import { abi as MACIFactory } from '../../../contracts/build/contracts/contracts/MACIFactory.sol/MACIFactory.json'
-import { abi as MACI } from '../../../contracts/build/contracts/maci-contracts/contracts/MACI.sol/MACI.json'
+import { abi as MACI } from '../../../contracts/build/contracts/@clrfund/maci-contracts/contracts/MACI.sol/MACI.json'
 import { abi as UserRegistry } from '../../../contracts/build/contracts/contracts/userRegistry/IUserRegistry.sol/IUserRegistry.json'
 import { abi as BrightIdUserRegistry } from '../../../contracts/build/contracts/contracts/userRegistry/BrightIdUserRegistry.sol/BrightIdUserRegistry.json'
 import { abi as SnapshotUserRegistry } from '../../../contracts/build/contracts/contracts/userRegistry/SnapshotUserRegistry.sol/SnapshotUserRegistry.json'
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		declare module 'maci-contracts'
		declare module '@clrfund/maci-contracts'