Compile Errors

Fixing compile errors. Just realised @safe-global's safe.sol uses IERC165, which openzeppelin already imports. Conflict to be fixed in next patch
EdmundBerkmann · Feb 13, 2024 · 56079af · 56079af
1 parent d2df6cd
commit 56079af
Show file tree

Hide file tree

Showing 9 changed files with 9,278 additions and 90 deletions.
diff --git a/Hardhat.config.js b/Hardhat.config.js
@@ -1,19 +1,6 @@
 require("@nomiclabs/hardhat-waffle");
+require("@nomiclabs/hardhat-ethers");
 require('dotenv').config();
-const { ethers } = require("ethers");
-
-// Convert mnemonic to private keys
-function getPrivateKeys(mnemonic) {
-    const walletPath = "m/44'/60'/0'/0";
-    const wallets = [];
-
-    for (let i = 0; i < 10; i++) {
-      const wallet = ethers.Wallet.fromMnemonic(mnemonic, `${walletPath}/${i}`);
-      wallets.push(wallet.privateKey);
-    }
-
-    return wallets;
-}
 
 /**
  * @type import('hardhat/config').HardhatUserConfig
@@ -23,7 +10,9 @@ module.exports = {
     networks: {
         polygonZkEvmTestnet: {
             url: process.env.POLYGON_ZKEVM_TESTNET_RPC_URL,
-            accounts: process.env.MNEMONIC ? getPrivateKeys(process.env.MNEMONIC) : [],
+            accounts: {
+                mnemonic: process.env.MNEMONIC
+            },
             chainId: parseInt(process.env.POLYGON_ZKEVM_TESTNET_CHAIN_ID || 1422),
         },
     },

diff --git a/Package.json b/Package.json
@@ -43,6 +43,7 @@
     "@reduxjs/toolkit": "^1.9.7",
     "@safe-global/api-kit": "^2.1.0",
     "@safe-global/protocol-kit": "^3.0.0",
+    "@safe-global/safe-contracts": "^1.4.1-build.0",
     "@safe-global/safe-core-sdk": "^3.3.5",
     "@safe-global/safe-core-sdk-types": "^4.0.0",
     "@walletconnect/react-native-dapp": "^1.8.0",

diff --git a/client/src/services/firestore.js b/client/src/services/firestore.js
@@ -42,6 +42,6 @@ class FirestoreService {
       console.error('Error getting documents: ', error);
     }
   }
+}
 
 export default FirestoreService;
-}
diff --git a/contracts/facets/features/BazaarFacet.sol b/contracts/facets/features/BazaarFacet.sol
@@ -3,8 +3,8 @@ pragma solidity 0.8.20;
 
 import "@openzeppelin/contracts/token/ERC1155/IERC1155.sol";
 import "../../libraries/LibDiamond.sol";
-import "./interfaces/IUniswapV4.sol";
-import "./interfaces/IUniswapX.sol";
+import "../../interfaces/IUniswapV4.sol";
+import "../../interfaces/IUniswapX.sol";
 
 contract BazaarFacet {
     // State variables for Uniswap interfaces, adjust types and names as per actual interface definitions

diff --git a/contracts/facets/features/ProfileFacet.sol b/contracts/facets/features/ProfileFacet.sol
@@ -5,7 +5,7 @@ import "@openzeppelin/contracts/token/ERC721/IERC721.sol";
 import "@openzeppelin/contracts/token/ERC1155/IERC1155.sol";
 import "@openzeppelin/contracts/access/Ownable.sol";
 import "@openzeppelin/contracts/utils/ReentrancyGuard.sol";
-import "../../interfaces/IProfileFacet.sol";
+import "../../interfaces/IFeaturesFacet.sol";
 import "../../libraries/LibDiamond.sol";
 import "../../interfaces/ILens.sol";
 import "../../interfaces/ISafe.sol";

diff --git a/contracts/facets/features/VillageFacet.sol b/contracts/facets/features/VillageFacet.sol
@@ -2,19 +2,11 @@
 pragma solidity 0.8.20;
 
 import "../../libraries/LibDiamond.sol";
-import "@openzeppelin/contracts/access/Ownable.sol";
-import "@openzeppelin/contracts/security/Pausable.sol";
+import "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
+import "@openzeppelin/contracts-upgradeable/utils/PausableUpgradeable.sol";
 import "@openzeppelin/contracts/utils/structs/EnumerableSet.sol";
 import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 
-// Simplified interface for the Diamond Standard
-interface IDiamondCut {
-    function diamondCut(
-        bytes[] calldata _diamondCut,
-        address _init,
-        bytes calldata _calldata
-    ) external;
-}
 
 // Simplified interface for handling chat encryption keys securely
 interface IEncryptionKeyManager {
@@ -30,7 +22,7 @@ interface IESCROW {
     // Additional functions for ESCROW management
 }
 
-contract VillageFacet is Ownable, Pausable {
+contract VillageFacet is OwnableUpgradeable, PausableUpgradeable {
     using EnumerableSet for EnumerableSet.AddressSet;
 
     IDiamondCut diamondCut;
@@ -79,7 +71,7 @@ contract VillageFacet is Ownable, Pausable {
     }
 
     // Function to handle group chat governance, e.g., voting
-    function groupChatGovernance(uint256 chatId, /* parameters for governance */) external {
+    function groupChatGovernance(uint256 chatId, uint256 proposalId, bool vote) external {
         // Governance logic here
     }
 

diff --git a/contracts/facets/steelo/SteeloGovernanceFacet.sol b/contracts/facets/steelo/SteeloGovernanceFacet.sol
@@ -4,7 +4,7 @@ pragma solidity 0.8.20;
 import "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
 import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
 import "../../libraries/LibDiamond.sol";
-import "../../interfaces/IGovernanceFacet.sol";
+import "../../interfaces/IAppFacet.sol";
 
 contract SteeloGovernanceFacet is IGovernanceFacet, Initializable, OwnableUpgradeable {
     using LibDiamond for LibDiamond.DiamondStorage;

diff --git a/yarn-error.log b/yarn-error.log
-Original file line number
+Diff line change
@@ Expand Up / @@ -42,6 +42,6 @@ class FirestoreService { @@
           console.error('Error getting documents: ', error);
         }
       }
+    }
     export default FirestoreService;
-    }