@agoric/cosmic-swingset 0.41.3-dev-69236fd.0 → 0.41.3
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/CHANGELOG.md +8 -0
- package/package.json +12 -13
- package/src/chain-main.js +1 -1
- package/src/export-kernel-db.js +2 -0
- package/src/kernel-stats.js +6 -6
- package/src/launch-chain.js +3 -2
- package/src/sim-chain.js +1 -0
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,14 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
### [0.41.3](https://github.com/Agoric/agoric-sdk/compare/@agoric/cosmic-swingset@0.41.2...@agoric/cosmic-swingset@0.41.3) (2023-06-09)
|
|
7
|
+
|
|
8
|
+
**Note:** Version bump only for package @agoric/cosmic-swingset
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
|
|
12
|
+
|
|
13
|
+
|
|
6
14
|
### [0.41.2](https://github.com/Agoric/agoric-sdk/compare/@agoric/cosmic-swingset@0.41.1...@agoric/cosmic-swingset@0.41.2) (2023-06-02)
|
|
7
15
|
|
|
8
16
|
**Note:** Version bump only for package @agoric/cosmic-swingset
|
package/package.json
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@agoric/cosmic-swingset",
|
|
3
|
-
"version": "0.41.3
|
|
3
|
+
"version": "0.41.3",
|
|
4
4
|
"description": "Agoric's Cosmos blockchain integration",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"bin": {
|
|
7
|
-
"ag-chain-cosmos": "src/entrypoint.js"
|
|
7
|
+
"ag-chain-cosmos": "./src/entrypoint.js"
|
|
8
8
|
},
|
|
9
9
|
"main": "src/chain-main.js",
|
|
10
10
|
"repository": "https://github.com/Agoric/agoric-sdk",
|
|
@@ -22,14 +22,14 @@
|
|
|
22
22
|
"author": "Agoric",
|
|
23
23
|
"license": "Apache-2.0",
|
|
24
24
|
"dependencies": {
|
|
25
|
-
"@agoric/assert": "0.6.
|
|
26
|
-
"@agoric/cosmos": "0.34.1
|
|
27
|
-
"@agoric/deploy-script-support": "0.10.3
|
|
28
|
-
"@agoric/internal": "0.3.
|
|
29
|
-
"@agoric/store": "0.9.
|
|
30
|
-
"@agoric/swing-store": "0.9.
|
|
31
|
-
"@agoric/swingset-vat": "0.32.
|
|
32
|
-
"@agoric/telemetry": "0.6.
|
|
25
|
+
"@agoric/assert": "^0.6.0",
|
|
26
|
+
"@agoric/cosmos": "^0.34.1",
|
|
27
|
+
"@agoric/deploy-script-support": "^0.10.3",
|
|
28
|
+
"@agoric/internal": "^0.3.2",
|
|
29
|
+
"@agoric/store": "^0.9.2",
|
|
30
|
+
"@agoric/swing-store": "^0.9.1",
|
|
31
|
+
"@agoric/swingset-vat": "^0.32.2",
|
|
32
|
+
"@agoric/telemetry": "^0.6.2",
|
|
33
33
|
"@endo/far": "^0.2.18",
|
|
34
34
|
"@endo/import-bundle": "^0.3.4",
|
|
35
35
|
"@endo/init": "^0.5.56",
|
|
@@ -37,8 +37,7 @@
|
|
|
37
37
|
"@endo/nat": "^4.1.27",
|
|
38
38
|
"@endo/promise-kit": "^0.2.56",
|
|
39
39
|
"@iarna/toml": "^2.2.3",
|
|
40
|
-
"@opentelemetry/
|
|
41
|
-
"@opentelemetry/sdk-metrics": "~1.9.0",
|
|
40
|
+
"@opentelemetry/sdk-metrics": "^0.32.0",
|
|
42
41
|
"anylogger": "^0.21.0",
|
|
43
42
|
"deterministic-json": "^1.0.5",
|
|
44
43
|
"import-meta-resolve": "^2.2.1",
|
|
@@ -60,5 +59,5 @@
|
|
|
60
59
|
],
|
|
61
60
|
"timeout": "20m"
|
|
62
61
|
},
|
|
63
|
-
"gitHead": "
|
|
62
|
+
"gitHead": "ba3b776444425bbcb275ce918794d9259f8e15da"
|
|
64
63
|
}
|
package/src/chain-main.js
CHANGED
|
@@ -494,7 +494,6 @@ export default async function main(progname, args, { env, homedir, agcc }) {
|
|
|
494
494
|
}
|
|
495
495
|
|
|
496
496
|
async function handleCosmosSnapshot(blockHeight, request, requestArgs) {
|
|
497
|
-
await null;
|
|
498
497
|
switch (request) {
|
|
499
498
|
case 'restore': {
|
|
500
499
|
const exportDir = requestArgs[0];
|
|
@@ -520,6 +519,7 @@ export default async function main(progname, args, { env, homedir, agcc }) {
|
|
|
520
519
|
});
|
|
521
520
|
stateSyncExport = exportData;
|
|
522
521
|
|
|
522
|
+
// eslint-disable-next-line @jessie.js/no-nested-await
|
|
523
523
|
await new Promise((resolve, reject) => {
|
|
524
524
|
tmpfs.dir(
|
|
525
525
|
{
|
package/src/export-kernel-db.js
CHANGED
|
@@ -144,9 +144,11 @@ export const initiateSwingStoreExport = (
|
|
|
144
144
|
if (includeExportData) {
|
|
145
145
|
log?.(`Writing Export Data`);
|
|
146
146
|
const fileName = `export-data.jsonl`;
|
|
147
|
+
// eslint-disable-next-line @jessie.js/no-nested-await
|
|
147
148
|
const exportDataFile = await open(pathResolve(exportDir, fileName), 'wx');
|
|
148
149
|
cleanup.push(async () => exportDataFile.close());
|
|
149
150
|
|
|
151
|
+
// eslint-disable-next-line @jessie.js/no-nested-await
|
|
150
152
|
for await (const entry of swingStoreExporter.getExportData()) {
|
|
151
153
|
await exportDataFile.write(`${JSON.stringify(entry)}\n`);
|
|
152
154
|
}
|
package/src/kernel-stats.js
CHANGED
|
@@ -16,8 +16,8 @@ import {
|
|
|
16
16
|
|
|
17
17
|
// diag.setLogger(new DiagConsoleLogger(), DiagLogLevel.VERBOSE);
|
|
18
18
|
|
|
19
|
-
/** @typedef {import('@opentelemetry/api').MetricAttributes} Attributes */
|
|
20
|
-
/** @typedef {import('@opentelemetry/api').Histogram} Histogram */
|
|
19
|
+
/** @typedef {import('@opentelemetry/api-metrics').MetricAttributes} Attributes */
|
|
20
|
+
/** @typedef {import('@opentelemetry/api-metrics').Histogram} Histogram */
|
|
21
21
|
|
|
22
22
|
import { getTelemetryProviders as getTelemetryProvidersOriginal } from '@agoric/telemetry';
|
|
23
23
|
|
|
@@ -111,7 +111,7 @@ export function getTelemetryProviders(powers = {}) {
|
|
|
111
111
|
}
|
|
112
112
|
|
|
113
113
|
/**
|
|
114
|
-
* @param {import('@opentelemetry/api').Meter} metricMeter
|
|
114
|
+
* @param {import('@opentelemetry/api-metrics').Meter} metricMeter
|
|
115
115
|
* @param {string} name
|
|
116
116
|
*/
|
|
117
117
|
function createHistogram(metricMeter, name) {
|
|
@@ -121,8 +121,8 @@ function createHistogram(metricMeter, name) {
|
|
|
121
121
|
|
|
122
122
|
/**
|
|
123
123
|
* @param {{
|
|
124
|
-
* metricMeter: import('@opentelemetry/api').Meter,
|
|
125
|
-
* attributes?: import('@opentelemetry/api').MetricAttributes,
|
|
124
|
+
* metricMeter: import('@opentelemetry/api-metrics').Meter,
|
|
125
|
+
* attributes?: import('@opentelemetry/api-metrics').MetricAttributes,
|
|
126
126
|
* }} param0
|
|
127
127
|
*/
|
|
128
128
|
export function makeSlogCallbacks({ metricMeter, attributes = {} }) {
|
|
@@ -284,7 +284,7 @@ export function makeInboundQueueMetrics(initialLength) {
|
|
|
284
284
|
/**
|
|
285
285
|
* @param {object} param0
|
|
286
286
|
* @param {any} param0.controller
|
|
287
|
-
* @param {import('@opentelemetry/api').Meter} param0.metricMeter
|
|
287
|
+
* @param {import('@opentelemetry/api-metrics').Meter} param0.metricMeter
|
|
288
288
|
* @param {Console} param0.log
|
|
289
289
|
* @param {Attributes} [param0.attributes]
|
|
290
290
|
* @param {any} [param0.inboundQueueMetrics]
|
package/src/launch-chain.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
// @ts-check
|
|
2
2
|
/* global process */
|
|
3
|
+
/* eslint-disable @jessie.js/no-nested-await */
|
|
3
4
|
import anylogger from 'anylogger';
|
|
4
5
|
|
|
5
6
|
import { E } from '@endo/far';
|
|
@@ -131,7 +132,6 @@ export async function buildSwingset(
|
|
|
131
132
|
swingsetConfig.vats[swingsetConfig.bootstrap || 'bootstrap'];
|
|
132
133
|
|
|
133
134
|
// Find the entrypoints for all the core proposals.
|
|
134
|
-
await null;
|
|
135
135
|
if (coreProposals) {
|
|
136
136
|
const { bundles, code } = await extractCoreProposalBundles(
|
|
137
137
|
coreProposals,
|
|
@@ -530,11 +530,12 @@ export async function launch({
|
|
|
530
530
|
*/
|
|
531
531
|
async function processActions(inboundQueue) {
|
|
532
532
|
let keepGoing = true;
|
|
533
|
-
await null;
|
|
534
533
|
for (const { action, context } of inboundQueue.consumeAll()) {
|
|
535
534
|
const inboundNum = `${context.blockHeight}-${context.txHash}-${context.msgIdx}`;
|
|
536
535
|
inboundQueueMetrics.decStat();
|
|
536
|
+
// eslint-disable-next-line no-await-in-loop
|
|
537
537
|
await performAction(action, inboundNum);
|
|
538
|
+
// eslint-disable-next-line no-await-in-loop
|
|
538
539
|
keepGoing = await runSwingset();
|
|
539
540
|
if (!keepGoing) {
|
|
540
541
|
// any leftover actions will remain on the inbound queue for possible
|