jeffemmett
/
non-fungible-apps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: fix local merge conflicts

This commit is contained in:
zoruka 2022-12-08 10:33:37 -03:00
parent 84d89141d6 c74a270579
commit 51136a4ebe
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -8,3 +8,7 @@ deployments/localhost
# NPM # NPM
package-lock.json package-lock.json
# Foundry
out
forge-cache

7
package.json
View File

@ -4,12 +4,13 @@
"description": "", "description": "",
"main": "index.js", "main": "index.js",
"scripts": { "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}\"", "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:local": "hardhat deploy --tags local",
"deploy:mumbai": "hardhat deploy --tags mumbai", "deploy:mumbai": "hardhat deploy --tags mumbai",
"interact": "npx hardhat run deploy/interact.js --network hardhat",
"compile": "hardhat compile" "compile": "hardhat compile"
}, },
"repository": { "repository": {