nayms · tgeorgas · Oct 2, 2023 · Apr 10, 2023 · Apr 12, 2023 · Apr 12, 2023
diff --git a/.env.example b/.env.example
@@ -2,8 +2,11 @@ export LOCAL_RPC_URL=
 export ETH_MAINNET_RPC_URL=
 export ETH_GOERLI_RPC_URL=
 export ETH_SEPOLIA_RPC_URL=
-export ETH_MAINNET_API_KEY=
-export ETH_GOERLI_API_KEY=
 export ETHERSCAN_API_KEY=
 export NAYMS_SALT=
-export OWNER_ACCOUNT_KEY=
+export OWNER_ACCOUNT_KEY=
+export SYSTEM_ADMIN_1=
+export BOOL_FORK_TEST=
+export FORK_BLOCK_1=
+export FORK_BLOCK_11155111=
+export FORK_BLOCK_31337=
diff --git a/.env.proposal b/.env.proposal
@@ -0,0 +1,14 @@
+export LOCAL_ID=123
+export LOCAL_RPC_URL=
+export LOCAL_OWNER_ACCOUNT_KEY=
+
+export MAINNET_ID=1
+export MAINNET_RPC_URL=
+export MAINNET_OWNER_ACCOUNT_KEY=
+
+export SEPOLIA_ID=11155111
+export SEPOLIA_RPC_URL=
+export SEPOLIA_OWNER_ACCOUNT_KEY=
+
+export ETHERSCAN_API_KEY=
+export NAYMS_SALT=
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -3,6 +3,7 @@ on:
   push:
     branches:
       - main
+      - dev
   pull_request:
 
 jobs:

diff --git a/.github/workflows/npm.yml b/.github/workflows/npm.yml
@@ -30,9 +30,6 @@ jobs:
           registry-url: "https://registry.npmjs.org"
           always-auth: true
 
-      - name: Update path
-        run: echo "/root/.cargo/bin:/root/.foundry/bin" >> $GITHUB_PATH
-
       - name: Install solc
         run: svm install 0.7.6 && svm install 0.8.17 && svm use 0.8.17
 

diff --git a/.github/workflows/solstat.yml b/.github/workflows/solstat.yml
@@ -25,9 +25,6 @@ jobs:
         with:
           submodules: recursive
 
-      - name: Update path
-        run: echo "/root/.cargo/bin:/root/.foundry/bin" >> $GITHUB_PATH
-
       - name: Make solstat report
         run: solstat --path ./src/diamonds/nayms/
 

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -3,6 +3,7 @@ on:
   push:
     branches:
       - main
+      - dev
   pull_request:
 
 jobs:
@@ -23,9 +24,6 @@ jobs:
         with:
           submodules: recursive
 
-      - name: Update path
-        run: echo "/root/.cargo/bin:/root/.foundry/bin" >> $GITHUB_PATH
-
       - name: Install solc
         run: svm install 0.7.6 && svm install 0.8.17 && svm use 0.8.17
 
@@ -47,10 +45,13 @@ jobs:
       - name: Tests - local
         env:
           ETH_MAINNET_RPC_URL: ${{ secrets.ETH_MAINNET_RPC_URL }}
+          ETH_SEPOLIA_RPC_URL: ${{ secrets.ETH_SEPOLIA_RPC_URL }}
           ETH_GOERLI_RPC_URL: ${{ secrets.ETH_GOERLI_RPC_URL }}
         run: make test
 
       - name: Coverage report
+        env:
+          ETH_MAINNET_RPC_URL: ${{ secrets.ETH_MAINNET_RPC_URL }}
         run: make coverage
 
       - name: Coveralls
@@ -73,12 +74,22 @@ jobs:
         with:
           sarif_file: ${{ steps.slither.outputs.sarif }}
 
-      - name: Generate upgrade hashes
-        env:
-          ETH_MAINNET_RPC_URL: ${{ secrets.ETH_MAINNET_RPC_URL }}
-          ETH_GOERLI_RPC_URL: ${{ secrets.ETH_GOERLI_RPC_URL }}
-          ETHERSCAN_API_KEY: ${{ secrets.ETHERSCAN_API_KEY }}
-        run: |
-          echo "### Upgrade hash" >> $GITHUB_STEP_SUMMARY
-          echo " - mainnet \`$(make upgrade-hash-mainnet)\`" >> $GITHUB_STEP_SUMMARY 
-          echo " - goerli \`$(make upgrade-hash-goerli)\`" >> $GITHUB_STEP_SUMMARY
+      # - name: Generate upgrade hashes
+      #   env:
+      #     ETH_MAINNET_RPC_URL: ${{ secrets.ETH_MAINNET_RPC_URL }}
+      #     ETH_GOERLI_RPC_URL: ${{ secrets.ETH_GOERLI_RPC_URL }}
+      #     ETHERSCAN_API_KEY: ${{ secrets.ETHERSCAN_API_KEY }}
+      #   run: |
+      #     make upgrade-hash-mainnet
+      #     make upgrade-hash-goerli
+      #     make upgrade-hash-sepolia
+
+      #     echo "### Upgrade hash" >> $GITHUB_STEP_SUMMARY
+      #     echo " - mainnet \`$(jq --raw-output '.returns.upgradeHash.value' broadcast/SmartDeploy.s.sol/1/dry-run/hash-latest.json || echo "Not Available")\`" >> $GITHUB_STEP_SUMMARY
+      #     echo "> $(jq --raw-output '.returns.cut.value' broadcast/SmartDeploy.s.sol/1/dry-run/hash-latest.json || echo "Not Available")" >> $GITHUB_STEP_SUMMARY
+
+      #     echo " - goerli \`$(jq --raw-output '.returns.upgradeHash.value' broadcast/SmartDeploy.s.sol/5/dry-run/hash-latest.json || echo "Not Available")\`" >> $GITHUB_STEP_SUMMARY
+      #     echo "> $(jq --raw-output '.returns.cut.value' broadcast/SmartDeploy.s.sol/5/dry-run/hash-latest.json || echo "Not Available")" >> $GITHUB_STEP_SUMMARY
+
+      #     echo " - sepolia \`$(jq --raw-output '.returns.upgradeHash.value' broadcast/SmartDeploy.s.sol/11155111/dry-run/hash-latest.json || echo "Not Available")\`" >> $GITHUB_STEP_SUMMARY
+      #     echo "> $(jq --raw-output '.returns.cut.value' broadcast/SmartDeploy.s.sol/11155111/dry-run/hash-latest.json || echo "Not Available") >> $GITHUB_STEP_SUMMARY
diff --git a/.github/workflows/upgrade-goerli-diamond.yml b/.github/workflows/upgrade-goerli-diamond.yml
@@ -22,9 +22,6 @@ jobs:
           submodules: true
           token: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Update path
-        run: echo "/root/.cargo/bin:/root/.foundry/bin" >> $GITHUB_PATH
-
       - name: Install solc
         run: svm install 0.8.17 && svm use 0.8.17
 

diff --git a/.gitignore b/.gitignore
@@ -8,7 +8,7 @@ results.sarif
 anvil*.json
 
 # SECURITY
-nayms_mnemonic.txt
+*mnemonic*.txt
 
 # yarn v1, node
 node_modules
@@ -31,6 +31,7 @@ facetsdeployed.txt
 .vscode/dryrun.log
 .vscode/targets.log
 .vscode/launch.json
+.vscode/slither-results.json
 
 .history
 
@@ -48,3 +49,12 @@ broadcast/**/31337/*
 NaymsDiamond.json
 
 broadcast/**/dry-run
+
+# coverage report
+cov-html
+
+# macOS
+.DS_Store
+
+# Generated files
+script/deployment/S03UpgradeDiamond.s.sol
diff --git a/.prettierrc b/.prettierrc
@@ -3,6 +3,7 @@
     {
       "files": "*.sol",
       "options": {
+        "parser": "solidity-parse",
         "printWidth": 180,
         "tabWidth": 4,
         "useTabs": false,
@@ -16,6 +17,17 @@
       "options": {
         "parser": "json"
       }
+    },
+    {
+      "files": "*.js",
+      "options": {
+        "parser": "flow",
+        "printWidth": 180,
+        "tabWidth": 4,
+        "useTabs": false,
+        "singleQuote": false,
+        "bracketSpacing": true
+      }
     }
   ]
 }
diff --git a/.solhint.json b/.solhint.json
@@ -8,6 +8,7 @@
     "avoid-low-level-calls": "off",
     "const-name-snakecase": "off",
     "reason-string": "off",
-    "var-name-mixedcase": "off"
+    "var-name-mixedcase": "off",
+    "func-name-mixedcase": "off"
   }
 }
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -14,5 +14,7 @@
     ".gas-snapshot": "julia"
   },
   "solidity.packageDefaultDependenciesContractsDirectory": "src",
-  "solidity.packageDefaultDependenciesDirectory": "lib"
+  "solidity.packageDefaultDependenciesDirectory": "lib",
+  "slither.solcPath": "",
+  "slither.hiddenDetectors": []
 }