Skip to content

Commit 3160c96

Browse files
dbeal-ethnoisekit
dbeal-eth
and
noisekit
authored
420 Phase 2 (#671)
* Add missing config calls for PositionManager * Add Pool420Migrate to timeout exemptions * Move overrides to separate config * Bump versions --------- Co-authored-by: Noisekit <[email protected]>
1 parent a06d708 commit 3160c96

File tree

4 files changed

+116
-38
lines changed

4 files changed

+116
-38
lines changed

‎omnibus-mainnet.toml‎

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name = "synthetix-omnibus"
2-
version = "24"
2+
version = "25"
33
description = "Includes the full synthetix system with configurations applied"
44
deployers = [
55
"0x1C8236B406911A376369e33D39189F1b4B39F27D",
@@ -21,6 +21,7 @@ include = [
2121
"tomls/markets/spot/usde.toml",
2222
"tomls/pools/spartan-council.toml",
2323
"tomls/permit-all-transferCrossChain.toml",
24+
"tomls/omnibus-mainnet/overrides.toml",
2425

2526
# Cannon Registry Mainnet Configuration
2627
"tomls/omnibus-mainnet/cannon-permissions.toml",
@@ -158,6 +159,9 @@ defaultValue = "<%= parseEther('1.1') %>"
158159
[setting.position_manager_address]
159160
defaultValue = "0x100c6c18381c9a7527762063047236356bbd0b8d"
160161

162+
[setting.pool420_migrate_address]
163+
defaultValue = "0x8bfd24F68149E3d4e9635a6E26b0e43EEfd2C692"
164+
161165
# we want to enable the spot market wrapper for usde
162166
[import.usde]
163167
source = "usde-token"
@@ -203,24 +207,6 @@ fromCall.func = "owner"
203207
func = "setDebtDecayFunction"
204208
args = ["1", "31536000", "<%= parseEther('1') %>", "<%= parseEther('0.5') %>"]
205209

206-
[invoke.setPositionManagerOverrideWithdrawTimeout]
207-
target = ["system.CoreProxy"]
208-
fromCall.func = "owner"
209-
func = "setConfig"
210-
args = [
211-
"<%= keccak256(defaultAbiCoder.encode(['bytes32', 'address'], [formatBytes32String('senderOverrideWithdrawTimeout'), settings.position_manager_address])) %>",
212-
"0x0000000000000000000000000000000000000000000000000000000000000001",
213-
]
214-
215-
[invoke.setPositionManagerOverrideMinDelegateTime]
216-
target = ["system.CoreProxy"]
217-
fromCall.func = "owner"
218-
func = "setConfig"
219-
args = [
220-
"<%= keccak256(defaultAbiCoder.encode(['bytes32', 'address', 'uint256'], [formatBytes32String('senderOverrideMinDelegateTime'), settings.position_manager_address, settings.treasury_pool_id])) %>",
221-
"0x0000000000000000000000000000000000000000000000000000000000000001",
222-
]
223-
224210
[var.governance]
225211
governance_package = "synthetix-governance:3.0.9"
226212
governance_satellite_package = "synthetix-governance-satellite:3.0.9"

‎omnibus-optimism-mainnet.toml‎

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name = "synthetix-omnibus"
2-
version = "14"
2+
version = "15"
33
description = "Includes the full synthetix system with configurations applied"
44
deployers = [
55
"0x1C8236B406911A376369e33D39189F1b4B39F27D",
@@ -21,6 +21,7 @@ include = [
2121
"tomls/permit-all-transferCrossChain.toml",
2222
"tomls/omnibus-optimism-mainnet/spot-factory.toml",
2323
"tomls/markets/spot/eth.toml",
24+
"tomls/omnibus-optimism-mainnet/overrides.toml",
2425

2526
# Governance
2627
"tomls/omnibus-optimism-mainnet/governance/councils-satellite.toml",
@@ -156,6 +157,9 @@ defaultValue = "<%= parseEther('1.1') %>"
156157
[setting.position_manager_address]
157158
defaultValue = "0x693cd986b8b840607d3c7952f038bc22da636f48"
158159

160+
[setting.pool420_migrate_address]
161+
defaultValue = "0x2305f5f9EF3aBF0d6d02411ACa44F85113b247Af"
162+
159163
# Pyth settlement strategy config
160164
[setting.pythFeedUrl]
161165
defaultValue = "https://api.synthetix.io/pyth-mainnet/api/get_vaa_ccip?data={data}"
@@ -214,24 +218,6 @@ fromCall.func = "owner"
214218
func = "setDebtDecayFunction"
215219
args = ["1", "31536000", "<%= parseEther('1') %>", "<%= parseEther('0.5') %>"]
216220

217-
[invoke.setPositionManagerOverrideWithdrawTimeout]
218-
target = ["system.CoreProxy"]
219-
fromCall.func = "owner"
220-
func = "setConfig"
221-
args = [
222-
"<%= keccak256(defaultAbiCoder.encode(['bytes32', 'address'], [formatBytes32String('senderOverrideWithdrawTimeout'), settings.position_manager_address])) %>",
223-
"0x0000000000000000000000000000000000000000000000000000000000000001",
224-
]
225-
226-
[invoke.setPositionManagerOverrideMinDelegateTime]
227-
target = ["system.CoreProxy"]
228-
fromCall.func = "owner"
229-
func = "setConfig"
230-
args = [
231-
"<%= keccak256(defaultAbiCoder.encode(['bytes32', 'address', 'uint256'], [formatBytes32String('senderOverrideMinDelegateTime'), settings.position_manager_address, settings.treasury_pool_id])) %>",
232-
"0x0000000000000000000000000000000000000000000000000000000000000001",
233-
]
234-
235221
[var.treasuryInfo]
236222
treasury_account_id = "10"
237223
treasury_liquidator_address = "0x9DAffb42b60Bb14d8EE80b503AAfC312dCbAF552"

‎tomls/omnibus-mainnet/overrides.toml‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
[invoke.setPositionManagerOverrideWithdrawTimeout]
2+
target = ["system.CoreProxy"]
3+
fromCall.func = "owner"
4+
func = "setConfig"
5+
args = [
6+
"<%= keccak256(defaultAbiCoder.encode(['bytes32', 'address'], [formatBytes32String('senderOverrideWithdrawTimeout'), settings.position_manager_address])) %>",
7+
"0x0000000000000000000000000000000000000000000000000000000000000000",
8+
]
9+
10+
[invoke.setPositionManagerOverrideMinDelegateTime]
11+
target = ["system.CoreProxy"]
12+
fromCall.func = "owner"
13+
func = "setConfig"
14+
args = [
15+
"<%= keccak256(defaultAbiCoder.encode(['bytes32', 'address', 'uint256'], [formatBytes32String('senderOverrideMinDelegateTime'), settings.position_manager_address, settings.treasury_pool_id])) %>",
16+
"0x0000000000000000000000000000000000000000000000000000000000000000",
17+
]
18+
19+
[invoke.setPositionManagerOverrideMinDelegateTime_SC_Pool]
20+
target = ["system.CoreProxy"]
21+
fromCall.func = "owner"
22+
func = "setConfig"
23+
args = [
24+
"<%= keccak256(defaultAbiCoder.encode(['bytes32', 'address', 'uint256'], [formatBytes32String('senderOverrideMinDelegateTime'), settings.position_manager_address, settings.sc_pool_id])) %>",
25+
"0x0000000000000000000000000000000000000000000000000000000000000000",
26+
]
27+
28+
[invoke.CoreProxy_setConfig_senderOverrideWithdrawTimeout_Pool420Migrate]
29+
target = ["system.CoreProxy"]
30+
fromCall.func = "owner"
31+
func = "setConfig"
32+
args = [
33+
"<%= keccak256(defaultAbiCoder.encode(['bytes32', 'address'], [formatBytes32String('senderOverrideWithdrawTimeout'), settings.pool420_migrate_address])) %>",
34+
"0x0000000000000000000000000000000000000000000000000000000000000001",
35+
]
36+
37+
[invoke.CoreProxy_setConfig_senderOverrideMinDelegateTime_Pool420Migrate_TreasuryPool]
38+
target = ["system.CoreProxy"]
39+
fromCall.func = "owner"
40+
func = "setConfig"
41+
args = [
42+
"<%= keccak256(defaultAbiCoder.encode(['bytes32', 'address', 'uint256'], [formatBytes32String('senderOverrideMinDelegateTime'), settings.pool420_migrate_address, settings.treasury_pool_id])) %>",
43+
"0x0000000000000000000000000000000000000000000000000000000000000001",
44+
]
45+
46+
[invoke.CoreProxy_setConfig_senderOverrideMinDelegateTime_Pool420Migrate_SCPool]
47+
target = ["system.CoreProxy"]
48+
fromCall.func = "owner"
49+
func = "setConfig"
50+
args = [
51+
"<%= keccak256(defaultAbiCoder.encode(['bytes32', 'address', 'uint256'], [formatBytes32String('senderOverrideMinDelegateTime'), settings.pool420_migrate_address, settings.sc_pool_id])) %>",
52+
"0x0000000000000000000000000000000000000000000000000000000000000001",
53+
]

‎tomls/omnibus-optimism-mainnet/overrides.toml‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
[invoke.setPositionManagerOverrideWithdrawTimeout]
2+
target = ["system.CoreProxy"]
3+
fromCall.func = "owner"
4+
func = "setConfig"
5+
args = [
6+
"<%= keccak256(defaultAbiCoder.encode(['bytes32', 'address'], [formatBytes32String('senderOverrideWithdrawTimeout'), settings.position_manager_address])) %>",
7+
"0x0000000000000000000000000000000000000000000000000000000000000000",
8+
]
9+
10+
[invoke.setPositionManagerOverrideMinDelegateTime]
11+
target = ["system.CoreProxy"]
12+
fromCall.func = "owner"
13+
func = "setConfig"
14+
args = [
15+
"<%= keccak256(defaultAbiCoder.encode(['bytes32', 'address', 'uint256'], [formatBytes32String('senderOverrideMinDelegateTime'), settings.position_manager_address, settings.treasury_pool_id])) %>",
16+
"0x0000000000000000000000000000000000000000000000000000000000000000",
17+
]
18+
19+
[invoke.setPositionManagerOverrideMinDelegateTime_SC_Pool]
20+
target = ["system.CoreProxy"]
21+
fromCall.func = "owner"
22+
func = "setConfig"
23+
args = [
24+
"<%= keccak256(defaultAbiCoder.encode(['bytes32', 'address', 'uint256'], [formatBytes32String('senderOverrideMinDelegateTime'), settings.position_manager_address, settings.sc_pool_id])) %>",
25+
"0x0000000000000000000000000000000000000000000000000000000000000000",
26+
]
27+
28+
[invoke.CoreProxy_setConfig_senderOverrideWithdrawTimeout_Pool420Migrate]
29+
target = ["system.CoreProxy"]
30+
fromCall.func = "owner"
31+
func = "setConfig"
32+
args = [
33+
"<%= keccak256(defaultAbiCoder.encode(['bytes32', 'address'], [formatBytes32String('senderOverrideWithdrawTimeout'), settings.pool420_migrate_address])) %>",
34+
"0x0000000000000000000000000000000000000000000000000000000000000001",
35+
]
36+
37+
[invoke.CoreProxy_setConfig_senderOverrideMinDelegateTime_Pool420Migrate_TreasuryPool]
38+
target = ["system.CoreProxy"]
39+
fromCall.func = "owner"
40+
func = "setConfig"
41+
args = [
42+
"<%= keccak256(defaultAbiCoder.encode(['bytes32', 'address', 'uint256'], [formatBytes32String('senderOverrideMinDelegateTime'), settings.pool420_migrate_address, settings.treasury_pool_id])) %>",
43+
"0x0000000000000000000000000000000000000000000000000000000000000001",
44+
]
45+
46+
[invoke.CoreProxy_setConfig_senderOverrideMinDelegateTime_Pool420Migrate_SCPool]
47+
target = ["system.CoreProxy"]
48+
fromCall.func = "owner"
49+
func = "setConfig"
50+
args = [
51+
"<%= keccak256(defaultAbiCoder.encode(['bytes32', 'address', 'uint256'], [formatBytes32String('senderOverrideMinDelegateTime'), settings.pool420_migrate_address, settings.sc_pool_id])) %>",
52+
"0x0000000000000000000000000000000000000000000000000000000000000001",
53+
]

0 commit comments

Comments
 (0)