Skip to content

Commit 6eb41f3

Browse files
authored
Merge branch 'main' into use-default-balancer-vault
2 parents 3ef6a27 + 08f8627 commit 6eb41f3

File tree

254 files changed

+17419
-15350
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

254 files changed

+17419
-15350
lines changed

.devcontainer/devcontainer.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"name": "Foundry + Node",
3+
"image": "mcr.microsoft.com/devcontainers/base:0",
4+
"features": {
5+
"ghcr.io/nlordell/features/foundry": {},
6+
"ghcr.io/devcontainers/features/node:1": {}
7+
},
8+
"customizations": {
9+
"vscode" : {
10+
"extensions": [
11+
"JuanBlanco.solidity"
12+
]
13+
}
14+
}
15+
}

.dockerignore

Lines changed: 0 additions & 5 deletions
This file was deleted.

.gas-snapshot

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
TestNoOp:test_noOp() (gas: 122)

.github/CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* @cowprotocol/contracts

.github/dependabot.yml

Lines changed: 0 additions & 9 deletions
This file was deleted.

.github/pull_request_template.md

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
1-
Closes #issue (optional)
1+
## Description
22

3-
_<Context of what this change does, why it is needed and how it is accomplished>_
3+
<!-- Describe the changes made in your pull request here - what this change does, why it is needed and how it is accomplished -->
44

5-
### Test Plan
5+
## Test Plan
66

7-
_<Explain how you and a reviewer have/intend to test this change>_
7+
<!-- Explain how you and a reviewer have/intend to test this change -->
8+
9+
## Related Issues
10+
11+
<!-- List related issues here -->
12+
<!-- Closes #issue (optional) -->

.github/workflows/CI.yml

Lines changed: 0 additions & 63 deletions
This file was deleted.

.github/workflows/ci.yml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: Node.js CI
2+
3+
on:
4+
push:
5+
branches: [main]
6+
pull_request:
7+
8+
jobs:
9+
test:
10+
strategy:
11+
matrix:
12+
node-version: [18.x]
13+
os: [ubuntu-latest]
14+
runs-on: ${{ matrix.os }}
15+
steps:
16+
- uses: actions/checkout@v4
17+
- uses: actions/setup-node@v4
18+
with:
19+
node-version: ${{ matrix.node }}
20+
- id: yarn-cache
21+
run: echo "::set-output name=dir::$(yarn cache dir)"
22+
- uses: actions/cache@v4
23+
with:
24+
path: ${{ steps.yarn-cache.outputs.dir }}
25+
key: ${{ matrix.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
26+
restore-keys: |
27+
${{ matrix.os }}-yarn-
28+
- run: yarn --frozen-lockfile
29+
- run: yarn build
30+
- run: yarn lint
31+
- run: yarn coverage
32+
- run: yarn test:ignored-in-coverage

.github/workflows/cla.yml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,15 @@ on:
66
pull_request_target:
77
types: [opened, closed, synchronize]
88

9-
permissions:
10-
actions: write
11-
contents: write
12-
pull-requests: write
13-
statuses: write
14-
159
jobs:
1610
cla:
1711
runs-on: ubuntu-latest
1812
steps:
1913
- name: "CLA Assistant"
2014
if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target'
21-
uses: contributor-assistant/github-action@v2.2.1
15+
uses: contributor-assistant/github-action@v2.6.1
2216
env:
2317
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
24-
PERSONAL_ACCESS_TOKEN : ${{ secrets.ORG_TOKEN }}
2518
with:
2619
branch: 'cla-signatures'
2720
path-to-signatures: 'signatures/version1/cla.json'

.github/workflows/gas.yml

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
name: Gas
2+
3+
on:
4+
pull_request:
5+
paths:
6+
- '**.sol'
7+
- '**.yml'
8+
- '**.toml'
9+
- 'lib/**'
10+
- '.gitmodules'
11+
- '.gas-snapshot'
12+
push:
13+
branches:
14+
- main
15+
paths:
16+
- '**.sol'
17+
- '**.yml'
18+
- '**.toml'
19+
- 'lib/**'
20+
- '.gitmodules'
21+
- '.gas-snapshot'
22+
23+
env:
24+
FOUNDRY_PROFILE: ci
25+
26+
jobs:
27+
gas:
28+
runs-on: ubuntu-latest
29+
steps:
30+
- uses: actions/checkout@v4
31+
with:
32+
submodules: recursive
33+
34+
- uses: actions/setup-node@v4
35+
- id: yarn-cache
36+
run: echo "dir=$(yarn cache dir)" >> "$GITHUB_OUTPUT"
37+
- uses: actions/cache@v4
38+
with:
39+
path: ${{ steps.yarn-cache.outputs.dir }}
40+
key: yarn-${{ hashFiles('**/yarn.lock') }}
41+
restore-keys: |
42+
yarn-
43+
- run: yarn --frozen-lockfile
44+
45+
- name: Install Foundry
46+
uses: foundry-rs/foundry-toolchain@v1
47+
with:
48+
version: nightly
49+
50+
- name: Check gas snapshots
51+
run: forge snapshot --check
52+
# TODO: remove failure allowance once foundry migration is complete
53+
continue-on-error: true

0 commit comments

Comments
 (0)