Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
5 changes: 0 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,5 @@ yarn-error.log
!.openzeppelin/goerli*.json
!.openzeppelin/rinkeby*.json
!.openzeppelin/mainnet*.json
packages/hardhat/artifacts
packages/hardhat/artifacts-ovm
packages/hardhat/cache
packages/hardhat/cache-ovm
packages/hardhat/typechain
**/.DS_Store
.vercel
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
[submodule "packages/hardhat/lib/forge-std"]
path = packages/hardhat/lib/forge-std
url = https://github.com/foundry-rs/forge-std
[submodule "packages/foundry/lib/forge-std"]
path = packages/foundry/lib/forge-std
url = https://github.com/foundry-rs/forge-std
Expand Down
3 changes: 0 additions & 3 deletions foundry.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,14 @@ remappings = [
'@anthonymartin/=node_modules/@anthonymartin/',
'@balancer-labs/=node_modules/@balancer-labs/',
'@chainlink/=node_modules/@chainlink/',
'forge-std/=node_modules/@popcorn/hardhat/lib/forge-std/src/',
'@ensdomains/=node_modules/@ensdomains/',
'@openzeppelin/=node_modules/@openzeppelin/',
'openzeppelin-upgradeable/=node_modules/@openzeppelin/contracts-upgradeable/',
'@popcorn/=node_modules/@popcorn/',
'@setprotocol/=node_modules/@setprotocol/',
'@uniswap/=node_modules/@uniswap/',
'base64-sol/=node_modules/base64-sol/',
'ds-test/=node_modules/@popcorn/hardhat/lib/forge-std/lib/ds-test/src/',
'eth-gas-reporter/=node_modules/eth-gas-reporter/',
'hardhat/=node_modules/hardhat/',
'merkle-tree-solidity/=node_modules/merkle-tree-solidity/',
'openzeppelin-v3/=node_modules/openzeppelin-v3/',
'solmate/=node_modules/solmate/'
Expand Down
6 changes: 1 addition & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,6 @@
"scripts": {
"dev": "yarn lerna run --parallel dev",
"build": "yarn lerna run build",
"app:build": "cd packages/hardhat; yarn build; cd ../app; yarn build",
"grants:build": "cd packages/hardhat; yarn build; cd ../grants; yarn build",
"app:start": "yarn lerna run --scope @popcorn/app start",
"start": "yarn lerna run --scope @popcorn/app start",
"pretify": "prettier --write .",
"test": "yarn lerna run test",
"nuke": "rm -r node_modules; for d in packages/*/node_modules; do echo $d; rm -r $d; done; for d in packages/*/.next; do echo $d; rm -r $d; done",
Expand All @@ -21,7 +17,7 @@
"coverage": "yarn lerna run coverage",
"prepare": "husky install",
"circulating-supply": "yarn lerna run circulating-supply --stream",
"netlify-build": "cd packages/hardhat; yarn build; cd ../greenfield-app; yarn build"
"netlify-build": "cd packages/greenfield-app; yarn build"
},
"lint-staged": {
"*.{sol,ts,tsx}": "prettier --write"
Expand Down
13 changes: 0 additions & 13 deletions packages/app/.gitignore

This file was deleted.

1 change: 0 additions & 1 deletion packages/app/.nvmrc

This file was deleted.

14 changes: 0 additions & 14 deletions packages/app/.prettierignore

This file was deleted.

Loading