Skip to content

Commit

Permalink
Squash (#211)
Browse files Browse the repository at this point in the history
* home page button

* changes

* fix(app): fixed babel error that converts ** to .pow causing build failure with Bigint error

babel converts ** to .pow, fix is to target only browser versions with native BigInt support

* feat(cli): crate prague erc20, mint with 18 decimals

deploy script should mint more pool tokens there need to be as many of these tokens as there are
tokens in the prize pool. Projects will then be able to exchange this dummy token for xdai.

* stub out vkregistry

* v0.3.1

* bump npm version

* v0.3.2

* fix: numeric overflow when passing initial supply of ERC20 token to contract

* message hook

* v0.3.3

* feat: track SimpleHackathon contract as a recipient registry in the subgraph

* fix: missing SimpleHackathon source on subgraph.yaml

* fix: build error due to missing data source

* feat: add basic signup command; minors and code lint

* v0.4.0

* revert: revern npm deploy

npm revert

* v1.0.0

* revert: npm revert to 0.3.3

* v1.0.1

* WIP: sigup patch

* patch - use pubkey to generate unserialized contract params for signup

* feat(cli): dothething command to batch all the other commands

leaves the funds distribution for a later step

* v1.1.0

* deploy round cli

* v1.2.0

* fix(cli): patch prague deploy

* v1.3.0

* WIP:vote

* squash and merge

* copy changes

* revert to hash router for IPFS

* recipient ids

* messages test

* vote in batches

* refactor: update contents for Ballot, Quickstart and Settings drawers and pages

* fund user wallets

* hardcode prague pubkeys

* feat(cli): command to fund user wallets for ethPrague

sends 0.1 base network unit to every participant to use for gas

* v1.4.0

* remove unused deps

* patch

* docs(cli): command description

* v1.4.1

* feat(app): graceful error handling on MACI key input

tests if MACI key is registered and hides ballot submit button if it is not

* v1.5.0

* add two projects

* experimental navbabr

* lint and update button text

* update maci input

* trim extra space from macikey input

* ballot changes

* better error messages

* quick fix - ballot page qr scan

* clean up

* revert

* success toast after tx is confirmed

* fix qr scanning on ballot

* Fix unable to run pre-commit hook in Ubuntu

* voting closed

* feat(ethbarcelona cli): configure cli for eth barcelona: polygon support

* clean up ethPrague constants

* feat(polygon support): gas price tweaks, eject csv of public keys on key gen

* v1.6.0

* v2.0.0

* update git head

* update git head for npm

* style(cli): nit formating

* v2.0.1

* base website changes

* feat(all): ethBarcelona changes

theme abstractions, landing page, button animation, custom fonts, mobile friendly, top nav layout

* routing+

* project page nav bug fix

* nit: copy change on settings screen

* feat(ethbarcelona: cli easy setup): change max projects

* v2.1.0

* fix: duration

* ens

* fix, upgrade alchemy node

* recover signup

* chore: improve guide and settings drawers

* Barcelona voting ready

* prod

* add project

* nit: text

* update polygon rpc

* v2.2.0

* bump version

* v2.2.1

* bugfix: verify macikeypair is valid length

* ethLatam

* v2.3.0

* bump version

* v2.3.1

* favicon + bg + title + navvar

* i18next

* fix all links contrast

* home buttons

* better buttons + better ballot page

* YES BACKGROUND

* feat: adapt Ballot page to fit figma designs

* chore:  remove console warnings

* fix: responsive home

* feat: new english texts + delete begin and settings page

* feat: spanish translations

* feat: update Ballot and BallotOption styles to support mobile views

* chore: refactor components disposition for mobile viewport

* styles: update all buttons and inputs to match ETH LATAM DS

* chore: rebase to main and fix minor issues post rebase

* chore: prune unneeded code

* chore: prune unneeded code, refactor BallotExplainer to display the accordion caret at the bottom of the CTA

* feat: add transaltions to MagikButton, Ballot and BallotOption

* feat: make BallotExplainer Accordion compliant with Figma designs

* feat: add lang select component

* feat: add missing translations, update some Accordion styles

* fix: update swapped translations

* chore: refactor link font size upscale

* feat: apply page

* feat: add titles

* remove Barcelona projects from the page

* fix merge conflict

* fix ballot page and add projects

* maci public keys quickcheck

* v2.4.0

* v3.0.0

* fix: fix projects mobile

* fix:connect wallet on mobile

* ethLatam contracts update

* bump npm version

* v3.1.0

* feat: add expediente crypto

* fix: fix commNode images

* feat: update Expediente Crypto logo picture

* update public key white list and set voting contract

* reduce number of rpc requests

* code cleanup

* test round

* ethTaiwan live vote tally feature

* npm version bump

* v3.4.2

* npm version bump, fix bin file for cli

* v3.4.5

* new grantround

* fix fast tally results

* npm version bump

* v3.5.1

* nit: change matching pool amount to USDC instead of DAI

* npm version bump

* v3.5.3

* update locale

* clean up code

* basic branding changes

* refactor(font): replace Helvetica with Noto Sans TC

* modified localized text

* modified for zkplayground stage 1

* npm version bump, suport goerli

* v3.5.4

* Update zk projects info

* Minor update

* Modified some usage of text

* minor update

* config zkplayground contracts and MACI keys

* v3.5.5

* npm version bump

* feat: modify the projects data and the provider network setting

* recover from project signup step

* feat: delete the keys of stateIndexByPubKey and userSignUps which are over 258

* point to poll contract on goerli

* tally - set grantround start block manually, qol changes

* v3.7.0

* npm version bump

* v3.7.2

* update grant round address

* nit: formating

* wip: ethporto <> transformers website

* new MACI/QFI contracts following proxy pattern and separation of concerns, initial tests passing. New Porto UI. Gutted CLI and will replace with new contracts to test

* ethporto ui theme

* refactor

* refactor - gitignore

* missing deps for es5 shim

* complete the refactor

* remove unused components

* fix dapp build error caused by typechain build, pin the needed contracts and delete the rest to reduce bundle size

* simplify the UI

* nit copy

* Add basic /about page

* Remove unused imports

* Update copy

* Update copy

* Remove unused imports

* e2e tests

* nit: clean up branding

* internationalization, PT

* project info for transformers proposals

* randomize projects

* CTA

* remove tooltips from nav

* landing page explanation

* start voting

---------

Co-authored-by: Giacomo <[email protected]>
Co-authored-by: Daehyun Paik <[email protected]>
Co-authored-by: Tobias <[email protected]>
Co-authored-by: 0xTobias <[email protected]>
Co-authored-by: Rorry <[email protected]>
Co-authored-by: emn178 <[email protected]>
Co-authored-by: zkplayground <[email protected]>
Co-authored-by: jimxjim <[email protected]>
Co-authored-by: EC2 Default User <[email protected]>
Co-authored-by: Sam Richards <[email protected]>
  • Loading branch information
11 people authored Oct 18, 2023
1 parent fc8549e commit 3c3df7e
Show file tree
Hide file tree
Showing 411 changed files with 66,974 additions and 43,205 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/contracts-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
8 changes: 4 additions & 4 deletions .github/workflows/contracts-coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/subgraph-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
/node_modules
/.pnp
.pnp.js
.vscode

# testing
/coverage
Expand All @@ -28,3 +29,4 @@ notes/
npm-debug.log*
yarn-debug.log*
yarn-error.log*
lerna-debug.log*
7 changes: 4 additions & 3 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -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()
Expand Down Expand Up @@ -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
32 changes: 32 additions & 0 deletions .husky/scripts/_pre-commit
Original file line number Diff line number Diff line change
@@ -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
Loading

0 comments on commit 3c3df7e

Please sign in to comment.