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

LOP v4 #49

Merged
merged 39 commits into from
Mar 12, 2024
Merged
Show file tree
Hide file tree
Changes from 18 commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
f381cd8
feat(lop-v4): implement maker traits
vbrvk Jan 19, 2024
1d01b3a
wip
vbrvk Feb 22, 2024
7b84e8d
final
vbrvk Feb 28, 2024
48a93a3
remove nonce manager
vbrvk Feb 29, 2024
f831957
rename ABI
vbrvk Mar 1, 2024
8fe6d0c
remove nonce manager and add delayAuctionStartTimeBy param
vbrvk Mar 1, 2024
8ed9dc5
pr comment fixes
vbrvk Mar 1, 2024
dd820c5
add getFillContractOrderArgsCalldata method
vbrvk Mar 1, 2024
0de801c
allow fusion order with permit2
vbrvk Mar 1, 2024
b070bfc
default extra params for fusion in single object
vbrvk Mar 1, 2024
2dc8aee
fix linter
vbrvk Mar 1, 2024
3afa3b9
fix types
vbrvk Mar 1, 2024
5e810c8
fix types
vbrvk Mar 1, 2024
f580c65
chore
vbrvk Mar 1, 2024
d6489b8
try reset cache
vbrvk Mar 2, 2024
e852c5f
try reset cache
vbrvk Mar 2, 2024
d4cc665
update doc
vbrvk Mar 4, 2024
c3a1114
remove addresses
vbrvk Mar 4, 2024
62d5618
refactor
vbrvk Mar 4, 2024
4b1cd40
use @1inch/limit-order-sdk
vbrvk Mar 11, 2024
e8e5010
pass allowMultipleFills/allowPartialFills to fusion order
vbrvk Mar 11, 2024
481022d
remove unused extension field
vbrvk Mar 11, 2024
9360f5e
fix doc
vbrvk Mar 11, 2024
8dc1189
fix doc
vbrvk Mar 11, 2024
14db2ef
fix doc
vbrvk Mar 11, 2024
7ca81f8
add allowMultipleFills to sdk
vbrvk Mar 11, 2024
07b9f08
Merge branch 'main' into feat/limit-order-v4
vbrvk Mar 11, 2024
3934d93
use @1inch eslint config
vbrvk Mar 11, 2024
5ad5819
fix a pr check job
vbrvk Mar 11, 2024
066a37c
fix a pr check job
vbrvk Mar 11, 2024
556d048
fix ci
vbrvk Mar 11, 2024
d9bfa6b
fix ci
vbrvk Mar 11, 2024
3d6ecad
fix whitelist creation
vbrvk Mar 12, 2024
a42e3ac
new ci
vbrvk Mar 12, 2024
fa91caf
change version
vbrvk Mar 12, 2024
2bad225
use pnpm
vbrvk Mar 12, 2024
c7a632d
update lock
vbrvk Mar 12, 2024
a6e1467
fix tests
vbrvk Mar 12, 2024
e545394
rename ci job
vbrvk Mar 12, 2024
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
29 changes: 2 additions & 27 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,29 +13,6 @@ jobs:
setup:
name: Setup
runs-on: ubuntu-20.04

steps:
- name: Load current commit
uses: actions/checkout@v3
with:
ref: ${{ github.ref }}

- name: Setup Node.js
uses: volta-cli/action@v4

- name: Restore cache
uses: actions/cache@v3
id: yarn-cache
if: github.event_name == 'pull_request' || github.event_name == 'push'
with:
path: '**/node_modules'
key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}


- name: Install dependencies
if: steps.yarn-cache.outputs.cache-hit != 'true'
run: |
yarn --frozen-lockfile --no-progress

static-checks:
name: Static checks
Expand All @@ -57,8 +34,7 @@ jobs:
if: github.event_name == 'pull_request' || github.event_name == 'push'
with:
path: '**/node_modules'
key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}

key: ${{ runner.os }}-modules-1-${{ hashFiles('**/yarn.lock') }}

- name: Install dependencies
if: steps.yarn-cache.outputs.cache-hit != 'true'
Expand All @@ -73,7 +49,7 @@ jobs:

- name: Type check
run: yarn typecheck

tests:
name: Unit tests
needs: setup
Expand All @@ -96,7 +72,6 @@ jobs:
path: '**/node_modules'
key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}


- name: Install dependencies
if: steps.yarn-cache.outputs.cache-hit != 'true'
run: |
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ yarn add @1inch/fusion-sdk
## Modules docs

- [auction-calculator](src/auction-calculator/README.md)
- [auction-salt](src/auction-salt/README.md)
- [auction-suffix](src/auction-suffix/README.md)
- [auction-salt](src/auction-details/README.md)
- [auction-suffix](src/post-interaction-data/README.md)
- [fusion-order](src/fusion-order/README.md)
- [sdk](src/sdk/README.md)
- [ws-api](src/ws-api/README.md)
Expand Down
9 changes: 4 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,11 @@
"ci-pipeline": "yarn run lint && yarn run test && yarn run typecheck"
},
"dependencies": {
"@ethersproject/bignumber": "^5.1.1",
"@metamask/eth-sig-util": "^5.0.2",
"bn.js": "^5.2.1",
"web3": "^1.8.1",
"ws": "^8.12.1",
"tslib": "^2.2.0"
"ethers": "6.11.0",
"tslib": "^2.2.0",
"ws": "^8.12.1"
},
"devDependencies": {
"@babel/core": "^7.13.16",
Expand All @@ -38,7 +37,7 @@
"@types/prompts": "^2.0.12",
"@types/ws": "^8.5.4",
"@typescript-eslint/eslint-plugin": "4",
"axios": "^1.2.3",
"axios": "^1.6.7",
"babel-jest": "^26.6.3",
"eslint": "7",
"eslint-config-prettier": "^8.2.0",
Expand Down
Loading
Loading