Merge pull request #84 from nayms/dev

Next MAINNET upgrade
nayms · Dec 11, 2023 · 03385a0 · 03385a0
2 parents 010fd43 + af09204
commit 03385a0
Show file tree

Hide file tree

Showing 168 changed files with 7,310 additions and 7,955 deletions.
diff --git a/.env.example b/.env.example
@@ -1,12 +1,19 @@
 export LOCAL_RPC_URL=
 export ETH_MAINNET_RPC_URL=
-export ETH_GOERLI_RPC_URL=
 export ETH_SEPOLIA_RPC_URL=
+export BASE_GOERLI_RPC_URL=
+export ETH_GOERLI_RPC_URL=
 export ETHERSCAN_API_KEY=
 export NAYMS_SALT=
 export OWNER_ACCOUNT_KEY=
 export SYSTEM_ADMIN_1=
 export BOOL_FORK_TEST=
+export TESTS_FORK_UPGRADE_DIAMOND=
+export TESTS_FORK_DIAMOND_ADDRESS_1=
+export TESTS_FORK_DIAMOND_ADDRESS_11155111=
+export TESTS_FORK_DIAMOND_ADDRESS_31337=
+export TESTS_FORK_DIAMOND_ADDRESS_84531=
 export FORK_BLOCK_1=
 export FORK_BLOCK_11155111=
-export FORK_BLOCK_31337=
+export FORK_BLOCK_31337=
+export FORK_BLOCK_84531=
diff --git a/.env.proposal b/.env.proposal
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -1,22 +1,21 @@
 module.exports = {
-  env: {
-    browser: false,
-    es2021: true,
-    mocha: true,
-    node: true,
-  },
-  extends: [
-    "standard",
-    "plugin:prettier/recommended",
-    "plugin:node/recommended",
-  ],
-  parserOptions: {
-    ecmaVersion: 12,
-  },
-  overrides: [
-    {
-      files: ["hardhat.config.js"],
-      globals: { task: true },
+    env: {
+        browser: false,
+        es2021: true,
+        mocha: true,
+        node: true,
     },
-  ],
+    eslint: {
+        runtime: "node"
+    },
+    extends: ["standard", "plugin:prettier/recommended", "plugin:node/recommended"],
+    parserOptions: {
+        ecmaVersion: 12,
+    },
+    overrides: [
+        {
+            files: ["hardhat.config.js"],
+            globals: { task: true },
+        },
+    ],
 };
diff --git a/.gas-snapshot b/.gas-snapshot
@@ -71,10 +71,10 @@ T02UserTest:testGetUserIdFromAddress() (gas: 13111)
 T02UserTest:testSetEntityFailsIfNotSysAdmin() (gas: 17858)
 T02UserTest:testSetNonExistingEntity() (gas: 21330)
 T03NaymsOwnershipTest:testFuzz_TransferOwnership(address,address,address) (runs: 256, μ: 115399, ~: 115399)
-T03NaymsOwnershipTest:testTransferOwernship() (gas: 80801)
-T03NaymsOwnershipTest:testTransferOwernshipFailsIfNewOwnerIsSysAdmin() (gas: 63812)
-T03NaymsOwnershipTest:testTransferOwernshipFailsIfNewOwnerIsSysManager() (gas: 102978)
-T03NaymsOwnershipTest:testTransferOwernshipFailsIfNotSysAdmin() (gas: 17824)
+T03NaymsOwnershipTest:testTransferOwnership() (gas: 80801)
+T03NaymsOwnershipTest:testTransferOwnershipFailsIfNewOwnerIsSysAdmin() (gas: 63812)
+T03NaymsOwnershipTest:testTransferOwnershipFailsIfNewOwnerIsSysManager() (gas: 102978)
+T03NaymsOwnershipTest:testTransferOwnershipFailsIfNotSysAdmin() (gas: 17824)
 T03SystemFacetTest:testD03CreateEntity() (gas: 18686)
 T03SystemFacetTest:testGetObjectMeta() (gas: 250099)
 T03SystemFacetTest:testIsObject() (gas: 239012)

diff --git a/.gemforge/.gitignore b/.gemforge/.gitignore
@@ -0,0 +1,3 @@
+*.json
+*.sol
+*.log
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -17,7 +17,7 @@ jobs:
 
       - uses: actions/setup-node@v3
         with:
-          node-version: "16"
+          node-version: 20
           cache: "yarn"
           registry-url: "https://registry.npmjs.org"
           scope: "@nayms"

diff --git a/.github/workflows/npm.yml b/.github/workflows/npm.yml
@@ -26,12 +26,12 @@ jobs:
 
       - uses: actions/setup-node@v3
         with:
-          node-version: "16.x"
+          node-version: 20
           registry-url: "https://registry.npmjs.org"
           always-auth: true
 
       - name: Install solc
-        run: svm install 0.7.6 && svm install 0.8.17 && svm use 0.8.17
+        run: svm install 0.7.6 && svm install 0.8.20 && svm use 0.8.20
 
       - name: Fix ownership
         run: git config --global --add safe.directory /__w/contracts-v3/contracts-v3
@@ -41,14 +41,22 @@ jobs:
 
       - name: Install Node dependencies
         run: yarn
-
-      - name: Prepare build
-        run: make prep-build
+      
+      - name: Drop-in Test Wallet
+        run: echo "test test test test test test test test test test test junk" > ./nayms_mnemonic.txt
 
       - name: Build solidity contracts
         run: make build
+        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 }}
+          BASE_GOERLI_RPC_URL: ${{ secrets.BASE_GOERLI_RPC_URL }}
+
+      - name: Filter ABI
+        run: make filter-abi
 
       - name: Publish to NPM
-        run: npm publish
+        run: rm src/generated/.gitignore && npm publish
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NODE_AUTH_TOKEN }}
diff --git a/.github/workflows/solstat.yml b/.github/workflows/solstat.yml
@@ -1,9 +1,9 @@
 name: solstat
 on:
-  push:
-    branches:
-      - main
-  pull_request:
+  # push:
+  #   branches:
+  #     - main
+  # pull_request:
   workflow_dispatch: {}
   workflow_call:
 
@@ -26,7 +26,7 @@ jobs:
           submodules: recursive
 
       - name: Make solstat report
-        run: solstat --path ./src/diamonds/nayms/
+        run: solstat --path ./src/
 
       - name: Publish solstat report
         run: cat solstat_report.md >> $GITHUB_STEP_SUMMARY
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -24,8 +24,13 @@ jobs:
         with:
           submodules: recursive
 
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 20
+          cache: "yarn"
+
       - name: Install solc
-        run: svm install 0.7.6 && svm install 0.8.17 && svm use 0.8.17
+        run: svm install 0.7.6 && svm install 0.8.20 && svm use 0.8.20
 
       - name: Fix ownership
         run: git config --global --add safe.directory /__w/contracts-v3/contracts-v3
@@ -36,18 +41,26 @@ jobs:
       - name: Install Node dependencies
         run: yarn
 
-      - name: Prepare build
-        run: make prep-build
+      - name: Drop-in Test Wallet
+        run: echo "test test test test test test test test test test test junk" > ./nayms_mnemonic.txt && echo "test test test test test test test test test test test junk" > ./nayms_mnemonic_mainnet.txt
 
       - name: Build solidity contracts
         run: make build
+        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 }}
+          BASE_MAINNET_RPC_URL: ${{ secrets.BASE_MAINNET_RPC_URL }}
+          BASE_GOERLI_RPC_URL: ${{ secrets.BASE_GOERLI_RPC_URL }}
 
       - name: Tests - local
+        run: make test
         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
+          BASE_MAINNET_RPC_URL: ${{ secrets.BASE_MAINNET_RPC_URL }}
+          BASE_GOERLI_RPC_URL: ${{ secrets.BASE_GOERLI_RPC_URL }}
 
       - name: Coverage report
         env:
@@ -61,35 +74,12 @@ jobs:
           path-to-lcov: "./lcov-filtered.info"
 
       - name: Slither Static Analyser
-        uses: crytic/[email protected]
         id: slither
-        with:
-          sarif: results.sarif
-          target: src/diamonds/nayms
-          slither-args: --exclude solc-version,assembly-usage,naming-convention,low-level-calls --ignore-compile
-        continue-on-error: true
+        env:
+          SOLC_VERSION: 0.8.20
+        run: make slither
 
       - name: Upload Slither SARIF file
         uses: github/codeql-action/upload-sarif@v2
         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: |
-      #     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
+          sarif_file: results.sarif
diff --git a/.github/workflows/upgrade-goerli-diamond.yml b/.github/workflows/upgrade-goerli-diamond.yml
diff --git a/.gitignore b/.gitignore
@@ -12,6 +12,7 @@ anvil*.json
 
 # yarn v1, node
 node_modules
+yarn-*.log
 
 # Hardhat files
 cache
@@ -34,6 +35,7 @@ facetsdeployed.txt
 .vscode/slither-results.json
 
 .history
+.DS_Store
 
 bin/
 .idea/.gitignore
@@ -42,6 +44,7 @@ bin/
 .idea/modules.xml
 .idea/runConfigurations.xml
 .idea/vcs.xml
+.metals
 
 broadcast/**/31337/*
 
@@ -53,8 +56,8 @@ broadcast/**/dry-run
 # coverage report
 cov-html
 
-# macOS
-.DS_Store
+# Gemforge
+# gemforge.deployments.json
 
 # Generated files
-script/deployment/S03UpgradeDiamond.s.sol
+script/deployment/S03UpgradeDiamond.s.sol
diff --git a/.gitmodules b/.gitmodules
@@ -10,12 +10,20 @@
 [submodule "lib/solidity-lib"]
 	path = lib/solidity-lib
 	url = https://github.com/uniswap/solidity-lib
-[submodule "lib/ozv4"]
-	path = lib/ozv4
-	url = https://github.com/openzeppelin/openzeppelin-contracts
 [submodule "lib/v3-periphery-foundry"]
 	path = lib/v3-periphery-foundry
 	url = https://github.com/gakonst/v3-periphery-foundry
 [submodule "lib/solidity-stringutils"]
 	path = lib/solidity-stringutils
 	url = https://github.com/arachnid/solidity-stringutils
+[submodule "lib/oz"]
+	path = lib/oz
+	url = https://github.com/openzeppelin/openzeppelin-contracts
+	branch = merge/release-v5.0
+[submodule "lib/diamond-2-hardhat"]
+	path = lib/diamond-2-hardhat
+	url = https://github.com/gemstation/diamond-2-hardhat
+	branch = gemforge-2
+[submodule "lib/solady"]
+	path = lib/solady
+	url = https://github.com/Vectorized/solady