Skip to content

Commit

Permalink
Rebase onto upstream (#16)
Browse files Browse the repository at this point in the history
* Add Airdrop UI (delvtech#400)

Co-authored-by: Ryan Goree <[email protected]>
Co-authored-by: Chakravarthy7102 <[email protected]>

* Remove custom bigint utils (delvtech#401)

* Add ArcadeDAO logo (delvtech#403)

* Update Gyroscope link (delvtech#404)

* Remove "COMING SOON" under Gyroscope (delvtech#405)

* Add terms and privacy links (delvtech#406)

* Upgrade all the things (delvtech#407)

* Edit top level config

* Update tsconfig

* Update prettier config

* Update eslint config

* checkpoint

* Update SDK configs

* Change typechain to artifacts

* Rename typechain folder

* Streamline artifacts

* Move artifacts script

* Remove I interface prefix and redundant interfaces

* Refactor prettier, add package back

* Update evm packages

* Refactor Models progress

* Update LockingVault model

* Update GSCVault model

* Update CachedContract id field to namespace

* Checkpoint

* Client improvements

* Badass evm-client

* Fix util type

* Fix NamedEventInput type

* Fix types

* Fix comment

* Update viem client

* Add calldatas to spellcheck

* Use arg types from evm-client

* Reorg evm-client, more fixes

* Wrap up clients

* Huge milestone force commit

* Add council-viem implementations

* Add council-ethers and reafactors

* Reset all app changes

* Update packages

* Redo CLI

* Remove single letter options, upgrade clide, fix all the things

* Package progress

* Package export management

* Checkpoint

* Update artifacts script

* Remove local evm-client package

* Fix option values passed to forked commands.

* Re-org src dir

* Fix wagmi and query client providers

* Update react-tooltip usage

* Fix import

* Bump evm-client version to fix type resolutions in next.js

* Milestone

* Details page working

* Milestone

* Progress

* Vaults page progress

* Progress

* Progress

* Progress

* Progress

* Progress

* Progress

* Progress

* Progress

* Progress

* Progress

* Fix ethers sdk

* Progress

* Progress

* Fix getBulkEnsRecords

* Fix examples

* Fix type errors

* Add test for `getVotingPowerBreakdown`

* Remove nonexistent file from tsconfig

* streamline pr workflow

* Add paths to landing page deploy workflow

* Fix file casing

* Remove color class from landiing H1

* Remove unnecessary casting to unknown

* Fix skeletons

* Update packages

* Disable council-viem integration test and move into src

* Fix voting UI and nav buttons

* Remove prop

* Remove parcel

* Update packages and sdk-starter

* Bump all deps

* Add changesets and release workflow (delvtech#410)

* Update pages workflow and nvm

* Add changesets

* Fix pages workflow

* Set all package versions to 0.0.0

* Fix changeset dep

* Init changesets

* Add changeset

* Fix typo

* chore: version packages (delvtech#411)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

* Add missing `publishConfig` setting to artifacts package.json (delvtech#412)

* Add publishConfig to artifacts package.json

* Add changeset

* chore: version packages (delvtech#413)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

* [CLI] Add hardhat to peer deps and handle errors (delvtech#414)

* Add hardhat to peer deps

* Change command name

* Remove hardhat from artifacts

* Handle run errors

* Handle missing hardhat

* Add changesets

* chore: version packages (delvtech#415)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

* Add prebuild script for WalletConnect domain verification (delvtech#416)

* Ensure env variables are picked up when used in production

* Bump version, add walletconnect.txt

* Add prebuild script for walletconnect domain verification

* Remove walletconnect.txt

* nit formatting

* Add changeset

* Handle no .env file

* chore: version packages (delvtech#417)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

* Bump rainbowkit, wagmi, viem (delvtech#418)

* Remove Voting Power column on GSC voting activity table (delvtech#419)

* Remove VP col on GSC voting activity table

* Remove non-null assertion

* Update tailwind config

* Add redirect for / -> /proposals

* Add logo

* Update proposals page copy

* Vaults page copy

* Update Voters page copy

* Don't support goerli

* Fix build

* Add meta tags:

* Add favicon

* Add favicon to head

* Add terms of service and privacy policy

* refactor hook -> getter

* Remove localhost chain id case

* Add EGP-16: GSC-5 proposal details (#15)

* Fix navigation import paths

* Hotfix for `ReadProposal._getExecutedEvents`

---------

Co-authored-by: Chakravarthy7102 <[email protected]>
Co-authored-by: Danny Delott <[email protected]>
  • Loading branch information
3 people authored Mar 21, 2024
1 parent 70bf67d commit 16d4270
Show file tree
Hide file tree
Showing 914 changed files with 30,094 additions and 90,675 deletions.
8 changes: 8 additions & 0 deletions .changeset/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# Changesets

Hello and welcome! This folder has been automatically generated by `@changesets/cli`, a build tool that works
with multi-package repos, or single-package repos to help you version and publish your code. You can
find the full documentation for it [in our repository](https://github.com/changesets/changesets)

We have a quick list of common questions to get you started engaging with this project in
[our documentation](https://github.com/changesets/changesets/blob/main/docs/common-questions.md)
11 changes: 11 additions & 0 deletions .changeset/config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"$schema": "https://unpkg.com/@changesets/[email protected]/schema.json",
"changelog": "@changesets/cli/changelog",
"commit": false,
"fixed": [],
"linked": [],
"access": "restricted",
"baseBranch": "main",
"updateInternalDependencies": "patch",
"ignore": []
}
31 changes: 0 additions & 31 deletions .github/workflows/build.yml

This file was deleted.

31 changes: 0 additions & 31 deletions .github/workflows/format-check.yml

This file was deleted.

30 changes: 20 additions & 10 deletions .github/workflows/gh-pages-council.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ on:
# Runs on pushes targeting the default branch
push:
branches: ["main"]
paths:
- "apps/council-ui/**"
- ".github/workflows/gh-pages-council.yml"

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:
Expand All @@ -23,23 +26,26 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Setup Node
uses: actions/setup-node@v3
- name: Check out code
uses: actions/checkout@v4

- name: Setup Node.js environment
uses: actions/setup-node@v4
with:
node-version: "16"
node-version: 20
cache: "yarn"

- name: Setup Pages
uses: actions/configure-pages@v2
uses: actions/configure-pages@v4
with:
# Automatically inject basePath in your Next.js configuration file and disable
# server side image optimization (https://nextjs.org/docs/api-reference/next/image#unoptimized).
#
# You may remove this line if you want to manage the configuration yourself.
static_site_generator: next

- name: Restore cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: |
apps/council-ui/.next/cache
Expand All @@ -48,16 +54,20 @@ jobs:
# If source files changed but packages didn't, rebuild from a prior cache.
restore-keys: |
${{ runner.os }}-nextjs-${{ hashFiles('**/package-lock.json', '**/yarn.lock') }}-
- name: Install dependencies
run: yarn

- name: Build with Next.js
env:
NEXT_PUBLIC_MAINNET_ALCHEMY_KEY: ${{ secrets.MAINNET_ALCHEMY_KEY }}
NEXT_PUBLIC_GOERLI_ALCHEMY_KEY: ${{ secrets.GOERLI_ALCHEMY_KEY }}
NEXT_PUBLIC_MAINNET_RPC_URL: ${{ secrets.MAINNET_RPC_URL }}
NEXT_PUBLIC_GOERLI_RPC_URL: ${{ secrets.GOERLI_RPC_URL }}
NEXT_PUBLIC_COUNCIL_UI_BASE_PATH: ${{ secrets.COUNCIL_UI_BASE_PATH }}
run: npx turbo run build --filter=council-ui

- name: Static HTML export of Next.js
run: yarn workspace council-ui run export

- name: Upload artifact
uses: actions/upload-pages-artifact@v1
with:
Expand All @@ -73,4 +83,4 @@ jobs:
steps:
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v1
uses: actions/deploy-pages@v4
31 changes: 0 additions & 31 deletions .github/workflows/lint.yml

This file was deleted.

34 changes: 34 additions & 0 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
# https://turbo.build/repo/docs/ci/github-actions

name: Pull Request

on:
pull_request:
types: [opened, synchronize, reopened, ready_for_review]

concurrency:
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
cancel-in-progress: true

jobs:
verify:
runs-on: ubuntu-latest
strategy:
matrix:
tasks: [lint, build, typecheck, test]

steps:
- name: Check out code
uses: actions/checkout@v4

- name: Setup Node.js environment
uses: actions/setup-node@v4
with:
node-version: 20
cache: "yarn"

- name: Install dependencies
run: yarn --frozen-lockfile

- name: Run ${{ matrix.tasks }}
run: yarn ${{ matrix.tasks }}
36 changes: 36 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
name: Release

on:
push:
branches:
- main

concurrency: ${{ github.workflow }}-${{ github.ref }}

jobs:
release:
name: Release
runs-on: ubuntu-latest
steps:
- name: Check out code
uses: actions/checkout@v4

- name: Setup Node.js environment
uses: actions/setup-node@v4
with:
node-version: 20
cache: 'yarn'

- name: Install dependencies
run: yarn --frozen-lockfile

- name: Create Release Pull Request or Publish to npm
id: changesets
uses: changesets/action@v1
with:
commit: 'chore: version packages'
title: 'chore: version packages'
publish: yarn release
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
node_modules
dist
.turbo
.next
.DS_Store
.parcel-cache
.DS_Store
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
20
15 changes: 15 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
node_modules
dist
.DS_Store
/build
/.svelte-kit
/package
.env
.env.*
!.env.example

# Ignore files for PNPM, NPM and YARN
pnpm-lock.yaml
package-lock.json
yarn.lock
vite.config.*.timestamp-*
1 change: 1 addition & 0 deletions packages/prettier-config/index.js → .prettierrc.cjs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
module.exports = {
plugins: ["prettier-plugin-organize-imports"],
tabWidth: 2,
useTabs: false,
trailingComma: "all",
Expand Down
14 changes: 13 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,17 @@
"url": "./packages/council-deploy/src/deployments/deployments.schema.json"
}
],
"markdown.extension.toc.levels": "2..6"
"markdown.extension.toc.levels": "2..6",
"cSpell.words": [
"abitype",
"calldatas",
"Delegators",
"delvtech",
"merkle",
"Timelock",
"tsup",
"typecheck",
"unvested",
"Viem"
]
}
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ This monorepo uses [Yarn](https://classic.yarnpkg.com/) as a package manager. It

| Name | Description |
| ----------------------------------------------------------------------------------------------- | ------------------------------------ |
| [eslint-config](https://github.com/delvtech/council-kit/tree/main/packages/eslint-config) | Package for static type checking. |
| [@council/eslint-config](https://github.com/delvtech/council-kit/tree/main/packages/@council/eslint-config) | Package for static type checking. |
| [prettier-config](https://github.com/delvtech/council-kit/tree/main/packages/prettier-config) | Package for code formatting. |
| [tsconfig](https://github.com/delvtech/council-kit/tree/main/packages/tsconfig) | Package for TypeScript configuation. |
| [@council/tsconfig](https://github.com/delvtech/council-kit/tree/main/packages/tsconfig) | Package for TypeScript configuation. |

Each package/app is 100% [TypeScript](https://www.typescriptlang.org/).

Expand Down
4 changes: 2 additions & 2 deletions apps/council-sdk-starter/.env.example
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
PROVIDER_URI=
WALLET_PRIVATE_KEY=
RPC_URL=
WALLET_PRIVATE_KEY=
1 change: 0 additions & 1 deletion apps/council-sdk-starter/.prettierignore

This file was deleted.

4 changes: 0 additions & 4 deletions apps/council-sdk-starter/.prettierrc.js

This file was deleted.

20 changes: 20 additions & 0 deletions apps/council-sdk-starter/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# council-sdk-starter

## 0.0.3

### Patch Changes

- @delvtech/council-viem@0.0.3

## 0.0.2

### Patch Changes

- @delvtech/council-viem@0.0.2

## 0.0.1

### Patch Changes

- Updated dependencies [abebf3c]
- @delvtech/council-viem@0.0.1
Loading

0 comments on commit 16d4270

Please sign in to comment.