Skip to content

Commit

Permalink
Merge branch 'develop' of github.com:etouyang/Maskbook into pet-owner
Browse files Browse the repository at this point in the history
* 'develop' of github.com:etouyang/Maskbook: (173 commits)
  feat: more debugger connection actions (DimensionDev#6438)
  fix: sign tx by wallet with mnemonic words (DimensionDev#6437)
  fix: sign arbitrary message (DimensionDev#6436)
  fix: bugfix for refactor (DimensionDev#6434)
  fix: lost overrides (DimensionDev#6435)
  feat: add useAccountName (DimensionDev#6429)
  fix: button logic under EVM chain (DimensionDev#6431)
  fix: gas price fallback (DimensionDev#6432)
  chore: update node-version for workspace (DimensionDev#6428)
  refactor: social address list (DimensionDev#6410)
  fix: bugfix for trader (DimensionDev#6424)
  fix: duplicated db fetch (DimensionDev#6426)
  docs(i18n): sync i18n files from Crowdin (DimensionDev#6425)
  fix: tsc need restart to handle new file or removed file in watch mode
  fix: lint errors
  feat: referral farms (DimensionDev#6128)
  fix: fixup maskbox for evm migrate (DimensionDev#6395)
  fix: pets artblocks plugin (DimensionDev#6393)
  docs: update compat table
  refactor: add RecentTransactionComputed (DimensionDev#6420)
  ...

# Conflicts:
#	packages/dashboard/src/initialization/isolated_bridge.ts
#	packages/mask/src/extension/dashboard/index.tsx
#	packages/mask/src/plugins/Pets/SNSAdaptor/PetSetDialog.tsx
#	packages/mask/src/plugins/Pets/SNSAdaptor/PreviewBox.tsx
#	packages/mask/src/plugins/Pets/Services/rss3.ts
#	packages/mask/src/plugins/Pets/hooks/useNfts.ts
#	packages/shared/src/index.ts
  • Loading branch information
etouyang committed Jun 7, 2022
2 parents 21d2538 + 467af98 commit 328452f
Show file tree
Hide file tree
Showing 1,988 changed files with 55,078 additions and 42,740 deletions.
32 changes: 32 additions & 0 deletions .github/ISSUE_TEMPLATE/evm.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
---
name: Deploy Contract Request
about: Request to deploy contracts on a new EVM-compatible chain.
title: '[EVM Chain] Request to deploy contracts on '
labels: ''
assignees: DimensionDev/dev-smartcontract
---

Request to depoly contracts on <!-- Replace it with the chain name -->.

<!-- If you are working on a bounty please link to the issue here. -->

## Chain Info

| Name | Content |
| ------------ | ------- |
| Name | \- |
| ChainId | \- |
| Website | \- |
| RPC Endponit | \- |


## Checklist

The following contracts are requested.

+ [RedPacket](https://github.com/DimensionDev/RedPacket)
+ [Initial Twitter Offer](https://github.com/DimensionDev/InitialTwitterOffering)
+ Dummy Qualification
+ BalanceChecker
+ Multicall
+ UniswapInterfaceMulticall
30 changes: 0 additions & 30 deletions .github/workflows/deploy-proxy.yml

This file was deleted.

13 changes: 0 additions & 13 deletions .github/workflows/linters.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,19 +46,6 @@ jobs:
ref: ${{ github.event.pull_request.head.sha }}
- uses: actions/setup-node@v2
- run: npx anti-trojan-source --files='packages/**/src/**/*.{ts,tsx,js}'
locale-kit:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
with:
ref: ${{ github.event.pull_request.head.sha }}
- uses: pnpm/action-setup@v2.2.1
- uses: actions/setup-node@v2
with:
node-version: "17"
cache: "pnpm"
- run: pnpm install
- run: npx gulp locale-kit
type-check-and-jest:
runs-on: ubuntu-20.04
steps:
Expand Down
Loading

0 comments on commit 328452f

Please sign in to comment.