Merge branch 'dev' into fuzd

wighawag · Dec 4, 2023 · ebde5b6 · ebde5b6
2 parents 7e1507d + 89a731f
commit ebde5b6
Show file tree

Hide file tree

Showing 12 changed files with 330 additions and 217 deletions.
diff --git a/README.md b/README.md
@@ -108,6 +108,26 @@ Then you can deploy your contract
 pnpm contracts:deploy <network>
 ```
 
+And you can verify the contract
+
+- on etherscan:
+
+```bash
+pnpm contracts:verify <network> etherscan
+```
+
+- using sourcify:
+
+```bash
+pnpm contracts:verify <network> sourcify
+```
+
+for etherscan if the network is not supported by default (no endpoint), you can provide your own:
+
+```bash
+pnpm contracts:verify <network> etherscan --endpoint <api endpoint url>
+```
+
 # Initial Setup
 
 You need to have these installed

diff --git a/common/package.json b/common/package.json
@@ -10,7 +10,7 @@
     "named-logs": "^0.2.2"
   },
   "devDependencies": {
-    "ldenv": "^0.3.7",
+    "ldenv": "^0.3.9",
     "prettier": "^3.1.0",
     "tsup": "^8.0.1",
     "typescript": "^5.3.2"

diff --git a/contracts/package.json b/contracts/package.json
@@ -8,17 +8,18 @@
     "as-soon": "^0.0.4",
     "eip-1193": "^0.4.7",
     "hardhat": "^2.19.1",
-    "hardhat-rocketh": "^1.0.3",
+    "hardhat-rocketh": "^1.0.4",
     "jolly-roger-common": "workspace:*",
-    "ldenv": "^0.3.7",
+    "ldenv": "^0.3.9",
     "prettier": "^3.1.0",
     "prettier-plugin-solidity": "^1.2.0",
-    "rocketh": "^0.7.3",
-    "rocketh-deploy-proxy": "^1.0.3",
-    "rocketh-doc": "^1.0.3",
-    "rocketh-export": "^1.0.3",
-    "rocketh-signer": "^1.0.3",
-    "rocketh-verifier": "^0.7.3",
+    "rocketh": "^0.7.4",
+    "rocketh-deploy": "^1.0.5",
+    "rocketh-deploy-proxy": "^1.0.5",
+    "rocketh-doc": "^1.0.4",
+    "rocketh-export": "^1.0.4",
+    "rocketh-signer": "^1.0.4",
+    "rocketh-verifier": "^0.7.4",
     "set-defaults": "^0.0.2",
     "solidity-coverage": "^0.8.5",
     "solidity-proxy": "^0.2.4",
@@ -38,6 +39,7 @@
     "execute": "ROCKETH_SKIP_ESBUILD=true ldenv -n HARDHAT_NETWORK -m localhost tsx @@",
     "deploy": "ldenv hardhat --network @@MODE deploy @@",
     "deploy:watch": "as-soon -w generated -w deploy pnpm run deploy",
+    "verify": "ldenv rocketh-verify -n @@MODE @@",
     "test": "vitest",
     "coverage:compile": "hardhat compile-for-coverage",
     "coverage:watch:compile": "as-soon -w src pnpm coverage:compile",

diff --git a/indexer/package.json b/indexer/package.json
@@ -12,9 +12,9 @@
     "named-logs": "^0.2.2"
   },
   "devDependencies": {
-    "ethereum-indexer-cli": "^0.6.23",
-    "ethereum-indexer-server": "^0.6.26",
-    "ldenv": "^0.3.7",
+    "ethereum-indexer-cli": "^0.6.24",
+    "ethereum-indexer-server": "^0.6.27",
+    "ldenv": "^0.3.9",
     "prettier": "^3.1.0",
     "tsup": "^8.0.1",
     "typescript": "^5.3.2",

diff --git a/package.json b/package.json
@@ -6,7 +6,7 @@
   "type": "module",
   "devDependencies": {
     "ask-env": "^0.0.1",
-    "ldenv": "^0.3.7",
+    "ldenv": "^0.3.9",
     "prettier": "^3.1.0",
     "syncpack": "^11.2.1",
     "vitepress": "1.0.0-rc.31"
@@ -32,10 +32,10 @@
     "web:dev": "pnpm --filter ./web dev",
     "indexer:dev": "pnpm --filter ./indexer dev",
     "common:dev": "pnpm --filter ./common dev",
-    "contracts:export": "ldenv -m localhost pnpm run --filter ./contracts export -n @@MODE --ts ../indexer/src/contracts.ts,../web/src/data/contracts.ts @@",
+    "contracts:export": "ldenv -d localhost pnpm run --filter ./contracts export -n @@MODE --ts ../indexer/src/contracts.ts,../web/src/data/contracts.ts @@",
     "contracts:test": "pnpm --filter ./contracts test",
     "contracts:execute": "pnpm --filter ./contracts execute",
-    "contracts:docs": "ldenv -m localhost pnpm run --filter ./contracts docgen @@MODE -o ../docs/contracts",
+    "contracts:docs": "ldenv -d localhost pnpm run --filter ./contracts docgen @@MODE -o ../docs/contracts",
     "indexer:build": "ldenv pnpm run contracts:export @@MODE ~~ pnpm run --filter ./common build ~~ pnpm run --filter ./indexer build ~~ @@",
     "indexer:index": "ldenv pnpm run indexer:build @@MODE ~~ pnpm --filter ./indexer index-to-file -n @@ETH_NODE_URI_:MODE,ETH_NODE_URI@:''@: -d src/contracts.ts -f ../web/static/indexed-state-@@MODE@:.json ~~ @@",
     "fuzd:dev": "pnpm --filter ./helper-services/fuzd dev",
@@ -45,16 +45,17 @@
     "docs:preview": "vitepress preview docs",
     "---------------------- WEB USING EXISTING DEPLOYMENT ----------------------": "",
     "zellij-attach": "zellij --layout dev/zellij-attach.kdl a ${npm_package_name}-attach-$MODE || zellij --layout dev/zellij-attach.kdl -s ${npm_package_name}-attach-$MODE",
-    "attach": "ldenv -m localhost pnpm run indexer:index @@MODE ~~ pnpm run zellij-attach ~~ @@",
+    "attach": "ldenv -d localhost pnpm run indexer:index @@MODE ~~ pnpm run zellij-attach ~~ @@",
     "---------------------- FULL AGAINST AN EXISTING NETWORK ----------------------": "",
     "zellij-remote": "zellij --layout dev/zellij-remote.kdl a ${npm_package_name}-remote-$MODE || zellij --layout dev/zellij-remote.kdl -s ${npm_package_name}-remote-$MODE",
     "remote": "ldenv pnpm run zellij-remote @@",
     "---------------------- DEPLOY ----------------------": "",
-    "build": "ldenv -m sepolia pnpm run indexer:index @@MODE ~~ pnpm run --filter ./web build ~~ @@",
+    "build": "ldenv -d sepolia pnpm run indexer:index @@MODE ~~ pnpm run --filter ./web build ~~ @@",
     "serve": "pnpm --filter ./web serve",
-    "contracts:deploy": "ldenv -m localhost pnpm _contracts:deploy @@",
-    "contracts:deploy:prepare": "ldenv -m localhost ask-env -f contracts/.env.local ETH_NODE_URI_@@MODE MNEMONIC_@@MODE ETHERSCAN_API_KEY:?:ETHERSCAN_API_KEY @@",
-    "contracts:deploy:watch": "ldenv -m localhost pnpm _contracts:deploy:watch @@",
+    "contracts:deploy": "ldenv -d localhost pnpm _contracts:deploy @@",
+    "contracts:deploy:prepare": "ldenv -d localhost ask-env -f contracts/.env.local ETH_NODE_URI_@@MODE MNEMONIC_@@MODE ETHERSCAN_API_KEY:?:ETHERSCAN_API_KEY @@",
+    "contracts:deploy:watch": "ldenv -d localhost pnpm _contracts:deploy:watch @@",
+    "contracts:verify": "pnpm --filter ./contracts verify",
     "---------------------- RUN FULL LOCAL SETUP ----------------------": "",
     "start:wezterm": "wezterm --config-file dev/wezterm.lua start $PWD",
     "stop": "zellij kill-session $npm_package_name",