Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: order with taker fee #37

Merged
merged 44 commits into from
Jan 21, 2025
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
48ed238
feat: order with taker fee
vbrvk Dec 30, 2024
3764f0d
fix linter
vbrvk Dec 30, 2024
53020ba
fixes
vbrvk Jan 15, 2025
42306eb
fixes
vbrvk Jan 15, 2025
5f19926
fix: add whitelist discount to interaction data
vbrvk Jan 16, 2025
a47b0fb
chore: forge init
vbrvk Jan 16, 2025
6d43059
forge install: forge-std
vbrvk Jan 16, 2025
f24c4ce
wipˆ
vbrvk Jan 16, 2025
23f843f
forge install: limit-order-protocol
vbrvk Jan 16, 2025
7f6f5f6
wip
vbrvk Jan 16, 2025
8f2c474
forge install: solidity-utils
vbrvk Jan 16, 2025
55c54a8
wip
vbrvk Jan 16, 2025
46aa849
forge install: openzeppelin-contracts.git
vbrvk Jan 16, 2025
c23676f
init contract build
vbrvk Jan 16, 2025
57063de
rfq test
vbrvk Jan 16, 2025
9061414
fix doc
vbrvk Jan 16, 2025
cc7eb49
Merge branch 'master' into taker-fee
vbrvk Jan 17, 2025
16f59dc
fix: add bluebird for dev (changelog generator requires it)
vbrvk Jan 17, 2025
87cee66
fix: deps
vbrvk Jan 17, 2025
150f653
fix: deps
vbrvk Jan 17, 2025
cee6cb2
fix: deps
vbrvk Jan 17, 2025
bad0bc3
remove changelog generation for dev release action
vbrvk Jan 17, 2025
9c0f721
version v4.9.3-rc.2
Jan 17, 2025
04b8610
version v4.9.3-rc.3
Jan 17, 2025
99b23ae
fix ci
vbrvk Jan 17, 2025
5c6f66d
version v4.9.3-rc.4
Jan 17, 2025
2c96676
Merge branch 'master' into taker-fee
vbrvk Jan 17, 2025
d23422a
version v4.9.3-rc.5
Jan 17, 2025
96a762a
update lock
vbrvk Jan 17, 2025
6e75bb2
version v4.9.3-rc.6
Jan 17, 2025
c7cfb4a
fix(ci): update pnpm in ci to v9
vbrvk Jan 17, 2025
2614b41
version v4.9.3-rc.7
Jan 17, 2025
6b1ce93
feat: exports for fee taker extˆ
vbrvk Jan 17, 2025
a0db173
Merge branch 'taker-fee-tests' into taker-fee
vbrvk Jan 20, 2025
db2b157
pnpm lock
vbrvk Jan 20, 2025
6a0a513
fix ci
vbrvk Jan 20, 2025
fada10e
version v4.9.3-rc.8
Jan 20, 2025
77e0511
add Bps to export
vbrvk Jan 20, 2025
8a09671
version v4.9.3-rc.9
Jan 20, 2025
ef5d791
tests wip
vbrvk Jan 20, 2025
d54cbfa
Merge branch 'taker-fee-tests' into taker-fee
vbrvk Jan 20, 2025
1078c32
tests
vbrvk Jan 20, 2025
f257bc8
refactor files
vbrvk Jan 21, 2025
74e0266
version v4.9.3-rc.10
Jan 21, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions .eslintignore

This file was deleted.

3 changes: 0 additions & 3 deletions .eslintrc.js

This file was deleted.

3 changes: 3 additions & 0 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
import oneInchEslintConfig from '@1inch/eslint-config'

export default oneInchEslintConfig
51 changes: 26 additions & 25 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,41 +42,42 @@
"docs:generate": "tsdoc --src=src/limit-order/* --dest=src/limit-order/README.md && tsdoc --src=src/limit-order-contract/* --dest=src/limit-order-contract/README.md",
"format": "prettier --write \"src/**/*.ts\" \"test/**/*.ts\"",
"lint:ci": "eslint \"{src,apps,libs,test}/**/*.ts\"",
"lint": "eslint \"{src,apps,libs,test}/**/*.ts\" --ignore-path .eslintignore --fix",
"lint": "eslint \"{src,apps,libs,test}/**/*.ts\" --fix",
"lint:types": "tsc --noEmit",
"test": "jest",
"test:watch": "jest --watch",
"check": "pnpm lint && pnpm lint:types && pnpm test",
"changelog:generate": "changelog generate -a"
},
"dependencies": {
"@1inch/byte-utils": "2.2.1",
"ethers": "6.13.1"
"@1inch/byte-utils": "3.0.0",
"ethers": "6.13.5"
},
"devDependencies": {
"@1inch/eslint-config": "1.4.3",
"@1inch/tsconfig": "1.0.7",
"@swc/core": "1.3.66",
"@swc/jest": "0.2.26",
"@types/jest": "29.5.2",
"@types/node": "^18.19.36",
"@typescript-eslint/eslint-plugin": "~5.59.11",
"@typescript-eslint/parser": "~5.51.0",
"axios": "^1.7.2",
"eslint": "8.41.0",
"eslint-config-prettier": "~8.3.0",
"@1inch/eslint-config": "3.0.6",
"@1inch/tsconfig": "1.0.8",
"@swc/core": "1.10.7",
"@swc/jest": "0.2.37",
"@types/jest": "29.5.14",
"@types/node": "^22.10.6",
"@typescript-eslint/eslint-plugin": "~8.20.0",
"@typescript-eslint/parser": "~8.20.0",
"axios": "^1.7.9",
"eslint": "9.18.0",
"eslint-config-prettier": "~10.0.1",
"eslint-config-standard": "^17.1.0",
"eslint-import-resolver-typescript": "3.5.5",
"eslint-plugin-import": "~2.26.0",
"eslint-plugin-n": "^16.6.2",
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-promise": "^6.2.0",
"eslint-plugin-unused-imports": "^2.0.0",
"eslint-import-resolver-typescript": "3.7.0",
"eslint-plugin-import": "~2.31.0",
"eslint-plugin-n": "^17.15.1",
"eslint-plugin-prettier": "^5.2.2",
"eslint-plugin-promise": "^7.2.1",
"eslint-plugin-unused-imports": "^4.1.4",
"generate-changelog": "^1.8.0",
"jest": "29.5.0",
"prettier": "^2.8.8",
"tsdoc-markdown": "0.3.0",
"tslib": "2.6.3",
"typescript": "4.9.4"
"jest": "29.7.0",
"prettier": "^3.4.2",
"tsdoc-markdown": "1.1.0",
"tslib": "2.8.1",
"typescript": "5.7.3"
},
"peerDependencies": {
"assert": "^2.0.0",
Expand Down
Loading
Loading