Merge branch 'master' into feat(web)/demo-staging

Author: alcercu

.gitmodules

@@ -0,0 +1,6 @@
+[submodule "contracts/lib/forge-std"]
+	path = contracts/lib/forge-std
+	url = https://github.com/foundry-rs/forge-std
+[submodule "contracts/lib/solmate"]
+	path = contracts/lib/solmate
+	url = https://github.com/rari-capital/solmate

contracts/foundry.toml

@@ -0,0 +1,7 @@
+
+[profile.default]
+src = 'src'
+out = 'out'
+libs = ['../node_modules', 'lib']
+
+# See more config options https://book.getfoundry.sh/reference/config.html

contracts/hardhat.config.ts

@@ -27,6 +27,7 @@ const config: HardhatUserConfig = {
   },
   paths: {
     sources: "./src",
+    cache: "./cache_hardhat",
   },
   networks: {
     hardhat: {

contracts/lib/forge-std

@@ -25,6 +25,8 @@
     "size": "hardhat size-contracts --no-compile",
     "watch": "hardhat watch",
     "docgen": "hardhat docgen",
+    "docserve": "scripts/docPreprocess.sh && forge doc --serve",
+    "docbuild": "scripts/docPreprocess.sh && forge doc --build --out dist",
     "publish": "yarn npm publish --access public --tag $(cat package.json | jq .version)"
   },
   "devDependencies": {

contracts/lib/solmate

@@ -0,0 +1,9 @@
+@ensdomains/=../node_modules/@ensdomains/
+@openzeppelin/=../node_modules/@openzeppelin/
+@kleros/=../node_modules/@kleros/
+ds-test/=lib/forge-std/lib/ds-test/src/
+eth-gas-reporter/=../node_modules/eth-gas-reporter/
+forge-std/=lib/forge-std/src/
+hardhat-deploy/=../node_modules/hardhat-deploy/
+hardhat/=../node_modules/hardhat/
+solmate/=lib/solmate/src/

contracts/package.json

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+
+# Remove unsupported natspec tags
+# Known issue: https://github.com/foundry-rs/foundry/issues/4118
+for tag in authors reviewers auditors bounties deployments tools
+do
+    find $SCRIPT_DIR/../src/ -type f -name '*.sol' | xargs sed -i.bak "/^.*@$tag.*$/d"
+done
+
+echo "Use 'git restore src/ && rm src/**/*.sol.bak' to revert the changes"
+
+