Skip to content

Sargas release v2.50.3-ovm-alpha #1549

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
barrasso merged 4 commits into from
Oct 6, 2021
Merged

Sargas release v2.50.3-ovm-alpha #1549

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
df42e00
Add SIP-142 to releases.json
barrasso Oct 6, 2021
090c490
Fix prepare deploy
barrasso Oct 6, 2021
3b5e873
Add v2.50.3 deployment artifacts. Fix rebuidl resolver cache
barrasso Oct 6, 2021
0a8e594
Update package-lock.json
barrasso Oct 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
594 changes: 218 additions & 376 deletions publish/deployed/kovan-ovm/deployment.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion publish/releases.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -605,7 +605,7 @@
"major": 2,
"minor": 50
},
"sips": [135, 174]
"sips": [135, 142, 174]
},
{
"name": "Kaus",
Expand Down
2 changes: 1 addition & 1 deletion publish/src/commands/deploy/rebuild-resolver-caches.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ module.exports = async ({
}
}

const addressesChunkSize = useOvm ? 7 : 20;
const addressesChunkSize = useOvm ? 5 : 20;
let batchCounter = 1;
for (let i = 0; i < contractsToRebuildCache.length; i += addressesChunkSize) {
const chunk = contractsToRebuildCache.slice(i, i + addressesChunkSize);
Expand Down
10 changes: 5 additions & 5 deletions publish/src/commands/prepare-deploy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@ const getReleasesNotYetReleased = ({ useOvm = false }) =>
);

// Get unreleased sips
const getSips = (useOvm = false) => {
const getSips = ({ useOvm = false }) => {
const layers = ['both', useOvm ? 'ovm' : 'base'];
return releases.sips.filter(
({ layer, released }) => layers.includes(layer) && !layers.includes(released)
);
};

// Get defined source files from the given sip, or an empty Array
const getSipSources = (sip, useOvm = false) => {
const getSipSources = ({ sip, useOvm = false }) => {
if (!sip.sources) return [];
if (Array.isArray(sip.sources)) return sip.sources;
const baseSources = sip.sources.base || [];
Expand Down Expand Up @@ -70,8 +70,8 @@ const prepareDeploy = async ({
let sources;
if (useSips) {
// Pick unreleased sips that have sources that need to be prepared
const sips = getSips();
sources = sips.flatMap(sip => getSipSources(sip, useOvm));
const sips = getSips({ useOvm });
sources = sips.flatMap(sip => getSipSources({ sip, useOvm }));

if (sources.length > 0) {
console.log(gray(`Preparing SIPs: ${sips.map(({ sip }) => sip).join(', ')}`));
Expand All @@ -84,7 +84,7 @@ const prepareDeploy = async ({
.flatMap(sipNumber => {
const sip = releases.sips.find(sip => sip.sip === sipNumber);
if (!sip) throw new Error(`Invalid SIP number "${sipNumber}"`);
return getSipSources(sip, useOvm);
return getSipSources({ sip, useOvm });
});

if (sources.length > 0) {
Expand Down