Simplify remappings and use master for OpenZeppelin dependencies (#26)

* Simplify remappings and use master for OpenZeppelin dependencies

* Adapt CI

* up

* up

* up

* up

* up

* up

Author: ernestognw

.github/actions/setup/action.yml

@@ -19,3 +19,6 @@ runs:
       uses: foundry-rs/foundry-toolchain@v1
       with:
         version: nightly
+    - name: Install submodule dependencies
+      shell: bash
+      run: forge install

.github/workflows/checks.yml

@@ -35,8 +35,6 @@ jobs:
       - uses: actions/checkout@v4
       - name: Set up environment
         uses: ./.github/actions/setup
-      - name: Bring vanilla repository test utils as a submodule
-        run: forge install
       - name: Run tests and generate gas report
         run: npm run test
 
@@ -46,8 +44,6 @@ jobs:
       - uses: actions/checkout@v4
       - name: Set up environment
         uses: ./.github/actions/setup
-      - name: Bring vanilla repository test utils as a submodule
-        run: forge install
       - name: Run coverage
         run: npm run coverage
 
@@ -68,7 +64,6 @@ jobs:
       - uses: actions/checkout@v4
       - name: Set up environment
         uses: ./.github/actions/setup
-      - run: rm foundry.toml
       - uses: crytic/[email protected]
 
   codespell:

foundry.toml

@@ -1,5 +1,5 @@
 [profile.default]
-solc_version = '0.8.26'
+solc_version = '0.8.27'
 evm_version = 'cancun'
 src = 'contracts'
 out = 'out'

hardhat.config.js

@@ -3,7 +3,7 @@ const { argv } = require('yargs/yargs')()
   .options({
     compiler: {
       type: 'string',
-      default: '0.8.26',
+      default: '0.8.27',
     },
     hardfork: {
       type: 'string',

package-lock.json

@@ -39,10 +39,7 @@
     "security",
     "zeppelin"
   ],
-  "dependencies": {
-    "@openzeppelin/contracts": "^5.0.2",
-    "@openzeppelin/contracts-upgradeable": "^5.0.2"
-  },
+  "dependencies": {},
   "devDependencies": {
     "@nomicfoundation/hardhat-chai-matchers": "^2.0.6",
     "@nomicfoundation/hardhat-ethers": "^3.0.5",

package.json

@@ -1,7 +1,3 @@
-@openzeppelin/contracts@v5/=node_modules/@openzeppelin/contracts/
-@openzeppelin/contracts-upgradeable@v5/=node_modules/@openzeppelin/contracts-upgradeable/
-
-@openzeppelin/contracts@master/=lib/@openzeppelin-contracts/contracts/
-@openzeppelin/contracts-upgradeable@master/=lib/@openzeppelin-contracts-upgradeable/contracts/
-
+@openzeppelin/contracts/=lib/@openzeppelin-contracts/contracts/
+@openzeppelin/contracts-upgradeable/=lib/@openzeppelin-contracts-upgradeable/contracts/
 @openzeppelin/community-contracts/=contracts/

remappings.txt

@@ -1,5 +1,4 @@
 {
     "detectors_to_run": "arbitrary-send-erc20,array-by-reference,incorrect-shift,name-reused,rtlo,suicidal,uninitialized-state,uninitialized-storage,arbitrary-send-erc20-permit,controlled-array-length,controlled-delegatecall,delegatecall-loop,msg-value-loop,reentrancy-eth,unchecked-transfer,weak-prng,domain-separator-collision,erc20-interface,erc721-interface,locked-ether,mapping-deletion,shadowing-abstract,tautology,write-after-write,boolean-cst,reentrancy-no-eth,reused-constructor,tx-origin,unchecked-lowlevel,unchecked-send,variable-scope,void-cst,events-access,events-maths,incorrect-unary,boolean-equal,cyclomatic-complexity,deprecated-standards,erc20-indexed,function-init-state,pragma,unused-state,reentrancy-unlimited-gas,constable-states,immutable-states,var-read-using-this",
-    "filter_paths": "contracts/mocks,contracts-exposed",
-    "compile_force_framework": "hardhat"
+    "filter_paths": "contracts/mocks,contracts-exposed"
 }