Skip to content

Commit 79af39f

Browse files
sparrowDomsparrowDom
committed
Merge remote-tracking branch 'origin/master' into sparrowDom/woeth_hack_proof
2 parents abd7fbe + ea4c2fd commit 79af39f

File tree

7 files changed

+168
-2
lines changed

7 files changed

+168
-2
lines changed

‎contracts/README.md‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -456,3 +456,12 @@ yarn test:fork:coverage
456456
```
457457

458458
The CI will upload the coverage reports to Codecov if they complete successfully.
459+
460+
## Active yield forwards
461+
462+
Here is the list of active yield forwards (which shall be removed once Monitoring shall be able to display it):
463+
| Chain | From | To |
464+
|-------|------------------------------------|-------------------------------------------|
465+
| sonic | addresses.sonic.Shadow.OsEco.pool | addresses.sonic.Shadow.OsEco.yf_treasury |
466+
| sonic | addresses.sonic.SwapX.OsHedgy.pool | addresses.sonic.SwapX.OsHedgy.yf_treasury |
467+
| | | |

‎contracts/deploy/sonic/010_swapx_yield_forward.js‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
const { deployOnSonic } = require("../../utils/deploy-l2");
2+
const addresses = require("../../utils/addresses");
3+
4+
module.exports = deployOnSonic(
5+
{
6+
deployName: "010_swapx_yield_forward",
7+
},
8+
async ({ ethers }) => {
9+
const cOSonicProxy = await ethers.getContract("OSonicProxy");
10+
const cOSonic = await ethers.getContractAt("OSonic", cOSonicProxy.address);
11+
12+
return {
13+
actions: [
14+
{
15+
// https://www.notion.so/originprotocol/TB-YieldForwarding-19a84d46f53c806f9fd3c0921f10d940?pvs=25
16+
contract: cOSonic,
17+
signature: "delegateYield(address,address)",
18+
args: [
19+
addresses.sonic.Shadow.OsEco.pool,
20+
addresses.sonic.Shadow.OsEco.yf_treasury,
21+
],
22+
},
23+
{
24+
// https://www.notion.so/originprotocol/TB-YieldForwarding-19984d46f53c80f1a913cdb199432ecd
25+
contract: cOSonic,
26+
signature: "delegateYield(address,address)",
27+
args: [
28+
addresses.sonic.SwapX.OsHedgy.pool,
29+
addresses.sonic.SwapX.OsHedgy.yf_treasury,
30+
],
31+
},
32+
],
33+
};
34+
}
35+
);

‎contracts/deploy/sonic/010_pool_booster_factory.js‎ renamed to ‎contracts/deploy/sonic/011_pool_booster_factory.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ const { oethUnits } = require("../../test/helpers");
88

99
module.exports = deployOnSonic(
1010
{
11-
deployName: "010_pool_booster_factory",
11+
deployName: "011_pool_booster_factory",
1212
},
1313
async ({ ethers }) => {
1414
const { deployerAddr } = await getNamedAccounts();

‎contracts/deployments/sonic/.migrations.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,6 @@
55
"004_timelock_1d_delay": 1737667104,
66
"005_multisig_as_canceller": 1737993969,
77
"006_yf_swpx_os_pool": 1738198367,
8-
"008_swapx_yield_forward": 1738873151
8+
"008_swapx_yield_forward": 1738873151,
9+
"010_swapx_yield_forward": 1740000624
910
}

‎contracts/deployments/sonic/operations/010_swapx_yield_forward.execute.json‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
{
2+
"version": "1.0",
3+
"chainId": "146",
4+
"createdAt": 1740000624,
5+
"meta": {
6+
"name": "Transaction Batch",
7+
"description": "",
8+
"txBuilderVersion": "1.16.1",
9+
"createdFromSafeAddress": "0xAdDEA7933Db7d83855786EB43a238111C69B00b6",
10+
"createdFromOwnerAddress": ""
11+
},
12+
"transactions": [
13+
{
14+
"to": "0x31a91336414d3B955E494E7d485a6B06b55FC8fB",
15+
"value": "0",
16+
"data": null,
17+
"contractMethod": {
18+
"inputs": [
19+
{
20+
"type": "address[]",
21+
"name": "targets"
22+
},
23+
{
24+
"type": "uint256[]",
25+
"name": "values"
26+
},
27+
{
28+
"type": "bytes[]",
29+
"name": "payloads"
30+
},
31+
{
32+
"type": "bytes32",
33+
"name": "predecessor"
34+
},
35+
{
36+
"type": "bytes32",
37+
"name": "salt"
38+
}
39+
],
40+
"name": "executeBatch",
41+
"payable": true
42+
},
43+
"contractInputsValues": {
44+
"targets": "[\"0xb1e25689D55734FD3ffFc939c4C3Eb52DFf8A794\",\"0xb1e25689D55734FD3ffFc939c4C3Eb52DFf8A794\"]",
45+
"values": "[\"0\",\"0\"]",
46+
"payloads": "[\"0x9d01fc72000000000000000000000000fd0cee796348fd99ab792c471f4419b4c56cf6b80000000000000000000000004b9919603170c77936d8ec2c08b604844e861699\",\"0x9d01fc720000000000000000000000001695d6bd8d8adc8b87c6204be34d34d19a3fe1d60000000000000000000000004c884677427a975d1b99286e99188c82d71223c8\"]",
47+
"predecessor": "0x0000000000000000000000000000000000000000000000000000000000000000",
48+
"salt": "0x0834436c65fab9e807afc5108602c19edeb28c0db3ba1ccc707b04fadf8b454f"
49+
}
50+
}
51+
]
52+
}

‎contracts/deployments/sonic/operations/010_swapx_yield_forward.schedule.json‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
{
2+
"version": "1.0",
3+
"chainId": "146",
4+
"createdAt": 1740000624,
5+
"meta": {
6+
"name": "Transaction Batch",
7+
"description": "",
8+
"txBuilderVersion": "1.16.1",
9+
"createdFromSafeAddress": "0xAdDEA7933Db7d83855786EB43a238111C69B00b6",
10+
"createdFromOwnerAddress": ""
11+
},
12+
"transactions": [
13+
{
14+
"to": "0x31a91336414d3B955E494E7d485a6B06b55FC8fB",
15+
"value": "0",
16+
"data": null,
17+
"contractMethod": {
18+
"inputs": [
19+
{
20+
"type": "address[]",
21+
"name": "targets"
22+
},
23+
{
24+
"type": "uint256[]",
25+
"name": "values"
26+
},
27+
{
28+
"type": "bytes[]",
29+
"name": "payloads"
30+
},
31+
{
32+
"type": "bytes32",
33+
"name": "predecessor"
34+
},
35+
{
36+
"type": "bytes32",
37+
"name": "salt"
38+
},
39+
{
40+
"type": "uint256",
41+
"name": "delay"
42+
}
43+
],
44+
"name": "scheduleBatch",
45+
"payable": false
46+
},
47+
"contractInputsValues": {
48+
"targets": "[\"0xb1e25689D55734FD3ffFc939c4C3Eb52DFf8A794\",\"0xb1e25689D55734FD3ffFc939c4C3Eb52DFf8A794\"]",
49+
"values": "[\"0\",\"0\"]",
50+
"payloads": "[\"0x9d01fc72000000000000000000000000fd0cee796348fd99ab792c471f4419b4c56cf6b80000000000000000000000004b9919603170c77936d8ec2c08b604844e861699\",\"0x9d01fc720000000000000000000000001695d6bd8d8adc8b87c6204be34d34d19a3fe1d60000000000000000000000004c884677427a975d1b99286e99188c82d71223c8\"]",
51+
"predecessor": "0x0000000000000000000000000000000000000000000000000000000000000000",
52+
"salt": "0x0834436c65fab9e807afc5108602c19edeb28c0db3ba1ccc707b04fadf8b454f",
53+
"delay": "86400"
54+
}
55+
}
56+
]
57+
}

‎contracts/utils/addresses.js‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -406,6 +406,18 @@ addresses.sonic.SwapXOsUSDCeMultisigBooster =
406406
addresses.sonic.SwapXOsGEMSxMultisigBooster =
407407
"0xE2c01Cc951E8322992673Fa2302054375636F7DE";
408408

409+
addresses.sonic.SwapX = {};
410+
411+
addresses.sonic.SwapX.OsHedgy = {};
412+
addresses.sonic.SwapX.OsHedgy.pool = "0x1695d6bd8d8adc8b87c6204be34d34d19a3fe1d6";
413+
addresses.sonic.SwapX.OsHedgy.yf_treasury = "0x4c884677427a975d1b99286e99188c82d71223c8";
414+
415+
// Sonic Shadow
416+
addresses.sonic.Shadow = {};
417+
addresses.sonic.Shadow.OsEco = {};
418+
addresses.sonic.Shadow.OsEco.pool = "0xfd0cee796348fd99ab792c471f4419b4c56cf6b8";
419+
addresses.sonic.Shadow.OsEco.yf_treasury = "0x4b9919603170c77936d8ec2c08b604844e861699";
420+
409421
// Sonic Curve
410422
addresses.sonic.WS_OS = {};
411423
addresses.sonic.WS_OS.pool = "0x7180f41a71f13fac52d2cfb17911f5810c8b0bb9";

0 commit comments

Comments
 (0)