Skip to content

Commit 77d715f

Browse files
EndymionJkbEndymionJkb
committed
Merge branch 'master' into deployment-preparation/add-via-swap-router
2 parents 50a8402 + 2eb4f03 commit 77d715f

File tree

69 files changed

+1968
-1079
lines changed

Some content is hidden

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

69 files changed

+1968
-1079
lines changed

‎.github/actions/setup/action.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ runs:
66
- name: Install node
77
uses: actions/setup-node@v4
88
with:
9-
node-version: 22.13
9+
node-version: 24.12
1010
- name: Cache
1111
uses: actions/cache@v4
1212
id: cache

‎.github/workflows/ci.yml‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
- name: Install node
2828
uses: actions/setup-node@v4
2929
with:
30-
node-version: 22.13
30+
node-version: 24.12
3131
- name: Cache
3232
uses: actions/cache@v4
3333
id: cache
@@ -37,7 +37,7 @@ jobs:
3737
- name: Install
3838
run: yarn --immutable
3939
if: steps.cache.outputs.cache-hit != 'true'
40-
- name: Forked Network Cache
40+
- name: Restore Forked Network Cache
4141
# Hardhat caches node requests when working with forked networks (e.g. when querying contract code, storage,
4242
# etc.) to save time in future runs. We cache this directory across runs.
4343
# This cache action is special for a couple reasons, which originate from a) it not occupying much disk size,
@@ -47,8 +47,8 @@ jobs:
4747
# - use a different key on every single run, causing for the cache to always be saved.
4848
# - use a wildcard as a restore key, which will cause all stored keys to match and the most recent one to be
4949
# selected.
50-
uses: pat-s/always-upload-cache@v3
51-
id: cache-forked-network
50+
id: cache-forked-network-restore
51+
uses: actions/cache/restore@v4
5252
with:
5353
path: 'src/helpers/.hardhat/cache/hardhat-network-fork/**'
5454
key: hardhat-network-fork-${{ github.run_number }}-${{ github.run_attempt }}
@@ -70,6 +70,15 @@ jobs:
7070
HYPEREVM_RPC_ENDPOINT: ${{ secrets.HYPEREVM_RPC_ENDPOINT }}
7171
PLASMA_RPC_ENDPOINT: ${{ secrets.PLASMA_RPC_ENDPOINT }}
7272
XLAYER_RPC_ENDPOINT: ${{ secrets.XLAYER_RPC_ENDPOINT }}
73+
MONAD_RPC_ENDPOINT: ${{ secrets.MONAD_RPC_ENDPOINT }}
7374
SEPOLIA_RPC_ENDPOINT: ${{ secrets.SEPOLIA_RPC_ENDPOINT }}
7475
- name: Test
7576
run: yarn test --bail
77+
- name: Save Forked Network Cache
78+
# Always save; the key changes on every run, and the current one should be the most complete one.
79+
id: cache-forked-network-save
80+
if: always()
81+
uses: actions/cache/save@v4
82+
with:
83+
key: ${{ steps.cache-forked-network-restore.outputs.cache-primary-key }}
84+
path: 'src/helpers/.hardhat/cache/hardhat-network-fork/**'

‎.github/workflows/deployment-checks.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ jobs:
3737
HYPEREVM_RPC_ENDPOINT: ${{ secrets.HYPEREVM_RPC_ENDPOINT }}
3838
MAINNET_RPC_ENDPOINT: ${{ secrets.MAINNET_RPC_ENDPOINT }}
3939
MODE_RPC_ENDPOINT: ${{ secrets.MODE_RPC_ENDPOINT }}
40+
MONAD_RPC_ENDPOINT: ${{ secrets.MONAD_RPC_ENDPOINT }}
4041
OPTIMISM_RPC_ENDPOINT: ${{ secrets.OPTIMISM_RPC_ENDPOINT }}
4142
PLASMA_RPC_ENDPOINT: ${{ secrets.PLASMA_RPC_ENDPOINT }}
4243
POLYGON_RPC_ENDPOINT: ${{ secrets.POLYGON_RPC_ENDPOINT }}
@@ -65,6 +66,7 @@ jobs:
6566
HYPEREVM_RPC_ENDPOINT: ${{ secrets.HYPEREVM_RPC_ENDPOINT }}
6667
MAINNET_RPC_ENDPOINT: ${{ secrets.MAINNET_RPC_ENDPOINT }}
6768
MODE_RPC_ENDPOINT: ${{ secrets.MODE_RPC_ENDPOINT }}
69+
MONAD_RPC_ENDPOINT: ${{ secrets.MONAD_RPC_ENDPOINT }}
6870
OPTIMISM_RPC_ENDPOINT: ${{ secrets.OPTIMISM_RPC_ENDPOINT }}
6971
PLASMA_RPC_ENDPOINT: ${{ secrets.PLASMA_RPC_ENDPOINT }}
7072
POLYGON_RPC_ENDPOINT: ${{ secrets.POLYGON_RPC_ENDPOINT }}

‎.github/workflows/timelock-authorizer-config.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ jobs:
3030
HYPEREVM_RPC_ENDPOINT: ${{ secrets.HYPEREVM_RPC_ENDPOINT }}
3131
MAINNET_RPC_ENDPOINT: ${{ secrets.MAINNET_RPC_ENDPOINT }}
3232
MODE_RPC_ENDPOINT: ${{ secrets.MODE_RPC_ENDPOINT }}
33+
MONAD_RPC_ENDPOINT: ${{ secrets.MONAD_RPC_ENDPOINT }}
3334
OPTIMISM_RPC_ENDPOINT: ${{ secrets.OPTIMISM_RPC_ENDPOINT }}
3435
PLASMA_RPC_ENDPOINT: ${{ secrets.PLASMA_RPC_ENDPOINT }}
3536
POLYGON_RPC_ENDPOINT: ${{ secrets.POLYGON_RPC_ENDPOINT }}

‎.nvmrc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v22.13.1
1+
v24.12.0

‎.yarn/releases/yarn-4.12.0.cjs‎

Lines changed: 942 additions & 0 deletions
Large diffs are not rendered by default.

‎.yarn/releases/yarn-4.6.0.cjs‎

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

‎.yarnrc.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ nodeLinker: node-modules
22

33
npmPublishAccess: public
44

5-
yarnPath: .yarn/releases/yarn-4.6.0.cjs
5+
yarnPath: .yarn/releases/yarn-4.12.0.cjs

‎action-ids/monad/action-ids.json‎

Lines changed: 229 additions & 0 deletions
Large diffs are not rendered by default.

‎action-ids/monad/expected-collisions.json‎

Lines changed: 212 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,212 @@
1+
{
2+
"0x99f2c4abb870753989c44aef2c45359982b4adc570cfd9b8cdbf98eb905166b9": [
3+
{
4+
"taskId": "20241204-v3-vault",
5+
"contractName": "ProtocolFeeController",
6+
"signature": "collectAggregateFees(address)",
7+
"useAdaptor": false
8+
},
9+
{
10+
"taskId": "20250214-v3-protocol-fee-controller-v2",
11+
"contractName": "ProtocolFeeController",
12+
"signature": "collectAggregateFees(address)",
13+
"useAdaptor": false
14+
}
15+
],
16+
"0x77942705d5d9a5859d470100ad5053209d0399f146eeaceda689e8803c67e6fc": [
17+
{
18+
"taskId": "20241204-v3-vault",
19+
"contractName": "ProtocolFeeController",
20+
"signature": "collectAggregateFeesHook(address)",
21+
"useAdaptor": false
22+
},
23+
{
24+
"taskId": "20250214-v3-protocol-fee-controller-v2",
25+
"contractName": "ProtocolFeeController",
26+
"signature": "collectAggregateFeesHook(address)",
27+
"useAdaptor": false
28+
}
29+
],
30+
"0xb0a3af0a5529d2ea46992a0974a7a1b0732b5dad5eae85cb099ca4d6a825849d": [
31+
{
32+
"taskId": "20241204-v3-vault",
33+
"contractName": "ProtocolFeeController",
34+
"signature": "registerPool(address,address,bool)",
35+
"useAdaptor": false
36+
},
37+
{
38+
"taskId": "20250214-v3-protocol-fee-controller-v2",
39+
"contractName": "ProtocolFeeController",
40+
"signature": "registerPool(address,address,bool)",
41+
"useAdaptor": false
42+
}
43+
],
44+
"0xd017dd98988dd56fee1d44cadb00bc6b14886626da16e19060a3cc92acf4040f": [
45+
{
46+
"taskId": "20241204-v3-vault",
47+
"contractName": "ProtocolFeeController",
48+
"signature": "setGlobalProtocolSwapFeePercentage(uint256)",
49+
"useAdaptor": false
50+
},
51+
{
52+
"taskId": "20250214-v3-protocol-fee-controller-v2",
53+
"contractName": "ProtocolFeeController",
54+
"signature": "setGlobalProtocolSwapFeePercentage(uint256)",
55+
"useAdaptor": false
56+
}
57+
],
58+
"0xf3c486bff37d26d70d9ec35e95f59a3967efeae2006b151df3f925ace3fe8ed9": [
59+
{
60+
"taskId": "20241204-v3-vault",
61+
"contractName": "ProtocolFeeController",
62+
"signature": "setGlobalProtocolYieldFeePercentage(uint256)",
63+
"useAdaptor": false
64+
},
65+
{
66+
"taskId": "20250214-v3-protocol-fee-controller-v2",
67+
"contractName": "ProtocolFeeController",
68+
"signature": "setGlobalProtocolYieldFeePercentage(uint256)",
69+
"useAdaptor": false
70+
}
71+
],
72+
"0xc4c1e7c74d67cd92f4df0f28ed4b1b14aa91b4186fbaf0fdd565c2f2e9294b61": [
73+
{
74+
"taskId": "20241204-v3-vault",
75+
"contractName": "ProtocolFeeController",
76+
"signature": "setPoolCreatorSwapFeePercentage(address,uint256)",
77+
"useAdaptor": false
78+
},
79+
{
80+
"taskId": "20250214-v3-protocol-fee-controller-v2",
81+
"contractName": "ProtocolFeeController",
82+
"signature": "setPoolCreatorSwapFeePercentage(address,uint256)",
83+
"useAdaptor": false
84+
}
85+
],
86+
"0x9516bde17a8f08d51078af4c849475b87486a592ca277ce2cb0a4fdb058d4dfc": [
87+
{
88+
"taskId": "20241204-v3-vault",
89+
"contractName": "ProtocolFeeController",
90+
"signature": "setPoolCreatorYieldFeePercentage(address,uint256)",
91+
"useAdaptor": false
92+
},
93+
{
94+
"taskId": "20250214-v3-protocol-fee-controller-v2",
95+
"contractName": "ProtocolFeeController",
96+
"signature": "setPoolCreatorYieldFeePercentage(address,uint256)",
97+
"useAdaptor": false
98+
}
99+
],
100+
"0x8e3e36d73cffa78076df8f76db769150ec14a9939c8a8c2999a4e594c8446490": [
101+
{
102+
"taskId": "20241204-v3-vault",
103+
"contractName": "ProtocolFeeController",
104+
"signature": "setProtocolSwapFeePercentage(address,uint256)",
105+
"useAdaptor": false
106+
},
107+
{
108+
"taskId": "20250214-v3-protocol-fee-controller-v2",
109+
"contractName": "ProtocolFeeController",
110+
"signature": "setProtocolSwapFeePercentage(address,uint256)",
111+
"useAdaptor": false
112+
}
113+
],
114+
"0x3fef70c8097cce35392087a74737d4861f412ec73028383037541fcc8ce240aa": [
115+
{
116+
"taskId": "20241204-v3-vault",
117+
"contractName": "ProtocolFeeController",
118+
"signature": "setProtocolYieldFeePercentage(address,uint256)",
119+
"useAdaptor": false
120+
},
121+
{
122+
"taskId": "20250214-v3-protocol-fee-controller-v2",
123+
"contractName": "ProtocolFeeController",
124+
"signature": "setProtocolYieldFeePercentage(address,uint256)",
125+
"useAdaptor": false
126+
}
127+
],
128+
"0xf2157d32e7c8873f0f5b9dc3477aa27a5ae48367485e498b600f037aba46d7ba": [
129+
{
130+
"taskId": "20241204-v3-vault",
131+
"contractName": "ProtocolFeeController",
132+
"signature": "updateProtocolSwapFeePercentage(address)",
133+
"useAdaptor": false
134+
},
135+
{
136+
"taskId": "20250214-v3-protocol-fee-controller-v2",
137+
"contractName": "ProtocolFeeController",
138+
"signature": "updateProtocolSwapFeePercentage(address)",
139+
"useAdaptor": false
140+
}
141+
],
142+
"0xe21f4388cd2254f4d6a417404c8a2ca64fd63c7868a3b53bfc2efda6631bd91a": [
143+
{
144+
"taskId": "20241204-v3-vault",
145+
"contractName": "ProtocolFeeController",
146+
"signature": "updateProtocolYieldFeePercentage(address)",
147+
"useAdaptor": false
148+
},
149+
{
150+
"taskId": "20250214-v3-protocol-fee-controller-v2",
151+
"contractName": "ProtocolFeeController",
152+
"signature": "updateProtocolYieldFeePercentage(address)",
153+
"useAdaptor": false
154+
}
155+
],
156+
"0xa4ad09ac3be18bb697f4c06655e25bfd7278d9ce6b8362911c5e4044d75c4ad8": [
157+
{
158+
"taskId": "20241204-v3-vault",
159+
"contractName": "ProtocolFeeController",
160+
"signature": "withdrawPoolCreatorFees(address)",
161+
"useAdaptor": false
162+
},
163+
{
164+
"taskId": "20250214-v3-protocol-fee-controller-v2",
165+
"contractName": "ProtocolFeeController",
166+
"signature": "withdrawPoolCreatorFees(address)",
167+
"useAdaptor": false
168+
}
169+
],
170+
"0x4b121082d1f34fbfcc22ebf2bda0daa2f28ce0d445a5420909dfd17b33641df8": [
171+
{
172+
"taskId": "20241204-v3-vault",
173+
"contractName": "ProtocolFeeController",
174+
"signature": "withdrawPoolCreatorFees(address,address)",
175+
"useAdaptor": false
176+
},
177+
{
178+
"taskId": "20250214-v3-protocol-fee-controller-v2",
179+
"contractName": "ProtocolFeeController",
180+
"signature": "withdrawPoolCreatorFees(address,address)",
181+
"useAdaptor": false
182+
}
183+
],
184+
"0x9b50ab496733616199be03f9adb07dedbc053ee47e3f069d57a7b1db51480332": [
185+
{
186+
"taskId": "20241204-v3-vault",
187+
"contractName": "ProtocolFeeController",
188+
"signature": "withdrawProtocolFees(address,address)",
189+
"useAdaptor": false
190+
},
191+
{
192+
"taskId": "20250214-v3-protocol-fee-controller-v2",
193+
"contractName": "ProtocolFeeController",
194+
"signature": "withdrawProtocolFees(address,address)",
195+
"useAdaptor": false
196+
}
197+
],
198+
"0xd8f952fca9feeca8075fa8cf14298353b4b424103a602b3879b031c57cf6def7": [
199+
{
200+
"taskId": "20241204-v3-vault",
201+
"contractName": "ProtocolFeeController",
202+
"signature": "withdrawProtocolFeesForToken(address,address,address)",
203+
"useAdaptor": false
204+
},
205+
{
206+
"taskId": "20250214-v3-protocol-fee-controller-v2",
207+
"contractName": "ProtocolFeeController",
208+
"signature": "withdrawProtocolFeesForToken(address,address,address)",
209+
"useAdaptor": false
210+
}
211+
]
212+
}

0 commit comments

Comments
 (0)