@0xsequence/catapult 1.3.10 → 1.3.11
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/lib/core/loader.d.ts.map +1 -1
- package/dist/lib/core/loader.js +0 -14
- package/dist/lib/core/loader.js.map +1 -1
- package/dist/lib/parsers/__tests__/job.spec.js +25 -2
- package/dist/lib/parsers/__tests__/job.spec.js.map +1 -1
- package/dist/lib/parsers/job.d.ts.map +1 -1
- package/dist/lib/parsers/job.js +31 -1
- package/dist/lib/parsers/job.js.map +1 -1
- package/dist/lib/std/templates/create4.yaml +172 -0
- package/dist/lib/utils/create4.d.ts +78 -0
- package/dist/lib/utils/create4.d.ts.map +1 -0
- package/dist/lib/utils/create4.js +237 -0
- package/dist/lib/utils/create4.js.map +1 -0
- package/package.json +13 -12
- package/src/lib/core/loader.ts +0 -16
- package/src/lib/parsers/__tests__/job.spec.ts +27 -4
- package/src/lib/parsers/job.ts +44 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../../../src/lib/core/loader.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAA;AACxC,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AAG5D,MAAM,WAAW,oBAAoB;IACnC,gBAAgB,CAAC,EAAE,OAAO,CAAA;CAC3B;AAED,qBAAa,aAAa;IAWtB,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,OAAO;IAXnB,IAAI,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,CAAY;IAClC,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAY;IACnD,SAAgB,kBAAkB,EAAE,kBAAkB,CAAA;IAG/C,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,CAAY;IAE9C,OAAO,CAAC,eAAe,CAAiC;gBAGrC,WAAW,EAAE,MAAM,EACnB,OAAO,GAAE,oBAAyB;IAK/C,IAAI;YAiCI,oBAAoB;YA0BpB,iBAAiB;YAqBjB,eAAe;
|
|
1
|
+
{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../../../src/lib/core/loader.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAA;AACxC,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AAG5D,MAAM,WAAW,oBAAoB;IACnC,gBAAgB,CAAC,EAAE,OAAO,CAAA;CAC3B;AAED,qBAAa,aAAa;IAWtB,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,OAAO;IAXnB,IAAI,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,CAAY;IAClC,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAY;IACnD,SAAgB,kBAAkB,EAAE,kBAAkB,CAAA;IAG/C,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,CAAY;IAE9C,OAAO,CAAC,eAAe,CAAiC;gBAGrC,WAAW,EAAE,MAAM,EACnB,OAAO,GAAE,oBAAyB;IAK/C,IAAI;YAiCI,oBAAoB;YA0BpB,iBAAiB;YAqBjB,eAAe;YAoCf,YAAY;YAwBZ,wBAAwB;YAOxB,6BAA6B;YA0B7B,oBAAoB;YAqCpB,UAAU;CAQzB"}
|
package/dist/lib/core/loader.js
CHANGED
|
@@ -128,20 +128,6 @@ class ProjectLoader {
|
|
|
128
128
|
continue;
|
|
129
129
|
}
|
|
130
130
|
const job = (0, parsers_1.parseJob)(content);
|
|
131
|
-
try {
|
|
132
|
-
const raw = JSON.parse(JSON.stringify(require('yaml').parse(content)));
|
|
133
|
-
if (raw && typeof raw === 'object' && raw.constants !== undefined) {
|
|
134
|
-
if (typeof raw.constants !== 'object' || Array.isArray(raw.constants)) {
|
|
135
|
-
throw new Error(`Invalid job "${job.name}": "constants" field must be an object if provided.`);
|
|
136
|
-
}
|
|
137
|
-
job.constants = raw.constants;
|
|
138
|
-
}
|
|
139
|
-
}
|
|
140
|
-
catch (peekErr) {
|
|
141
|
-
if (peekErr instanceof Error && peekErr.message.includes('Failed to parse')) {
|
|
142
|
-
throw new Error(`Job constants peek failed for ${filePath}: ${peekErr.message}`);
|
|
143
|
-
}
|
|
144
|
-
}
|
|
145
131
|
job._path = filePath;
|
|
146
132
|
this.jobs.set(job.name, job);
|
|
147
133
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loader.js","sourceRoot":"","sources":["../../../src/lib/core/loader.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"loader.js","sourceRoot":"","sources":["../../../src/lib/core/loader.ts"],"names":[],"mappings":"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"}
|
|
@@ -298,7 +298,7 @@ actions:
|
|
|
298
298
|
expect(job.actions[2].output).toBe(false);
|
|
299
299
|
expect(job.actions[3].output).toEqual({ important: '{{action4.hash}}' });
|
|
300
300
|
});
|
|
301
|
-
it('should
|
|
301
|
+
it('should attach an optional job-level constants block as an object', () => {
|
|
302
302
|
const yamlContent = `
|
|
303
303
|
name: "job-with-constants"
|
|
304
304
|
version: "1"
|
|
@@ -312,7 +312,30 @@ actions:
|
|
|
312
312
|
x: "{{FEE}}"
|
|
313
313
|
`;
|
|
314
314
|
const job = (0, job_1.parseJob)(yamlContent);
|
|
315
|
-
expect(job.
|
|
315
|
+
expect(job.constants).toEqual({
|
|
316
|
+
FEE: '1000',
|
|
317
|
+
ADMIN: '0x0000000000000000000000000000000000000001'
|
|
318
|
+
});
|
|
319
|
+
});
|
|
320
|
+
it('should parse job-level skip conditions', () => {
|
|
321
|
+
const yamlContent = `
|
|
322
|
+
name: "job-with-skip"
|
|
323
|
+
version: "1"
|
|
324
|
+
skip_condition:
|
|
325
|
+
- type: "contract-exists"
|
|
326
|
+
arguments:
|
|
327
|
+
address: "0xabc"
|
|
328
|
+
actions:
|
|
329
|
+
- name: "a1"
|
|
330
|
+
template: "t1"
|
|
331
|
+
arguments: {}
|
|
332
|
+
`;
|
|
333
|
+
const job = (0, job_1.parseJob)(yamlContent);
|
|
334
|
+
expect(job.skip_condition).toHaveLength(1);
|
|
335
|
+
expect(job.skip_condition?.[0]).toEqual({
|
|
336
|
+
type: 'contract-exists',
|
|
337
|
+
arguments: { address: '0xabc' }
|
|
338
|
+
});
|
|
316
339
|
});
|
|
317
340
|
});
|
|
318
341
|
//# sourceMappingURL=job.spec.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"job.spec.js","sourceRoot":"","sources":["../../../../src/lib/parsers/__tests__/job.spec.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAAwB;AACxB,2CAA4B;AAC5B,gCAAiC;AAGjC,QAAQ,CAAC,UAAU,EAAE,GAAG,EAAE;IAGxB,EAAE,CAAC,kGAAkG,EAAE,GAAG,EAAE;QAC1G,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,4CAA4C,CAAC,CAAA;QACtF,MAAM,WAAW,GAAG,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;QAEtD,MAAM,GAAG,GAAQ,IAAA,cAAQ,EAAC,WAAW,CAAC,CAAA;QAEtC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAA;QACpC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QACjC,MAAM,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAA;QACzD,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,aAAa,EAAE,CAAA;QACtC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAA;QAGnC,MAAM,aAAa,GAAG,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,SAAS,CAAC,CAAA;QACnE,MAAM,CAAC,aAAa,CAAC,CAAC,WAAW,EAAE,CAAA;QACnC,MAAM,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC,IAAI,CAAC,+BAA+B,CAAC,CAAA;QACrE,MAAM,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC,OAAO,CAAC;YACvC,YAAY,EAAE,gDAAgD;YAC9D,IAAI,EAAE,GAAG;SACV,CAAC,CAAA;QACF,MAAM,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC,aAAa,EAAE,CAAA;QAGjD,MAAM,gBAAgB,GAAG,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,aAAa,CAAC,CAAA;QAC1E,MAAM,CAAC,gBAAgB,CAAC,CAAC,WAAW,EAAE,CAAA;QACtC,MAAM,CAAC,gBAAgB,EAAE,QAAQ,CAAC,CAAC,IAAI,CAAC,+BAA+B,CAAC,CAAA;QACxE,MAAM,CAAC,gBAAgB,EAAE,UAAU,CAAC,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,CAAC,CAAA;QACzD,MAAM,CAAC,gBAAgB,EAAE,SAAS,CAAC,CAAC,OAAO,CAAC;YAC1C,IAAI,EAAE,GAAG;YACT,YAAY,EAAE;gBACZ,IAAI,EAAE,oBAAoB;gBAC1B,SAAS,EAAE;oBACT,YAAY,EAAE,oDAAoD;oBAClE,KAAK,EAAE,CAAC,SAAS,CAAC;oBAClB,MAAM,EAAE,CAAC,qBAAqB,CAAC;iBAChC;aACF;SACF,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,oEAAoE,EAAE,GAAG,EAAE;QAC5E,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,0CAA0C,CAAC,CAAA;QACpF,MAAM,WAAW,GAAG,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;QAEtD,MAAM,GAAG,GAAQ,IAAA,cAAQ,EAAC,WAAW,CAAC,CAAA;QAEtC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;QAClC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QAC7B,MAAM,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,iDAAiD,CAAC,CAAA;QAC/E,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,CAAC,aAAa,CAAC,CAAC,CAAA;QAC/C,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAA;IACrC,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,4DAA4D,EAAE,GAAG,EAAE;QACpE,MAAM,WAAW,GAAG;;;;;;;;CAQvB,CAAA;QACG,MAAM,GAAG,GAAG,IAAA,cAAQ,EAAC,WAAW,CAAC,CAAA;QACjC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QAC7B,MAAM,CAAC,OAAO,GAAG,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;IAC3C,CAAC,CAAC,CAAA;IAIF,EAAE,CAAC,0CAA0C,EAAE,GAAG,EAAE;QAClD,MAAM,WAAW,GAAG,oCAAoC,CAAA;QACxD,MAAM,CAAC,GAAG,EAAE,CAAC,IAAA,cAAQ,EAAC,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,sCAAsC,CAAC,CAAA;IACrF,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,qEAAqE,EAAE,GAAG,EAAE;QAC7E,MAAM,WAAW,GAAG,eAAe,CAAA;QACnC,MAAM,CAAC,GAAG,EAAE,CAAC,IAAA,cAAQ,EAAC,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,sDAAsD,CAAC,CAAA;IACrG,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,sDAAsD,EAAE,GAAG,EAAE;QAC9D,MAAM,WAAW,GAAG;;;CAGvB,CAAA;QACG,MAAM,CAAC,GAAG,EAAE,CAAC,IAAA,cAAQ,EAAC,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,6DAA6D,CAAC,CAAA;IAC5G,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,2DAA2D,EAAE,GAAG,EAAE;QACnE,MAAM,WAAW,GAAG;;;;CAIvB,CAAA;QACG,MAAM,CAAC,GAAG,EAAE,CAAC,IAAA,cAAQ,EAAC,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,6DAA6D,CAAC,CAAA;IAC5G,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,yDAAyD,EAAE,GAAG,EAAE;QACjE,MAAM,WAAW,GAAG;;;CAGvB,CAAA;QACG,MAAM,CAAC,GAAG,EAAE,CAAC,IAAA,cAAQ,EAAC,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,oDAAoD,CAAC,CAAA;IACnG,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,yDAAyD,EAAE,GAAG,EAAE;QACjE,MAAM,WAAW,GAAG;;;CAGvB,CAAA;QACG,MAAM,CAAC,GAAG,EAAE,CAAC,IAAA,cAAQ,EAAC,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,yEAAyE,CAAC,CAAA;IACxH,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,8DAA8D,EAAE,GAAG,EAAE;QACtE,MAAM,WAAW,GAAG;;;;CAIvB,CAAA;QACG,MAAM,CAAC,GAAG,EAAE,CAAC,IAAA,cAAQ,EAAC,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,yEAAyE,CAAC,CAAA;IACxH,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,0EAA0E,EAAE,GAAG,EAAE;QAClF,MAAM,WAAW,GAAG;;;;;CAKvB,CAAA;QACG,MAAM,CAAC,GAAG,EAAE,CAAC,IAAA,cAAQ,EAAC,WAAW,CAAC,CAAC,CAAC,OAAO,CACzC,sEAAsE,CACvE,CAAA;IACH,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,gEAAgE,EAAE,GAAG,EAAE;QACxE,MAAM,WAAW,GAAG;;;;;;CAMvB,CAAA;QACG,MAAM,CAAC,GAAG,EAAE,CAAC,IAAA,cAAQ,EAAC,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,uEAAuE,CAAC,CAAA;IACtH,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,oEAAoE,EAAE,GAAG,EAAE;QAC5E,MAAM,WAAW,GAAG;;;;;;CAMvB,CAAA;QACG,MAAM,CAAC,GAAG,EAAE,CAAC,IAAA,cAAQ,EAAC,WAAW,CAAC,CAAC,CAAC,OAAO,CACzC,gJAAgJ,CACjJ,CAAA;IACH,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,qEAAqE,EAAE,GAAG,EAAE;QAC7E,MAAM,WAAW,GAAG;;;;;;CAMvB,CAAA;QACG,MAAM,CAAC,GAAG,EAAE,CAAC,IAAA,cAAQ,EAAC,WAAW,CAAC,CAAC,CAAC,OAAO,CACzC,4GAA4G,CAC7G,CAAA;IACH,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,2EAA2E,EAAE,GAAG,EAAE;QACnF,MAAM,WAAW,GAAG;;;;;;;CAOvB,CAAA;QACG,MAAM,CAAC,GAAG,EAAE,CAAC,IAAA,cAAQ,EAAC,WAAW,CAAC,CAAC,CAAC,OAAO,CACzC,4GAA4G,CAC7G,CAAA;IACH,CAAC,CAAC,CAAA;IAIF,EAAE,CAAC,kDAAkD,EAAE,GAAG,EAAE;QAC1D,MAAM,WAAW,GAAG;;;;;;;;CAQvB,CAAA;QACG,MAAM,GAAG,GAAG,IAAA,cAAQ,EAAC,WAAW,CAAC,CAAA;QACjC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IAC1C,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,mDAAmD,EAAE,GAAG,EAAE;QAC3D,MAAM,WAAW,GAAG;;;;;;;;CAQvB,CAAA;QACG,MAAM,GAAG,GAAG,IAAA,cAAQ,EAAC,WAAW,CAAC,CAAA;QACjC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;IAC3C,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,iEAAiE,EAAE,GAAG,EAAE;QACzE,MAAM,WAAW,GAAG;;;;;;;CAOvB,CAAA;QACG,MAAM,GAAG,GAAG,IAAA,cAAQ,EAAC,WAAW,CAAC,CAAA;QACjC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,aAAa,EAAE,CAAA;IAC/C,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,iEAAiE,EAAE,GAAG,EAAE;QACzE,MAAM,WAAW,GAAG;;;;;;;;;;CAUvB,CAAA;QACG,MAAM,GAAG,GAAG,IAAA,cAAQ,EAAC,WAAW,CAAC,CAAA;QACjC,MAAM,CAAC,OAAO,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;QACnD,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC;YACpC,OAAO,EAAE,iBAAiB;YAC1B,MAAM,EAAE,wBAAwB;SAC1B,CAAC,CAAA;IACX,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,kEAAkE,EAAE,GAAG,EAAE;QAC1E,MAAM,WAAW,GAAG;;;;;;;;CAQvB,CAAA;QACG,MAAM,CAAC,GAAG,EAAE,CAAC,IAAA,cAAQ,EAAC,WAAW,CAAC,CAAC,CAAC,OAAO,CACzC,uJAAuJ,CACxJ,CAAA;IACH,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,mDAAmD,EAAE,GAAG,EAAE;QAC3D,MAAM,WAAW,GAAG;;;;;;;;CAQvB,CAAA;QACG,MAAM,CAAC,GAAG,EAAE,CAAC,IAAA,cAAQ,EAAC,WAAW,CAAC,CAAC,CAAC,OAAO,CACzC,uJAAuJ,CACxJ,CAAA;IACH,CAAC,CAAC,CAAA;IAEF,EAAE,CAAC,qEAAqE,EAAE,GAAG,EAAE;QAC7E,MAAM,WAAW,GAAG;;;;;;;;;;;;;;;;;;;;CAoBvB,CAAA;QACG,MAAM,GAAG,GAAG,IAAA,cAAQ,EAAC,WAAW,CAAC,CAAA;QACjC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACxC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,aAAa,EAAE,CAAA;QAC7C,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;QACzC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,EAAE,SAAS,EAAE,kBAAkB,EAAS,CAAC,CAAA;IACjF,CAAC,CAAC,CAAA;IAIF,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"job.spec.js","sourceRoot":"","sources":["../../../../src/lib/parsers/__tests__/job.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"job.d.ts","sourceRoot":"","sources":["../../../src/lib/parsers/job.ts"],"names":[],"mappings":"AACA,OAAO,
|
|
1
|
+
{"version":3,"file":"job.d.ts","sourceRoot":"","sources":["../../../src/lib/parsers/job.ts"],"names":[],"mappings":"AACA,OAAO,EAAa,GAAG,EAAa,MAAM,UAAU,CAAA;AAiCpD,wBAAgB,QAAQ,CAAC,WAAW,EAAE,MAAM,GAAG,GAAG,CAiHjD"}
|
package/dist/lib/parsers/job.js
CHANGED
|
@@ -2,6 +2,19 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.parseJob = parseJob;
|
|
4
4
|
const yaml_1 = require("yaml");
|
|
5
|
+
function isCondition(item) {
|
|
6
|
+
if (!item || typeof item !== 'object' || typeof item.type !== 'string') {
|
|
7
|
+
return false;
|
|
8
|
+
}
|
|
9
|
+
if (['contract-exists', 'job-completed'].includes(item.type)) {
|
|
10
|
+
return true;
|
|
11
|
+
}
|
|
12
|
+
if (item.type === 'basic-arithmetic') {
|
|
13
|
+
const op = item.arguments?.operation;
|
|
14
|
+
return typeof op === 'string' && ['eq', 'neq', 'gt', 'lt', 'gte', 'lte'].includes(op);
|
|
15
|
+
}
|
|
16
|
+
return false;
|
|
17
|
+
}
|
|
5
18
|
function parseJob(yamlContent) {
|
|
6
19
|
let rawObject;
|
|
7
20
|
try {
|
|
@@ -62,6 +75,21 @@ function parseJob(yamlContent) {
|
|
|
62
75
|
if (rawObject.min_evm_version !== undefined && typeof rawObject.min_evm_version !== 'string') {
|
|
63
76
|
throw new Error(`Invalid job "${rawObject.name}": "min_evm_version" must be a string if provided.`);
|
|
64
77
|
}
|
|
78
|
+
if (rawObject.skip_condition !== undefined) {
|
|
79
|
+
if (!Array.isArray(rawObject.skip_condition)) {
|
|
80
|
+
throw new Error(`Invalid job "${rawObject.name}": "skip_condition" must be an array if provided.`);
|
|
81
|
+
}
|
|
82
|
+
for (const condition of rawObject.skip_condition) {
|
|
83
|
+
if (!isCondition(condition)) {
|
|
84
|
+
throw new Error(`Invalid job "${rawObject.name}": "skip_condition" contains an invalid condition entry.`);
|
|
85
|
+
}
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
if (rawObject.constants !== undefined) {
|
|
89
|
+
if (typeof rawObject.constants !== 'object' || rawObject.constants === null || Array.isArray(rawObject.constants)) {
|
|
90
|
+
throw new Error(`Invalid job "${rawObject.name}": "constants" field must be an object if provided.`);
|
|
91
|
+
}
|
|
92
|
+
}
|
|
65
93
|
const job = {
|
|
66
94
|
name: rawObject.name,
|
|
67
95
|
version: rawObject.version,
|
|
@@ -71,7 +99,9 @@ function parseJob(yamlContent) {
|
|
|
71
99
|
only_networks: rawObject.only_networks,
|
|
72
100
|
skip_networks: rawObject.skip_networks,
|
|
73
101
|
min_evm_version: rawObject.min_evm_version,
|
|
74
|
-
deprecated: rawObject.deprecated === true
|
|
102
|
+
deprecated: rawObject.deprecated === true,
|
|
103
|
+
skip_condition: rawObject.skip_condition,
|
|
104
|
+
constants: rawObject.constants,
|
|
75
105
|
};
|
|
76
106
|
return job;
|
|
77
107
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"job.js","sourceRoot":"","sources":["../../../src/lib/parsers/job.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"job.js","sourceRoot":"","sources":["../../../src/lib/parsers/job.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,172 @@
|
|
|
1
|
+
name: "create4"
|
|
2
|
+
type: "template"
|
|
3
|
+
description: "Deploy chain-specific bytecodes through the CREATE4 universal deployer"
|
|
4
|
+
|
|
5
|
+
arguments:
|
|
6
|
+
create4Address:
|
|
7
|
+
type: "address"
|
|
8
|
+
description: "Address of the deployed CREATE4 contract"
|
|
9
|
+
salt:
|
|
10
|
+
type: "bytes32"
|
|
11
|
+
description: "Plan salt mixed with the plan root (32-byte hex string)"
|
|
12
|
+
bytecodes:
|
|
13
|
+
type: "json"
|
|
14
|
+
description: "Dictionary with per-chain entries and a fallback. Keys should be chain ids plus `fallback`, and may include `sharedConstructor`. Each entry can provide `initCode` directly or `creationCode` + optional `constructor`."
|
|
15
|
+
|
|
16
|
+
returns:
|
|
17
|
+
address:
|
|
18
|
+
type: "address"
|
|
19
|
+
description: "Deterministic address of the deployed contract"
|
|
20
|
+
planRoot:
|
|
21
|
+
type: "bytes32"
|
|
22
|
+
description: "Merkle root committed to for this plan"
|
|
23
|
+
deploymentSalt:
|
|
24
|
+
type: "bytes32"
|
|
25
|
+
description: "CREATE3 salt derived from the plan root and user salt"
|
|
26
|
+
mode:
|
|
27
|
+
type: "string"
|
|
28
|
+
description: "Either 'chain' or 'fallback' depending on what was deployed"
|
|
29
|
+
|
|
30
|
+
setup:
|
|
31
|
+
actions:
|
|
32
|
+
- type: "static"
|
|
33
|
+
name: "validate-create4-factory"
|
|
34
|
+
arguments:
|
|
35
|
+
value:
|
|
36
|
+
type: "contract-exists"
|
|
37
|
+
arguments:
|
|
38
|
+
address: "{{create4Address}}"
|
|
39
|
+
selectors: ["0x9e0fae72", "0x8a056fe6"]
|
|
40
|
+
- type: "static"
|
|
41
|
+
name: "create4-plan"
|
|
42
|
+
arguments:
|
|
43
|
+
value:
|
|
44
|
+
type: "create4-plan"
|
|
45
|
+
arguments:
|
|
46
|
+
deployerAddress: "{{create4Address}}"
|
|
47
|
+
chainId: "{{Network().chainId}}"
|
|
48
|
+
salt: "{{salt}}"
|
|
49
|
+
bytecodes:
|
|
50
|
+
type: "resolve-json"
|
|
51
|
+
arguments: "{{bytecodes}}"
|
|
52
|
+
|
|
53
|
+
skip_condition:
|
|
54
|
+
- type: "contract-exists"
|
|
55
|
+
arguments:
|
|
56
|
+
address:
|
|
57
|
+
type: "read-json"
|
|
58
|
+
arguments:
|
|
59
|
+
json: "{{create4-plan.value}}"
|
|
60
|
+
path: "address"
|
|
61
|
+
|
|
62
|
+
actions:
|
|
63
|
+
- name: "create4-deploy"
|
|
64
|
+
template: "assured-deployment"
|
|
65
|
+
skip_condition:
|
|
66
|
+
- type: "basic-arithmetic"
|
|
67
|
+
arguments:
|
|
68
|
+
operation: "eq"
|
|
69
|
+
values:
|
|
70
|
+
- type: "read-json"
|
|
71
|
+
arguments:
|
|
72
|
+
json: "{{create4-plan.value}}"
|
|
73
|
+
path: "target.modeFlag"
|
|
74
|
+
- "0"
|
|
75
|
+
arguments:
|
|
76
|
+
targetAddress:
|
|
77
|
+
type: "read-json"
|
|
78
|
+
arguments:
|
|
79
|
+
json: "{{create4-plan.value}}"
|
|
80
|
+
path: "address"
|
|
81
|
+
factoryAddress: "{{create4Address}}"
|
|
82
|
+
callData:
|
|
83
|
+
type: "abi-encode"
|
|
84
|
+
arguments:
|
|
85
|
+
signature: "deploy(bytes32[],bytes,uint64,bytes32)"
|
|
86
|
+
values:
|
|
87
|
+
- type: "read-json"
|
|
88
|
+
arguments:
|
|
89
|
+
json: "{{create4-plan.value}}"
|
|
90
|
+
path: "target.proof"
|
|
91
|
+
- type: "read-json"
|
|
92
|
+
arguments:
|
|
93
|
+
json: "{{create4-plan.value}}"
|
|
94
|
+
path: "target.initCode"
|
|
95
|
+
- type: "read-json"
|
|
96
|
+
arguments:
|
|
97
|
+
json: "{{create4-plan.value}}"
|
|
98
|
+
path: "target.nextChainId"
|
|
99
|
+
- "{{salt}}"
|
|
100
|
+
|
|
101
|
+
- name: "create4-deploy-fallback"
|
|
102
|
+
template: "assured-deployment"
|
|
103
|
+
skip_condition:
|
|
104
|
+
- type: "basic-arithmetic"
|
|
105
|
+
arguments:
|
|
106
|
+
operation: "eq"
|
|
107
|
+
values:
|
|
108
|
+
- type: "read-json"
|
|
109
|
+
arguments:
|
|
110
|
+
json: "{{create4-plan.value}}"
|
|
111
|
+
path: "target.modeFlag"
|
|
112
|
+
- "1"
|
|
113
|
+
arguments:
|
|
114
|
+
targetAddress:
|
|
115
|
+
type: "read-json"
|
|
116
|
+
arguments:
|
|
117
|
+
json: "{{create4-plan.value}}"
|
|
118
|
+
path: "address"
|
|
119
|
+
factoryAddress: "{{create4Address}}"
|
|
120
|
+
callData:
|
|
121
|
+
type: "abi-encode"
|
|
122
|
+
arguments:
|
|
123
|
+
signature: "deployFallback(bytes32,bytes32,bytes32[],bytes32[],bytes,bytes32)"
|
|
124
|
+
values:
|
|
125
|
+
- type: "read-json"
|
|
126
|
+
arguments:
|
|
127
|
+
json: "{{create4-plan.value}}"
|
|
128
|
+
path: "target.gapLeafPrefix"
|
|
129
|
+
- type: "read-json"
|
|
130
|
+
arguments:
|
|
131
|
+
json: "{{create4-plan.value}}"
|
|
132
|
+
path: "target.gapLeafHash"
|
|
133
|
+
- type: "read-json"
|
|
134
|
+
arguments:
|
|
135
|
+
json: "{{create4-plan.value}}"
|
|
136
|
+
path: "target.gapProof"
|
|
137
|
+
- type: "read-json"
|
|
138
|
+
arguments:
|
|
139
|
+
json: "{{create4-plan.value}}"
|
|
140
|
+
path: "target.proof"
|
|
141
|
+
- type: "read-json"
|
|
142
|
+
arguments:
|
|
143
|
+
json: "{{create4-plan.value}}"
|
|
144
|
+
path: "target.initCode"
|
|
145
|
+
- "{{salt}}"
|
|
146
|
+
|
|
147
|
+
outputs:
|
|
148
|
+
address:
|
|
149
|
+
type: "read-json"
|
|
150
|
+
arguments:
|
|
151
|
+
json: "{{create4-plan.value}}"
|
|
152
|
+
path: "address"
|
|
153
|
+
planRoot:
|
|
154
|
+
type: "read-json"
|
|
155
|
+
arguments:
|
|
156
|
+
json: "{{create4-plan.value}}"
|
|
157
|
+
path: "planRoot"
|
|
158
|
+
deploymentSalt:
|
|
159
|
+
type: "read-json"
|
|
160
|
+
arguments:
|
|
161
|
+
json: "{{create4-plan.value}}"
|
|
162
|
+
path: "deploymentSalt"
|
|
163
|
+
plan:
|
|
164
|
+
type: "read-json"
|
|
165
|
+
arguments:
|
|
166
|
+
json: "{{create4-plan.value}}"
|
|
167
|
+
path: "plan"
|
|
168
|
+
mode:
|
|
169
|
+
type: "read-json"
|
|
170
|
+
arguments:
|
|
171
|
+
json: "{{create4-plan.value}}"
|
|
172
|
+
path: "target.mode"
|
|
@@ -0,0 +1,78 @@
|
|
|
1
|
+
export interface Create4ConstructorSpec {
|
|
2
|
+
types?: readonly string[];
|
|
3
|
+
values?: readonly any[];
|
|
4
|
+
}
|
|
5
|
+
export type Create4BytecodeEntry = string | {
|
|
6
|
+
initCode?: string;
|
|
7
|
+
creationCode?: string;
|
|
8
|
+
constructor?: Create4ConstructorSpec;
|
|
9
|
+
label?: string;
|
|
10
|
+
chainId?: string | number | bigint;
|
|
11
|
+
};
|
|
12
|
+
export type Create4BytecodeDictionary = {
|
|
13
|
+
fallback: Create4BytecodeEntry;
|
|
14
|
+
sharedConstructor?: Create4ConstructorSpec | null;
|
|
15
|
+
chains?: Record<string, Create4BytecodeEntry>;
|
|
16
|
+
} & Record<string, any>;
|
|
17
|
+
export interface ComputeCreate4PlanArgs {
|
|
18
|
+
deployerAddress: string;
|
|
19
|
+
chainId: string | number | bigint;
|
|
20
|
+
salt?: string | null;
|
|
21
|
+
bytecodes: Create4BytecodeDictionary;
|
|
22
|
+
}
|
|
23
|
+
export interface SerializedChainLeaf {
|
|
24
|
+
chainId: string;
|
|
25
|
+
nextChainId: string;
|
|
26
|
+
label?: string;
|
|
27
|
+
initCode: string;
|
|
28
|
+
initCodeHash: string;
|
|
29
|
+
prefix: string;
|
|
30
|
+
leafHash: string;
|
|
31
|
+
proof: string[];
|
|
32
|
+
}
|
|
33
|
+
export interface SerializedFallbackLeaf {
|
|
34
|
+
chainId: string;
|
|
35
|
+
nextChainId: string;
|
|
36
|
+
initCode: string;
|
|
37
|
+
initCodeHash: string;
|
|
38
|
+
prefix: string;
|
|
39
|
+
leafHash: string;
|
|
40
|
+
proof: string[];
|
|
41
|
+
}
|
|
42
|
+
export interface Create4ChainTarget {
|
|
43
|
+
mode: 'chain';
|
|
44
|
+
modeFlag: string;
|
|
45
|
+
chainId: string;
|
|
46
|
+
nextChainId: string;
|
|
47
|
+
initCode: string;
|
|
48
|
+
initCodeHash: string;
|
|
49
|
+
proof: string[];
|
|
50
|
+
}
|
|
51
|
+
export interface Create4FallbackTarget {
|
|
52
|
+
mode: 'fallback';
|
|
53
|
+
modeFlag: string;
|
|
54
|
+
gapChainId: string;
|
|
55
|
+
gapNextChainId: string;
|
|
56
|
+
gapLeafPrefix: string;
|
|
57
|
+
gapLeafHash: string;
|
|
58
|
+
gapProof: string[];
|
|
59
|
+
initCode: string;
|
|
60
|
+
initCodeHash: string;
|
|
61
|
+
proof: string[];
|
|
62
|
+
}
|
|
63
|
+
export interface Create4PlanComputationResult {
|
|
64
|
+
factoryAddress: string;
|
|
65
|
+
chainId: string;
|
|
66
|
+
planRoot: string;
|
|
67
|
+
salt: string;
|
|
68
|
+
deploymentSalt: string;
|
|
69
|
+
address: string;
|
|
70
|
+
target: Create4ChainTarget | Create4FallbackTarget;
|
|
71
|
+
plan: {
|
|
72
|
+
root: string;
|
|
73
|
+
leaves: SerializedChainLeaf[];
|
|
74
|
+
fallback: SerializedFallbackLeaf;
|
|
75
|
+
};
|
|
76
|
+
}
|
|
77
|
+
export declare function computeCreate4Plan(args: ComputeCreate4PlanArgs): Create4PlanComputationResult;
|
|
78
|
+
//# sourceMappingURL=create4.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"create4.d.ts","sourceRoot":"","sources":["../../../src/lib/utils/create4.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,237 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.computeCreate4Plan = computeCreate4Plan;
|
|
4
|
+
const ethers_1 = require("ethers");
|
|
5
|
+
const create4_1 = require("@0xsequence/create4");
|
|
6
|
+
function computeCreate4Plan(args) {
|
|
7
|
+
const factoryAddress = normalizeAddress(args.deployerAddress);
|
|
8
|
+
const targetChainId = normalizeChainIdInput(args.chainId, 'chain id');
|
|
9
|
+
const planSalt = normalizePlanSalt(args.salt);
|
|
10
|
+
const planSpec = buildPlanSpec(args.bytecodes, planSalt);
|
|
11
|
+
const plan = (0, create4_1.buildPlanFromSpec)(planSpec);
|
|
12
|
+
const deploymentSalt = (0, create4_1.deriveDeploymentSalt)(plan.root, planSalt);
|
|
13
|
+
const address = (0, create4_1.computeCreate3Address)(factoryAddress, deploymentSalt);
|
|
14
|
+
const targetLeaf = plan.leaves.find(leaf => BigInt(leaf.chainId) === targetChainId);
|
|
15
|
+
const target = targetLeaf
|
|
16
|
+
? buildChainTarget(targetLeaf)
|
|
17
|
+
: buildFallbackTarget(plan.leaves, plan.fallback, targetChainId);
|
|
18
|
+
return {
|
|
19
|
+
factoryAddress,
|
|
20
|
+
chainId: targetChainId.toString(),
|
|
21
|
+
planRoot: plan.root,
|
|
22
|
+
salt: plan.salt,
|
|
23
|
+
deploymentSalt,
|
|
24
|
+
address,
|
|
25
|
+
target,
|
|
26
|
+
plan: {
|
|
27
|
+
root: plan.root,
|
|
28
|
+
leaves: plan.leaves,
|
|
29
|
+
fallback: plan.fallback,
|
|
30
|
+
},
|
|
31
|
+
};
|
|
32
|
+
}
|
|
33
|
+
function buildPlanSpec(bytecodes, salt) {
|
|
34
|
+
if (!bytecodes || typeof bytecodes !== 'object') {
|
|
35
|
+
throw new Error('create4-plan: bytecodes must be an object with chain entries and a fallback');
|
|
36
|
+
}
|
|
37
|
+
const sharedConstructor = normalizeConstructor(bytecodes.sharedConstructor, 'bytecodes.sharedConstructor');
|
|
38
|
+
const fallbackEntry = bytecodes.fallback ?? bytecodes['fallbackInitCode'];
|
|
39
|
+
if (!fallbackEntry) {
|
|
40
|
+
throw new Error('create4-plan: bytecodes.fallback is required');
|
|
41
|
+
}
|
|
42
|
+
const chains = [];
|
|
43
|
+
const chainSource = (bytecodes.chains && typeof bytecodes.chains === 'object') ? bytecodes.chains : bytecodes;
|
|
44
|
+
for (const [key, value] of Object.entries(chainSource)) {
|
|
45
|
+
if (key === 'fallback' || key === 'fallbackInitCode' || key === 'sharedConstructor' || key === 'chains') {
|
|
46
|
+
continue;
|
|
47
|
+
}
|
|
48
|
+
if (value === undefined || value === null) {
|
|
49
|
+
throw new Error(`create4-plan: bytecodes entry "${key}" is missing a value`);
|
|
50
|
+
}
|
|
51
|
+
chains.push(normalizeChainEntry(key, value, sharedConstructor));
|
|
52
|
+
}
|
|
53
|
+
if (chains.length === 0) {
|
|
54
|
+
throw new Error('create4-plan: at least one chain entry is required');
|
|
55
|
+
}
|
|
56
|
+
return {
|
|
57
|
+
salt,
|
|
58
|
+
fallbackInitCode: normalizeBytecodeEntry(fallbackEntry, undefined, 'bytecodes.fallback'),
|
|
59
|
+
chains: chains.map(entry => ({
|
|
60
|
+
chainId: entry.chainId.toString(),
|
|
61
|
+
initCode: entry.initCode,
|
|
62
|
+
label: entry.label,
|
|
63
|
+
})),
|
|
64
|
+
};
|
|
65
|
+
}
|
|
66
|
+
function buildChainTarget(leaf) {
|
|
67
|
+
return {
|
|
68
|
+
mode: 'chain',
|
|
69
|
+
modeFlag: '1',
|
|
70
|
+
chainId: leaf.chainId,
|
|
71
|
+
nextChainId: leaf.nextChainId,
|
|
72
|
+
initCode: leaf.initCode,
|
|
73
|
+
initCodeHash: leaf.initCodeHash,
|
|
74
|
+
proof: leaf.proof,
|
|
75
|
+
};
|
|
76
|
+
}
|
|
77
|
+
function buildFallbackTarget(leaves, fallback, targetChainId) {
|
|
78
|
+
const gapLeaf = findGapLeaf(leaves, targetChainId);
|
|
79
|
+
return {
|
|
80
|
+
mode: 'fallback',
|
|
81
|
+
modeFlag: '0',
|
|
82
|
+
gapChainId: gapLeaf.chainId,
|
|
83
|
+
gapNextChainId: gapLeaf.nextChainId,
|
|
84
|
+
gapLeafPrefix: gapLeaf.prefix,
|
|
85
|
+
gapLeafHash: gapLeaf.initCodeHash,
|
|
86
|
+
gapProof: gapLeaf.proof,
|
|
87
|
+
initCode: fallback.initCode,
|
|
88
|
+
initCodeHash: fallback.initCodeHash,
|
|
89
|
+
proof: fallback.proof,
|
|
90
|
+
};
|
|
91
|
+
}
|
|
92
|
+
function findGapLeaf(leaves, targetChainId) {
|
|
93
|
+
for (const leaf of leaves) {
|
|
94
|
+
if ((0, create4_1.isChainIdInGap)(leaf.chainId, leaf.nextChainId, targetChainId)) {
|
|
95
|
+
return leaf;
|
|
96
|
+
}
|
|
97
|
+
}
|
|
98
|
+
throw new Error(`create4-plan: no fallback gap covers chain id ${targetChainId.toString()}`);
|
|
99
|
+
}
|
|
100
|
+
function normalizePlanSalt(value) {
|
|
101
|
+
if (value === undefined || value === null || value === '') {
|
|
102
|
+
return create4_1.ZERO_SALT;
|
|
103
|
+
}
|
|
104
|
+
return (0, create4_1.normalizeSaltHex)(value);
|
|
105
|
+
}
|
|
106
|
+
function normalizeChainEntry(key, entry, sharedConstructor) {
|
|
107
|
+
const trimmedKey = key.trim();
|
|
108
|
+
if (!trimmedKey) {
|
|
109
|
+
throw new Error('create4-plan: chain entry keys cannot be empty');
|
|
110
|
+
}
|
|
111
|
+
let entryObj;
|
|
112
|
+
if (typeof entry === 'string') {
|
|
113
|
+
entryObj = { initCode: entry };
|
|
114
|
+
}
|
|
115
|
+
else if (entry && typeof entry === 'object') {
|
|
116
|
+
entryObj = entry;
|
|
117
|
+
}
|
|
118
|
+
else {
|
|
119
|
+
throw new Error(`create4-plan: chain entry "${key}" must be a hex string or an object`);
|
|
120
|
+
}
|
|
121
|
+
const keyChainId = normalizeChainIdInput(trimmedKey, `chain id key "${key}"`);
|
|
122
|
+
if (entryObj.chainId !== undefined) {
|
|
123
|
+
const providedChainId = normalizeChainIdInput(entryObj.chainId, `chain id for "${key}"`);
|
|
124
|
+
if (providedChainId !== keyChainId) {
|
|
125
|
+
throw new Error(`create4-plan: chain id mismatch for entry "${key}"`);
|
|
126
|
+
}
|
|
127
|
+
}
|
|
128
|
+
return {
|
|
129
|
+
key,
|
|
130
|
+
chainId: keyChainId,
|
|
131
|
+
label: typeof entryObj.label === 'string' ? entryObj.label : undefined,
|
|
132
|
+
initCode: normalizeBytecodeEntry(entryObj, sharedConstructor, `bytecodes[${key}]`),
|
|
133
|
+
};
|
|
134
|
+
}
|
|
135
|
+
function normalizeBytecodeEntry(entry, sharedConstructor, context) {
|
|
136
|
+
if (typeof entry === 'string') {
|
|
137
|
+
return normalizeHex(entry, `${context}.initCode`);
|
|
138
|
+
}
|
|
139
|
+
if (!entry || typeof entry !== 'object') {
|
|
140
|
+
throw new Error(`create4-plan: ${context} must be a hex string or an object`);
|
|
141
|
+
}
|
|
142
|
+
if (entry.initCode !== undefined) {
|
|
143
|
+
return normalizeHex(entry.initCode, `${context}.initCode`);
|
|
144
|
+
}
|
|
145
|
+
if (!entry.creationCode) {
|
|
146
|
+
throw new Error(`create4-plan: ${context} must include initCode or creationCode`);
|
|
147
|
+
}
|
|
148
|
+
const creationCode = normalizeHex(entry.creationCode, `${context}.creationCode`);
|
|
149
|
+
const hasOwnConstructor = Object.prototype.hasOwnProperty.call(entry, 'constructor');
|
|
150
|
+
const constructorOverride = hasOwnConstructor ? entry.constructor : undefined;
|
|
151
|
+
const constructorSpec = normalizeConstructor(constructorOverride ?? sharedConstructor, `${context}.constructor`);
|
|
152
|
+
if (!constructorSpec) {
|
|
153
|
+
return creationCode;
|
|
154
|
+
}
|
|
155
|
+
const encodedArgs = encodeConstructorArgs(constructorSpec, context);
|
|
156
|
+
return ethers_1.ethers.hexlify(ethers_1.ethers.concat([ethers_1.ethers.getBytes(creationCode), ethers_1.ethers.getBytes(encodedArgs)]));
|
|
157
|
+
}
|
|
158
|
+
function normalizeConstructor(value, context) {
|
|
159
|
+
if (value === undefined || value === null) {
|
|
160
|
+
return undefined;
|
|
161
|
+
}
|
|
162
|
+
if (typeof value !== 'object') {
|
|
163
|
+
throw new Error(`create4-plan: ${context} must be an object with types and values arrays`);
|
|
164
|
+
}
|
|
165
|
+
const types = Array.isArray(value.types) ? value.types.map(t => String(t)) : undefined;
|
|
166
|
+
const values = Array.isArray(value.values) ? [...value.values] : undefined;
|
|
167
|
+
if (!types || !values) {
|
|
168
|
+
throw new Error(`create4-plan: ${context} must include types[] and values[]`);
|
|
169
|
+
}
|
|
170
|
+
if (types.length !== values.length) {
|
|
171
|
+
throw new Error(`create4-plan: ${context} types length (${types.length}) must match values length (${values.length})`);
|
|
172
|
+
}
|
|
173
|
+
return { types, values };
|
|
174
|
+
}
|
|
175
|
+
function encodeConstructorArgs(constructorSpec, context) {
|
|
176
|
+
try {
|
|
177
|
+
return ethers_1.ethers.AbiCoder.defaultAbiCoder().encode(constructorSpec.types, constructorSpec.values);
|
|
178
|
+
}
|
|
179
|
+
catch (error) {
|
|
180
|
+
const reason = error instanceof Error ? error.message : String(error);
|
|
181
|
+
throw new Error(`create4-plan: failed to encode constructor for ${context}: ${reason}`);
|
|
182
|
+
}
|
|
183
|
+
}
|
|
184
|
+
function normalizeHex(value, label) {
|
|
185
|
+
if (typeof value !== 'string') {
|
|
186
|
+
throw new Error(`create4-plan: ${label} must be provided as a hex string`);
|
|
187
|
+
}
|
|
188
|
+
let hex = value.trim();
|
|
189
|
+
if (!hex.startsWith('0x')) {
|
|
190
|
+
hex = '0x' + hex;
|
|
191
|
+
}
|
|
192
|
+
try {
|
|
193
|
+
return ethers_1.ethers.hexlify(ethers_1.ethers.getBytes(hex));
|
|
194
|
+
}
|
|
195
|
+
catch {
|
|
196
|
+
throw new Error(`create4-plan: ${label} must be a valid hex string`);
|
|
197
|
+
}
|
|
198
|
+
}
|
|
199
|
+
function normalizeChainIdInput(value, label) {
|
|
200
|
+
if (typeof value === 'bigint') {
|
|
201
|
+
return assertChainIdRange(value, label);
|
|
202
|
+
}
|
|
203
|
+
if (typeof value === 'number') {
|
|
204
|
+
if (!Number.isFinite(value) || !Number.isInteger(value)) {
|
|
205
|
+
throw new Error(`create4-plan: ${label} must be a finite integer`);
|
|
206
|
+
}
|
|
207
|
+
return assertChainIdRange(BigInt(value), label);
|
|
208
|
+
}
|
|
209
|
+
if (typeof value === 'string') {
|
|
210
|
+
const trimmed = value.trim();
|
|
211
|
+
if (!trimmed) {
|
|
212
|
+
throw new Error(`create4-plan: ${label} cannot be empty`);
|
|
213
|
+
}
|
|
214
|
+
try {
|
|
215
|
+
return assertChainIdRange(BigInt(trimmed), label);
|
|
216
|
+
}
|
|
217
|
+
catch {
|
|
218
|
+
throw new Error(`create4-plan: invalid ${label}: ${value}`);
|
|
219
|
+
}
|
|
220
|
+
}
|
|
221
|
+
throw new Error(`create4-plan: ${label} must be a string, number, or bigint`);
|
|
222
|
+
}
|
|
223
|
+
function assertChainIdRange(value, label) {
|
|
224
|
+
if (value < 0n || value > ((1n << 64n) - 1n)) {
|
|
225
|
+
throw new Error(`create4-plan: ${label} must fit within uint64 range`);
|
|
226
|
+
}
|
|
227
|
+
return value;
|
|
228
|
+
}
|
|
229
|
+
function normalizeAddress(value) {
|
|
230
|
+
try {
|
|
231
|
+
return ethers_1.ethers.getAddress(value);
|
|
232
|
+
}
|
|
233
|
+
catch {
|
|
234
|
+
throw new Error(`create4-plan: invalid deployer address: ${value}`);
|
|
235
|
+
}
|
|
236
|
+
}
|
|
237
|
+
//# sourceMappingURL=create4.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"create4.js","sourceRoot":"","sources":["../../../src/lib/utils/create4.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,11 +1,23 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@0xsequence/catapult",
|
|
3
|
-
"version": "1.3.
|
|
3
|
+
"version": "1.3.11",
|
|
4
4
|
"description": "Ethereum contract deployment CLI tool",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"bin": {
|
|
7
7
|
"catapult": "dist/index.js"
|
|
8
8
|
},
|
|
9
|
+
"scripts": {
|
|
10
|
+
"build": "tsc && cp -r src/lib/std dist/lib/",
|
|
11
|
+
"dev": "ts-node src/index.ts",
|
|
12
|
+
"start": "node dist/index.js",
|
|
13
|
+
"start:dev": "npm run build && npm run start",
|
|
14
|
+
"watch": "tsc --watch",
|
|
15
|
+
"clean": "rm -rf dist",
|
|
16
|
+
"prepare": "npm run build",
|
|
17
|
+
"test": "jest --runInBand --detectOpenHandles",
|
|
18
|
+
"lint": "eslint src/**/*.ts",
|
|
19
|
+
"lint:fix": "eslint src/**/*.ts --fix"
|
|
20
|
+
},
|
|
9
21
|
"keywords": [
|
|
10
22
|
"ethereum",
|
|
11
23
|
"deployment",
|
|
@@ -52,16 +64,5 @@
|
|
|
52
64
|
},
|
|
53
65
|
"engines": {
|
|
54
66
|
"node": ">=16.0.0"
|
|
55
|
-
},
|
|
56
|
-
"scripts": {
|
|
57
|
-
"build": "tsc && cp -r src/lib/std dist/lib/",
|
|
58
|
-
"dev": "ts-node src/index.ts",
|
|
59
|
-
"start": "node dist/index.js",
|
|
60
|
-
"start:dev": "npm run build && npm run start",
|
|
61
|
-
"watch": "tsc --watch",
|
|
62
|
-
"clean": "rm -rf dist",
|
|
63
|
-
"test": "jest --runInBand --detectOpenHandles",
|
|
64
|
-
"lint": "eslint src/**/*.ts",
|
|
65
|
-
"lint:fix": "eslint src/**/*.ts --fix"
|
|
66
67
|
}
|
|
67
68
|
}
|
package/src/lib/core/loader.ts
CHANGED
|
@@ -121,22 +121,6 @@ export class ProjectLoader {
|
|
|
121
121
|
}
|
|
122
122
|
|
|
123
123
|
const job = parseJob(content)
|
|
124
|
-
// Capture optional job-level constants by peeking the raw YAML for "constants"
|
|
125
|
-
try {
|
|
126
|
-
const raw = JSON.parse(JSON.stringify(require('yaml').parse(content)))
|
|
127
|
-
if (raw && typeof raw === 'object' && raw.constants !== undefined) {
|
|
128
|
-
if (typeof raw.constants !== 'object' || Array.isArray(raw.constants)) {
|
|
129
|
-
throw new Error(`Invalid job "${job.name}": "constants" field must be an object if provided.`)
|
|
130
|
-
}
|
|
131
|
-
(job as any).constants = raw.constants
|
|
132
|
-
}
|
|
133
|
-
} catch (peekErr) {
|
|
134
|
-
// parseJob already validated YAML; if this peek fails due to YAML parsing, surface it
|
|
135
|
-
if (peekErr instanceof Error && peekErr.message.includes('Failed to parse')) {
|
|
136
|
-
throw new Error(`Job constants peek failed for ${filePath}: ${peekErr.message}`)
|
|
137
|
-
}
|
|
138
|
-
// Otherwise ignore non-YAML related errors here
|
|
139
|
-
}
|
|
140
124
|
job._path = filePath
|
|
141
125
|
this.jobs.set(job.name, job)
|
|
142
126
|
} catch (error) {
|
|
@@ -315,7 +315,7 @@ actions:
|
|
|
315
315
|
|
|
316
316
|
// --- New: Job-level constants field parsing ---
|
|
317
317
|
|
|
318
|
-
it('should
|
|
318
|
+
it('should attach an optional job-level constants block as an object', () => {
|
|
319
319
|
const yamlContent = `
|
|
320
320
|
name: "job-with-constants"
|
|
321
321
|
version: "1"
|
|
@@ -328,8 +328,31 @@ actions:
|
|
|
328
328
|
arguments:
|
|
329
329
|
x: "{{FEE}}"
|
|
330
330
|
`
|
|
331
|
-
const job = parseJob(yamlContent)
|
|
332
|
-
|
|
333
|
-
|
|
331
|
+
const job = parseJob(yamlContent)
|
|
332
|
+
expect(job.constants).toEqual({
|
|
333
|
+
FEE: '1000',
|
|
334
|
+
ADMIN: '0x0000000000000000000000000000000000000001'
|
|
335
|
+
})
|
|
336
|
+
})
|
|
337
|
+
|
|
338
|
+
it('should parse job-level skip conditions', () => {
|
|
339
|
+
const yamlContent = `
|
|
340
|
+
name: "job-with-skip"
|
|
341
|
+
version: "1"
|
|
342
|
+
skip_condition:
|
|
343
|
+
- type: "contract-exists"
|
|
344
|
+
arguments:
|
|
345
|
+
address: "0xabc"
|
|
346
|
+
actions:
|
|
347
|
+
- name: "a1"
|
|
348
|
+
template: "t1"
|
|
349
|
+
arguments: {}
|
|
350
|
+
`
|
|
351
|
+
const job = parseJob(yamlContent)
|
|
352
|
+
expect(job.skip_condition).toHaveLength(1)
|
|
353
|
+
expect(job.skip_condition?.[0]).toEqual({
|
|
354
|
+
type: 'contract-exists',
|
|
355
|
+
arguments: { address: '0xabc' }
|
|
356
|
+
})
|
|
334
357
|
})
|
|
335
358
|
})
|
package/src/lib/parsers/job.ts
CHANGED
|
@@ -1,5 +1,27 @@
|
|
|
1
1
|
import { parse as parseYaml, YAMLParseError } from 'yaml'
|
|
2
|
-
import { Job, JobAction } from '../types'
|
|
2
|
+
import { Condition, Job, JobAction } from '../types'
|
|
3
|
+
|
|
4
|
+
/**
|
|
5
|
+
* Determines whether a raw YAML item is a valid Condition.
|
|
6
|
+
* Mirrors the validation logic used for templates so job-level
|
|
7
|
+
* skip conditions behave consistently.
|
|
8
|
+
*/
|
|
9
|
+
function isCondition(item: any): item is Condition {
|
|
10
|
+
if (!item || typeof item !== 'object' || typeof item.type !== 'string') {
|
|
11
|
+
return false
|
|
12
|
+
}
|
|
13
|
+
|
|
14
|
+
if (['contract-exists', 'job-completed'].includes(item.type)) {
|
|
15
|
+
return true
|
|
16
|
+
}
|
|
17
|
+
|
|
18
|
+
if (item.type === 'basic-arithmetic') {
|
|
19
|
+
const op = item.arguments?.operation
|
|
20
|
+
return typeof op === 'string' && ['eq', 'neq', 'gt', 'lt', 'gte', 'lte'].includes(op)
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
return false
|
|
24
|
+
}
|
|
3
25
|
|
|
4
26
|
/**
|
|
5
27
|
* Parses a YAML string defining a job into a structured `Job` object.
|
|
@@ -88,6 +110,24 @@ export function parseJob(yamlContent: string): Job {
|
|
|
88
110
|
throw new Error(`Invalid job "${rawObject.name}": "min_evm_version" must be a string if provided.`)
|
|
89
111
|
}
|
|
90
112
|
|
|
113
|
+
// --- Optional: validate job-level skip_condition and constants ---
|
|
114
|
+
if (rawObject.skip_condition !== undefined) {
|
|
115
|
+
if (!Array.isArray(rawObject.skip_condition)) {
|
|
116
|
+
throw new Error(`Invalid job "${rawObject.name}": "skip_condition" must be an array if provided.`)
|
|
117
|
+
}
|
|
118
|
+
for (const condition of rawObject.skip_condition) {
|
|
119
|
+
if (!isCondition(condition)) {
|
|
120
|
+
throw new Error(`Invalid job "${rawObject.name}": "skip_condition" contains an invalid condition entry.`)
|
|
121
|
+
}
|
|
122
|
+
}
|
|
123
|
+
}
|
|
124
|
+
|
|
125
|
+
if (rawObject.constants !== undefined) {
|
|
126
|
+
if (typeof rawObject.constants !== 'object' || rawObject.constants === null || Array.isArray(rawObject.constants)) {
|
|
127
|
+
throw new Error(`Invalid job "${rawObject.name}": "constants" field must be an object if provided.`)
|
|
128
|
+
}
|
|
129
|
+
}
|
|
130
|
+
|
|
91
131
|
// --- Construct and return the strongly-typed Job object ---
|
|
92
132
|
const job: Job = {
|
|
93
133
|
name: rawObject.name,
|
|
@@ -99,7 +139,9 @@ export function parseJob(yamlContent: string): Job {
|
|
|
99
139
|
only_networks: rawObject.only_networks,
|
|
100
140
|
skip_networks: rawObject.skip_networks,
|
|
101
141
|
min_evm_version: rawObject.min_evm_version,
|
|
102
|
-
deprecated: rawObject.deprecated === true
|
|
142
|
+
deprecated: rawObject.deprecated === true,
|
|
143
|
+
skip_condition: rawObject.skip_condition as Condition[] | undefined,
|
|
144
|
+
constants: rawObject.constants,
|
|
103
145
|
}
|
|
104
146
|
|
|
105
147
|
return job
|