Skip to content

Commit

Permalink
Merge branch 'main' into remove_balance_check
Browse files Browse the repository at this point in the history
* main: (79 commits)
  Update package.json - bump to v2.0.4 (ProjectOpenSea#291)
  Update Node.js to v16.20.1 (ProjectOpenSea#290)
  Respect ERC1271 (ProjectOpenSea#286)
  Update dependency dotenv to v16.3.1 (ProjectOpenSea#273)
  Update dependency sinon to v15.2.0 (ProjectOpenSea#285)
  Update dependency c8 to v8 (ProjectOpenSea#287)
  Bump @openzeppelin/contracts from 4.9.0 to 4.9.2 (ProjectOpenSea#289)
  Update dependency @types/node to v16.18.36 (ProjectOpenSea#284)
  Update dependency hardhat to v2.15.0 (ProjectOpenSea#282)
  Update dependency @0xsequence/multicall to v0.43.34 (ProjectOpenSea#278)
  Update typescript-eslint monorepo to v5.60.0 (ProjectOpenSea#277)
  Update dependency eslint to v8.43.0 (ProjectOpenSea#271)
  Update dependency typescript to v5.1.3 (ProjectOpenSea#267)
  Update dependency concurrently to v8.2.0 (ProjectOpenSea#266)
  fix postinstall script, bump version (ProjectOpenSea#280)
  Update npm-publish.yml (ProjectOpenSea#276)
  Fix husky postinstall script (ProjectOpenSea#275)
  add readme banner (ProjectOpenSea#270)
  Update package.json version (ProjectOpenSea#269)
  Fix npm-publish.yml (ProjectOpenSea#268)
  ...
  • Loading branch information
nero-tang committed Jun 22, 2023
2 parents ec01171 + 5663e74 commit 45d3657
Show file tree
Hide file tree
Showing 61 changed files with 21,300 additions and 49,356 deletions.
8 changes: 4 additions & 4 deletions .c8rc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"reporter": ["lcov","text"],
"src": ["src"],
"exclude": ["hardhat.config.ts", "src/__tests__/*", "src/abi/*"]
}
"reporter": ["lcov", "text"],
"src": ["src"],
"exclude": ["hardhat.config.ts", "src/abi/*"]
}
Empty file removed .env.example
Empty file.
3 changes: 2 additions & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@ node_modules
artifacts
cache
coverage
lib
lib
typechain-types
6 changes: 3 additions & 3 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,22 @@ module.exports = {
ignorePatterns: ["lib"],
plugins: ["@typescript-eslint", "import"],
extends: [
"standard",
"plugin:prettier/recommended",
"eslint:recommended",
"plugin:prettier/recommended",
"plugin:import/typescript",
],
parser: "@typescript-eslint/parser",
parserOptions: {
ecmaVersion: 12,
project: ["tsconfig.json"],
},
rules: {
"n/no-unsupported-features/es-syntax": ["error", { ignores: ["modules"] }],
"no-unused-expressions": "off",
"@typescript-eslint/no-unused-vars": [
"error",
{ argsIgnorePattern: "^_", varsIgnorePattern: "^_" },
],
"@typescript-eslint/require-await": "error",
"object-shorthand": ["error", "always"],
},
};
File renamed without changes.
21 changes: 6 additions & 15 deletions .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,17 @@ on:
- main
pull_request:

env:
GITHUB_TOKEN: ${{ secrets.GH_PAT_TOKEN }}

jobs:
lint:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- name: Setup Node.js
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: 16.11.0
node-version: 16.x
cache: npm
env:
NODE_AUTH_TOKEN: ${{ secrets.GH_PAT_TOKEN }}

- name: Install dependencies
run: npm ci --ignore-scripts
Expand All @@ -38,12 +33,10 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Setup Node.js
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: 16.11.0
node-version: 16.x
cache: npm
env:
NODE_AUTH_TOKEN: ${{ secrets.GH_PAT_TOKEN }}

- name: Install dependencies
run: npm ci --ignore-scripts
Expand All @@ -60,12 +53,10 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Setup Node.js
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: 16.11.0
node-version: 16.x
cache: npm
env:
NODE_AUTH_TOKEN: ${{ secrets.GH_PAT_TOKEN }}

- name: Install dependencies
run: npm ci --ignore-scripts
Expand Down
23 changes: 23 additions & 0 deletions .github/workflows/npm-publish.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# This workflow will run tests using node and then publish a package to GitHub Packages when a release is created
# For more information see: https://help.github.com/actions/language-and-framework-guides/publishing-nodejs-packages

name: Node.js Package

on:
release:
types: [published]

jobs:
publish-npm:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version-file: .nvmrc
registry-url: https://registry.npmjs.org/
- run: npm install
- run: npm test
- run: npm publish
env:
NODE_AUTH_TOKEN: ${{secrets.npm_token}}
19 changes: 19 additions & 0 deletions .github/workflows/stale.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: "Close stale issues"
on:
schedule:
- cron: "0 0 * * *"

jobs:
stale:
runs-on: ubuntu-latest
steps:
- uses: actions/stale@v8
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
stale-issue-message: "This issue has been automatically marked as stale because it has not had recent activity. It will be closed in 14 days if no further activity occurs. Thank you for your contributions. If you believe this was a mistake, please comment."
stale-pr-message: "This PR has been automatically marked as stale because it has not had recent activity. It will be closed in 14 days if no further activity occurs. Thank you for your contributions. If you believe this was a mistake, please comment."
days-before-stale: 60
days-before-close: 14
operations-per-run: 100
exempt-pr-labels: "work-in-progress"
exempt-issue-labels: "work-in-progress"
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,14 @@ node_modules
.env
coverage
coverage.json
typechain
typechain-types
lib
yarn.lock

#Hardhat files
cache
artifacts

.vscode
.DS_Store
.idea/
2 changes: 1 addition & 1 deletion .husky/pre-push
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh
. "$(dirname "$0")/_/husky.sh"

yarn check-types:incremental
npm run check-types:incremental
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
16.11.0
16.20.1
3 changes: 1 addition & 2 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,5 @@ node_modules
artifacts
cache
coverage*
gasReporterOutput.json
lib
typechain
typechain-types
6 changes: 5 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
<p align="center">
<img src="./img/banner.png" />
</p>

[![Version][version-badge]][version-link]
[![npm][npm-badge]][npm-link]
[![Test CI][ci-badge]][ci-link]
Expand Down Expand Up @@ -158,7 +162,7 @@ const transaction = executeAllFulfillActions();

## Contributing

See [the contributing guide](CONTRIBUTING.md) for detailed instructions on how to get started with this project.
See [the contributing guide](./.github/CONTRIBUTING.md) for detailed instructions on how to get started with this project.

## License

Expand Down
23 changes: 5 additions & 18 deletions hardhat.config.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import * as dotenv from "dotenv";

import { HardhatUserConfig } from "hardhat/config";
import "@nomiclabs/hardhat-waffle";
import "@typechain/hardhat";
import "hardhat-gas-reporter";
import "@nomiclabs/hardhat-ethers";
import "@nomiclabs/hardhat-waffle";
import "solidity-coverage";

dotenv.config();

// Go to https://hardhat.org/config/ to learn more
// Go to https://hardhat.org/config to learn more
const config: HardhatUserConfig = {
solidity: {
compilers: [
Expand All @@ -30,15 +30,6 @@ const config: HardhatUserConfig = {
},
},
},
{
version: "0.4.23",
settings: {
optimizer: {
enabled: true,
runs: 200,
},
},
},
],
},
networks: {
Expand All @@ -47,16 +38,12 @@ const config: HardhatUserConfig = {
chainId: 1,
},
},
gasReporter: {
enabled: process.env.REPORT_GAS !== undefined,
currency: "USD",
},
typechain: {
outDir: "src/typechain",
outDir: "src/typechain-types",
target: "ethers-v5",
},
paths: {
tests: "src/__tests__",
tests: "test",
artifacts: "src/artifacts",
sources: "src/contracts",
},
Expand Down
Binary file added img/banner.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 45d3657

Please sign in to comment.