v1.5 contract and test code

.env.sample

@@ -9,4 +9,7 @@ LOCAL_FACTORY_ADDERSS=0x5FbDB2315678afecb367f032d93F642f64180aa3
 UUPS_PROXY_ADMIN_MULTISIG_ADDRESS=
 YMT_CLI_MODE=
 DEFENDER_TEAM_API_KEY=
-DEFENDER_TEAM_API_SECRET_KEY=
+DEFENDER_TEAM_API_SECRET_KEY=
+NETWORK=
+SIGNER_ADDRESS_PRIVATE_KEY=
+COMMUNITY_MULTISIG_ADDRESS=

.github/workflows/formatter-and-linter-check.yaml

@@ -1,24 +1,23 @@
 name: Formatter and Linter check
 on:
   push:
-    branches:
-      - master
+    branches: [master]
   pull_request:
-    branches:
-      - master
+    branches: [master]
 
 jobs:
   formatter-linter-check:
-    name: Formatter and Linter check
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-node@v4
         with:
-          node-version: 14.x
+          node-version: 20
           registry-url: https://registry.npmjs.org
-      - uses: actions/cache@v2
+
+      - uses: actions/cache@v4
         with:
           path: ~/.npm
           key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
@@ -40,8 +39,8 @@ jobs:
       - name: Do check
         run: npm run lint:check
 
-      - name: discord notification（if failure）
+      - name: discord notification (if failure)
+        if: failure()
         uses: sarisia/actions-status-discord@v1
-        if: ${{ failure() }}
         with:
           webhook: ${{ secrets.DISCORD_WEBHOOK }}

.github/workflows/slither-analyze.yaml

@@ -1,67 +1,75 @@
 name: Slither Analyze
 on:
   push:
-    branches:
-      - turnOffUntilIssue76IsSolved
+    branches: [turnOffUntilIssue76IsSolved]
   pull_request:
-    branches:
-      - turnOffUntilIssue76IsSolved
+    branches: [turnOffUntilIssue76IsSolved]
 
 jobs:
-  unit-tests:
-    name: Slither Analyze
+  slither-analyze:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      # Git checkout
+      - uses: actions/checkout@v4
 
-      - uses: actions/setup-node@v2
+      # Node (for npm scripts)
+      - uses: actions/setup-node@v4
         with:
-          node-version: 14.x
+          node-version: 20
           registry-url: https://registry.npmjs.org
-      - uses: actions/cache@v2
-        with:
-          path: ~/.npm
-          key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-node-
+          cache: "npm" # npm キャッシュを actions/cache の代わりに自動付与可
+
+      # 旧スタイルでキャッシュしたい場合はこちら
+      # - uses: actions/cache@v4
+      #   with:
+      #     path: ~/.npm
+      #     key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
+      #     restore-keys: |
+      #       ${{ runner.os }}-node-
+
+      # npm install
       - name: Install dependencies
         env:
           PRIVATE_KEY: ${{ secrets.CI_PRIVATE_KEY }}
         run: |
           mkdir -p ~/.ssh
           echo "$PRIVATE_KEY" | tr -d '\r' > ~/.ssh/id_rsa
           chmod 700 ~/.ssh/id_rsa
-          eval $(ssh-agent -s)
+          eval "$(ssh-agent -s)"
           ssh-add ~/.ssh/id_rsa
           ssh-keyscan -H github.com >> ~/.ssh/known_hosts
           npm ci
 
-      - uses: actions/setup-python@v2
+      # Python (for Slither)
+      - uses: actions/setup-python@v5
+        with:
+          python-version: "3.11"
+
+      # solc & Slither
       - name: Install solc compiler
         run: |
-          sudo add-apt-repository ppa:ethereum/ethereum
+          sudo add-apt-repository -y ppa:ethereum/ethereum
           sudo apt-get update
-          sudo apt-get install solc
-
+          sudo apt-get install -y solc
       - name: Install slither
-        run: sudo pip install slither-analyzer
+        run: pip install --upgrade slither-analyzer
 
+      # Run Slither
       - name: Run slither analyze
-        run: |
-          npm run analyze || :
-          npm run analyze:resultRet
-          # exit $(npm run analyze:resultRet|tail -n1)
-          echo $(npm run analyze:resultRet|tail -n1) problems found
-          echo but I ignore them in this time.
-
         env:
           ALCHEMY_URL: ${{ secrets.ALCHEMY_URL }}
           DEPLOYER_PRIVATE_KEY: ${{ secrets.DEPLOYER_PRIVATE_KEY }}
           FOUNDATION_PRIVATE_KEY: ${{ secrets.FOUNDATION_PRIVATE_KEY }}
+        run: |
+          # Slither の結果を無視するなら `|| :` でも良い
+          npm run analyze || :
+          npm run analyze:resultRet
+          echo "$(npm run analyze:resultRet | tail -n1) problems found (ignored for now)"
 
-      - name: discord notification（if failure）
+      # Discord 通知
+      - name: discord notification (if failure)
+        if: failure()
         uses: sarisia/actions-status-discord@v1
-        if: ${{ failure() }}
         with:
           webhook: ${{ secrets.DISCORD_WEBHOOK }}

.github/workflows/unit-tests.yaml

@@ -1,58 +1,58 @@
 name: Unit Tests
 on:
   push:
-    branches:
-      - master
+    branches: [master]
   pull_request:
-    branches:
-      - master
+    branches: [master]
 
 jobs:
   unit-tests:
-    name: Unit Tests
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      # 1. ソース取得
+      - uses: actions/checkout@v4
+
+      # 2. Node セットアップ + npm キャッシュ
+      - uses: actions/setup-node@v4
         with:
-          node-version: 14.x
+          node-version: 20 # Node 18 でも可
           registry-url: https://registry.npmjs.org
-      - uses: actions/cache@v2
-        with:
-          path: ~/.npm
-          key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-node-
+          cache: "npm" # ~/.npm を自動キャッシュ
 
+      # 3. 依存インストール
       - name: Install dependencies
         env:
           PRIVATE_KEY: ${{ secrets.CI_PRIVATE_KEY }}
         run: |
           mkdir -p ~/.ssh
           echo "$PRIVATE_KEY" | tr -d '\r' > ~/.ssh/id_rsa
           chmod 700 ~/.ssh/id_rsa
-          eval $(ssh-agent -s)
+          eval "$(ssh-agent -s)"
           ssh-add ~/.ssh/id_rsa
           ssh-keyscan -H github.com >> ~/.ssh/known_hosts
           npm ci
 
+      # 4. コンパイル
       - name: Compile
-        run: npm run compile
         env:
           ALCHEMY_URL: ${{ secrets.ALCHEMY_URL }}
           DEPLOYER_PRIVATE_KEY: ${{ secrets.DEPLOYER_PRIVATE_KEY }}
           FOUNDATION_PRIVATE_KEY: ${{ secrets.FOUNDATION_PRIVATE_KEY }}
+        run: npm run compile
 
+      # 5. ユニットテスト
       - name: Run unit tests
-        run: "NODE_ENV=ci npm test"
         env:
+          NODE_ENV: ci
           ALCHEMY_URL: ${{ secrets.ALCHEMY_URL }}
           DEPLOYER_PRIVATE_KEY: ${{ secrets.DEPLOYER_PRIVATE_KEY }}
           FOUNDATION_PRIVATE_KEY: ${{ secrets.FOUNDATION_PRIVATE_KEY }}
+        run: npm test
 
-      - name: discord notification（if failure）
+      # 6. Discord 通知 (失敗時)
+      - name: discord notification (if failure)
+        if: failure()
         uses: sarisia/actions-status-discord@v1
-        if: ${{ failure() }}
         with:
           webhook: ${{ secrets.DISCORD_WEBHOOK }}

.gitignore

@@ -15,7 +15,8 @@ typechain/*
 *.dbg.json
 cache/**/*
 !deployments/goerli/.chainId
-deployments/localhost
+!deployments/localhost/.chainId
+deployments/localhost/*
 typechain-types
 abis
 test/**/*.js