chore: fix local merge conflicts
This commit is contained in:
commit
51136a4ebe
|
|
@ -8,3 +8,7 @@ deployments/localhost
|
|||
|
||||
# NPM
|
||||
package-lock.json
|
||||
|
||||
# Foundry
|
||||
out
|
||||
forge-cache
|
||||
|
|
|
|||
|
|
@ -4,12 +4,13 @@
|
|||
"description": "",
|
||||
"main": "index.js",
|
||||
"scripts": {
|
||||
"test": "hardhat test",
|
||||
"test": "hardhat test && forge test --via-ir",
|
||||
"test:foundry": "forge test --via-ir",
|
||||
"test:hardhat": "hardhat test",
|
||||
"format": "prettier --write \"./**/*.{js,ts,sol}\"",
|
||||
"node:hh": "hardhat node --tags local",
|
||||
"node:hardhat": "hardhat node --tags local",
|
||||
"deploy:local": "hardhat deploy --tags local",
|
||||
"deploy:mumbai": "hardhat deploy --tags mumbai",
|
||||
"interact": "npx hardhat run deploy/interact.js --network hardhat",
|
||||
"compile": "hardhat compile"
|
||||
},
|
||||
"repository": {
|
||||
|
|
|
|||
Loading…
Reference in New Issue