Skip to content

Commit ef7fb52

Browse files
eternauta1337justin j. moses
and
justin j. moses
authored
Add Alnair entry to releases.json (Synthetixio#1222)
* Allow to prepare for evm/ovm releases * Rename to Regora and add SystemStatus * Rename to Alnair * Added exchanger * Increase gas for taking debt snapshots on deploy Co-authored-by: justin j. moses <justin@synthetix.io>
1 parent 50ad33b commit ef7fb52

File tree

4 files changed

+29
-2
lines changed

4 files changed

+29
-2
lines changed

contracts/test-helpers/TestableMinimalProxyFactory.sol

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ pragma solidity ^0.5.16;
22

33
import "../MinimalProxyFactory.sol";
44

5+
56
contract TestableMinimalProxyFactory is MinimalProxyFactory {
67
function cloneAsMinimalProxy(address _base, string calldata _revertMsg) external returns (address clone) {
78
clone = _cloneAsMinimalProxy(_base, _revertMsg);

publish/releases.json

+25
Original file line numberDiff line numberDiff line change
@@ -193,5 +193,30 @@
193193
},
194194
"sources": [],
195195
"sips": [115, 128]
196+
},
197+
{
198+
"name": "Alnair",
199+
"version": {
200+
"major": 2,
201+
"minor": 44
202+
},
203+
"sources": ["SynthetixBridgeToOptimism", "SynthetixBridgeEscrow"],
204+
"sips": [116]
205+
},
206+
{
207+
"name": "Alnair (Optimism)",
208+
"version": {
209+
"major": 2,
210+
"minor": 44
211+
},
212+
"ovm": true,
213+
"sources": [
214+
"SynthetixBridgeToBase",
215+
"Synthetix",
216+
"Exchanger",
217+
"DebtCache",
218+
"SystemStatus"
219+
],
220+
"sips": [116, 117, 118]
196221
}
197222
]

publish/src/commands/deploy.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2370,7 +2370,7 @@ const deploy = async ({
23702370
if (force || validityChanged) {
23712371
console.log(yellow(`Refreshing debt snapshot...`));
23722372
await runStep({
2373-
gasLimit: useOvm ? 3.5e6 : 2.5e6, // About 1.7 million gas is required to refresh the snapshot with ~40 synths on L1
2373+
gasLimit: useOvm ? 3.5e6 : 3.0e6, // About 1.7 million gas is required to refresh the snapshot with ~40 synths on L1
23742374
contract: 'DebtCache',
23752375
target: debtCache,
23762376
write: 'takeDebtSnapshot',

publish/src/commands/prepare-deploy.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ const prepareDeploy = async ({ network = DEFAULTS.network, useOvm }) => {
2727
const config = JSON.parse(fs.readFileSync(configFile));
2828

2929
// Pick the latest release from the list
30-
const release = releases.slice(-1)[0];
30+
const release = releases.reverse().find(release => (useOvm ? release.ovm : !release.ovm));
3131
console.log(gray(`Preparing release for ${release.name} on network ${network}...`));
3232

3333
// Sweep releases.sources and,
@@ -71,6 +71,7 @@ module.exports = {
7171
} catch (err) {
7272
// show pretty errors for CLI users
7373
console.error(red(err));
74+
console.log(err.stack);
7475
process.exitCode = 1;
7576
}
7677
}),

0 commit comments

Comments
 (0)