Merge pull request #1 from ATXDAO/scaffold-eth-2-migration

Scaffold eth 2 migration

.github/workflows/lint.yaml

@@ -8,8 +8,6 @@ on:
     branches:
       - main
 
-
-
 jobs:
   ci:
     runs-on: ${{ matrix.os }}
@@ -20,23 +18,6 @@ jobs:
         node: [16.x]
 
     steps:
-      - name: foundry-toolchain
-        uses: foundry-rs/foundry-toolchain@v1.0.10
-
-      - uses: actions/checkout@v3
-        with:
-          submodules: recursive
-
-      - name: Install Foundry
-        uses: foundry-rs/foundry-toolchain@v1
-
-      - name: Run tests
-        run: forge test -vvv
-
-      - name: Run snapshot
-        run: forge snapshot
-
-
       - name: Checkout
         uses: actions/checkout@master
 
@@ -49,14 +30,14 @@ jobs:
       - name: Install dependencies
         run: yarn install --immutable
 
-      # - name: Run hardhat node, deploy contracts (& generate contracts typescript output)
-      #   run: yarn chain & yarn deploy-local
+     # - name: Run hardhat node, deploy contracts (& generate contracts typescript output)
+     #   run: yarn chain & yarn deploy 
 
       - name: Run nextjs lint
         run: yarn next:lint --max-warnings=0
 
       - name: Check typings on nextjs
         run: yarn next:check-types
 
-      - name: Run hardhat lint
-        run: yarn hardhat:lint --max-warnings=0
+      #- name: Run hardhat lint
+      #  run: yarn hardhat:lint --max-warnings=0

.gitignore

@@ -10,4 +10,4 @@ node_modules
 !.yarn/versions
 .eslintcache
 .vscode/**
-.DS_Store
+.DS_Store

.gitmodules

@@ -1,7 +1,12 @@
-[submodule "packages/smart-contracts/lib/forge-std"]
-	path = packages/smart-contracts/lib/forge-std
+[submodule "packages/foundry/lib/forge-std"]
+	path = packages/foundry/lib/forge-std
 	url = https://github.com/foundry-rs/forge-std
-[submodule "packages/smart-contracts/lib/reputation"]
-	path = packages/smart-contracts/lib/reputation
-	url = https://github.com/ATXDAO/reputation
-
+[submodule "packages/foundry/lib/openzeppelin-contracts"]
+	path = packages/foundry/lib/openzeppelin-contracts
+	url = https://github.com/OpenZeppelin/openzeppelin-contracts
+[submodule "packages/foundry/lib/solidity-bytes-utils"]
+	path = packages/foundry/lib/solidity-bytes-utils
+	url = https://github.com/gnsps/solidity-bytes-utils
+[submodule "packages/foundry/lib/reputation"]
+	path = packages/foundry/lib/reputation
+	url = https://github.com/atxdao/reputation