diff --git a/.github/workflows/contracts-build.yml b/.github/workflows/contracts-build.yml
index 157e3655..0883e227 100644
--- a/.github/workflows/contracts-build.yml
+++ b/.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
diff --git a/.github/workflows/contracts-coverage.yml b/.github/workflows/contracts-coverage.yml
index 8a1103c4..8b4e2bdb 100644
--- a/.github/workflows/contracts-coverage.yml
+++ b/.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
diff --git a/.github/workflows/subgraph-build.yml b/.github/workflows/subgraph-build.yml
index 1fefce1e..b12fcd76 100644
--- a/.github/workflows/subgraph-build.yml
+++ b/.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
diff --git a/.gitignore b/.gitignore
index cbbee59e..67f2bf96 100644
--- a/.gitignore
+++ b/.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*
diff --git a/.husky/pre-commit b/.husky/pre-commit
index 3bf8d3ff..16ce1359 100755
--- a/.husky/pre-commit
+++ b/.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
\ No newline at end of file
diff --git a/.husky/scripts/_pre-commit b/.husky/scripts/_pre-commit
new file mode 100755
index 00000000..a6fb9a99
--- /dev/null
+++ b/.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
diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 00000000..50124887
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,375 @@
+# Change Log
+
+All notable changes to this project will be documented in this file.
+See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+
+## [3.7.2](https://github.com/compare/v3.7.0...v3.7.2) (2022-11-07)
+
+**Note:** Version bump only for package @qfi/qfi
+
+
+
+
+
+# [3.7.0](https://github.com/compare/v3.5.5...v3.7.0) (2022-11-07)
+
+
+### Features
+
+* delete the keys of stateIndexByPubKey and userSignUps which are over 258 ([809a565](https://github.com/commit/809a5651764e322318922596f8102ec7353680f2))
+* modify the projects data and the provider network setting ([e5dc704](https://github.com/commit/e5dc704ce3c4d2eb7b1d661935f5729c6a3b3988))
+
+
+
+
+
+## [3.5.5](https://github.com/compare/v3.5.4...v3.5.5) (2022-10-26)
+
+**Note:** Version bump only for package @qfi/qfi
+
+
+
+
+
+## [3.5.4](https://github.com/compare/v3.5.3...v3.5.4) (2022-10-19)
+
+**Note:** Version bump only for package @qfi/qfi
+
+
+
+
+
+## [3.5.3](https://github.com/compare/v3.5.1...v3.5.3) (2022-09-27)
+
+**Note:** Version bump only for package @qfi/qfi
+
+
+
+
+
+## [3.5.1](https://github.com/compare/v3.4.5...v3.5.1) (2022-09-27)
+
+**Note:** Version bump only for package @qfi/qfi
+
+
+
+
+
+## [3.4.5](https://github.com/compare/v3.4.2...v3.4.5) (2022-09-27)
+
+**Note:** Version bump only for package @qfi/qfi
+
+
+
+
+
+## [3.4.2](https://github.com/compare/v3.1.0...v3.4.2) (2022-09-27)
+
+
+### Bug Fixes
+
+* fix commNode images ([e15d941](https://github.com/commit/e15d941295a9e0da289d7c198db725cd70d456fa))
+* fix projects mobile ([f6d00a6](https://github.com/commit/f6d00a61ae7adb8d9ee0b3851d44cc5581c0d655))
+
+
+### Features
+
+* add expediente crypto ([85f80dd](https://github.com/commit/85f80dde31892411b7695047528e41c21e71654a))
+* update Expediente Crypto logo picture ([2eb6d8a](https://github.com/commit/2eb6d8af6bc0aa241a8705c8ff30a9dd8ece1611))
+
+
+
+
+
+# [2.1.0](https://github.com/compare/v2.0.1...v2.1.0) (2022-07-08)
+
+
+### Features
+
+* **all:** ethBarcelona changes ([5e59b1a](https://github.com/commit/5e59b1add68fe141269e8d42a08e605af3c916cb))
+* **ethbarcelona: cli easy setup:** change max projects ([9a88f84](https://github.com/commit/9a88f843f621ac6e83ded42dc64a7059b51ecc7b))
+
+
+
+
+
+## [2.0.1](https://github.com/compare/v2.0.0...v2.0.1) (2022-06-29)
+
+**Note:** Version bump only for package @qfi/qfi
+
+
+
+
+
+# [2.0.0](https://github.com/compare/v1.5.0...v2.0.0) (2022-06-29)
+
+
+### Features
+
+* **ethbarcelona cli:** configure cli for eth barcelona: polygon support ([5c87081](https://github.com/commit/5c8708192f0ab5615d8a2c909917e4a9a73d4df9))
+* **polygon support:** gas price tweaks, eject csv of public keys on key gen ([0ff3ab0](https://github.com/commit/0ff3ab0526069b21e808d73239c0d1c19d706826))
+
+
+
+
+
+# [1.6.0](https://github.com/compare/v1.5.0...v1.6.0) (2022-06-29)
+
+
+### Features
+
+* **ethbarcelona cli:** configure cli for eth barcelona: polygon support ([5c87081](https://github.com/commit/5c8708192f0ab5615d8a2c909917e4a9a73d4df9))
+* **polygon support:** gas price tweaks, eject csv of public keys on key gen ([0ff3ab0](https://github.com/commit/0ff3ab0526069b21e808d73239c0d1c19d706826))
+
+
+
+
+
+# [1.5.0](https://github.com/compare/v1.4.1...v1.5.0) (2022-06-11)
+
+
+### Features
+
+* **app:** graceful error handling on MACI key input ([f1b11db](https://github.com/commit/f1b11dbb1f999d1a5cf21cf23492bdace15cd26e))
+
+
+
+
+
+## [1.4.1](https://github.com/compare/v1.4.0...v1.4.1) (2022-06-11)
+
+**Note:** Version bump only for package @qfi/qfi
+
+
+
+
+
+# [1.4.0](https://github.com/compare/v1.3.0...v1.4.0) (2022-06-11)
+
+
+### Features
+
+* **cli:** command to fund user wallets for ethPrague ([aec08b6](https://github.com/commit/aec08b6c608fb535c3e21832a58edcc9253a8b38))
+
+
+
+
+
+# [1.3.0](https://github.com/compare/v1.2.0...v1.3.0) (2022-06-10)
+
+
+### Bug Fixes
+
+* **cli:** patch prague deploy ([c4eb8dd](https://github.com/commit/c4eb8ddab9594772e5e72f5a5640b3a24f960320))
+
+
+
+
+
+# [1.2.0](https://github.com/compare/v1.1.0...v1.2.0) (2022-06-10)
+
+**Note:** Version bump only for package @qfi/qfi
+
+
+
+
+
+# [1.1.0](https://github.com/compare/v1.0.1...v1.1.0) (2022-06-10)
+
+
+### Features
+
+* **cli:** dothething command to batch all the other commands ([0254747](https://github.com/commit/0254747fdc6da224300986d476a855ab289f65b1))
+
+
+
+# [0.4.0](https://github.com/compare/v0.3.3...v0.4.0) (2022-06-09)
+
+
+### Bug Fixes
+
+* build error due to missing data source ([aa8d6d7](https://github.com/commit/aa8d6d771924ca44b255611694bb730cbbbc3c09))
+* missing SimpleHackathon source on subgraph.yaml ([44eaeea](https://github.com/commit/44eaeeaca442fc3409e5ad050bf346d0ce594064))
+
+
+### Features
+
+* add basic signup command; minors and code lint ([1a3bab8](https://github.com/commit/1a3bab8b065ae64b5c3c47590e633745e77abce4))
+* track SimpleHackathon contract as a recipient registry in the subgraph ([abe27c5](https://github.com/commit/abe27c5a9be033192eaa47af3ee5c02824bcaad1))
+
+
+
+
+
+
+## [1.0.1](https://github.com/compare/v1.0.0...v1.0.1) (2022-06-09)
+
+
+### Reverts
+
+* npm revert to 0.3.3 ([68e6766](https://github.com/commit/68e676698356c95e7e456622138407993150e943))
+
+
+
+## [0.3.3](https://github.com/compare/v0.3.2...v0.3.3) (2022-06-09)
+
+
+### Bug Fixes
+
+* numeric overflow when passing initial supply of ERC20 token to contract ([375b63c](https://github.com/commit/375b63cfe144d36c0ccd97f34f34f8b2e0d020ec))
+
+
+
+
+
+## [0.3.1](https://github.com/compare/v0.2.2...v0.3.1) (2022-06-09)
+
+
+### Bug Fixes
+
+* add missing converter for request type ([9766979](https://github.com/commit/9766979ba5257132deaacf43332c5b956cd21156))
+* **app:** fixed babel error that converts ** to .pow causing build failure with Bigint error ([ac2d7d5](https://github.com/commit/ac2d7d54ceb31f7c02d4d6bd110caf3c019cdf11))
+* change from a new creation of a QFI scheme to its loading for the same id ([b7af432](https://github.com/commit/b7af432ef46b441fa2eafd664bced4ec40182e3b))
+* converters and qfi initialization ([969c1b4](https://github.com/commit/969c1b4c1d0468c2031cd3084e8300ce78d67e97))
+* missing abis for different data sources ([0cf3a3d](https://github.com/commit/0cf3a3d30633bcc30861b34f979f900035bd7a2d))
+* removed non-nullable property for wrong variables when deploying QFI ([d5cf5c9](https://github.com/commit/d5cf5c90c1ea77775d24fa9807dcbe8ea83eacfa))
+* wrong controller parameter value passed to SimpleRecipientRegistry constructor ([26c8c11](https://github.com/commit/26c8c119245ed5298c59c58eadd6d682d1e9f32d))
+* wrong deploy script name in package.json; code lint and fix ([2d241b2](https://github.com/commit/2d241b2a8c3b1ea8b420ba937702153d2ba1ef8f))
+
+
+### Features
+
+* add MACI/QFI smart contracts initialization command ([24491cf](https://github.com/commit/24491cf61615f74674c1c0161bc2d366792adbea))
+* add missing grant round factory entity for managing pre-QFI Recipient Registry change ([0495196](https://github.com/commit/0495196d92189189616f460e6fa272068fc8be88))
+* **cli:** crate prague erc20, mint with 18 decimals ([dc40032](https://github.com/commit/dc40032fba08832b35bb5ce4862bd77952908e00))
+
+
+
+
+
+# [0.3.0](https://github.com/compare/v0.2.2...v0.3.0) (2022-06-08)
+
+
+### Bug Fixes
+
+* add missing converter for request type ([9766979](https://github.com/commit/9766979ba5257132deaacf43332c5b956cd21156))
+* change from a new creation of a QFI scheme to its loading for the same id ([b7af432](https://github.com/commit/b7af432ef46b441fa2eafd664bced4ec40182e3b))
+* converters and qfi initialization ([969c1b4](https://github.com/commit/969c1b4c1d0468c2031cd3084e8300ce78d67e97))
+* missing abis for different data sources ([0cf3a3d](https://github.com/commit/0cf3a3d30633bcc30861b34f979f900035bd7a2d))
+* removed non-nullable property for wrong variables when deploying QFI ([d5cf5c9](https://github.com/commit/d5cf5c90c1ea77775d24fa9807dcbe8ea83eacfa))
+
+
+### Features
+
+* add missing grant round factory entity for managing pre-QFI Recipient Registry change ([0495196](https://github.com/commit/0495196d92189189616f460e6fa272068fc8be88))
+
+
+
+
+
+## [0.2.2](https://github.com/compare/v0.2.1...v0.2.2) (2022-06-08)
+
+
+### Bug Fixes
+
+* **app:** connect button on mobile ([7799767](https://github.com/commit/77997672b6065782bdb4f65211dda1767a57369e))
+
+
+
+
+
+## [0.2.1](https://github.com/compare/v0.2.0...v0.2.1) (2022-06-08)
+
+
+### Features
+
+* **app:** add project to ballots via search params and enforce voting rules ([a139415](https://github.com/commit/a13941580e11d80a4324d2c7f1df727f1f716e8d))
+* **contracts:** emergency fund distribution on round cancel ([1c55859](https://github.com/commit/1c55859b96815f032161b9d20bbee42163a56e2b))
+
+
+
+
+
+# [0.2.0](https://github.com/compare/v0.1.0...v0.2.0) (2022-06-03)
+
+
+### Features
+
+* **contracts:** simple hackathon contracts, 99% code coverage ([aed7974](https://github.com/commit/aed79744022e4c2f1f72bcb2ce0b342914576cca))
+* implement Capital Constaint for QF, fix failing tests ([30efe04](https://github.com/commit/30efe04634afb461da7d88e7cc818a6f0707421e))
+
+
+### BREAKING CHANGES
+
+* **contracts:** fixed maci decorators to verify tally results, disabled contribution payouts since
+sign ups will not require contribution
+* changes the finalization step on QF rounds
+
+
+
+
+
+# [0.1.0](https://github.com/compare/v0.0.4...v0.1.0) (2022-06-02)
+
+
+### Bug Fixes
+
+* **all:** make lerna commands play nice with yarn workspaces ([5717344](https://github.com/commit/57173443e138d89320e8316f93375ab139fb8d9c))
+* change packages order when running build from root to avoid broken links among them ([09e5b32](https://github.com/commit/09e5b32ae619d21f08cb8ffe84c0a193dd1a1ebe))
+
+
+### Features
+
+* add command to authenticate via a wallet mnemonic phrase ([d15f1d2](https://github.com/commit/d15f1d2212845372e3c520bf539c5c7f3d0125c7))
+
+
+
+
+
+## [0.0.4](https://github.com/compare/v0.0.3...v0.0.4) (2022-06-01)
+
+**Note:** Version bump only for package @qfi/qfi
+
+
+
+
+
+## [0.0.3](https://github.com/compare/v0.0.2...v0.0.3) (2022-06-01)
+
+
+### Bug Fixes
+
+* **all:** fix circular dependencies, changes to hoisting in monorepo, fix failing build ([1421c97](https://github.com/commit/1421c971a8dd5a85d96fbf67baf5a0dac6a7b062))
+* **ci:** build failing ([e85b744](https://github.com/commit/e85b74426f45a3b75148e82cfaf85cee62da0701))
+
+
+
+
+
+## 0.0.2 (2022-06-01)
+
+
+### Bug Fixes
+
+* add missing initialization to start indexing Grant Round templates ([ab1e435](https://github.com/commit/ab1e435ea8dadfe107038c7e547f51c8579a33c0))
+* match eslint version of subgraph and cli packages to app to avoid build errors ([bbe6141](https://github.com/commit/bbe61411060b8143809f8e6a66e94aee0ad8f3fc))
+* solve build errors ([f36722a](https://github.com/commit/f36722afeeadb2a7e5d560ae0db94a4ff2e60755))
+* typo when retrieving an event param ([03f036a](https://github.com/commit/03f036ae3df56c3fbeff6b060ea23f4145d04970))
+* update abi imports from build to typechain folder ([26917de](https://github.com/commit/26917de487116c38c66259304371ea242982e6a3))
+* wrong workaround address ([8bddfb4](https://github.com/commit/8bddfb467a9c17cf457ac3f60f0cae0afe4b069f))
+
+
+### Features
+
+* add cli boilerplate ([55299af](https://github.com/commit/55299af20bf7c2bd12be7a55f31c520271be2ecd))
+* add deploy MACI/QFI smart contracts command ([4af03d8](https://github.com/commit/4af03d8f8f69d3041ddc7ca6451955d42c38a560))
+* add first complete draft of all necessary mappings ([ef93b3d](https://github.com/commit/ef93b3d7b6829bbeb712b84c0abae16e753bc781))
+* add genkeys command ([d900757](https://github.com/commit/d9007573a51577df551240bdaf259f589b07a3e1))
+* add QR code scan for Admin page ([d948b08](https://github.com/commit/d948b08001904412c11b02dba988fcf874bed2a1))
+* add register recipients command ([3feff1d](https://github.com/commit/3feff1d82f11e7b63f51cba131743228d3aeb7f5))
+* add relationship between Contributor and PublicKey entities ([6316bb3](https://github.com/commit/6316bb31bc64db24ada6c8699baf6c422eeccf2d))
+* add sender and tx hash tracking for message entity ([54f627b](https://github.com/commit/54f627b30611d7f31abad12437398d68148b836a))
+* add subgraph yaml; add empty mapping files for graph codegen ([03c2eaa](https://github.com/commit/03c2eaa435f8a3a8f4962ce2676aa0f40d136358))
+* add tracking of contributions and lifetime amount for PublicKey ([55da83c](https://github.com/commit/55da83ccd61507ce589369feb2cd9bc43878a1f4))
+* add unit test for QFI deploy and initialization ([4151380](https://github.com/commit/41513804565cf86485ca4890f748369c3e9d395d))
+* store tx hash when creating a new Contributor ([ae8459e](https://github.com/commit/ae8459e08d0d156cf889e69168e7c12de2273e55))
diff --git a/lerna.json b/lerna.json
index 427ac247..99693771 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,6 +1,8 @@
{
- "packages": ["packages/*"],
- "version": "0.0.0",
+ "packages": [
+ "packages/*"
+ ],
+ "version": "3.7.2",
"npmClient": "yarn",
"useWorkspaces": true
}
diff --git a/package.json b/package.json
index 0ba27913..bd8b3989 100644
--- a/package.json
+++ b/package.json
@@ -8,32 +8,39 @@
},
"private": true,
"devDependencies": {
+ "commitizen": "^4.2.4",
+ "cz-conventional-changelog": "^3.3.0",
"husky": "^7.0.0",
"lerna": "^4.0.0",
"lint-staged": "^12.3.7"
},
- "resolutions": {
- "qaci-cli/circomlib": "https://github.com/weijiekoh/circomlib.git#24ed08eee0bb613b8c0135d66c1013bd9f78d50a",
- "qaci-crypto/circomlib": "https://github.com/weijiekoh/circomlib.git#24ed08eee0bb613b8c0135d66c1013bd9f78d50a"
- },
"workspaces": {
"packages": [
- "packages/*"
- ],
+ "packages/macisdk",
+ "packages/contracts",
+ "packages/cli",
+ "packages/subgraph",
+ "packages/hooks",
+ "packages/ui",
+ "packages/app"
+ ],
"nohoist": [
- "**/@nomiclabs/**",
"**/gitbook-cli/**",
"**/fs-extra/**"
]
},
"scripts": {
+ "cz": "cz",
+ "release": "lerna version --conventional-commits",
+ "canary": "lerna publish --canary --preid",
+ "publish": "lerna publish",
"build": "yarn workspaces run build",
"build:contracts": "yarn workspace @qfi/contracts run build",
"build:subgraph": "yarn workspace @qfi/subgraph run build",
"build:hooks": "yarn workspace @qfi/hooks run build",
- "test": "yarn workspaces run test",
+ "test": "lerna run test:unit --scope=@qfi/contracts --stream",
"test:contracts": "yarn workspace @qfi/contracts run test",
- "deploy:subgraph":"yarn workspace @qfi/subgraph run deploy",
+ "deploy:subgraph": "yarn workspace @qfi/subgraph run deploy",
"prepare": "husky install"
},
"keywords": [
@@ -43,5 +50,10 @@
"bugs": {
"url": "https://github.com/"
},
- "homepage": "https://github.com/"
-}
+ "homepage": "https://github.com/",
+ "config": {
+ "commitizen": {
+ "path": "./node_modules/cz-conventional-changelog"
+ }
+ }
+}
\ No newline at end of file
diff --git a/packages/app/CHANGELOG.md b/packages/app/CHANGELOG.md
new file mode 100644
index 00000000..b4f9faf8
--- /dev/null
+++ b/packages/app/CHANGELOG.md
@@ -0,0 +1,159 @@
+# Change Log
+
+All notable changes to this project will be documented in this file.
+See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+
+# [2.1.0](https://github.com/quadratic-funding/qfi/compare/v2.0.1...v2.1.0) (2022-07-08)
+
+
+### Features
+
+* **all:** ethBarcelona changes ([5e59b1a](https://github.com/quadratic-funding/qfi/commit/5e59b1add68fe141269e8d42a08e605af3c916cb))
+
+
+
+
+
+# [2.0.0](https://github.com/quadratic-funding/qfi/compare/v1.5.0...v2.0.0) (2022-06-29)
+
+**Note:** Version bump only for package @qfi/app
+
+
+
+
+
+# [1.6.0](https://github.com/quadratic-funding/qfi/compare/v1.5.0...v1.6.0) (2022-06-29)
+
+**Note:** Version bump only for package @qfi/app
+
+
+
+
+
+# [1.5.0](https://github.com/quadratic-funding/qfi/compare/v1.4.1...v1.5.0) (2022-06-11)
+
+
+### Features
+
+* **app:** graceful error handling on MACI key input ([f1b11db](https://github.com/quadratic-funding/qfi/commit/f1b11dbb1f999d1a5cf21cf23492bdace15cd26e))
+
+
+
+
+
+# [1.4.0](https://github.com/quadratic-funding/qfi/compare/v1.3.0...v1.4.0) (2022-06-11)
+
+**Note:** Version bump only for package @qfi/app
+
+
+
+
+
+# [1.1.0](https://github.com/quadratic-funding/qfi/compare/v1.0.1...v1.1.0) (2022-06-10)
+
+
+
+# [0.4.0](https://github.com/quadratic-funding/qfi/compare/v0.3.3...v0.4.0) (2022-06-09)
+
+**Note:** Version bump only for package @qfi/app
+
+
+
+
+
+
+# [1.0.0](https://github.com/quadratic-funding/qfi/compare/v0.3.3...v1.0.0) (2022-06-09)
+
+**Note:** Version bump only for package @qfi/app
+
+
+
+
+
+## [0.3.3](https://github.com/quadratic-funding/qfi/compare/v0.3.2...v0.3.3) (2022-06-09)
+
+**Note:** Version bump only for package @qfi/app
+
+
+
+
+
+## [0.3.1](https://github.com/quadratic-funding/qfi/compare/v0.2.2...v0.3.1) (2022-06-09)
+
+
+### Bug Fixes
+
+* **app:** fixed babel error that converts ** to .pow causing build failure with Bigint error ([ac2d7d5](https://github.com/quadratic-funding/qfi/commit/ac2d7d54ceb31f7c02d4d6bd110caf3c019cdf11))
+
+
+
+
+
+# [0.3.0](https://github.com/quadratic-funding/qfi/compare/v0.2.2...v0.3.0) (2022-06-08)
+
+**Note:** Version bump only for package @qfi/app
+
+
+
+
+
+## [0.2.2](https://github.com/quadratic-funding/qfi/compare/v0.2.1...v0.2.2) (2022-06-08)
+
+**Note:** Version bump only for package @qfi/app
+
+
+
+
+
+## [0.2.1](https://github.com/quadratic-funding/qfi/compare/v0.2.0...v0.2.1) (2022-06-08)
+
+
+### Features
+
+* **app:** add project to ballots via search params and enforce voting rules ([a139415](https://github.com/quadratic-funding/qfi/commit/a13941580e11d80a4324d2c7f1df727f1f716e8d))
+
+
+
+
+
+# [0.2.0](https://github.com/quadratic-funding/qfi/compare/v0.1.0...v0.2.0) (2022-06-03)
+
+**Note:** Version bump only for package @qfi/app
+
+
+
+
+
+# [0.1.0](https://github.com/quadratic-funding/qfi/compare/v0.0.4...v0.1.0) (2022-06-02)
+
+**Note:** Version bump only for package @qfi/app
+
+
+
+
+
+## [0.0.4](https://github.com/quadratic-funding/qfi/compare/v0.0.3...v0.0.4) (2022-06-01)
+
+**Note:** Version bump only for package @qfi/app
+
+
+
+
+
+## [0.0.3](https://github.com/quadratic-funding/qfi/compare/v0.0.2...v0.0.3) (2022-06-01)
+
+
+### Bug Fixes
+
+* **ci:** build failing ([e85b744](https://github.com/quadratic-funding/qfi/commit/e85b74426f45a3b75148e82cfaf85cee62da0701))
+
+
+
+
+
+## 0.0.2 (2022-06-01)
+
+
+### Features
+
+* add QR code scan for Admin page ([d948b08](https://github.com/quadratic-funding/qfi/commit/d948b08001904412c11b02dba988fcf874bed2a1))
diff --git a/packages/app/craco.config.js b/packages/app/craco.config.js
index c2715a50..a0c3e773 100644
--- a/packages/app/craco.config.js
+++ b/packages/app/craco.config.js
@@ -1,24 +1,39 @@
const path = require("path");
-const { getLoader, loaderByName } = require("@craco/craco");
+const { getLoader, loaderByName, addAfterLoader } = require("@craco/craco");
+// const BundleAnalyzerPlugin = require("webpack-bundle-analyzer").BundleAnalyzerPlugin;
const packages = [];
+const libs = [];
packages.push(path.join(__dirname, "../ui"));
packages.push(path.join(__dirname, "../hooks"));
-
+libs.push(path.join(__dirname, "../macisdk"));
module.exports = {
webpack: {
+ // plugins: [new BundleAnalyzerPlugin({ analyzerMode: "server" })],
configure: (webpackConfig, arg) => {
const { isFound, match } = getLoader(webpackConfig, loaderByName("babel-loader"));
if (isFound) {
- const include = Array.isArray(match.loader.include)
- ? match.loader.include
- : [match.loader.include];
+ const include = Array.isArray(match.loader.include) ? match.loader.include : [match.loader.include];
match.loader.include = include.concat(packages);
}
+ // //NOTE: configure ts loader
+ // const tsLoader = {
+ // test: /\.tsx?$/,
+ // loader: 'ts-loader',
+ // include: libs,
+ // options: { transpileOnly: true },
+ // };
+ // const { isAdded: tsLoaderIsAdded } = addAfterLoader(
+ // webpackConfig,
+ // loaderByName("ts-loader"),
+ // tsLoader // babel-loader
+ // );
+ // console.log("tsLoaderIsAdded", tsLoaderIsAdded);
+
return webpackConfig;
},
},
-};
\ No newline at end of file
+};
diff --git a/packages/app/package.json b/packages/app/package.json
index 346b9dc1..5b7c50a1 100644
--- a/packages/app/package.json
+++ b/packages/app/package.json
@@ -1,39 +1,43 @@
{
"name": "@qfi/app",
- "version": "0.1.0",
+ "version": "3.0.0",
"private": true,
+ "homepage": ".",
"dependencies": {
"@chakra-ui/react": "^1.8.6",
"@coinbase/wallet-sdk": "^3.0.4",
"@emotion/react": "^11.0.0",
"@emotion/styled": "^11.0.0",
+ "@fontsource/archivo": "^4.5.7",
"@fontsource/tinos": "^4.5.4",
"@gnosis.pm/safe-apps-web3modal": "^12.0.0",
- "@qfi/hooks": "^0.1.0",
- "@qfi/ui": "^0.1.0",
- "@testing-library/jest-dom": "^5.9.0",
- "@testing-library/react": "^10.2.1",
- "@testing-library/user-event": "^12.0.2",
- "@types/jest": "^25.0.0",
- "@types/node": "^12.0.0",
- "@types/react": "^16.9.0",
- "@types/react-dom": "^16.9.0",
+ "@qfi/hooks": "^3.0.0",
+ "@qfi/ui": "^3.0.0",
"@walletconnect/web3-provider": "^1.7.5",
+ "base64url": "^3.0.1",
+ "blake-hash": "^1.1.0",
"chakra-ui-steps": "^1.6.2",
+ "circomlibjs": "0.0.8",
"ethers": "^5.6.1",
+ "ffjavascript": "^0.2.57",
"framer-motion": "^4.0.0",
+ "i18next": "^21.8.16",
"react": "^17.0.2",
"react-dom": "^17.0.2",
+ "react-i18next": "^11.18.3",
"react-icons": "^3.0.0",
"react-pose": "^4.0.10",
"react-pose-text": "^3.1.0",
+ "react-qr-reader": "^3.0.0-beta-1",
"react-router-dom": "^6.0.2",
- "react-scripts": "4.0.3",
"react-spinners": "^0.11.0",
- "typescript": "^4.3.5",
"web-vitals": "^0.2.2",
"web3modal": "^1.9.5"
},
+ "resolutions": {},
+ "nohoist": [
+ "**/ethers"
+ ],
"scripts": {
"start": "craco start",
"build": "craco build",
@@ -45,9 +49,11 @@
},
"browserslist": {
"production": [
- ">0.2%",
- "not dead",
- "not op_mini all"
+ "chrome >= 67",
+ "edge >= 79",
+ "firefox >= 68",
+ "opera >= 54",
+ "safari >= 14"
],
"development": [
"last 1 chrome version",
@@ -56,6 +62,18 @@
]
},
"devDependencies": {
- "@craco/craco": "^6.4.1"
+ "@craco/craco": "^6.4.1",
+ "@testing-library/jest-dom": "^5.9.0",
+ "@testing-library/react": "^10.2.1",
+ "@testing-library/user-event": "^12.0.2",
+ "@types/jest": "^25.0.0",
+ "@types/node": "^12.0.0",
+ "@types/react": "^16.9.0",
+ "@types/react-dom": "^16.9.0",
+ "@types/react-qr-reader": "^2.1.4",
+ "react-scripts": "4.0.3",
+ "ts-loader": "^9.4.2",
+ "typescript": "^4.3.5",
+ "webpack-bundle-analyzer": "^4.5.0"
}
}
diff --git a/packages/app/public/android-chrome-192x192.png b/packages/app/public/android-chrome-192x192.png
new file mode 100644
index 00000000..ce86fb39
Binary files /dev/null and b/packages/app/public/android-chrome-192x192.png differ
diff --git a/packages/app/public/android-chrome-512x512.png b/packages/app/public/android-chrome-512x512.png
new file mode 100644
index 00000000..841463db
Binary files /dev/null and b/packages/app/public/android-chrome-512x512.png differ
diff --git a/packages/app/public/apple-touch-icon.png b/packages/app/public/apple-touch-icon.png
new file mode 100644
index 00000000..68ab24a3
Binary files /dev/null and b/packages/app/public/apple-touch-icon.png differ
diff --git a/packages/app/public/chevron_down.svg b/packages/app/public/chevron_down.svg
new file mode 100644
index 00000000..fd72132b
--- /dev/null
+++ b/packages/app/public/chevron_down.svg
@@ -0,0 +1,3 @@
+
diff --git a/packages/app/public/chevron_up.svg b/packages/app/public/chevron_up.svg
new file mode 100644
index 00000000..cd4dda28
--- /dev/null
+++ b/packages/app/public/chevron_up.svg
@@ -0,0 +1,3 @@
+
diff --git a/packages/app/public/favicon-16x16.png b/packages/app/public/favicon-16x16.png
new file mode 100644
index 00000000..f34bc0af
Binary files /dev/null and b/packages/app/public/favicon-16x16.png differ
diff --git a/packages/app/public/favicon-32x32.png b/packages/app/public/favicon-32x32.png
new file mode 100644
index 00000000..2f1dac5b
Binary files /dev/null and b/packages/app/public/favicon-32x32.png differ
diff --git a/packages/app/public/favicon.ico b/packages/app/public/favicon.ico
index a11777cc..91a859cf 100644
Binary files a/packages/app/public/favicon.ico and b/packages/app/public/favicon.ico differ
diff --git a/packages/app/public/favicon_io/site.webmanifest b/packages/app/public/favicon_io/site.webmanifest
new file mode 100644
index 00000000..45dc8a20
--- /dev/null
+++ b/packages/app/public/favicon_io/site.webmanifest
@@ -0,0 +1 @@
+{"name":"","short_name":"","icons":[{"src":"/android-chrome-192x192.png","sizes":"192x192","type":"image/png"},{"src":"/android-chrome-512x512.png","sizes":"512x512","type":"image/png"}],"theme_color":"#ffffff","background_color":"#ffffff","display":"standalone"}
\ No newline at end of file
diff --git a/packages/app/public/fonts/NeuePixelGrotesk.ttf b/packages/app/public/fonts/NeuePixelGrotesk.ttf
new file mode 100644
index 00000000..904ae282
Binary files /dev/null and b/packages/app/public/fonts/NeuePixelGrotesk.ttf differ
diff --git a/packages/app/public/hero.svg b/packages/app/public/hero.svg
deleted file mode 100644
index fbe44457..00000000
--- a/packages/app/public/hero.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-
diff --git a/packages/app/public/index.html b/packages/app/public/index.html
index aa069f27..fe9149b5 100644
--- a/packages/app/public/index.html
+++ b/packages/app/public/index.html
@@ -2,19 +2,22 @@
-
+
-
+
-
+
+
- React App
+ Transformers QF
diff --git a/packages/app/public/logo.png b/packages/app/public/logo.png
new file mode 100644
index 00000000..859abaa5
Binary files /dev/null and b/packages/app/public/logo.png differ
diff --git a/packages/app/public/logo.svg b/packages/app/public/logo.svg
index b06df6d3..84def835 100644
--- a/packages/app/public/logo.svg
+++ b/packages/app/public/logo.svg
@@ -1,19 +1,7 @@
-