install openzeppelin-contracts a submodule instead of npm package

Author: d10r

.gitmodules

@@ -1,7 +1,7 @@
 [submodule "lib/forge-std"]
 	path = lib/forge-std
 	url = https://github.com/foundry-rs/forge-std
-[submodule "packages/ethereum-contracts/lib/openzeppelin-contracts"]
-	path = packages/ethereum-contracts/lib/openzeppelin-contracts
+[submodule "lib/openzeppelin-contracts"]
+	path = lib/openzeppelin-contracts
 	url = https://github.com/OpenZeppelin/openzeppelin-contracts.git
 	branch = release-v5.4

…eum-contracts/lib/openzeppelin-contracts lib/openzeppelin-contractspackages/ethereum-contracts/lib/openzeppelin-contracts renamed to lib/openzeppelin-contracts packages/ethereum-contracts/lib/openzeppelin-contracts renamed to lib/openzeppelin-contracts

@@ -52,6 +52,7 @@
     },
     "scripts": {
         "prepare": "husky && npm run git-submodule:init",
+        "postinstall": "ln -s ../../lib/openzeppelin-contracts/contracts node_modules/@openzeppelin/contracts",
         "lint": "run-s -l lint:*",
         "lint:syncpack": "syncpack lint",
         "lint:shellcheck": "tasks/shellcheck-all-tasks.sh",

package.json

@@ -3,13 +3,13 @@ root = '../../../'
 libs = ['lib']
 src = 'packages/automation-contracts/autowrap'
 solc_version = "0.8.30"
-evm_version = 'shanghai'
+evm_version = 'cancun'
 optimizer = true
 optimizer_runs = 200
 remappings = [
     '@superfluid-finance/solidity-semantic-money/src/=packages/solidity-semantic-money/src/',
     '@superfluid-finance/ethereum-contracts/=packages/ethereum-contracts/',
-    '@openzeppelin/=node_modules/@openzeppelin/',
+    '@openzeppelin/=lib/openzeppelin-contracts/',
     'ds-test/=lib/forge-std/lib/ds-test/src/',
     'forge-std/=lib/forge-std/src/']
 out = 'packages/automation-contracts/autowrap/out/default'

packages/automation-contracts/autowrap/foundry.toml

@@ -3,7 +3,6 @@
     "description": "Open contracts that allow upgrading underlying token to supertokens based on running stream",
     "version": "0.3.0",
     "devDependencies": {
-        "@openzeppelin/contracts": "^5.4.0",
         "@superfluid-finance/ethereum-contracts": "^1.13.0",
         "@superfluid-finance/metadata": "^1.6.0"
     },

packages/automation-contracts/autowrap/package.json

@@ -3,13 +3,13 @@ root = '../../../'
 libs = ['lib']
 src = 'packages/automation-contracts/scheduler'
 solc_version = "0.8.30"
-evm_version = 'shanghai'
+evm_version = 'cancun'
 optimizer = true
 optimizer_runs = 200
 remappings = [
     '@superfluid-finance/solidity-semantic-money/src/=packages/solidity-semantic-money/src/',
     '@superfluid-finance/ethereum-contracts/=packages/ethereum-contracts/',
-    '@openzeppelin/=node_modules/@openzeppelin/',
+    '@openzeppelin/=lib/openzeppelin-contracts/',
     'ds-test/=lib/forge-std/lib/ds-test/src/',
     'forge-std/=lib/forge-std/src/']
 out = 'packages/automation-contracts/scheduler/out/default'

packages/automation-contracts/scheduler/foundry.toml

@@ -3,7 +3,6 @@
     "description": "Open contracts that allow scheduling streams and vestings onchain",
     "version": "1.3.0",
     "devDependencies": {
-        "@openzeppelin/contracts": "^5.4.0",
         "@superfluid-finance/ethereum-contracts": "^1.13.0",
         "@superfluid-finance/metadata": "^1.6.0"
     },

packages/automation-contracts/scheduler/package.json

@@ -8,13 +8,13 @@ ignored_error_codes = [
     1699 # assembly { selfdestruct } in contracts/mocks/SuperfluidDestructorMock.sol
 ]
 # keep in sync with truffle-config.js
-evm_version = 'shanghai'
+evm_version = 'cancun'
 optimizer = true
 optimizer_runs = 200
 remappings = [
     '@superfluid-finance/ethereum-contracts/contracts/=packages/ethereum-contracts/contracts/',
     '@superfluid-finance/solidity-semantic-money/src/=packages/solidity-semantic-money/src/',
-    '@openzeppelin/contracts/=node_modules/@openzeppelin/contracts/',
+    '@openzeppelin/=lib/openzeppelin-contracts/',
     'ds-test/=lib/forge-std/lib/ds-test/src/',
     'forge-std/=lib/forge-std/src/']
 out = 'packages/ethereum-contracts/build/foundry/default'

packages/ethereum-contracts/foundry.toml

@@ -13,7 +13,7 @@ import "solidity-coverage";
 import {config as dotenvConfig} from "dotenv";
 import {NetworkUserConfig} from "hardhat/types";
 import "solidity-docgen";
-import {relative, resolve} from "path";
+import {relative} from "path";
 
 try {
     dotenvConfig();
@@ -54,33 +54,6 @@ subtask(TASK_COMPILE_SOLIDITY_GET_SOURCE_PATHS).setAction(
     }
 );
 
-// New subtask to define remappings
-subtask(TASK_COMPILE_GET_REMAPPINGS).setAction(
-    async (_, { config }, runSuper) => {
-        console.log("=== TASK_COMPILE_GET_REMAPPINGS START ===");
-        
-        // Get default remappings (if any)
-        const remappings = await runSuper();
-        
-        console.log("Type of remappings:", typeof remappings);
-        console.log("Remappings object:", remappings);
-        
-        // Add hardcoded remapping for OpenZeppelin
-        const openzeppelinPath = "../../../lib/openzeppelin-contracts/contracts";
-        console.log("Adding OpenZeppelin remapping:", `@openzeppelin/contracts -> ${openzeppelinPath}`);
-        
-        // Return the remappings object with our custom mapping
-        const newRemappings = {
-            ...remappings,
-            "@openzeppelin/contracts/": "lib/openzeppelin-contracts/contracts/",
-        };
-
-        console.log("New remappings object:", newRemappings);
-
-        return newRemappings;
-    }
-);
-
 const chainIds = {
     "eth-mainnet": 1,
     "eth-sepolia": 11155111,
@@ -131,11 +104,7 @@ const config: HardhatUserConfig = {
         },
     },
     paths: {
-        root: "../../",
-        sources: "packages/ethereum-contracts/contracts",
-        artifacts: "packages/ethereum-contracts/build/hardhat",
-        tests: "packages/ethereum-contracts/test",
-        cache: "packages/ethereum-contracts/cache",
+        artifacts: "build/hardhat",
     },
     networks: {
         "bsc-mainnet": {
@@ -206,7 +175,6 @@ const config: HardhatUserConfig = {
                 : undefined,
     },
     typechain: {
-        outDir: "packages/ethereum-contracts/typechain-types",
         target: "ethers-v5"
     },
 };

packages/ethereum-contracts/hardhat.config.ts

@@ -5,7 +5,6 @@
     "dependencies": {
         "@decentral.ee/web3-helpers": "0.5.3",
         "@nomiclabs/hardhat-ethers": "2.2.3",
-        "@openzeppelin/contracts": "5.4.0",
         "@truffle/contract": "4.6.31",
         "ethereumjs-tx": "2.1.2",
         "ethereumjs-util": "7.1.5",