Squash

.github/workflows/contracts-build.yml

@@ -31,13 +31,13 @@ jobs:
 
       - name: Run Unit Test
         run: |
-          yarn workspace @quadratic-funding/contracts run typechain
-          yarn workspace @quadratic-funding/contracts run test:unit
+          yarn workspace @qfi/contracts run typechain
+          yarn workspace @qfi/contracts run test:unit
 
       - name: Lint
         run: |
-          yarn workspace @quadratic-funding/contracts run lint:solidity
-          yarn workspace @quadratic-funding/contracts run lint:js
+          yarn workspace @qfi/contracts run lint:solidity
+          yarn workspace @qfi/contracts run lint:js
 
   qv-test:
     runs-on: ubuntu-20.04
@@ -55,8 +55,8 @@ jobs:
 
       - name: Run QV Test
         run: |
-          yarn workspace @quadratic-funding/contracts run typechain
-          yarn workspace @quadratic-funding/contracts test:qv
+          yarn workspace @qfi/contracts run typechain
+          yarn workspace @qfi/contracts test:qv
 
   qf-test:
     runs-on: ubuntu-20.04
@@ -74,5 +74,5 @@ jobs:
 
       - name: Run QF Test
         run: |
-          yarn workspace @quadratic-funding/contracts run typechain
-          yarn workspace @quadratic-funding/contracts run test:qf
+          yarn workspace @qfi/contracts run typechain
+          yarn workspace @qfi/contracts run test:qf

.github/workflows/contracts-coverage.yml

@@ -29,13 +29,13 @@ jobs:
 
       - name: Lint
         run: |
-          yarn workspace @quadratic-funding/contracts run lint:solidity
-          yarn workspace @quadratic-funding/contracts run lint:js
+          yarn workspace @qfi/contracts run lint:solidity
+          yarn workspace @qfi/contracts run lint:js
 
       - name: Test Contract
         run: |
-          yarn workspace @quadratic-funding/contracts run generate:abi
-          yarn workspace @quadratic-funding/contracts run test:coverage
+          yarn workspace @qfi/contracts run generate:abi
+          yarn workspace @qfi/contracts run test:coverage
 
       - name: Upload coverage report
         uses: codecov/codecov-action@v2

.github/workflows/subgraph-build.yml

@@ -29,5 +29,5 @@ jobs:
 
       - name: Build
         run: |
-          CI=false yarn workspace @quadratic-funding/subgraph codegen
-          CI=false yarn workspace @quadratic-funding/subgraph build
+          CI=false yarn workspace @qfi/subgraph codegen
+          CI=false yarn workspace @qfi/subgraph build

.gitignore

@@ -8,6 +8,7 @@
 /node_modules
 /.pnp
 .pnp.js
+.vscode
 
 # testing
 /coverage
@@ -28,3 +29,4 @@ notes/
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
+lerna-debug.log*

.husky/pre-commit

@@ -1,5 +1,6 @@
 #!/bin/sh
 
+BASE_DIR="$( cd "$( dirname "$0" )" && pwd )"
 
 # Return `true` if files under `packages/contracts/contracts/` directory has been changed or added. Otherwise, return `false`
 is_contracts_changed()
@@ -32,6 +33,6 @@ npx lint-staged
 RETURN_CODE=$(is_contracts_changed)
 if [ $RETURN_CODE = "true" ]; then
     # Run contract tests
-    npx yarn workspace @quadratic-funding/contracts typechain
-    npx yarn workspace @quadratic-funding/contracts test:unit
-fi
+    npx yarn workspace @qfi/contracts typechain
+    npx yarn workspace @qfi/contracts test:unit
+fi

.husky/scripts/_pre-commit

@@ -0,0 +1,32 @@
+#!/bin/bash
+
+# Return `true` if files under `packages/contracts/contracts/` directory has been changed or added. Otherwise, return `false`
+is_contracts_changed()
+{
+    result="false"
+    git_changes=$(git diff --cached --name-status)
+
+    while read -r line; do
+        changed_file_path=$(echo "$line" | awk '/packages/ {print $2}')
+        file_status=$(echo "$line" | cut -c 1)
+
+        if [ "$file_status" = 'A' ] || [ "$file_status" = 'M' ]
+        then
+            case $changed_file_path in packages/contracts/contracts/*)
+                result="true"
+            esac
+        fi
+    done <<< "$git_changes"
+
+    echo "$result"
+}
+
+# Check lint for all subpackage
+npx lint-staged
+
+RETURN_CODE=$(is_contracts_changed)
+if [ $RETURN_CODE = "true" ]; then
+    # Run contract tests
+    npx yarn workspace @quadratic-funding/contracts typechain
+    npx yarn workspace @quadratic-funding/contracts test:unit
+fi