From a5321e6a1eee992bf8983f9b2a4c5329611253d4 Mon Sep 17 00:00:00 2001 From: Akim Mamedov Date: Tue, 1 Aug 2023 15:19:50 +0700 Subject: [PATCH 01/48] * Separate marine worker as a package * Trying to fix tests --- packages/@tests/smoke/node/package.json | 5 +- packages/@tests/smoke/web/package.json | 2 +- packages/@tests/smoke/web/public/index.js | 5 +- packages/@tests/smoke/web/src/index.ts | 4 +- packages/client/js-client.node/package.json | 24 +- packages/client/js-client.node/src/index.ts | 11 +- packages/client/js-client.node/vite.config.js | 26 + .../client/js-client.web.standalone/build.ts | 39 +- .../js-client.web.standalone/mocks/crypto.js | 3 + .../js-client.web.standalone/mocks/dgram.js | 1 + .../js-client.web.standalone/mocks/module.js | 1 + .../js-client.web.standalone/mocks/net.js | 1 + .../js-client.web.standalone/package.json | 27 +- .../js-client.web.standalone/src/index.ts | 7 +- packages/core/js-peer/package.json | 3 +- packages/core/js-peer/run-peer.ts | 51 + packages/core/js-peer/src/index.ts | 132 ++ .../core/js-peer/src/marine/worker/index.ts | 8 +- packages/core/js-peer/tsconfig.json | 3 +- packages/core/marine-worker/package.json | 44 + packages/core/marine-worker/src/index.ts | 80 + packages/core/marine-worker/tsconfig.json | 8 + packages/core/marine-worker/vite.config.js | 24 + pnpm-lock.yaml | 1634 +++++++++++++---- 24 files changed, 1787 insertions(+), 356 deletions(-) create mode 100644 packages/client/js-client.node/vite.config.js create mode 100644 packages/client/js-client.web.standalone/mocks/crypto.js create mode 100644 packages/client/js-client.web.standalone/mocks/dgram.js create mode 100644 packages/client/js-client.web.standalone/mocks/module.js create mode 100644 packages/client/js-client.web.standalone/mocks/net.js create mode 100644 packages/core/js-peer/run-peer.ts create mode 100644 packages/core/js-peer/src/index.ts create mode 100644 packages/core/marine-worker/package.json create mode 100644 packages/core/marine-worker/src/index.ts create mode 100644 packages/core/marine-worker/tsconfig.json create mode 100644 packages/core/marine-worker/vite.config.js diff --git a/packages/@tests/smoke/node/package.json b/packages/@tests/smoke/node/package.json index 88bf67a46..2479f31d7 100644 --- a/packages/@tests/smoke/node/package.json +++ b/packages/@tests/smoke/node/package.json @@ -19,7 +19,6 @@ "dependencies": { "@fluencelabs/js-client.api": "workspace:^", "@fluencelabs/js-client.node": "workspace:^", - "@test/aqua_for_test": "workspace:^" - }, - "devDependencies": {} + "@test/aqua_for_test": "workspace:../../aqua" + } } diff --git a/packages/@tests/smoke/web/package.json b/packages/@tests/smoke/web/package.json index e444b1402..b3e4e6924 100644 --- a/packages/@tests/smoke/web/package.json +++ b/packages/@tests/smoke/web/package.json @@ -20,7 +20,7 @@ "license": "Apache-2.0", "dependencies": { "@fluencelabs/js-client.web.standalone": "workspace:^", - "@test/test-utils": "workspace:^" + "@test/test-utils": "workspace:../../test-utils" }, "devDependencies": {} } diff --git a/packages/@tests/smoke/web/public/index.js b/packages/@tests/smoke/web/public/index.js index 390375f48..221f69168 100644 --- a/packages/@tests/smoke/web/public/index.js +++ b/packages/@tests/smoke/web/public/index.js @@ -84,7 +84,8 @@ const getRelayTime = () => { const main = async () => { console.log('starting fluence...'); - await fluence.defaultClient.connect(relay); + fluence.defaultClient = await fluence.clientFactory(relay); + // await fluence.defaultClient.connect(relay); console.log('started fluence'); console.log('getting relay time...'); @@ -104,7 +105,7 @@ btn.addEventListener('click', () => { main().then((res) => { const inner = document.createElement('div'); inner.id = 'res'; - inner.innerText = 'res'; + inner.innerText = res; document.getElementById('res-placeholder').appendChild(inner); }); }); diff --git a/packages/@tests/smoke/web/src/index.ts b/packages/@tests/smoke/web/src/index.ts index 017cd1bc5..b4345c962 100644 --- a/packages/@tests/smoke/web/src/index.ts +++ b/packages/@tests/smoke/web/src/index.ts @@ -14,7 +14,7 @@ const test = async () => { const localServer = await startContentServer(port, publicPath); console.log('starting puppeteer...'); - const browser = await puppeteer.launch(); + const browser = await puppeteer.launch({ headless: false }); const page = await browser.newPage(); // uncomment to debug what's happening inside the browser @@ -27,7 +27,7 @@ const test = async () => { await page.click('#btn'); console.log('waiting for result to appear...'); - const elem = await page.waitForSelector('#res'); + const elem = await page.waitForSelector('#res', {timeout: 10000000}); console.log('getting the content of result div...'); const content = await elem?.evaluate((x) => x.textContent); diff --git a/packages/client/js-client.node/package.json b/packages/client/js-client.node/package.json index 9eb3aa366..6c2bacf1a 100644 --- a/packages/client/js-client.node/package.json +++ b/packages/client/js-client.node/package.json @@ -2,7 +2,7 @@ "name": "@fluencelabs/js-client.node", "version": "0.7.0", "description": "TypeScript implementation of Fluence Peer", - "main": "./dist/index.js", + "main": "./dist/js-client.node.js", "typings": "./dist/index.d.ts", "engines": { "node": ">=10", @@ -10,25 +10,35 @@ }, "exports": { ".": { - "import": "./dist/index.js", + "import": "./dist/js-client.node.js", "types": "./dist/index.d.ts" } }, "type": "module", "scripts": { - "build": "tsc" + "build": "vite build" }, "repository": "https://github.com/fluencelabs/fluence-js", "author": "Fluence Labs", "license": "Apache-2.0", "dependencies": { - "@fluencelabs/js-peer": "0.9.0", - "@fluencelabs/interfaces": "0.8.0", "@fluencelabs/avm": "0.40.0", + "@fluencelabs/interfaces": "0.8.0", + "@fluencelabs/js-peer": "0.9.0", "@fluencelabs/marine-js": "0.3.45", - "platform": "1.3.6" + "@fluencelabs/marine-worker": "workspace:*", + "cross-fetch": "4.0.0", + "platform": "1.3.6", + "threads": "1.7.0", + "vite-plugin-require-transform": "1.0.21" }, "devDependencies": { - "@types/platform": "1.3.4" + "@rollup/plugin-commonjs": "25.0.3", + "@rollup/plugin-dynamic-import-vars": "2.0.4", + "@types/platform": "1.3.4", + "rollup-plugin-cjs-es": "2.0.0", + "vite": "4.0.4", + "vite-plugin-commonjs": "0.8.2", + "vite-plugin-replace": "0.1.1" } } diff --git a/packages/client/js-client.node/src/index.ts b/packages/client/js-client.node/src/index.ts index c84d6d141..e00a29b95 100644 --- a/packages/client/js-client.node/src/index.ts +++ b/packages/client/js-client.node/src/index.ts @@ -15,15 +15,19 @@ */ import * as platform from 'platform'; -import type { RelayOptions, ClientConfig, IFluenceClient } from '@fluencelabs/interfaces'; +import type { ClientConfig, IFluenceClient, RelayOptions } from '@fluencelabs/interfaces'; import { ClientPeer, makeClientPeerConfig } from '@fluencelabs/js-peer/dist/clientPeer/ClientPeer.js'; import { callAquaFunction } from '@fluencelabs/js-peer/dist/compilerSupport/callFunction.js'; import { registerService } from '@fluencelabs/js-peer/dist/compilerSupport/registerService.js'; import { MarineBasedAvmRunner } from '@fluencelabs/js-peer/dist/jsPeer/avm.js'; import { MarineBackgroundRunner } from '@fluencelabs/js-peer/dist/marine/worker/index.js'; import { WasmLoaderFromNpm } from '@fluencelabs/js-peer/dist/marine/deps-loader/node.js'; -import { WorkerLoader } from '@fluencelabs/js-peer/dist/marine/worker-script/workerLoader.js'; import { doRegisterNodeUtils } from '@fluencelabs/js-peer/dist/services/NodeUtils.js'; +import WorkerInlineUrl from '@fluencelabs/marine-worker/dist/marine-worker.umd.сjs?url'; + +// @ts-ignore +import { BlobWorker } from 'threads'; +import fetch from 'cross-fetch'; throwIfNotSupported(); @@ -39,7 +43,8 @@ export const defaultNames = { }; const createClient = async (relay: RelayOptions, config: ClientConfig): Promise => { - const workerLoader = new WorkerLoader(); + const workerBlob = await fetch(WorkerInlineUrl).then(res => res.blob()); + const workerLoader = new BlobWorker(workerBlob); const controlModuleLoader = new WasmLoaderFromNpm(defaultNames.marine.package, defaultNames.marine.file); const avmModuleLoader = new WasmLoaderFromNpm(defaultNames.avm.package, defaultNames.avm.file); diff --git a/packages/client/js-client.node/vite.config.js b/packages/client/js-client.node/vite.config.js new file mode 100644 index 000000000..d52341835 --- /dev/null +++ b/packages/client/js-client.node/vite.config.js @@ -0,0 +1,26 @@ +import {defineConfig} from 'vite' +import {resolve} from 'path'; +import {builtinModules} from "module"; +import { replaceCodePlugin } from "vite-plugin-replace"; + +export default defineConfig({ + build: { + target: 'es2022', + lib: { + entry: resolve(__dirname, 'src/index.ts'), + name: 'JSClient', + }, + rollupOptions: { + external: builtinModules + }, + commonjsOptions: { + esmExternals: true, + dynamicRequireRoot: '/Users/a.mamedov/WebstormProjects/js-client/node_modules/.pnpm', + dynamicRequireTargets: ['./default-gateway@6.0.3/node_modules/default-gateway/*.js'], + ignoreDynamicRequires: true, + } + }, + plugins: [replaceCodePlugin({ + replacements: [{from: 'require(`./${file}.js`)', to: ''}] + })] +}) \ No newline at end of file diff --git a/packages/client/js-client.web.standalone/build.ts b/packages/client/js-client.web.standalone/build.ts index f0a2f2650..67969da80 100644 --- a/packages/client/js-client.web.standalone/build.ts +++ b/packages/client/js-client.web.standalone/build.ts @@ -1,17 +1,20 @@ import * as fs from 'fs'; -import * as path from 'path'; +import path, { dirname, join, resolve } from 'path'; import { fromUint8Array } from 'js-base64'; +import type { InlineConfig, PluginOption } from 'vite'; import { build } from 'vite'; import { createRequire } from 'module'; -import type { InlineConfig } from 'vite'; import tsconfigPaths from 'vite-tsconfig-paths'; -import * as inject from '@rollup/plugin-inject'; +import inject from '@rollup/plugin-inject'; import { replaceCodePlugin } from 'vite-plugin-replace'; +import stdLibBrowser from 'node-stdlib-browser'; +import { fileURLToPath } from 'url'; const require = createRequire(import.meta.url); + const getWorkerScriptPathOrDie = () => { - const scriptPath = path.resolve('../../core/js-peer/dist/marine/worker-script/index.js'); + const scriptPath = resolve('../../core/js-peer/dist/marine/worker-script/index.js'); if (!fs.existsSync(scriptPath)) { console.error('Worker script not found, looking at: ' + scriptPath); process.exit(1); @@ -25,8 +28,9 @@ const commonConfig = (opts: { name: string; entry: string; }): InlineConfig & Required> => { + const esbuildShim = require.resolve('node-stdlib-browser/helpers/esbuild/shim'); + // @ts-ignore return { - mode: 'production', build: { minify: 'esbuild', lib: { @@ -37,7 +41,11 @@ const commonConfig = (opts: { outDir: opts.outDir, }, base: '', - plugins: [tsconfigPaths()], + plugins: [tsconfigPaths(), {...inject({ + global: [esbuildShim, 'global'], + process: [esbuildShim, 'process'], + Buffer: [esbuildShim, 'Buffer'] + }), enforce: 'post'}] as PluginOption[], optimizeDeps: { esbuildOptions: { define: { @@ -45,6 +53,14 @@ const commonConfig = (opts: { }, }, }, + resolve: { + alias: { + ...stdLibBrowser, + net: 'node-stdlib-browser/esm/mock/net', + dgram: path.resolve(dirname(fileURLToPath(import.meta.url)), 'mocks/dgram'), + module: path.resolve(dirname(fileURLToPath(import.meta.url)), 'mocks/module'), + } + } }; }; @@ -56,7 +72,7 @@ const readAsBase64 = async (filePath: string): Promise => { const readWasmFromNpmAsBase64 = (pkg: string, wasmFileName: string): Promise => { const pkgPath = require.resolve(pkg); - const wasmFilePath = path.join(path.dirname(pkgPath), wasmFileName); + const wasmFilePath = join(dirname(pkgPath), wasmFileName); return readAsBase64(wasmFilePath); }; @@ -69,15 +85,6 @@ const buildClient = async () => { entry: getWorkerScriptPathOrDie(), name: 'worker-script', }); - workerConfig.build!.rollupOptions = { - plugins: [ - // @ts-ignore - inject.default({ - Buffer: ['buffer', 'Buffer'], - process: 'process', - }), - ], - }; await build(workerConfig); diff --git a/packages/client/js-client.web.standalone/mocks/crypto.js b/packages/client/js-client.web.standalone/mocks/crypto.js new file mode 100644 index 000000000..cd106a198 --- /dev/null +++ b/packages/client/js-client.web.standalone/mocks/crypto.js @@ -0,0 +1,3 @@ +import crypto from 'crypto-browserify'; +export default crypto; +export const webcrypto = crypto; \ No newline at end of file diff --git a/packages/client/js-client.web.standalone/mocks/dgram.js b/packages/client/js-client.web.standalone/mocks/dgram.js new file mode 100644 index 000000000..86192848c --- /dev/null +++ b/packages/client/js-client.web.standalone/mocks/dgram.js @@ -0,0 +1 @@ +export const createSocket = () => {}; \ No newline at end of file diff --git a/packages/client/js-client.web.standalone/mocks/module.js b/packages/client/js-client.web.standalone/mocks/module.js new file mode 100644 index 000000000..a97219683 --- /dev/null +++ b/packages/client/js-client.web.standalone/mocks/module.js @@ -0,0 +1 @@ +export const createRequire = () => () => ({name: '@achingbrain/ssdp', version: '4.0.4'}); \ No newline at end of file diff --git a/packages/client/js-client.web.standalone/mocks/net.js b/packages/client/js-client.web.standalone/mocks/net.js new file mode 100644 index 000000000..ddd9b40ef --- /dev/null +++ b/packages/client/js-client.web.standalone/mocks/net.js @@ -0,0 +1 @@ +export const createServer = () => {}; \ No newline at end of file diff --git a/packages/client/js-client.web.standalone/package.json b/packages/client/js-client.web.standalone/package.json index 84db214d4..6b4269bcf 100644 --- a/packages/client/js-client.web.standalone/package.json +++ b/packages/client/js-client.web.standalone/package.json @@ -10,28 +10,41 @@ }, "type": "module", "scripts": { - "build": "node --loader ts-node/esm ./build.ts" + "build": "node --loader ts-node/esm -C browser ./build.ts" }, "repository": "https://github.com/fluencelabs/fluence-js", "author": "Fluence Labs", "license": "Apache-2.0", "dependencies": { - "@fluencelabs/js-peer": "0.9.0", "@fluencelabs/interfaces": "0.8.0", + "@fluencelabs/js-peer": "0.9.0", + "@fluencelabs/marine-worker": "workspace:*", "buffer": "6.0.3", - "process": "0.11.10" + "cross-fetch": "4.0.0", + "process": "0.11.10", + "threads": "1.7.0", + "vite-plugin-node-polyfills": "0.9.0", + "webpack": "5.88.2" }, "devDependencies": { "@fluencelabs/avm": "0.40.0", "@fluencelabs/marine-js": "0.3.45", - "@types/node": "16.11.59", + "@rollup/plugin-inject": "5.0.3", "@types/jest": "28.1.0", + "@types/node": "16.11.59", + "crypto-browserify": "3.12.0", + "esbuild-loader": "3.0.1", "jest": "28.1.0", - "ts-jest": "28.0.2", "js-base64": "3.7.5", - "@rollup/plugin-inject": "5.0.3", - "vite-plugin-replace": "0.1.1", + "node-polyfill-webpack-plugin": "2.0.1", + "node-stdlib-browser": "1.2.0", + "rollup-plugin-node-polyfills": "0.2.1", + "ts-jest": "28.0.2", + "ts-loader": "9.4.4", "vite": "4.0.4", + "vite-plugin-external": "1.2.8", + "vite-plugin-externals": "0.6.2", + "vite-plugin-replace": "0.1.1", "vite-tsconfig-paths": "4.0.3" } } diff --git a/packages/client/js-client.web.standalone/src/index.ts b/packages/client/js-client.web.standalone/src/index.ts index aaabe3cbd..8b02f1693 100644 --- a/packages/client/js-client.web.standalone/src/index.ts +++ b/packages/client/js-client.web.standalone/src/index.ts @@ -20,9 +20,14 @@ import { registerService } from '@fluencelabs/js-peer/dist/compilerSupport/regis import { MarineBasedAvmRunner } from '@fluencelabs/js-peer/dist/jsPeer/avm.js'; import { MarineBackgroundRunner } from '@fluencelabs/js-peer/dist/marine/worker/index.js'; import { InlinedWorkerLoader, InlinedWasmLoader } from '@fluencelabs/js-peer/dist/marine/deps-loader/common.js'; +import { BlobWorker } from 'threads'; +import fetch from 'cross-fetch'; + +import WorkerInlineUrl from '@fluencelabs/marine-worker/dist/marine-worker.umd.сjs?url'; const createClient = async (relay: RelayOptions, config: ClientConfig): Promise => { - const workerLoader = new InlinedWorkerLoader('___worker___'); + const workerBlob = await fetch(WorkerInlineUrl).then(res => res.blob()); + const workerLoader = new BlobWorker(workerBlob); const controlModuleLoader = new InlinedWasmLoader('___marine___'); const avmModuleLoader = new InlinedWasmLoader('___avm___'); diff --git a/packages/core/js-peer/package.json b/packages/core/js-peer/package.json index 391e5fdec..8e584599a 100644 --- a/packages/core/js-peer/package.json +++ b/packages/core/js-peer/package.json @@ -45,7 +45,8 @@ "@libp2p/interface-connection": "3.0.8", "@libp2p/mplex": "7.1.1", "@libp2p/websockets": "5.0.3", - "@multiformats/multiaddr": "11.3.0" + "@multiformats/multiaddr": "11.3.0", + "@fluencelabs/marine-worker": "workspace:*" }, "devDependencies": { "@fluencelabs/aqua-api": "0.9.3", diff --git a/packages/core/js-peer/run-peer.ts b/packages/core/js-peer/run-peer.ts new file mode 100644 index 000000000..e2646f4b2 --- /dev/null +++ b/packages/core/js-peer/run-peer.ts @@ -0,0 +1,51 @@ +/* + * Copyright 2023 Fluence Labs Limited + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +import { KeyPair } from './src/keypair/index.js'; +import { RELAY } from './src/clientPeer/__test__/connection.js'; +import { ClientPeer } from './src/clientPeer/ClientPeer.js'; +import { WorkerLoader } from './src/marine/worker-script/workerLoader.js'; +import { WasmLoaderFromNpm } from './src/marine/deps-loader/node.js'; +import { MarineBackgroundRunner } from './src/marine/worker/index.js'; +import { MarineBasedAvmRunner } from './src/jsPeer/avm.js'; +import { multiaddr } from '@multiformats/multiaddr'; + +// const key = '+cmeYlZKj+MfSa9dpHV+BmLPm6wq4inGlsPlQ1GvtPk='; +// const keyBytes = toUint8Array(key); +// +// const privKey = await generateKeyPairFromSeed('Ed25519', keyBytes, 256); +// const peer = new ClientPeer({}, new KeyPair(privKey, "12D3KooWBM3SdXWqGaawQDGQ6JprtwswEg3FWGvGhmgmMez1vRbR")); +// await peer.start(); + +const workerLoader = new WorkerLoader(); +const controlModuleLoader = new WasmLoaderFromNpm('@fluencelabs/marine-js', 'marine-js.wasm'); +const avmModuleLoader = new WasmLoaderFromNpm('@fluencelabs/avm', 'avm.wasm'); +const marine = new MarineBackgroundRunner(workerLoader, controlModuleLoader); +const avm = new MarineBasedAvmRunner(marine, avmModuleLoader); + +const r = await KeyPair.randomEd25519(); +const clientPeer = new ClientPeer({ + debug: { + printParticleId: false, + }, + defaultTtlMs: 7000, +}, { + peerId: r.getLibp2pPeerId(), + relayAddress: multiaddr(RELAY), + dialTimeoutMs: undefined, + maxInboundStreams: 1024, + maxOutboundStreams: 1024, +}, r, marine, avm); +await clientPeer.connect(); diff --git a/packages/core/js-peer/src/index.ts b/packages/core/js-peer/src/index.ts new file mode 100644 index 000000000..51166ace0 --- /dev/null +++ b/packages/core/js-peer/src/index.ts @@ -0,0 +1,132 @@ +/* + * Copyright 2023 Fluence Labs Limited + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +// @ts-nocheck + +import { getFluenceInterface, getFluenceInterfaceFromGlobalThis } from './util.js'; +import { + IFluenceClient, + ClientConfig, + RelayOptions, + ConnectionState, + CallAquaFunctionType, + RegisterServiceType, +} from '@fluencelabs/interfaces'; +import { WorkerLoader } from './marine/worker-script/workerLoader.js'; +export type { IFluenceClient, ClientConfig, CallParams } from '@fluencelabs/interfaces'; + +export { + ArrayType, + ArrowType, + ArrowWithCallbacks, + ArrowWithoutCallbacks, + BottomType, + FunctionCallConstants, + FunctionCallDef, + LabeledProductType, + NilType, + NonArrowType, + OptionType, + ProductType, + ScalarNames, + ScalarType, + ServiceDef, + StructType, + TopType, + UnlabeledProductType, + CallAquaFunctionType, + CallAquaFunctionArgs, + PassedArgs, + FnConfig, + RegisterServiceType, + RegisterServiceArgs, +} from '@fluencelabs/interfaces'; + +export { v5_callFunction, v5_registerService } from './compilerSupport/implementation.js'; + +/** + * Public interface to Fluence Network + */ +export const Fluence = { + /** + * Connect to the Fluence network + * @param relay - relay node to connect to + * @param config - client configuration + */ + connect: async (relay: RelayOptions, config?: ClientConfig): Promise => { + const fluence = await getFluenceInterface(); + const client = await fluence.clientFactory(relay, config); + fluence.defaultClient = client; + }, + + /** + * Disconnect from the Fluence network + */ + disconnect: async (): Promise => { + const fluence = await getFluenceInterface(); + await fluence.defaultClient?.disconnect(); + fluence.defaultClient = undefined; + }, + + /** + * Handle connection state changes. Immediately returns the current connection state + */ + onConnectionStateChange(handler: (state: ConnectionState) => void): ConnectionState { + const optimisticResult = getFluenceInterfaceFromGlobalThis(); + if (optimisticResult && optimisticResult.defaultClient) { + return optimisticResult.defaultClient.onConnectionStateChange(handler); + } + + getFluenceInterface().then((fluence) => { + fluence.defaultClient?.onConnectionStateChange(handler); + }); + + return 'disconnected'; + }, + + /** + * Low level API. Get the underlying client instance which holds the connection to the network + * @returns IFluenceClient instance + */ + getClient: async (): Promise => { + const fluence = await getFluenceInterface(); + if (!fluence.defaultClient) { + throw new Error('Fluence client is not initialized. Call Fluence.connect() first'); + } + return fluence.defaultClient; + }, +}; + +/** + * Low level API. Generally you need Fluence.connect() instead. + * @returns IFluenceClient instance + */ +export const createClient = async (relay: RelayOptions, config?: ClientConfig): Promise => { + const fluence = await getFluenceInterface(); + return await fluence.clientFactory(relay, config); +}; + +const publicFluenceInterface = { + clientFactory: createClient, + callAquaFunction, + registerService, +}; + +export function createClient() { + const workerLoader = new WorkerLoader(); +} + +export { callAquaFunction } from './compilerSupport/callFunction.js'; +export { registerService } from './compilerSupport/registerService.js'; diff --git a/packages/core/js-peer/src/marine/worker/index.ts b/packages/core/js-peer/src/marine/worker/index.ts index f793226c3..67fdb348e 100644 --- a/packages/core/js-peer/src/marine/worker/index.ts +++ b/packages/core/js-peer/src/marine/worker/index.ts @@ -25,6 +25,8 @@ import { Buffer } from 'buffer'; import { MarineLogger, marineLogger } from '../../util/logger.js'; import { IMarineHost, IWasmLoader, IWorkerLoader } from '../interfaces.js'; +// @ts-ignore +import type { WorkerImplementation } from 'threads/dist/types/master'; export class MarineBackgroundRunner implements IMarineHost { private marineServices = new Set(); @@ -32,7 +34,7 @@ export class MarineBackgroundRunner implements IMarineHost { private loggers: Map = new Map(); - constructor(private workerLoader: IWorkerLoader, private controlModuleLoader: IWasmLoader) {} + constructor(private worker: WorkerImplementation, private controlModuleLoader: IWasmLoader) {} hasService(serviceId: string): boolean { return this.marineServices.has(serviceId); @@ -48,11 +50,9 @@ export class MarineBackgroundRunner implements IMarineHost { } this.marineServices = new Set(); - await this.workerLoader.start(); await this.controlModuleLoader.start(); - const worker = this.workerLoader.getValue(); const wasm = this.controlModuleLoader.getValue(); - this.workerThread = await spawn(worker, { timeout: 99999999 }); + this.workerThread = await spawn(this.worker, { timeout: 99999999 }); const logfn: LogFunction = (message) => { const serviceLogger = this.loggers.get(message.service); if (!serviceLogger) { diff --git a/packages/core/js-peer/tsconfig.json b/packages/core/js-peer/tsconfig.json index d9ea46454..aa5bb8304 100644 --- a/packages/core/js-peer/tsconfig.json +++ b/packages/core/js-peer/tsconfig.json @@ -4,6 +4,5 @@ "outDir": "./dist" }, "include": ["src/**/*"], - "exclude": ["node_modules", "dist"], - "esModuleInterop": true + "exclude": ["node_modules", "dist"] } diff --git a/packages/core/marine-worker/package.json b/packages/core/marine-worker/package.json new file mode 100644 index 000000000..f404a6bdc --- /dev/null +++ b/packages/core/marine-worker/package.json @@ -0,0 +1,44 @@ +{ + "name": "@fluencelabs/marine-worker", + "version": "1.0.0", + "description": "Marine worker", + "files": [ + "dist" + ], + "main": "./dist/marine-worker.umd.cjs", + "module": "/dist/marine-worker.js", + "exports": { + ".": { + "import": "./dist/marine-worker.js", + "require": "./dist/marine-worker.umd.cjs" + }, + "./dist/marine-worker.js": { + "import": "./dist/marine-worker.js" + }, + "./dist/marine-worker.umd.сjs": { + "import": "./dist/marine-worker.umd.cjs" + } + }, + "type": "module", + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1", + "build": "vite build" + }, + "repository": "https://github.com/fluencelabs/fluence-js", + "author": "Fluence Labs", + "license": "Apache-2.0", + "keywords": [], + "devDependencies": { + "@rollup/plugin-inject": "5.0.3", + "@types/node": "20.4.5", + "node-stdlib-browser": "1.2.0", + "typescript": "5.1.6", + "vite": "4.0.4", + "vitest": "0.29.7" + }, + "dependencies": { + "@fluencelabs/marine-js": "0.3.45", + "observable-fns": "0.6.1", + "threads": "1.7.0" + } +} diff --git a/packages/core/marine-worker/src/index.ts b/packages/core/marine-worker/src/index.ts new file mode 100644 index 000000000..5d7fe4355 --- /dev/null +++ b/packages/core/marine-worker/src/index.ts @@ -0,0 +1,80 @@ +/* + * Copyright 2022 Fluence Labs Limited + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { MarineService } from '@fluencelabs/marine-js/dist/MarineService'; +import type { Env, MarineServiceConfig } from '@fluencelabs/marine-js/dist/config'; +import type { JSONArray, JSONObject, LogMessage } from '@fluencelabs/marine-js/dist/types'; +import { Observable, Subject } from 'observable-fns'; +// @ts-ignore no types provided for package +import { expose } from 'threads'; + +let marineServices = new Map(); +let controlModule: WebAssembly.Module | undefined; + +const onLogMessage = new Subject(); + +const toExpose = { + init: async (controlModuleWasm: ArrayBuffer): Promise => { + controlModule = await WebAssembly.compile(controlModuleWasm); + }, + + createService: async ( + wasm: ArrayBuffer, + serviceId: string, + marineConfig?: MarineServiceConfig, + envs?: Env, + ): Promise => { + if (!controlModule) { + throw new Error('MarineJS is not initialized. To initialize call `init` function'); + } + + const service = await WebAssembly.compile(wasm); + const srv = new MarineService( + controlModule, + service, + serviceId, + onLogMessage.next.bind(onLogMessage), + marineConfig, + envs, + ); + await srv.init(); + marineServices.set(serviceId, srv); + }, + + terminate: () => { + marineServices.forEach((val, key) => { + val.terminate(); + }); + onLogMessage.complete(); + }, + + callService: (serviceId: string, functionName: string, args: JSONArray | JSONObject, callParams: any): unknown => { + const srv = marineServices.get(serviceId); + if (!srv) { + throw new Error(`service with id=${serviceId} not found`); + } + + return srv.call(functionName, args, callParams); + }, + + onLogMessage(): Observable { + return Observable.from(onLogMessage); + }, +}; + +export type MarineBackgroundInterface = typeof toExpose; + +expose(toExpose); diff --git a/packages/core/marine-worker/tsconfig.json b/packages/core/marine-worker/tsconfig.json new file mode 100644 index 000000000..aa5bb8304 --- /dev/null +++ b/packages/core/marine-worker/tsconfig.json @@ -0,0 +1,8 @@ +{ + "extends": "../../../tsconfig.json", + "compilerOptions": { + "outDir": "./dist" + }, + "include": ["src/**/*"], + "exclude": ["node_modules", "dist"] +} diff --git a/packages/core/marine-worker/vite.config.js b/packages/core/marine-worker/vite.config.js new file mode 100644 index 000000000..1fb966855 --- /dev/null +++ b/packages/core/marine-worker/vite.config.js @@ -0,0 +1,24 @@ +import {defineConfig} from 'vite' +import {resolve} from 'path'; +import {createRequire} from "module"; +import inject from "@rollup/plugin-inject"; + +const require = createRequire(import.meta.url); +const esbuildShim = require.resolve('node-stdlib-browser/helpers/esbuild/shim'); + +export default defineConfig({ + build: { + target: 'es6', + lib: { + entry: resolve(__dirname, 'src/index.ts'), + name: 'MarineWorker', + }, + }, + plugins: [{ + ...inject({ + global: [esbuildShim, 'global'], + process: [esbuildShim, 'process'], + Buffer: [esbuildShim, 'Buffer'] + }), enforce: 'post' + }] +}) \ No newline at end of file diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index fa361af56..7c4031c6a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -10,7 +10,7 @@ importers: devDependencies: '@fluencelabs/aqua': specifier: 0.9.1-374 - version: 0.9.1-374(jest@27.5.1)(node-fetch@3.3.1)(typescript@4.7.2) + version: 0.9.1-374(@babel/core@7.22.5)(jest@27.5.1)(node-fetch@3.3.2)(typescript@4.7.2) '@fluencelabs/aqua-lib': specifier: 0.6.0 version: 0.6.0 @@ -44,7 +44,7 @@ importers: version: 0.6.0 '@fluencelabs/cli': specifier: 0.3.9 - version: 0.3.9(@ethersproject/abi@5.7.0)(@ethersproject/providers@5.7.2)(@nomicfoundation/hardhat-chai-matchers@1.0.6)(@nomicfoundation/hardhat-network-helpers@1.0.8)(@nomiclabs/hardhat-ethers@2.2.3)(@nomiclabs/hardhat-etherscan@3.1.7)(@typechain/ethers-v5@10.2.1)(@typechain/hardhat@6.1.6)(@types/chai@4.3.5)(@types/mocha@9.1.1)(@types/node@18.13.0)(chai@4.3.7)(hardhat-gas-reporter@1.0.9)(hardhat@2.15.0)(jest@27.5.1)(solidity-coverage@0.7.22)(ts-node@10.9.1)(typechain@8.2.0)(typescript@4.7.2) + version: 0.3.9(@ethersproject/abi@5.7.0)(@ethersproject/providers@5.7.2)(@nomicfoundation/hardhat-chai-matchers@1.0.6)(@nomicfoundation/hardhat-network-helpers@1.0.8)(@nomiclabs/hardhat-ethers@2.2.3)(@nomiclabs/hardhat-etherscan@3.1.7)(@typechain/ethers-v5@10.2.1)(@typechain/hardhat@6.1.6)(@types/chai@4.3.5)(@types/mocha@9.1.1)(@types/node@20.4.5)(chai@4.3.7)(hardhat-gas-reporter@1.0.9)(hardhat@2.15.0)(jest@27.5.1)(solidity-coverage@0.7.22)(ts-node@10.9.1)(typechain@8.2.0)(typescript@4.7.2) '@fluencelabs/registry': specifier: 0.8.2 version: 0.8.2 @@ -61,7 +61,7 @@ importers: specifier: workspace:^ version: link:../../../client/js-client.node '@test/aqua_for_test': - specifier: workspace:^ + specifier: workspace:../../aqua version: link:../../aqua packages/@tests/smoke/web: @@ -70,7 +70,7 @@ importers: specifier: workspace:^ version: link:../../../client/js-client.web.standalone '@test/test-utils': - specifier: workspace:^ + specifier: workspace:../../test-utils version: link:../../test-utils packages/@tests/smoke/web-cra-ts: @@ -110,7 +110,7 @@ importers: version: 18.2.0(react@18.2.0) react-scripts: specifier: 5.0.1 - version: 5.0.1(@babel/plugin-syntax-flow@7.22.5)(@babel/plugin-transform-react-jsx@7.22.5)(eslint@8.43.0)(react@18.2.0)(ts-node@10.9.1)(typescript@4.9.5) + version: 5.0.1(@babel/plugin-syntax-flow@7.22.5)(@babel/plugin-transform-react-jsx@7.22.5)(eslint@8.43.0)(react@18.2.0)(typescript@4.9.5) typescript: specifier: 4.9.5 version: 4.9.5 @@ -155,7 +155,7 @@ importers: version: 7.2.0 microbundle: specifier: 0.15.1 - version: 0.15.1(ts-node@10.9.1) + version: 0.15.1 packages/client/js-client.node: dependencies: @@ -171,13 +171,43 @@ importers: '@fluencelabs/marine-js': specifier: 0.3.45 version: 0.3.45 + '@fluencelabs/marine-worker': + specifier: workspace:* + version: link:../../core/marine-worker + cross-fetch: + specifier: 4.0.0 + version: 4.0.0 platform: specifier: 1.3.6 version: 1.3.6 + threads: + specifier: 1.7.0 + version: 1.7.0 + vite-plugin-require-transform: + specifier: 1.0.21 + version: 1.0.21 devDependencies: + '@rollup/plugin-commonjs': + specifier: 25.0.3 + version: 25.0.3(rollup@3.25.1) + '@rollup/plugin-dynamic-import-vars': + specifier: 2.0.4 + version: 2.0.4(rollup@3.25.1) '@types/platform': specifier: 1.3.4 version: 1.3.4 + rollup-plugin-cjs-es: + specifier: 2.0.0 + version: 2.0.0(rollup@3.25.1) + vite: + specifier: 4.0.4 + version: 4.0.4 + vite-plugin-commonjs: + specifier: 0.8.2 + version: 0.8.2 + vite-plugin-replace: + specifier: 0.1.1 + version: 0.1.1(vite@4.0.4) packages/client/js-client.web: dependencies: @@ -196,7 +226,7 @@ importers: version: 16.11.59 jest: specifier: 28.1.0 - version: 28.1.0(@types/node@16.11.59)(ts-node@10.9.1) + version: 28.1.0(@types/node@16.11.59) ts-jest: specifier: 28.0.2 version: 28.0.2(@babel/core@7.22.5)(@types/jest@28.1.0)(jest@28.1.0)(typescript@4.7.2) @@ -209,12 +239,27 @@ importers: '@fluencelabs/js-peer': specifier: 0.9.0 version: link:../../core/js-peer + '@fluencelabs/marine-worker': + specifier: workspace:* + version: link:../../core/marine-worker buffer: specifier: 6.0.3 version: 6.0.3 + cross-fetch: + specifier: 4.0.0 + version: 4.0.0 process: specifier: 0.11.10 version: 0.11.10 + threads: + specifier: 1.7.0 + version: 1.7.0 + vite-plugin-node-polyfills: + specifier: 0.9.0 + version: 0.9.0(vite@4.0.4) + webpack: + specifier: 5.88.2 + version: 5.88.2 devDependencies: '@fluencelabs/avm': specifier: 0.40.0 @@ -231,18 +276,42 @@ importers: '@types/node': specifier: 16.11.59 version: 16.11.59 + crypto-browserify: + specifier: 3.12.0 + version: 3.12.0 + esbuild-loader: + specifier: 3.0.1 + version: 3.0.1(webpack@5.88.2) jest: specifier: 28.1.0 - version: 28.1.0(@types/node@16.11.59)(ts-node@10.9.1) + version: 28.1.0(@types/node@16.11.59) js-base64: specifier: 3.7.5 version: 3.7.5 + node-polyfill-webpack-plugin: + specifier: 2.0.1 + version: 2.0.1(webpack@5.88.2) + node-stdlib-browser: + specifier: 1.2.0 + version: 1.2.0 + rollup-plugin-node-polyfills: + specifier: 0.2.1 + version: 0.2.1 ts-jest: specifier: 28.0.2 version: 28.0.2(@babel/core@7.22.5)(@types/jest@28.1.0)(jest@28.1.0)(typescript@4.7.2) + ts-loader: + specifier: 9.4.4 + version: 9.4.4(typescript@4.7.2)(webpack@5.88.2) vite: specifier: 4.0.4 version: 4.0.4(@types/node@16.11.59) + vite-plugin-external: + specifier: 1.2.8 + version: 1.2.8 + vite-plugin-externals: + specifier: 0.6.2 + version: 0.6.2(vite@4.0.4) vite-plugin-replace: specifier: 0.1.1 version: 0.1.1(vite@4.0.4) @@ -282,6 +351,9 @@ importers: '@fluencelabs/marine-js': specifier: 0.3.45 version: 0.3.45 + '@fluencelabs/marine-worker': + specifier: workspace:* + version: link:../marine-worker '@libp2p/crypto': specifier: 1.0.8 version: 1.0.8(uint8arraylist@2.4.3) @@ -323,7 +395,7 @@ importers: version: 6.0.3 debug: specifier: 4.3.4 - version: 4.3.4(supports-color@8.1.1) + version: 4.3.4 it-length-prefixed: specifier: 8.0.4 version: 8.0.4 @@ -380,6 +452,37 @@ importers: specifier: 0.29.7 version: 0.29.7 + packages/core/marine-worker: + dependencies: + '@fluencelabs/marine-js': + specifier: 0.3.45 + version: 0.3.45 + observable-fns: + specifier: 0.6.1 + version: 0.6.1 + threads: + specifier: 1.7.0 + version: 1.7.0 + devDependencies: + '@rollup/plugin-inject': + specifier: 5.0.3 + version: 5.0.3 + '@types/node': + specifier: 20.4.5 + version: 20.4.5 + node-stdlib-browser: + specifier: 1.2.0 + version: 1.2.0 + typescript: + specifier: 5.1.6 + version: 5.1.6 + vite: + specifier: 4.0.4 + version: 4.0.4(@types/node@20.4.5) + vitest: + specifier: 0.29.7 + version: 0.29.7 + packages: /@achingbrain/ip-address@8.1.0: @@ -474,7 +577,7 @@ packages: '@babel/traverse': 7.22.5 '@babel/types': 7.22.5 convert-source-map: 1.9.0 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 gensync: 1.0.0-beta.2 json5: 2.2.3 semver: 6.3.0 @@ -567,7 +670,7 @@ packages: '@babel/core': 7.22.5 '@babel/helper-compilation-targets': 7.22.5(@babel/core@7.22.5) '@babel/helper-plugin-utils': 7.22.5 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 lodash.debounce: 4.0.8 resolve: 1.22.2 semver: 6.3.0 @@ -1832,7 +1935,7 @@ packages: '@babel/helper-split-export-declaration': 7.22.5 '@babel/parser': 7.22.5 '@babel/types': 7.22.5 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 globals: 11.12.0 transitivePeerDependencies: - supports-color @@ -1889,7 +1992,7 @@ packages: '@stablelib/hkdf': 1.0.1 '@stablelib/sha256': 1.0.1 '@stablelib/x25519': 1.0.3 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 it-buffer: 0.1.3 it-length-prefixed: 5.0.3 it-pair: 1.0.0 @@ -1940,6 +2043,7 @@ packages: engines: {node: '>=12'} dependencies: '@jridgewell/trace-mapping': 0.3.9 + dev: true /@csstools/normalize.css@12.0.0: resolution: {integrity: sha512-M0qqxAcwCsIVfpFQSlGN5XjXWu8l5JDZN+fPt1LeW5SZexQTgnaEvgXAY+CeygRw0EeppWHi12JxESWiWrB0Sg==} @@ -2104,6 +2208,14 @@ packages: cpu: [arm64] os: [android] requiresBuild: true + optional: true + + /@esbuild/android-arm64@0.17.19: + resolution: {integrity: sha512-KBMWvEZooR7+kzY0BtbTQn0OAYY7CsiydT63pVEaPtVYF0hXbUaOyZog37DKxK7NF3XacBJOpYT4adIJh+avxA==} + engines: {node: '>=12'} + cpu: [arm64] + os: [android] + requiresBuild: true dev: true optional: true @@ -2113,6 +2225,14 @@ packages: cpu: [arm] os: [android] requiresBuild: true + optional: true + + /@esbuild/android-arm@0.17.19: + resolution: {integrity: sha512-rIKddzqhmav7MSmoFCmDIb6e2W57geRsM94gV2l38fzhXMwq7hZoClug9USI2pFRGL06f4IOPHHpFNOkWieR8A==} + engines: {node: '>=12'} + cpu: [arm] + os: [android] + requiresBuild: true dev: true optional: true @@ -2122,6 +2242,14 @@ packages: cpu: [x64] os: [android] requiresBuild: true + optional: true + + /@esbuild/android-x64@0.17.19: + resolution: {integrity: sha512-uUTTc4xGNDT7YSArp/zbtmbhO0uEEK9/ETW29Wk1thYUJBz3IVnvgEiEwEa9IeLyvnpKrWK64Utw2bgUmDveww==} + engines: {node: '>=12'} + cpu: [x64] + os: [android] + requiresBuild: true dev: true optional: true @@ -2131,6 +2259,14 @@ packages: cpu: [arm64] os: [darwin] requiresBuild: true + optional: true + + /@esbuild/darwin-arm64@0.17.19: + resolution: {integrity: sha512-80wEoCfF/hFKM6WE1FyBHc9SfUblloAWx6FJkFWTWiCoht9Mc0ARGEM47e67W9rI09YoUxJL68WHfDRYEAvOhg==} + engines: {node: '>=12'} + cpu: [arm64] + os: [darwin] + requiresBuild: true dev: true optional: true @@ -2140,6 +2276,14 @@ packages: cpu: [x64] os: [darwin] requiresBuild: true + optional: true + + /@esbuild/darwin-x64@0.17.19: + resolution: {integrity: sha512-IJM4JJsLhRYr9xdtLytPLSH9k/oxR3boaUIYiHkAawtwNOXKE8KoU8tMvryogdcT8AU+Bflmh81Xn6Q0vTZbQw==} + engines: {node: '>=12'} + cpu: [x64] + os: [darwin] + requiresBuild: true dev: true optional: true @@ -2149,6 +2293,14 @@ packages: cpu: [arm64] os: [freebsd] requiresBuild: true + optional: true + + /@esbuild/freebsd-arm64@0.17.19: + resolution: {integrity: sha512-pBwbc7DufluUeGdjSU5Si+P3SoMF5DQ/F/UmTSb8HXO80ZEAJmrykPyzo1IfNbAoaqw48YRpv8shwd1NoI0jcQ==} + engines: {node: '>=12'} + cpu: [arm64] + os: [freebsd] + requiresBuild: true dev: true optional: true @@ -2158,6 +2310,14 @@ packages: cpu: [x64] os: [freebsd] requiresBuild: true + optional: true + + /@esbuild/freebsd-x64@0.17.19: + resolution: {integrity: sha512-4lu+n8Wk0XlajEhbEffdy2xy53dpR06SlzvhGByyg36qJw6Kpfk7cp45DR/62aPH9mtJRmIyrXAS5UWBrJT6TQ==} + engines: {node: '>=12'} + cpu: [x64] + os: [freebsd] + requiresBuild: true dev: true optional: true @@ -2167,6 +2327,14 @@ packages: cpu: [arm64] os: [linux] requiresBuild: true + optional: true + + /@esbuild/linux-arm64@0.17.19: + resolution: {integrity: sha512-ct1Tg3WGwd3P+oZYqic+YZF4snNl2bsnMKRkb3ozHmnM0dGWuxcPTTntAF6bOP0Sp4x0PjSF+4uHQ1xvxfRKqg==} + engines: {node: '>=12'} + cpu: [arm64] + os: [linux] + requiresBuild: true dev: true optional: true @@ -2176,6 +2344,14 @@ packages: cpu: [arm] os: [linux] requiresBuild: true + optional: true + + /@esbuild/linux-arm@0.17.19: + resolution: {integrity: sha512-cdmT3KxjlOQ/gZ2cjfrQOtmhG4HJs6hhvm3mWSRDPtZ/lP5oe8FWceS10JaSJC13GBd4eH/haHnqf7hhGNLerA==} + engines: {node: '>=12'} + cpu: [arm] + os: [linux] + requiresBuild: true dev: true optional: true @@ -2185,6 +2361,14 @@ packages: cpu: [ia32] os: [linux] requiresBuild: true + optional: true + + /@esbuild/linux-ia32@0.17.19: + resolution: {integrity: sha512-w4IRhSy1VbsNxHRQpeGCHEmibqdTUx61Vc38APcsRbuVgK0OPEnQ0YD39Brymn96mOx48Y2laBQGqgZ0j9w6SQ==} + engines: {node: '>=12'} + cpu: [ia32] + os: [linux] + requiresBuild: true dev: true optional: true @@ -2194,6 +2378,14 @@ packages: cpu: [loong64] os: [linux] requiresBuild: true + optional: true + + /@esbuild/linux-loong64@0.17.19: + resolution: {integrity: sha512-2iAngUbBPMq439a+z//gE+9WBldoMp1s5GWsUSgqHLzLJ9WoZLZhpwWuym0u0u/4XmZ3gpHmzV84PonE+9IIdQ==} + engines: {node: '>=12'} + cpu: [loong64] + os: [linux] + requiresBuild: true dev: true optional: true @@ -2203,6 +2395,14 @@ packages: cpu: [mips64el] os: [linux] requiresBuild: true + optional: true + + /@esbuild/linux-mips64el@0.17.19: + resolution: {integrity: sha512-LKJltc4LVdMKHsrFe4MGNPp0hqDFA1Wpt3jE1gEyM3nKUvOiO//9PheZZHfYRfYl6AwdTH4aTcXSqBerX0ml4A==} + engines: {node: '>=12'} + cpu: [mips64el] + os: [linux] + requiresBuild: true dev: true optional: true @@ -2212,6 +2412,14 @@ packages: cpu: [ppc64] os: [linux] requiresBuild: true + optional: true + + /@esbuild/linux-ppc64@0.17.19: + resolution: {integrity: sha512-/c/DGybs95WXNS8y3Ti/ytqETiW7EU44MEKuCAcpPto3YjQbyK3IQVKfF6nbghD7EcLUGl0NbiL5Rt5DMhn5tg==} + engines: {node: '>=12'} + cpu: [ppc64] + os: [linux] + requiresBuild: true dev: true optional: true @@ -2221,6 +2429,14 @@ packages: cpu: [riscv64] os: [linux] requiresBuild: true + optional: true + + /@esbuild/linux-riscv64@0.17.19: + resolution: {integrity: sha512-FC3nUAWhvFoutlhAkgHf8f5HwFWUL6bYdvLc/TTuxKlvLi3+pPzdZiFKSWz/PF30TB1K19SuCxDTI5KcqASJqA==} + engines: {node: '>=12'} + cpu: [riscv64] + os: [linux] + requiresBuild: true dev: true optional: true @@ -2230,6 +2446,14 @@ packages: cpu: [s390x] os: [linux] requiresBuild: true + optional: true + + /@esbuild/linux-s390x@0.17.19: + resolution: {integrity: sha512-IbFsFbxMWLuKEbH+7sTkKzL6NJmG2vRyy6K7JJo55w+8xDk7RElYn6xvXtDW8HCfoKBFK69f3pgBJSUSQPr+4Q==} + engines: {node: '>=12'} + cpu: [s390x] + os: [linux] + requiresBuild: true dev: true optional: true @@ -2239,6 +2463,14 @@ packages: cpu: [x64] os: [linux] requiresBuild: true + optional: true + + /@esbuild/linux-x64@0.17.19: + resolution: {integrity: sha512-68ngA9lg2H6zkZcyp22tsVt38mlhWde8l3eJLWkyLrp4HwMUr3c1s/M2t7+kHIhvMjglIBrFpncX1SzMckomGw==} + engines: {node: '>=12'} + cpu: [x64] + os: [linux] + requiresBuild: true dev: true optional: true @@ -2248,6 +2480,14 @@ packages: cpu: [x64] os: [netbsd] requiresBuild: true + optional: true + + /@esbuild/netbsd-x64@0.17.19: + resolution: {integrity: sha512-CwFq42rXCR8TYIjIfpXCbRX0rp1jo6cPIUPSaWwzbVI4aOfX96OXY8M6KNmtPcg7QjYeDmN+DD0Wp3LaBOLf4Q==} + engines: {node: '>=12'} + cpu: [x64] + os: [netbsd] + requiresBuild: true dev: true optional: true @@ -2257,6 +2497,14 @@ packages: cpu: [x64] os: [openbsd] requiresBuild: true + optional: true + + /@esbuild/openbsd-x64@0.17.19: + resolution: {integrity: sha512-cnq5brJYrSZ2CF6c35eCmviIN3k3RczmHz8eYaVlNasVqsNY+JKohZU5MKmaOI+KkllCdzOKKdPs762VCPC20g==} + engines: {node: '>=12'} + cpu: [x64] + os: [openbsd] + requiresBuild: true dev: true optional: true @@ -2266,6 +2514,14 @@ packages: cpu: [x64] os: [sunos] requiresBuild: true + optional: true + + /@esbuild/sunos-x64@0.17.19: + resolution: {integrity: sha512-vCRT7yP3zX+bKWFeP/zdS6SqdWB8OIpaRq/mbXQxTGHnIxspRtigpkUcDMlSCOejlHowLqII7K2JKevwyRP2rg==} + engines: {node: '>=12'} + cpu: [x64] + os: [sunos] + requiresBuild: true dev: true optional: true @@ -2275,6 +2531,14 @@ packages: cpu: [arm64] os: [win32] requiresBuild: true + optional: true + + /@esbuild/win32-arm64@0.17.19: + resolution: {integrity: sha512-yYx+8jwowUstVdorcMdNlzklLYhPxjniHWFKgRqH7IFlUEa0Umu3KuYplf1HUZZ422e3NU9F4LGb+4O0Kdcaag==} + engines: {node: '>=12'} + cpu: [arm64] + os: [win32] + requiresBuild: true dev: true optional: true @@ -2284,6 +2548,14 @@ packages: cpu: [ia32] os: [win32] requiresBuild: true + optional: true + + /@esbuild/win32-ia32@0.17.19: + resolution: {integrity: sha512-eggDKanJszUtCdlVs0RB+h35wNlb5v4TWEkq4vZcmVt5u/HiDZrTXe2bWFQUez3RgNHwx/x4sk5++4NSSicKkw==} + engines: {node: '>=12'} + cpu: [ia32] + os: [win32] + requiresBuild: true dev: true optional: true @@ -2293,6 +2565,14 @@ packages: cpu: [x64] os: [win32] requiresBuild: true + optional: true + + /@esbuild/win32-x64@0.17.19: + resolution: {integrity: sha512-lAhycmKnVOuRYNtRtatQR1LPQf2oYCkRGkSFnseDAKPl8lu5SOsK/e1sXe5a0Pc5kHIHe6P2I/ilntNv2xf3cA==} + engines: {node: '>=12'} + cpu: [x64] + os: [win32] + requiresBuild: true dev: true optional: true @@ -2316,7 +2596,7 @@ packages: engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dependencies: ajv: 6.12.6 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 espree: 9.5.2 globals: 13.20.0 ignore: 5.2.4 @@ -2698,15 +2978,15 @@ packages: resolution: {integrity: sha512-ifjtCM93KO3LhzPkMxqmXhwLmrg/scjOiyTihEVg7ns5N+BVzaK1eWzdOdqGdl9ZVoah43pdlQUepEo7VdRmsw==} dev: true - /@fluencelabs/aqua@0.9.1-374(jest@27.5.1)(node-fetch@3.3.1)(typescript@4.7.2): + /@fluencelabs/aqua@0.9.1-374(@babel/core@7.22.5)(jest@27.5.1)(node-fetch@3.3.2)(typescript@4.7.2): resolution: {integrity: sha512-jF6oVE4h7bP/dQArKEfsy4UxbQbzACfVIBY/TFUL5D3np4ssjxrh15Y3gl1PwSWjlaPcDeFvAuStmcqfYQmLqQ==} hasBin: true dependencies: '@fluencelabs/aqua-ipfs': 0.5.8 '@fluencelabs/aqua-lib': 0.6.0 - '@fluencelabs/fluence': 0.27.5(jest@27.5.1)(node-fetch@3.3.1)(typescript@4.7.2) + '@fluencelabs/fluence': 0.27.5(@babel/core@7.22.5)(jest@27.5.1)(node-fetch@3.3.2)(typescript@4.7.2) '@fluencelabs/fluence-network-environment': 1.0.13 - ipfs-http-client: 50.1.2(node-fetch@3.3.1) + ipfs-http-client: 50.1.2(node-fetch@3.3.2) transitivePeerDependencies: - '@babel/core' - '@types/jest' @@ -2732,22 +3012,22 @@ packages: /@fluencelabs/avm@0.40.0: resolution: {integrity: sha512-DkCht5+Tg8txRlLIXdP/CPKXmvZqWvJk8Nb89r0JmykPelgI2xTlSkKcAtVrNnGIhp0ghS+HXq2KXVYwu2Il1Q==} - /@fluencelabs/cli@0.3.9(@ethersproject/abi@5.7.0)(@ethersproject/providers@5.7.2)(@nomicfoundation/hardhat-chai-matchers@1.0.6)(@nomicfoundation/hardhat-network-helpers@1.0.8)(@nomiclabs/hardhat-ethers@2.2.3)(@nomiclabs/hardhat-etherscan@3.1.7)(@typechain/ethers-v5@10.2.1)(@typechain/hardhat@6.1.6)(@types/chai@4.3.5)(@types/mocha@9.1.1)(@types/node@18.13.0)(chai@4.3.7)(hardhat-gas-reporter@1.0.9)(hardhat@2.15.0)(jest@27.5.1)(solidity-coverage@0.7.22)(ts-node@10.9.1)(typechain@8.2.0)(typescript@4.7.2): + /@fluencelabs/cli@0.3.9(@ethersproject/abi@5.7.0)(@ethersproject/providers@5.7.2)(@nomicfoundation/hardhat-chai-matchers@1.0.6)(@nomicfoundation/hardhat-network-helpers@1.0.8)(@nomiclabs/hardhat-ethers@2.2.3)(@nomiclabs/hardhat-etherscan@3.1.7)(@typechain/ethers-v5@10.2.1)(@typechain/hardhat@6.1.6)(@types/chai@4.3.5)(@types/mocha@9.1.1)(@types/node@20.4.5)(chai@4.3.7)(hardhat-gas-reporter@1.0.9)(hardhat@2.15.0)(jest@27.5.1)(solidity-coverage@0.7.22)(ts-node@10.9.1)(typechain@8.2.0)(typescript@4.7.2): resolution: {integrity: sha512-xJYi7+AHrWt6RgWnr7Efr8Jpv0dNLoWhiCMvgSbXoFpIZzQAyNDgk5hnCdwIQ/eiJcNg0GHY0gyC+Q/d5YKc1Q==} engines: {node: '=16'} hasBin: true dependencies: '@fluencelabs/aqua-api': 0.10.6 - '@fluencelabs/deal-aurora': 0.1.12(@ethersproject/abi@5.7.0)(@ethersproject/providers@5.7.2)(@nomicfoundation/hardhat-chai-matchers@1.0.6)(@nomicfoundation/hardhat-network-helpers@1.0.8)(@nomiclabs/hardhat-ethers@2.2.3)(@nomiclabs/hardhat-etherscan@3.1.7)(@typechain/ethers-v5@10.2.1)(@typechain/hardhat@6.1.6)(@types/chai@4.3.5)(@types/mocha@9.1.1)(@types/node@18.13.0)(chai@4.3.7)(ethers@5.7.2)(hardhat-gas-reporter@1.0.9)(hardhat@2.15.0)(solidity-coverage@0.7.22)(ts-node@10.9.1)(typechain@8.2.0)(typescript@4.7.2) + '@fluencelabs/deal-aurora': 0.1.12(@ethersproject/abi@5.7.0)(@ethersproject/providers@5.7.2)(@nomicfoundation/hardhat-chai-matchers@1.0.6)(@nomicfoundation/hardhat-network-helpers@1.0.8)(@nomiclabs/hardhat-ethers@2.2.3)(@nomiclabs/hardhat-etherscan@3.1.7)(@typechain/ethers-v5@10.2.1)(@typechain/hardhat@6.1.6)(@types/chai@4.3.5)(@types/mocha@9.1.1)(@types/node@20.4.5)(chai@4.3.7)(ethers@5.7.2)(hardhat-gas-reporter@1.0.9)(hardhat@2.15.0)(solidity-coverage@0.7.22)(ts-node@10.9.1)(typechain@8.2.0)(typescript@4.7.2) '@fluencelabs/fluence': 0.28.0(jest@27.5.1)(node-fetch@2.6.11)(typescript@4.7.2) '@fluencelabs/fluence-network-environment': 1.0.14 '@iarna/toml': 2.2.5 '@mswjs/interceptors': 0.19.5 '@oclif/color': 1.0.6 - '@oclif/core': 2.8.7(@types/node@18.13.0)(typescript@4.7.2) - '@oclif/plugin-autocomplete': 2.3.0(@types/node@18.13.0)(typescript@4.7.2) - '@oclif/plugin-help': 5.2.10(@types/node@18.13.0)(typescript@4.7.2) - '@oclif/plugin-not-found': 2.3.26(@types/node@18.13.0)(typescript@4.7.2) + '@oclif/core': 2.8.7(@types/node@20.4.5)(typescript@4.7.2) + '@oclif/plugin-autocomplete': 2.3.0(@types/node@20.4.5)(typescript@4.7.2) + '@oclif/plugin-help': 5.2.10(@types/node@20.4.5)(typescript@4.7.2) + '@oclif/plugin-not-found': 2.3.26(@types/node@20.4.5)(typescript@4.7.2) '@walletconnect/universal-provider': 2.8.1(lokijs@1.5.12) ajv: 8.12.0 camelcase: 7.0.1 @@ -2828,7 +3108,7 @@ packages: - utf-8-validate dev: true - /@fluencelabs/connection@0.2.0(node-fetch@3.3.1): + /@fluencelabs/connection@0.2.0(node-fetch@3.3.2): resolution: {integrity: sha512-0jTRI1h/j/fR2VaLIlcIm6VoP3j2jL2lI6/OaYaOnwGXmI6CbZWHNeq9eaKWycT9B1vpN9wHu0Vi7vH3pFplhg==} engines: {node: '>=10', pnpm: '>=3'} dependencies: @@ -2838,12 +3118,12 @@ packages: buffer: 6.0.3 it-length-prefixed: 5.0.3 it-pipe: 1.1.0 - libp2p: 0.36.2(node-fetch@3.3.1) - libp2p-interfaces: 4.0.6(node-fetch@3.3.1) + libp2p: 0.36.2(node-fetch@3.3.2) + libp2p-interfaces: 4.0.6(node-fetch@3.3.2) libp2p-mplex: 0.10.7 - libp2p-websockets: 0.16.2(node-fetch@3.3.1) + libp2p-websockets: 0.16.2(node-fetch@3.3.2) loglevel: 1.8.0 - multiaddr: 10.0.1(node-fetch@3.3.1) + multiaddr: 10.0.1(node-fetch@3.3.2) peer-id: 0.16.0 transitivePeerDependencies: - bufferutil @@ -2853,10 +3133,10 @@ packages: - utf-8-validate dev: true - /@fluencelabs/deal-aurora@0.1.12(@ethersproject/abi@5.7.0)(@ethersproject/providers@5.7.2)(@nomicfoundation/hardhat-chai-matchers@1.0.6)(@nomicfoundation/hardhat-network-helpers@1.0.8)(@nomiclabs/hardhat-ethers@2.2.3)(@nomiclabs/hardhat-etherscan@3.1.7)(@typechain/ethers-v5@10.2.1)(@typechain/hardhat@6.1.6)(@types/chai@4.3.5)(@types/mocha@9.1.1)(@types/node@18.13.0)(chai@4.3.7)(ethers@5.7.2)(hardhat-gas-reporter@1.0.9)(hardhat@2.15.0)(solidity-coverage@0.7.22)(ts-node@10.9.1)(typechain@8.2.0)(typescript@4.7.2): + /@fluencelabs/deal-aurora@0.1.12(@ethersproject/abi@5.7.0)(@ethersproject/providers@5.7.2)(@nomicfoundation/hardhat-chai-matchers@1.0.6)(@nomicfoundation/hardhat-network-helpers@1.0.8)(@nomiclabs/hardhat-ethers@2.2.3)(@nomiclabs/hardhat-etherscan@3.1.7)(@typechain/ethers-v5@10.2.1)(@typechain/hardhat@6.1.6)(@types/chai@4.3.5)(@types/mocha@9.1.1)(@types/node@20.4.5)(chai@4.3.7)(ethers@5.7.2)(hardhat-gas-reporter@1.0.9)(hardhat@2.15.0)(solidity-coverage@0.7.22)(ts-node@10.9.1)(typechain@8.2.0)(typescript@4.7.2): resolution: {integrity: sha512-CcmcDIC8DJI2aVzN+ZMB4vYRuML0IHF9VfaL/GMjhkpe4iADPJq4YS527I1nPH335Ik3hTlncz71F/2jD35A+A==} dependencies: - '@nomicfoundation/hardhat-toolbox': 1.0.2(@ethersproject/abi@5.7.0)(@ethersproject/providers@5.7.2)(@nomicfoundation/hardhat-chai-matchers@1.0.6)(@nomicfoundation/hardhat-network-helpers@1.0.8)(@nomiclabs/hardhat-ethers@2.2.3)(@nomiclabs/hardhat-etherscan@3.1.7)(@typechain/ethers-v5@10.2.1)(@typechain/hardhat@6.1.6)(@types/chai@4.3.5)(@types/mocha@9.1.1)(@types/node@18.13.0)(chai@4.3.7)(ethers@5.7.2)(hardhat-gas-reporter@1.0.9)(hardhat@2.15.0)(solidity-coverage@0.7.22)(ts-node@10.9.1)(typechain@8.2.0)(typescript@4.7.2) + '@nomicfoundation/hardhat-toolbox': 1.0.2(@ethersproject/abi@5.7.0)(@ethersproject/providers@5.7.2)(@nomicfoundation/hardhat-chai-matchers@1.0.6)(@nomicfoundation/hardhat-network-helpers@1.0.8)(@nomiclabs/hardhat-ethers@2.2.3)(@nomiclabs/hardhat-etherscan@3.1.7)(@typechain/ethers-v5@10.2.1)(@typechain/hardhat@6.1.6)(@types/chai@4.3.5)(@types/mocha@9.1.1)(@types/node@20.4.5)(chai@4.3.7)(ethers@5.7.2)(hardhat-gas-reporter@1.0.9)(hardhat@2.15.0)(solidity-coverage@0.7.22)(ts-node@10.9.1)(typechain@8.2.0)(typescript@4.7.2) '@openzeppelin/contracts': 4.9.2 '@openzeppelin/contracts-upgradeable': 4.9.2 dotenv: 16.3.1 @@ -2890,17 +3170,17 @@ packages: resolution: {integrity: sha512-lMiH+7obmJW2Q+PMUR/vNAuX6TcVqlKmsWAHvnBogH7s8IeMT+UGN8qrweILWmE57G7MfauB302dIFQowR9tug==} dev: true - /@fluencelabs/fluence@0.27.5(jest@27.5.1)(node-fetch@3.3.1)(typescript@4.7.2): + /@fluencelabs/fluence@0.27.5(@babel/core@7.22.5)(jest@27.5.1)(node-fetch@3.3.2)(typescript@4.7.2): resolution: {integrity: sha512-nMCzd/oHHk5/yWdg/+rPB+sc8X+fQ5YgwPhGVDoxFs8/CmIr1G5Na8Y6l8rrigasgQd+LV5GtAyh50Oq7/IXkg==} engines: {node: '>=10', pnpm: '>=3'} deprecated: fluencelabs/fluence is deprecated in favor of a thinner CDN-distributed .js bundle, please see the following link for installation instructions https://github.com/fluencelabs/js-client#installation hasBin: true dependencies: '@fluencelabs/avm': 0.31.10 - '@fluencelabs/connection': 0.2.0(node-fetch@3.3.1) + '@fluencelabs/connection': 0.2.0(node-fetch@3.3.2) '@fluencelabs/interfaces': 0.1.0 '@fluencelabs/keypair': 0.2.0 - '@fluencelabs/marine-js': 0.3.37(jest@27.5.1)(typescript@4.7.2) + '@fluencelabs/marine-js': 0.3.37(@babel/core@7.22.5)(jest@27.5.1)(typescript@4.7.2) async: 3.2.4 base64-js: 1.5.1 browser-or-node: 2.0.0 @@ -2980,6 +3260,25 @@ packages: peer-id: 0.16.0 dev: true + /@fluencelabs/marine-js@0.3.37(@babel/core@7.22.5)(jest@27.5.1)(typescript@4.7.2): + resolution: {integrity: sha512-/Kpu3S+aDOfrOpKBAK1VeWSHKCoD36/dxtHEWHbj3Lsro0GB9zkoaZPHlFFL7rorCB+hyjAJqLDuBGI8f3l/qg==} + dependencies: + '@wasmer/wasi': 0.12.0 + '@wasmer/wasmfs': 0.12.0 + browser-or-node: 2.0.0 + buffer: 6.0.3 + threads: 1.7.0 + ts-jest: 27.1.5(@babel/core@7.22.5)(jest@27.5.1)(typescript@4.7.2) + transitivePeerDependencies: + - '@babel/core' + - '@types/jest' + - babel-jest + - esbuild + - jest + - supports-color + - typescript + dev: true + /@fluencelabs/marine-js@0.3.37(jest@27.5.1)(typescript@4.7.2): resolution: {integrity: sha512-/Kpu3S+aDOfrOpKBAK1VeWSHKCoD36/dxtHEWHbj3Lsro0GB9zkoaZPHlFFL7rorCB+hyjAJqLDuBGI8f3l/qg==} dependencies: @@ -3030,7 +3329,7 @@ packages: engines: {node: '>=10.10.0'} dependencies: '@humanwhocodes/object-schema': 1.2.1 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 minimatch: 3.1.2 transitivePeerDependencies: - supports-color @@ -3102,12 +3401,57 @@ packages: engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} dependencies: '@jest/types': 28.1.3 - '@types/node': 18.13.0 + '@types/node': 20.4.5 chalk: 4.1.2 jest-message-util: 28.1.3 jest-util: 28.1.3 slash: 3.0.0 + /@jest/core@27.5.1: + resolution: {integrity: sha512-AK6/UTrvQD0Cd24NSqmIA6rKsu0tKIxfiCducZvqxYdmMisOYAsdItspT+fQDQYARPf8XgjAFZi0ogW2agH5nQ==} + engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} + peerDependencies: + node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0 + peerDependenciesMeta: + node-notifier: + optional: true + dependencies: + '@jest/console': 27.5.1 + '@jest/reporters': 27.5.1 + '@jest/test-result': 27.5.1 + '@jest/transform': 27.5.1 + '@jest/types': 27.5.1 + '@types/node': 20.4.5 + ansi-escapes: 4.3.2 + chalk: 4.1.2 + emittery: 0.8.1 + exit: 0.1.2 + graceful-fs: 4.2.11 + jest-changed-files: 27.5.1 + jest-config: 27.5.1 + jest-haste-map: 27.5.1 + jest-message-util: 27.5.1 + jest-regex-util: 27.5.1 + jest-resolve: 27.5.1 + jest-resolve-dependencies: 27.5.1 + jest-runner: 27.5.1 + jest-runtime: 27.5.1 + jest-snapshot: 27.5.1 + jest-util: 27.5.1 + jest-validate: 27.5.1 + jest-watcher: 27.5.1 + micromatch: 4.0.5 + rimraf: 3.0.2 + slash: 3.0.0 + strip-ansi: 6.0.1 + transitivePeerDependencies: + - bufferutil + - canvas + - supports-color + - ts-node + - utf-8-validate + dev: false + /@jest/core@27.5.1(ts-node@10.9.1): resolution: {integrity: sha512-AK6/UTrvQD0Cd24NSqmIA6rKsu0tKIxfiCducZvqxYdmMisOYAsdItspT+fQDQYARPf8XgjAFZi0ogW2agH5nQ==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} @@ -3151,8 +3495,9 @@ packages: - supports-color - ts-node - utf-8-validate + dev: true - /@jest/core@28.1.3(ts-node@10.9.1): + /@jest/core@28.1.3: resolution: {integrity: sha512-CIKBrlaKOzA7YG19BEqCw3SLIsEwjZkeJzf5bdooVnW4bH5cktqe3JX+G2YV1aK5vP8N9na1IGWFzYaTp6k6NA==} engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} peerDependencies: @@ -3166,14 +3511,14 @@ packages: '@jest/test-result': 28.1.3 '@jest/transform': 28.1.3 '@jest/types': 28.1.3 - '@types/node': 18.13.0 + '@types/node': 20.4.5 ansi-escapes: 4.3.2 chalk: 4.1.2 ci-info: 3.8.0 exit: 0.1.2 graceful-fs: 4.2.11 jest-changed-files: 28.1.3 - jest-config: 28.1.3(@types/node@18.13.0)(ts-node@10.9.1) + jest-config: 28.1.3(@types/node@20.4.5) jest-haste-map: 28.1.3 jest-message-util: 28.1.3 jest-regex-util: 28.0.2 @@ -3210,7 +3555,7 @@ packages: dependencies: '@jest/fake-timers': 28.1.3 '@jest/types': 28.1.3 - '@types/node': 18.13.0 + '@types/node': 20.4.5 jest-mock: 28.1.3 dev: true @@ -3248,7 +3593,7 @@ packages: dependencies: '@jest/types': 28.1.3 '@sinonjs/fake-timers': 9.1.2 - '@types/node': 18.13.0 + '@types/node': 20.4.5 jest-message-util: 28.1.3 jest-mock: 28.1.3 jest-util: 28.1.3 @@ -3325,7 +3670,7 @@ packages: '@jest/transform': 28.1.3 '@jest/types': 28.1.3 '@jridgewell/trace-mapping': 0.3.18 - '@types/node': 18.13.0 + '@types/node': 20.4.5 chalk: 4.1.2 collect-v8-coverage: 1.0.1 exit: 0.1.2 @@ -3461,7 +3806,7 @@ packages: dependencies: '@types/istanbul-lib-coverage': 2.0.4 '@types/istanbul-reports': 3.0.1 - '@types/node': 18.13.0 + '@types/node': 20.4.5 '@types/yargs': 16.0.5 chalk: 4.1.2 @@ -3472,7 +3817,7 @@ packages: '@jest/schemas': 28.1.3 '@types/istanbul-lib-coverage': 2.0.4 '@types/istanbul-reports': 3.0.1 - '@types/node': 18.13.0 + '@types/node': 20.4.5 '@types/yargs': 17.0.24 chalk: 4.1.2 @@ -3491,6 +3836,7 @@ packages: /@jridgewell/resolve-uri@3.1.1: resolution: {integrity: sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==} engines: {node: '>=6.0.0'} + dev: true /@jridgewell/set-array@1.1.2: resolution: {integrity: sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==} @@ -3519,6 +3865,7 @@ packages: dependencies: '@jridgewell/resolve-uri': 3.1.1 '@jridgewell/sourcemap-codec': 1.4.15 + dev: true /@json-rpc-tools/provider@1.7.6: resolution: {integrity: sha512-z7D3xvJ33UfCGv77n40lbzOYjZKVM3k2+5cV7xS8G6SCvKTzMkhkUYuD/qzQUNT4cG/lv0e9mRToweEEVLVVmA==} @@ -3871,7 +4218,7 @@ packages: dependencies: '@libp2p/interface-peer-id': 2.0.2 '@multiformats/multiaddr': 12.1.3 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 interface-datastore: 8.2.3 multiformats: 11.0.2 transitivePeerDependencies: @@ -4066,7 +4413,7 @@ packages: '@open-draft/until': 1.0.3 '@remix-run/web-fetch': 4.3.4 '@types/debug': 4.1.7 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 headers-polyfill: 3.1.2 outvariant: 1.4.0 strict-event-emitter: 0.4.6 @@ -4185,7 +4532,7 @@ packages: '@nomicfoundation/ethereumjs-tx': 5.0.1 '@nomicfoundation/ethereumjs-util': 9.0.1 abstract-level: 1.0.3 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 ethereum-cryptography: 0.1.3 level: 8.0.0 lru-cache: 5.1.1 @@ -4226,7 +4573,7 @@ packages: '@nomicfoundation/ethereumjs-common': 4.0.1 '@nomicfoundation/ethereumjs-tx': 5.0.1 '@nomicfoundation/ethereumjs-util': 9.0.1 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 ethereum-cryptography: 0.1.3 mcl-wasm: 0.7.9 rustbn.js: 0.2.0 @@ -4247,7 +4594,7 @@ packages: dependencies: '@nomicfoundation/ethereumjs-common': 4.0.1 '@nomicfoundation/ethereumjs-rlp': 5.0.1 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 ethereum-cryptography: 0.1.3 ethers: 5.7.2 js-sdsl: 4.4.1 @@ -4305,7 +4652,7 @@ packages: '@nomicfoundation/ethereumjs-trie': 6.0.1 '@nomicfoundation/ethereumjs-tx': 5.0.1 '@nomicfoundation/ethereumjs-util': 9.0.1 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 ethereum-cryptography: 0.1.3 mcl-wasm: 0.7.9 rustbn.js: 0.2.0 @@ -4343,7 +4690,7 @@ packages: hardhat: 2.15.0(ts-node@10.9.1)(typescript@4.7.2) dev: true - /@nomicfoundation/hardhat-toolbox@1.0.2(@ethersproject/abi@5.7.0)(@ethersproject/providers@5.7.2)(@nomicfoundation/hardhat-chai-matchers@1.0.6)(@nomicfoundation/hardhat-network-helpers@1.0.8)(@nomiclabs/hardhat-ethers@2.2.3)(@nomiclabs/hardhat-etherscan@3.1.7)(@typechain/ethers-v5@10.2.1)(@typechain/hardhat@6.1.6)(@types/chai@4.3.5)(@types/mocha@9.1.1)(@types/node@18.13.0)(chai@4.3.7)(ethers@5.7.2)(hardhat-gas-reporter@1.0.9)(hardhat@2.15.0)(solidity-coverage@0.7.22)(ts-node@10.9.1)(typechain@8.2.0)(typescript@4.7.2): + /@nomicfoundation/hardhat-toolbox@1.0.2(@ethersproject/abi@5.7.0)(@ethersproject/providers@5.7.2)(@nomicfoundation/hardhat-chai-matchers@1.0.6)(@nomicfoundation/hardhat-network-helpers@1.0.8)(@nomiclabs/hardhat-ethers@2.2.3)(@nomiclabs/hardhat-etherscan@3.1.7)(@typechain/ethers-v5@10.2.1)(@typechain/hardhat@6.1.6)(@types/chai@4.3.5)(@types/mocha@9.1.1)(@types/node@20.4.5)(chai@4.3.7)(ethers@5.7.2)(hardhat-gas-reporter@1.0.9)(hardhat@2.15.0)(solidity-coverage@0.7.22)(ts-node@10.9.1)(typechain@8.2.0)(typescript@4.7.2): resolution: {integrity: sha512-8CEgWSKUK2aMit+76Sez8n7UB0Ze1lwT+LcWxj4EFP30lQWOwOws048t6MTPfThH0BlSWjC6hJRr0LncIkc1Sw==} peerDependencies: '@ethersproject/abi': ^5.4.7 @@ -4376,13 +4723,13 @@ packages: '@typechain/hardhat': 6.1.6(@ethersproject/abi@5.7.0)(@ethersproject/providers@5.7.2)(@typechain/ethers-v5@10.2.1)(ethers@5.7.2)(hardhat@2.15.0)(typechain@8.2.0) '@types/chai': 4.3.5 '@types/mocha': 9.1.1 - '@types/node': 18.13.0 + '@types/node': 20.4.5 chai: 4.3.7 ethers: 5.7.2 hardhat: 2.15.0(ts-node@10.9.1)(typescript@4.7.2) hardhat-gas-reporter: 1.0.9(hardhat@2.15.0) solidity-coverage: 0.7.22 - ts-node: 10.9.1(@types/node@18.13.0)(typescript@4.7.2) + ts-node: 10.9.1(@types/node@20.4.5)(typescript@4.7.2) typechain: 8.2.0(typescript@4.7.2) typescript: 4.7.2 dev: true @@ -4512,7 +4859,7 @@ packages: '@ethersproject/address': 5.7.0 cbor: 8.1.0 chalk: 2.4.2 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 fs-extra: 7.0.1 hardhat: 2.15.0(ts-node@10.9.1)(typescript@4.7.2) lodash: 4.17.21 @@ -4534,7 +4881,7 @@ packages: tslib: 2.5.3 dev: true - /@oclif/core@2.8.7(@types/node@18.13.0)(typescript@4.7.2): + /@oclif/core@2.8.7(@types/node@20.4.5)(typescript@4.7.2): resolution: {integrity: sha512-WTZUFgANYGyHQOmGc2YsczEdqdlG2/ZEfqksHnuYbz3egozpka/R9LrFwNfWPZETi9ydzcjDWwJKUGQmJG3ixA==} engines: {node: '>=14.0.0'} dependencies: @@ -4562,7 +4909,7 @@ packages: strip-ansi: 6.0.1 supports-color: 8.1.1 supports-hyperlinks: 2.3.0 - ts-node: 10.9.1(@types/node@18.13.0)(typescript@4.7.2) + ts-node: 10.9.1(@types/node@20.4.5)(typescript@4.7.2) tslib: 2.5.3 widest-line: 3.1.0 wordwrap: 1.0.0 @@ -4574,13 +4921,13 @@ packages: - typescript dev: true - /@oclif/plugin-autocomplete@2.3.0(@types/node@18.13.0)(typescript@4.7.2): + /@oclif/plugin-autocomplete@2.3.0(@types/node@20.4.5)(typescript@4.7.2): resolution: {integrity: sha512-32gdneCAQbtjAvpX7lYFYrxsMPAfOh2hyvP4QEMspTiZkygT8m/NwayBVA+Ua5EM3/rk7jxTKYFQ7Gm/ZgSFuA==} engines: {node: '>=12.0.0'} dependencies: - '@oclif/core': 2.8.7(@types/node@18.13.0)(typescript@4.7.2) + '@oclif/core': 2.8.7(@types/node@20.4.5)(typescript@4.7.2) chalk: 4.1.2 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 fs-extra: 9.1.0 transitivePeerDependencies: - '@swc/core' @@ -4590,11 +4937,11 @@ packages: - typescript dev: true - /@oclif/plugin-help@5.2.10(@types/node@18.13.0)(typescript@4.7.2): + /@oclif/plugin-help@5.2.10(@types/node@20.4.5)(typescript@4.7.2): resolution: {integrity: sha512-l3hnloPkXOLGGrepLLdj8NsBpVhhEpg4jclIeIBaZzIo6+c+/uqcL2LjvOogmSEf5g4zooRtxivwUpcFiBSaBg==} engines: {node: '>=12.0.0'} dependencies: - '@oclif/core': 2.8.7(@types/node@18.13.0)(typescript@4.7.2) + '@oclif/core': 2.8.7(@types/node@20.4.5)(typescript@4.7.2) transitivePeerDependencies: - '@swc/core' - '@swc/wasm' @@ -4602,12 +4949,12 @@ packages: - typescript dev: true - /@oclif/plugin-not-found@2.3.26(@types/node@18.13.0)(typescript@4.7.2): + /@oclif/plugin-not-found@2.3.26(@types/node@20.4.5)(typescript@4.7.2): resolution: {integrity: sha512-a8WfN8km1A9Q0lXWo1LZgFEjVFYIbOOp/QG++zyHt2Hnsp2b5Zr0p8EQLBK7v6na6C0Mrr+GlMI8zE40hYWMbw==} engines: {node: '>=12.0.0'} dependencies: '@oclif/color': 1.0.6 - '@oclif/core': 2.8.7(@types/node@18.13.0)(typescript@4.7.2) + '@oclif/core': 2.8.7(@types/node@20.4.5)(typescript@4.7.2) fast-levenshtein: 3.0.0 transitivePeerDependencies: - '@swc/core' @@ -4779,6 +5126,40 @@ packages: rollup: 2.79.1 dev: true + /@rollup/plugin-commonjs@25.0.3(rollup@3.25.1): + resolution: {integrity: sha512-uBdtWr/H3BVcgm97MUdq2oJmqBR23ny1hOrWe2PKo9FTbjsGqg32jfasJUKYAI5ouqacjRnj65mBB/S79F+GQA==} + engines: {node: '>=14.0.0'} + peerDependencies: + rollup: ^2.68.0||^3.0.0 + peerDependenciesMeta: + rollup: + optional: true + dependencies: + '@rollup/pluginutils': 5.0.2(rollup@3.25.1) + commondir: 1.0.1 + estree-walker: 2.0.2 + glob: 8.1.0 + is-reference: 1.2.1 + magic-string: 0.27.0 + rollup: 3.25.1 + dev: true + + /@rollup/plugin-dynamic-import-vars@2.0.4(rollup@3.25.1): + resolution: {integrity: sha512-aAD4eJ657PfQFgsIP0tvpPF6d4viSAf64BgAJQEBsxL75KrOVVr/QBlfdCnB0w7fJrVDfo9guZwz0k+xEj2FJA==} + engines: {node: '>=14.0.0'} + peerDependencies: + rollup: ^1.20.0||^2.0.0||^3.0.0 + peerDependenciesMeta: + rollup: + optional: true + dependencies: + '@rollup/pluginutils': 5.0.2(rollup@3.25.1) + estree-walker: 2.0.2 + fast-glob: 3.2.12 + magic-string: 0.27.0 + rollup: 3.25.1 + dev: true + /@rollup/plugin-inject@5.0.3: resolution: {integrity: sha512-411QlbL+z2yXpRWFXSmw/teQRMkXcAAC8aYTemc15gwJRpvEVDQwoe+N/HTFD8RFG8+88Bme9DK2V9CVm7hJdA==} engines: {node: '>=14.0.0'} @@ -4791,7 +5172,6 @@ packages: '@rollup/pluginutils': 5.0.2 estree-walker: 2.0.2 magic-string: 0.27.0 - dev: true /@rollup/plugin-json@4.1.0(rollup@2.79.1): resolution: {integrity: sha512-yfLbTdNS6amI/2OpmbiBoW12vngr5NW2jCJVZSBEz+H5KfUJZ2M7sDjk0U6GOOdCWFVScShte29o9NezJ53TPw==} @@ -4857,6 +5237,20 @@ packages: '@types/estree': 1.0.1 estree-walker: 2.0.2 picomatch: 2.3.1 + + /@rollup/pluginutils@5.0.2(rollup@3.25.1): + resolution: {integrity: sha512-pTd9rIsP92h+B6wWwFbW8RkZv4hiR/xKsqre4SIuAOaOEQRxi0lqLke9k2/7WegC85GgUs9pjmOjCUi3In4vwA==} + engines: {node: '>=14.0.0'} + peerDependencies: + rollup: ^1.20.0||^2.0.0||^3.0.0 + peerDependenciesMeta: + rollup: + optional: true + dependencies: + '@types/estree': 1.0.1 + estree-walker: 2.0.2 + picomatch: 2.3.1 + rollup: 3.25.1 dev: true /@rushstack/eslint-patch@1.3.2: @@ -5323,7 +5717,7 @@ packages: dependencies: '@truffle/error': 0.1.1 '@truffle/interface-adapter': 0.5.34 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 web3: 1.7.4 transitivePeerDependencies: - bufferutil @@ -5338,15 +5732,19 @@ packages: /@tsconfig/node10@1.0.9: resolution: {integrity: sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA==} + dev: true /@tsconfig/node12@1.0.11: resolution: {integrity: sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==} + dev: true /@tsconfig/node14@1.0.3: resolution: {integrity: sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==} + dev: true /@tsconfig/node16@1.0.4: resolution: {integrity: sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==} + dev: true /@typechain/ethers-v5@10.2.1(@ethersproject/abi@5.7.0)(@ethersproject/providers@5.7.2)(ethers@5.7.2)(typechain@8.2.0)(typescript@4.7.2): resolution: {integrity: sha512-n3tQmCZjRE6IU4h6lqUGiQ1j866n5MTCBJreNEHHVWXa2u9GJTaeYyU1/k+1qLutkyw+sS6VAN+AbeiTqsxd/A==} @@ -5417,26 +5815,26 @@ packages: /@types/bn.js@4.11.6: resolution: {integrity: sha512-pqr857jrp2kPuO9uRjZ3PwnJTjoQy+fcdxvBTvHm6dkmEL9q+hDD/2j/0ELOBPtPnS8LjCX0gI9nbl8lVkadpg==} dependencies: - '@types/node': 18.13.0 + '@types/node': 20.4.5 dev: true /@types/bn.js@5.1.1: resolution: {integrity: sha512-qNrYbZqMx0uJAfKnKclPh+dTwK33KfLHYqtyODwd5HnXOjnkhc4qgn3BrK6RWyGZm5+sIFE7Q7Vz6QQtJB7w7g==} dependencies: - '@types/node': 18.13.0 + '@types/node': 20.4.5 dev: true /@types/body-parser@1.19.2: resolution: {integrity: sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==} dependencies: '@types/connect': 3.4.35 - '@types/node': 18.13.0 + '@types/node': 20.4.5 dev: false /@types/bonjour@3.5.10: resolution: {integrity: sha512-p7ienRMiS41Nu2/igbJxxLDWrSZ0WxM8UQgCeO9KhoVF7cOVFkrKsiDr1EsJIla8vV3oEEjGcz11jc5yimhzZw==} dependencies: - '@types/node': 18.13.0 + '@types/node': 20.4.5 dev: false /@types/bs58@4.0.1: @@ -5450,7 +5848,7 @@ packages: dependencies: '@types/http-cache-semantics': 4.0.1 '@types/keyv': 3.1.4 - '@types/node': 18.13.0 + '@types/node': 20.4.5 '@types/responselike': 1.0.0 dev: true @@ -5473,26 +5871,26 @@ packages: /@types/cli-progress@3.11.0: resolution: {integrity: sha512-XhXhBv1R/q2ahF3BM7qT5HLzJNlIL0wbcGyZVjqOTqAybAnsLisd7gy1UCyIqpL+5Iv6XhlSyzjLCnI2sIdbCg==} dependencies: - '@types/node': 18.13.0 + '@types/node': 20.4.5 dev: true /@types/concat-stream@1.6.1: resolution: {integrity: sha512-eHE4cQPoj6ngxBZMvVf6Hw7Mh4jMW4U9lpGmS5GBPB9RYxlFg+CHaVN7ErNY4W9XfLIEn20b4VDYaIrbq0q4uA==} dependencies: - '@types/node': 18.13.0 + '@types/node': 20.4.5 dev: true /@types/connect-history-api-fallback@1.5.0: resolution: {integrity: sha512-4x5FkPpLipqwthjPsF7ZRbOv3uoLUFkTA9G9v583qi4pACvq0uTELrB8OLUzPWUI4IJIyvM85vzkV1nyiI2Lig==} dependencies: '@types/express-serve-static-core': 4.17.35 - '@types/node': 18.13.0 + '@types/node': 20.4.5 dev: false /@types/connect@3.4.35: resolution: {integrity: sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==} dependencies: - '@types/node': 18.13.0 + '@types/node': 20.4.5 dev: false /@types/debug@4.1.7: @@ -5506,14 +5904,12 @@ packages: dependencies: '@types/eslint': 8.40.2 '@types/estree': 1.0.1 - dev: false /@types/eslint@8.40.2: resolution: {integrity: sha512-PRVjQ4Eh9z9pmmtaq8nTjZjQwKFk7YIHIud3lRoKRBgUQjgjRmoGxxGEPXQkF+lH7QkHJRNr5F4aBgYCW0lqpQ==} dependencies: '@types/estree': 1.0.1 '@types/json-schema': 7.0.12 - dev: false /@types/estree@0.0.39: resolution: {integrity: sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==} @@ -5524,7 +5920,7 @@ packages: /@types/express-serve-static-core@4.17.35: resolution: {integrity: sha512-wALWQwrgiB2AWTT91CB62b6Yt0sNHpznUXeZEcnPU3DRdlDIz74x8Qg1UUYKSVFi+va5vKOLYRBI1bRKiLLKIg==} dependencies: - '@types/node': 18.13.0 + '@types/node': 20.4.5 '@types/qs': 6.9.7 '@types/range-parser': 1.2.4 '@types/send': 0.17.1 @@ -5542,14 +5938,14 @@ packages: /@types/form-data@0.0.33: resolution: {integrity: sha512-8BSvG1kGm83cyJITQMZSulnl6QV8jqAGreJsc5tPu1Jq0vTSOiY/k24Wx82JRpWwZSqrala6sd5rWi6aNXvqcw==} dependencies: - '@types/node': 18.13.0 + '@types/node': 20.4.5 dev: true /@types/glob@7.2.0: resolution: {integrity: sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==} dependencies: '@types/minimatch': 5.1.2 - '@types/node': 18.13.0 + '@types/node': 20.4.5 dev: true /@types/graceful-fs@4.1.6: @@ -5568,7 +5964,7 @@ packages: /@types/http-proxy@1.17.11: resolution: {integrity: sha512-HC8G7c1WmaF2ekqpnFq626xd3Zz0uvaqFmBJNRZCGEZCXkvSdJoNFn/8Ygbd9fKNQj8UzLdCETaI0UWPAjK7IA==} dependencies: - '@types/node': 18.13.0 + '@types/node': 20.4.5 dev: false /@types/istanbul-lib-coverage@2.0.4: @@ -5599,7 +5995,6 @@ packages: /@types/json-schema@7.0.12: resolution: {integrity: sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA==} - dev: false /@types/json5@0.0.29: resolution: {integrity: sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==} @@ -5608,7 +6003,7 @@ packages: /@types/keyv@3.1.4: resolution: {integrity: sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==} dependencies: - '@types/node': 18.13.0 + '@types/node': 20.4.5 dev: true /@types/long@4.0.2: @@ -5653,7 +6048,6 @@ packages: /@types/node@16.11.59: resolution: {integrity: sha512-6u+36Dj3aDzhfBVUf/mfmc92OEdzQ2kx2jcXGdigfl70E/neV21ZHE6UCz4MDzTRcVqGAM27fk+DLXvyDsn3Jw==} - dev: true /@types/node@16.18.12: resolution: {integrity: sha512-vzLe5NaNMjIE3mcddFVGlAXN1LEWueUsMsOJWaT6wWMJGyljHAWHznqfnKUQWGzu7TLPrGvWdNAsvQYW+C0xtw==} @@ -5662,6 +6056,9 @@ packages: /@types/node@18.13.0: resolution: {integrity: sha512-gC3TazRzGoOnoKAhUx+Q0t8S9Tzs74z7m0ipwGpSqQrleP14hKxP4/JUeEQcD3W1/aIpnWl8pHowI7WokuZpXg==} + /@types/node@20.4.5: + resolution: {integrity: sha512-rt40Nk13II9JwQBdeYqmbn2Q6IVTA5uPhvSO+JVqdXw/6/4glI6oR9ezty/A9Hg5u7JH4OmYmuQ+XvjKm0Datg==} + /@types/node@8.10.66: resolution: {integrity: sha512-tktOkFUA4kXx2hhhrB8bIFb5TbwzS4uOhKEmwiD+NoiL0qtP2OQ9mFldbgD4dV1djrlBYP6eBuQZiWjuHUpqFw==} dev: true @@ -5672,7 +6069,7 @@ packages: /@types/pbkdf2@3.1.0: resolution: {integrity: sha512-Cf63Rv7jCQ0LaL8tNXmEyqTHuIJxRdlS5vMh1mj5voN4+QFhVZnlZruezqpWYDiJ8UTzhP0VmeLXCmBk66YrMQ==} dependencies: - '@types/node': 18.13.0 + '@types/node': 20.4.5 dev: true /@types/platform@1.3.4: @@ -5714,19 +6111,19 @@ packages: /@types/readable-stream@2.3.15: resolution: {integrity: sha512-oM5JSKQCcICF1wvGgmecmHldZ48OZamtMxcGGVICOJA8o8cahXC1zEVAif8iwoc5j8etxFaRFnf095+CDsuoFQ==} dependencies: - '@types/node': 18.13.0 + '@types/node': 20.4.5 safe-buffer: 5.1.2 dev: true /@types/resolve@1.17.1: resolution: {integrity: sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==} dependencies: - '@types/node': 18.13.0 + '@types/node': 20.4.5 /@types/responselike@1.0.0: resolution: {integrity: sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==} dependencies: - '@types/node': 18.13.0 + '@types/node': 20.4.5 dev: true /@types/retry@0.12.0: @@ -5743,7 +6140,7 @@ packages: /@types/secp256k1@4.0.3: resolution: {integrity: sha512-Da66lEIFeIz9ltsdMZcpQvmrmmoqrfju8pm1BH8WbYjZSwUgCwXLb9C+9XYogwBITnbsSaMdVPb2ekf7TV+03w==} dependencies: - '@types/node': 18.13.0 + '@types/node': 20.4.5 dev: true /@types/semver@7.5.0: @@ -5754,7 +6151,7 @@ packages: resolution: {integrity: sha512-Cwo8LE/0rnvX7kIIa3QHCkcuF21c05Ayb0ZfxPiv0W8VRiZiNW/WuRupHKpqqGVGf7SUA44QSOUKaEd9lIrd/Q==} dependencies: '@types/mime': 1.3.2 - '@types/node': 18.13.0 + '@types/node': 20.4.5 dev: false /@types/serve-handler@6.1.1: @@ -5773,13 +6170,13 @@ packages: resolution: {integrity: sha512-NUo5XNiAdULrJENtJXZZ3fHtfMolzZwczzBbnAeBbqBwG+LaG6YaJtuwzwGSQZ2wsCrxjEhNNjAkKigy3n8teQ==} dependencies: '@types/mime': 3.0.1 - '@types/node': 18.13.0 + '@types/node': 20.4.5 dev: false /@types/sockjs@0.3.33: resolution: {integrity: sha512-f0KEEe05NvUnat+boPTZ0dgaLZ4SfSouXUgv5noUiefG2ajgKjmETo9ZJyuqsl7dfl2aHlLJUiki6B4ZYldiiw==} dependencies: - '@types/node': 18.13.0 + '@types/node': 20.4.5 dev: false /@types/stack-utils@2.0.1: @@ -5802,7 +6199,7 @@ packages: /@types/ws@8.5.5: resolution: {integrity: sha512-lwhs8hktwxSjf9UaZ9tG5M03PGogvFaH8gUgLNbN9HKIg0dvv6q+gkSuJ8HN4/VbyxkuLzCjlN7GquQ0gUJfIg==} dependencies: - '@types/node': 18.13.0 + '@types/node': 20.4.5 dev: false /@types/yargs-parser@21.0.0: @@ -5822,7 +6219,7 @@ packages: resolution: {integrity: sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==} requiresBuild: true dependencies: - '@types/node': 18.13.0 + '@types/node': 20.4.5 dev: true optional: true @@ -5842,7 +6239,7 @@ packages: '@typescript-eslint/scope-manager': 5.60.0 '@typescript-eslint/type-utils': 5.60.0(eslint@8.43.0)(typescript@4.9.5) '@typescript-eslint/utils': 5.60.0(eslint@8.43.0)(typescript@4.9.5) - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 eslint: 8.43.0 grapheme-splitter: 1.0.4 ignore: 5.2.4 @@ -5880,7 +6277,7 @@ packages: '@typescript-eslint/scope-manager': 5.60.0 '@typescript-eslint/types': 5.60.0 '@typescript-eslint/typescript-estree': 5.60.0(typescript@4.9.5) - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 eslint: 8.43.0 typescript: 4.9.5 transitivePeerDependencies: @@ -5907,7 +6304,7 @@ packages: dependencies: '@typescript-eslint/typescript-estree': 5.60.0(typescript@4.9.5) '@typescript-eslint/utils': 5.60.0(eslint@8.43.0)(typescript@4.9.5) - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 eslint: 8.43.0 tsutils: 3.21.0(typescript@4.9.5) typescript: 4.9.5 @@ -5931,7 +6328,7 @@ packages: dependencies: '@typescript-eslint/types': 5.60.0 '@typescript-eslint/visitor-keys': 5.60.0 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 globby: 11.1.0 is-glob: 4.0.3 semver: 7.5.2 @@ -6265,19 +6662,15 @@ packages: dependencies: '@webassemblyjs/helper-numbers': 1.11.6 '@webassemblyjs/helper-wasm-bytecode': 1.11.6 - dev: false /@webassemblyjs/floating-point-hex-parser@1.11.6: resolution: {integrity: sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==} - dev: false /@webassemblyjs/helper-api-error@1.11.6: resolution: {integrity: sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==} - dev: false /@webassemblyjs/helper-buffer@1.11.6: resolution: {integrity: sha512-z3nFzdcp1mb8nEOFFk8DrYLpHvhKC3grJD2ardfKOzmbmJvEf/tPIqCY+sNcwZIY8ZD7IkB2l7/pqhUhqm7hLA==} - dev: false /@webassemblyjs/helper-numbers@1.11.6: resolution: {integrity: sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==} @@ -6285,11 +6678,9 @@ packages: '@webassemblyjs/floating-point-hex-parser': 1.11.6 '@webassemblyjs/helper-api-error': 1.11.6 '@xtuc/long': 4.2.2 - dev: false /@webassemblyjs/helper-wasm-bytecode@1.11.6: resolution: {integrity: sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==} - dev: false /@webassemblyjs/helper-wasm-section@1.11.6: resolution: {integrity: sha512-LPpZbSOwTpEC2cgn4hTydySy1Ke+XEu+ETXuoyvuyezHO3Kjdu90KK95Sh9xTbmjrCsUwvWwCOQQNta37VrS9g==} @@ -6298,23 +6689,19 @@ packages: '@webassemblyjs/helper-buffer': 1.11.6 '@webassemblyjs/helper-wasm-bytecode': 1.11.6 '@webassemblyjs/wasm-gen': 1.11.6 - dev: false /@webassemblyjs/ieee754@1.11.6: resolution: {integrity: sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==} dependencies: '@xtuc/ieee754': 1.2.0 - dev: false /@webassemblyjs/leb128@1.11.6: resolution: {integrity: sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==} dependencies: '@xtuc/long': 4.2.2 - dev: false /@webassemblyjs/utf8@1.11.6: resolution: {integrity: sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==} - dev: false /@webassemblyjs/wasm-edit@1.11.6: resolution: {integrity: sha512-Ybn2I6fnfIGuCR+Faaz7YcvtBKxvoLV3Lebn1tM4o/IAJzmi9AWYIPWpyBfU8cC+JxAO57bk4+zdsTjJR+VTOw==} @@ -6327,7 +6714,6 @@ packages: '@webassemblyjs/wasm-opt': 1.11.6 '@webassemblyjs/wasm-parser': 1.11.6 '@webassemblyjs/wast-printer': 1.11.6 - dev: false /@webassemblyjs/wasm-gen@1.11.6: resolution: {integrity: sha512-3XOqkZP/y6B4F0PBAXvI1/bky7GryoogUtfwExeP/v7Nzwo1QLcq5oQmpKlftZLbT+ERUOAZVQjuNVak6UXjPA==} @@ -6337,7 +6723,6 @@ packages: '@webassemblyjs/ieee754': 1.11.6 '@webassemblyjs/leb128': 1.11.6 '@webassemblyjs/utf8': 1.11.6 - dev: false /@webassemblyjs/wasm-opt@1.11.6: resolution: {integrity: sha512-cOrKuLRE7PCe6AsOVl7WasYf3wbSo4CeOk6PkrjS7g57MFfVUF9u6ysQBBODX0LdgSvQqRiGz3CXvIDKcPNy4g==} @@ -6346,7 +6731,6 @@ packages: '@webassemblyjs/helper-buffer': 1.11.6 '@webassemblyjs/wasm-gen': 1.11.6 '@webassemblyjs/wasm-parser': 1.11.6 - dev: false /@webassemblyjs/wasm-parser@1.11.6: resolution: {integrity: sha512-6ZwPeGzMJM3Dqp3hCsLgESxBGtT/OeCvCZ4TA1JUPYgmhAx38tTPR9JaKy0S5H3evQpO/h2uWs2j6Yc/fjkpTQ==} @@ -6357,22 +6741,18 @@ packages: '@webassemblyjs/ieee754': 1.11.6 '@webassemblyjs/leb128': 1.11.6 '@webassemblyjs/utf8': 1.11.6 - dev: false /@webassemblyjs/wast-printer@1.11.6: resolution: {integrity: sha512-JM7AhRcE+yW2GWYaKeHL5vt4xqee5N2WcezptmgyhNS+ScggqcT1OtXykhAb13Sn5Yas0j2uv9tHgrjwvzAP4A==} dependencies: '@webassemblyjs/ast': 1.11.6 '@xtuc/long': 4.2.2 - dev: false /@xtuc/ieee754@1.2.0: resolution: {integrity: sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==} - dev: false /@xtuc/long@4.2.2: resolution: {integrity: sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==} - dev: false /@zxing/text-encoding@0.9.0: resolution: {integrity: sha512-U/4aVJ2mxI0aDNI8Uq0wEhMgY+u4CNtEb0om3+y3+niDAsoTCOB33UF0sxpzqzdqXLqmvc+vZyAt4O8pPdfkwA==} @@ -6451,7 +6831,6 @@ packages: acorn: ^8 dependencies: acorn: 8.9.0 - dev: false /acorn-jsx@5.3.2(acorn@8.9.0): resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==} @@ -6468,6 +6847,7 @@ packages: /acorn-walk@8.2.0: resolution: {integrity: sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==} engines: {node: '>=0.4.0'} + dev: true /acorn@7.4.1: resolution: {integrity: sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==} @@ -6504,7 +6884,7 @@ packages: resolution: {integrity: sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==} engines: {node: '>= 6.0.0'} dependencies: - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 transitivePeerDependencies: - supports-color @@ -6533,7 +6913,6 @@ packages: ajv: ^6.9.1 dependencies: ajv: 6.12.6 - dev: false /ajv-keywords@5.1.0(ajv@8.12.0): resolution: {integrity: sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==} @@ -6678,6 +7057,7 @@ packages: /arg@4.1.3: resolution: {integrity: sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==} + dev: true /arg@5.0.2: resolution: {integrity: sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==} @@ -6796,7 +7176,6 @@ packages: inherits: 2.0.4 minimalistic-assert: 1.0.1 safer-buffer: 2.1.2 - dev: true /asn1@0.2.6: resolution: {integrity: sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==} @@ -6809,6 +7188,14 @@ packages: engines: {node: '>=0.8'} dev: true + /assert@2.0.0: + resolution: {integrity: sha512-se5Cd+js9dXJnu6Ag2JFc00t+HmHOen+8Q+L7O9zI0PqQXr20uk2J0XQqMxZEeo5U50o8Nvmmx7dZrl+Ufr35A==} + dependencies: + es6-object-assign: 1.1.0 + is-nan: 1.3.2 + object-is: 1.1.5 + util: 0.12.5 + /assertion-error@1.1.0: resolution: {integrity: sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==} dev: true @@ -6890,7 +7277,7 @@ packages: /axios@0.21.4: resolution: {integrity: sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==} dependencies: - follow-redirects: 1.15.2(debug@4.3.4) + follow-redirects: 1.15.2 transitivePeerDependencies: - debug dev: true @@ -7168,7 +7555,6 @@ packages: /big.js@5.2.2: resolution: {integrity: sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==} - dev: false /bigint-crypto-utils@3.2.2: resolution: {integrity: sha512-U1RbE3aX9ayCUVcIPHuPDPKcK3SFOXf93J1UK/iHlJuQB7bhagPIX06/CLpLEsDThJ7KA4Dhrnzynl+d2weTiw==} @@ -7237,11 +7623,9 @@ packages: /bn.js@4.12.0: resolution: {integrity: sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==} - dev: true /bn.js@5.2.1: resolution: {integrity: sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==} - dev: true /body-parser@1.20.1: resolution: {integrity: sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==} @@ -7327,7 +7711,6 @@ packages: /brorand@1.1.0: resolution: {integrity: sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w==} - dev: true /brotli-size@4.0.0: resolution: {integrity: sha512-uA9fOtlTRC0iqKfzff1W34DXUA3GyVqbUaeo3Rw3d4gd1eavKVCETXrn3NzO74W+UVkG3UHu8WxUi+XvKI/huA==} @@ -7361,6 +7744,11 @@ packages: engines: {node: '>=16.0.0', npm: '>=7.0.0'} dev: true + /browser-resolve@2.0.0: + resolution: {integrity: sha512-7sWsQlYL2rGLy2IWm8WL8DCTJvYLc/qlOnsakDac87SOoCd16WLsaAMdCiAqsTNHIe+SXfaqyxyo6THoWqs8WQ==} + dependencies: + resolve: 1.22.2 + /browser-stdout@1.3.1: resolution: {integrity: sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==} dev: true @@ -7374,7 +7762,6 @@ packages: evp_bytestokey: 1.0.3 inherits: 2.0.4 safe-buffer: 5.2.1 - dev: true /browserify-cipher@1.0.1: resolution: {integrity: sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==} @@ -7382,7 +7769,6 @@ packages: browserify-aes: 1.2.0 browserify-des: 1.0.2 evp_bytestokey: 1.0.3 - dev: true /browserify-des@1.0.2: resolution: {integrity: sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==} @@ -7391,14 +7777,12 @@ packages: des.js: 1.1.0 inherits: 2.0.4 safe-buffer: 5.2.1 - dev: true /browserify-rsa@4.1.0: resolution: {integrity: sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==} dependencies: bn.js: 5.2.1 randombytes: 2.1.0 - dev: true /browserify-sign@4.2.1: resolution: {integrity: sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==} @@ -7412,7 +7796,11 @@ packages: parse-asn1: 5.1.6 readable-stream: 3.6.2 safe-buffer: 5.2.1 - dev: true + + /browserify-zlib@0.2.0: + resolution: {integrity: sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==} + dependencies: + pako: 1.0.11 /browserslist@4.21.9: resolution: {integrity: sha512-M0MFoZzbUrRU4KNfCrDLnvyE7gub+peetoTid3TBIqtunaDJyXlwhakT+/VkvSXcfIzFfK/nkCs4nmyTmxdNSg==} @@ -7486,7 +7874,6 @@ packages: /buffer-xor@1.0.3: resolution: {integrity: sha512-571s0T7nZWK6vB67HI5dyUF7wXiNcfaPPPTl6zYCNApANjIvYJTg7hlud/+cJpdAhS7dVzqMLmfhfHR3rAcOjQ==} - dev: true /buffer@5.7.1: resolution: {integrity: sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==} @@ -7512,6 +7899,9 @@ packages: resolution: {integrity: sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==} engines: {node: '>=6'} + /builtin-status-codes@3.0.0: + resolution: {integrity: sha512-HpGFw18DgFWlncDfjTa2rcQ4W88O1mC8e8yZ2AvQY5KDaktSTwo+KRf6nHK6FRI5FyRyb/5T6+TSxfP7QyGsmQ==} + /busboy@1.6.0: resolution: {integrity: sha512-8SFQbg/0hQ9xy3UNTB0YEnsNBbWfhf7RtnzpL7TkBiTBRfrQ9Fxcnz7VJsleJpyp6rVLvXiuORqjlHi5q+PYuA==} engines: {node: '>=10.16.0'} @@ -7782,7 +8172,6 @@ packages: /chrome-trace-event@1.0.3: resolution: {integrity: sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==} engines: {node: '>=6.0'} - dev: false /chromium-bidi@0.4.4(devtools-protocol@0.0.1094867): resolution: {integrity: sha512-4BX5cSaponuvVT1+SbLYTOAgDoVtX/Khoc9UsbFJ/AsPVUeFAM3RiIDFI6XFhLYMi9WmVJqh1ZH+dRpNKkKwiQ==} @@ -7829,6 +8218,14 @@ packages: dependencies: inherits: 2.0.4 safe-buffer: 5.2.1 + + /cjs-es@0.9.2: + resolution: {integrity: sha512-b3dU5kkUWO8slt5DHHgKFgV5ghWbyBCQVa6lJnDA3+zfgil6MnL8JtoqoM01xabrDcgoazizriwvObCm1sXFgg==} + dependencies: + '@rollup/pluginutils': 4.2.1 + estree-walker: 3.0.3 + is-reference: 3.0.1 + magic-string: 0.26.7 dev: true /cjs-module-lexer@1.2.3: @@ -8104,6 +8501,12 @@ packages: engines: {node: '>=0.8'} dev: false + /console-browserify@1.2.0: + resolution: {integrity: sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==} + + /constants-browserify@1.0.0: + resolution: {integrity: sha512-xFxOwqIzR/e1k1gLiWEophSCMqXcwVHIH7akf7b/vxcUeGunlj3hvZaaqxwHsTgn+IndtkQJgSztIDWeumWJDQ==} + /content-disposition@0.5.2: resolution: {integrity: sha512-kRGRZw3bLlFISDBgwTSA1TMBFN6J6GWDeubmDE3AF+3+yXL8hTWv8r5rkLbqYXY4RjPk/EzHnClI3zQf1cFmHA==} engines: {node: '>= 0.6'} @@ -8227,7 +8630,6 @@ packages: dependencies: bn.js: 4.12.0 elliptic: 6.5.4 - dev: true /create-hash@1.2.0: resolution: {integrity: sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==} @@ -8237,7 +8639,6 @@ packages: md5.js: 1.3.5 ripemd160: 2.0.2 sha.js: 2.4.11 - dev: true /create-hmac@1.1.7: resolution: {integrity: sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==} @@ -8248,7 +8649,6 @@ packages: ripemd160: 2.0.2 safe-buffer: 5.2.1 sha.js: 2.4.11 - dev: true /create-require@1.1.1: resolution: {integrity: sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==} @@ -8264,11 +8664,19 @@ packages: /cross-fetch@3.1.6: resolution: {integrity: sha512-riRvo06crlE8HiqOwIpQhxwdOk4fOeR7FVM/wXoxchFEqMNUjvbs3bfo4OTgMEMHzppd4DxFBDbyySj8Cv781g==} dependencies: - node-fetch: 2.6.11 + node-fetch: 2.6.12 transitivePeerDependencies: - encoding dev: true + /cross-fetch@4.0.0: + resolution: {integrity: sha512-e4a5N8lVvuLgAWgnCrLr2PP0YyDOTHa9H/Rj54dirp61qXnNq46m82bRhNqIA5VccJtWBvPTFRV3TtvHUKPB1g==} + dependencies: + node-fetch: 2.6.12 + transitivePeerDependencies: + - encoding + dev: false + /cross-spawn@6.0.5: resolution: {integrity: sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==} engines: {node: '>=4.8'} @@ -8306,7 +8714,6 @@ packages: public-encrypt: 4.0.3 randombytes: 2.1.0 randomfill: 1.0.4 - dev: true /crypto-random-string@2.0.0: resolution: {integrity: sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==} @@ -8582,7 +8989,7 @@ packages: resolution: {integrity: sha512-DmPsUux63daOfCszxLkcp6LjdJ0k/BQNhIMtoAi5mbraYQnEQkFtKORmTu6XmDX6ujbtaBkeuJAiCBNI7MZklw==} engines: {node: '>=16.0.0', npm: '>=7.0.0'} dependencies: - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 err-code: 3.0.1 interface-datastore: 6.1.1 it-drain: 1.0.5 @@ -8654,6 +9061,17 @@ packages: dependencies: ms: 2.1.3 + /debug@4.3.4: + resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==} + engines: {node: '>=6.0'} + peerDependencies: + supports-color: '*' + peerDependenciesMeta: + supports-color: + optional: true + dependencies: + ms: 2.1.2 + /debug@4.3.4(supports-color@8.1.1): resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==} engines: {node: '>=6.0'} @@ -8665,6 +9083,7 @@ packages: dependencies: ms: 2.1.2 supports-color: 8.1.1 + dev: true /decamelize@1.2.0: resolution: {integrity: sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==} @@ -8855,7 +9274,6 @@ packages: dependencies: inherits: 2.0.4 minimalistic-assert: 1.0.1 - dev: true /destroy@1.2.0: resolution: {integrity: sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==} @@ -8889,7 +9307,7 @@ packages: hasBin: true dependencies: address: 1.2.2 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 transitivePeerDependencies: - supports-color dev: true @@ -8919,6 +9337,7 @@ packages: /diff@4.0.2: resolution: {integrity: sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==} engines: {node: '>=0.3.1'} + dev: true /diff@5.0.0: resolution: {integrity: sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==} @@ -8936,7 +9355,6 @@ packages: bn.js: 4.12.0 miller-rabin: 4.0.1 randombytes: 2.1.0 - dev: true /dir-glob@3.0.1: resolution: {integrity: sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==} @@ -8955,7 +9373,7 @@ packages: /dns-over-http-resolver@1.2.3(node-fetch@2.6.11): resolution: {integrity: sha512-miDiVSI6KSNbi4SVifzO/reD8rMnxgrlnkrlkugOLQpWQTe2qMdHsZp5DmfKjxNE+/T3VAAYLQUZMv9SMr6+AA==} dependencies: - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 native-fetch: 3.0.0(node-fetch@2.6.11) receptacle: 1.3.2 transitivePeerDependencies: @@ -8963,11 +9381,11 @@ packages: - supports-color dev: true - /dns-over-http-resolver@1.2.3(node-fetch@3.3.1): + /dns-over-http-resolver@1.2.3(node-fetch@3.3.2): resolution: {integrity: sha512-miDiVSI6KSNbi4SVifzO/reD8rMnxgrlnkrlkugOLQpWQTe2qMdHsZp5DmfKjxNE+/T3VAAYLQUZMv9SMr6+AA==} dependencies: - debug: 4.3.4(supports-color@8.1.1) - native-fetch: 3.0.0(node-fetch@3.3.1) + debug: 4.3.4 + native-fetch: 3.0.0(node-fetch@3.3.2) receptacle: 1.3.2 transitivePeerDependencies: - node-fetch @@ -8978,7 +9396,7 @@ packages: resolution: {integrity: sha512-Lm/eXB7yAQLJ5WxlBGwYfBY7utduXPZykcSmcG6K7ozM0wrZFvxZavhT6PqI0kd/5CUTfev/RrEFQqyU4CGPew==} engines: {node: '>=16.0.0', npm: '>=7.0.0'} dependencies: - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 native-fetch: 4.0.2(undici@5.22.1) receptacle: 1.3.2 undici: 5.22.1 @@ -9034,6 +9452,10 @@ packages: resolution: {integrity: sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w==} dev: true + /domain-browser@4.22.0: + resolution: {integrity: sha512-IGBwjF7tNk3cwypFNH/7bfzBcgSCbaMOD3GsaY1AU/JRrnHnYgEM0+9kQt52iZxjNsjBtJYtao146V+f8jFZNw==} + engines: {node: '>=10'} + /domelementtype@1.3.1: resolution: {integrity: sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==} dev: false @@ -9168,7 +9590,6 @@ packages: inherits: 2.0.4 minimalistic-assert: 1.0.1 minimalistic-crypto-utils: 1.0.1 - dev: true /emittery@0.10.2: resolution: {integrity: sha512-aITqOwnLanpHLNXZJENbOgjUBeHocD+xsSJmNrjovKBW5HbSpW3d1pEls7GFQPUWXiwG9+0P4GtHfEqC/4M0Iw==} @@ -9191,7 +9612,6 @@ packages: /emojis-list@3.0.0: resolution: {integrity: sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==} engines: {node: '>= 4'} - dev: false /encodeurl@1.0.2: resolution: {integrity: sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==} @@ -9214,7 +9634,6 @@ packages: dependencies: graceful-fs: 4.2.11 tapable: 2.2.1 - dev: false /enquirer@2.3.6: resolution: {integrity: sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==} @@ -9301,9 +9720,20 @@ packages: stop-iteration-iterator: 1.0.0 dev: false + /es-info@0.4.0: + resolution: {integrity: sha512-fH+6WU7kIhEFM0tkQwMlpVn9N+Kk1oj8IxuwiNj55fEMiSrJG9e73C/WKYvk5Eeg+X3zsr+nfGd1588Th+DmtQ==} + dependencies: + '@rollup/pluginutils': 4.2.1 + estree-walker: 3.0.3 + is-reference: 3.0.1 + dev: true + + /es-module-lexer@0.4.1: + resolution: {integrity: sha512-ooYciCUtfw6/d2w56UVeqHPcoCFAiJdz5XOkYpv/Txl1HMUozpXjz/2RIQgqwKdXNDPSF1W7mJCFse3G+HDyAA==} + dev: true + /es-module-lexer@1.3.0: resolution: {integrity: sha512-vZK7T0N2CBmBOixhmjdqx2gWVbFZ4DXZ/NyRMZVlJXPa7CyFS+/a4QQsDGDQy9ZfEzxFuNEsMLeQJnKP2p5/JA==} - dev: false /es-set-tostringtag@2.0.1: resolution: {integrity: sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==} @@ -9345,6 +9775,9 @@ packages: es6-symbol: 3.1.3 dev: true + /es6-object-assign@1.1.0: + resolution: {integrity: sha512-MEl9uirslVwqQU369iHNWZXsI8yaZYGg/D65aOgZkeyFJwHYSxilf7rQzXKI7DdDuBPrBXbfk3sl9hJhmd5AUw==} + /es6-promise@4.2.8: resolution: {integrity: sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==} dev: true @@ -9361,6 +9794,18 @@ packages: ext: 1.7.0 dev: true + /esbuild-loader@3.0.1(webpack@5.88.2): + resolution: {integrity: sha512-aZfGybqTeuyCd4AsVvWOOfkhIuN+wfZFjMyh3gyQEU1Uvsl8L6vye9HqP93iRa0iTA+6Jclap514PJIC3cLnMA==} + peerDependencies: + webpack: ^4.40.0 || ^5.0.0 + dependencies: + esbuild: 0.17.19 + get-tsconfig: 4.6.2 + loader-utils: 2.0.4 + webpack: 5.88.2 + webpack-sources: 1.4.3 + dev: true + /esbuild@0.16.17: resolution: {integrity: sha512-G8LEkV0XzDMNwXKgM0Jwu3nY3lSTwSGY6XbxM9cr9+s0T/qSV1q1JVPBGzm3dcjhCic9+emZDmMffkwgPeOeLg==} engines: {node: '>=12'} @@ -9389,6 +9834,35 @@ packages: '@esbuild/win32-arm64': 0.16.17 '@esbuild/win32-ia32': 0.16.17 '@esbuild/win32-x64': 0.16.17 + + /esbuild@0.17.19: + resolution: {integrity: sha512-XQ0jAPFkK/u3LcVRcvVHQcTIqD6E2H1fvZMA5dQPSOWb3suUbWbfbRf94pjc0bNzRYLfIrDRQXr7X+LHIm5oHw==} + engines: {node: '>=12'} + hasBin: true + requiresBuild: true + optionalDependencies: + '@esbuild/android-arm': 0.17.19 + '@esbuild/android-arm64': 0.17.19 + '@esbuild/android-x64': 0.17.19 + '@esbuild/darwin-arm64': 0.17.19 + '@esbuild/darwin-x64': 0.17.19 + '@esbuild/freebsd-arm64': 0.17.19 + '@esbuild/freebsd-x64': 0.17.19 + '@esbuild/linux-arm': 0.17.19 + '@esbuild/linux-arm64': 0.17.19 + '@esbuild/linux-ia32': 0.17.19 + '@esbuild/linux-loong64': 0.17.19 + '@esbuild/linux-mips64el': 0.17.19 + '@esbuild/linux-ppc64': 0.17.19 + '@esbuild/linux-riscv64': 0.17.19 + '@esbuild/linux-s390x': 0.17.19 + '@esbuild/linux-x64': 0.17.19 + '@esbuild/netbsd-x64': 0.17.19 + '@esbuild/openbsd-x64': 0.17.19 + '@esbuild/sunos-x64': 0.17.19 + '@esbuild/win32-arm64': 0.17.19 + '@esbuild/win32-ia32': 0.17.19 + '@esbuild/win32-x64': 0.17.19 dev: true /escalade@3.1.1: @@ -9578,7 +10052,7 @@ packages: '@typescript-eslint/eslint-plugin': 5.60.0(@typescript-eslint/parser@5.60.0)(eslint@8.43.0)(typescript@4.9.5) '@typescript-eslint/experimental-utils': 5.60.0(eslint@8.43.0)(typescript@4.9.5) eslint: 8.43.0 - jest: 27.5.1(ts-node@10.9.1) + jest: 27.5.1 transitivePeerDependencies: - supports-color - typescript @@ -9661,7 +10135,6 @@ packages: dependencies: esrecurse: 4.3.0 estraverse: 4.3.0 - dev: false /eslint-scope@7.2.0: resolution: {integrity: sha512-DYj5deGlHBfMt15J7rdtyKNq/Nqlv5KfU4iodrQ019XESsRnwXH9KAE0y3cwtUHDo2ob7CypAnCqefh6vioWRw==} @@ -9712,7 +10185,7 @@ packages: ajv: 6.12.6 chalk: 4.1.2 cross-spawn: 7.0.3 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 doctrine: 3.0.0 escape-string-regexp: 4.0.0 eslint-scope: 7.2.0 @@ -9782,7 +10255,6 @@ packages: engines: {node: '>=4.0'} dependencies: estraverse: 5.3.0 - dev: false /estraverse@1.9.3: resolution: {integrity: sha512-25w1fMXQrGdoquWnScXZGckOv+Wes+JDnuN/+7ex3SauFRS72r2lFDec0EKPt2YD1wUJ/IrfEex+9yp4hfSOJA==} @@ -9792,7 +10264,6 @@ packages: /estraverse@4.3.0: resolution: {integrity: sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==} engines: {node: '>=4.0'} - dev: false /estraverse@5.3.0: resolution: {integrity: sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==} @@ -9807,6 +10278,11 @@ packages: /estree-walker@2.0.2: resolution: {integrity: sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==} + + /estree-walker@3.0.3: + resolution: {integrity: sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==} + dependencies: + '@types/estree': 1.0.1 dev: true /esutils@2.0.3: @@ -10029,7 +10505,6 @@ packages: dependencies: md5.js: 1.3.5 safe-buffer: 5.2.1 - dev: true /execa@5.1.1: resolution: {integrity: sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==} @@ -10131,7 +10606,7 @@ packages: engines: {node: '>= 10.17.0'} hasBin: true dependencies: - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 get-stream: 5.2.0 yauzl: 2.10.0 optionalDependencies: @@ -10320,6 +10795,11 @@ packages: engines: {node: '>=0.10.0'} dev: true + /filter-obj@2.0.2: + resolution: {integrity: sha512-lO3ttPjHZRfjMcxWKb1j1eDhTFsu4meeR3lnMcnBFhk6RuLhvEiuALu2TlfL310ph4lCYYwgF/ElIjdP739tdg==} + engines: {node: '>=8'} + dev: true + /finalhandler@1.2.0: resolution: {integrity: sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==} engines: {node: '>= 0.8'} @@ -10400,6 +10880,15 @@ packages: resolution: {integrity: sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==} dev: false + /follow-redirects@1.15.2: + resolution: {integrity: sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==} + engines: {node: '>=4.0'} + peerDependencies: + debug: '*' + peerDependenciesMeta: + debug: + optional: true + /follow-redirects@1.15.2(debug@4.3.4): resolution: {integrity: sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==} engines: {node: '>=4.0'} @@ -10409,7 +10898,8 @@ packages: debug: optional: true dependencies: - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 + dev: true /for-each@0.3.3: resolution: {integrity: sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==} @@ -10709,6 +11199,12 @@ packages: call-bind: 1.0.2 get-intrinsic: 1.2.1 + /get-tsconfig@4.6.2: + resolution: {integrity: sha512-E5XrT4CbbXcXWy+1jChlZmrmCwd5KGx502kDCXJJ7y898TtWW9FwoG5HfOLVRKmlmDGkWN2HM9Ho+/Y8F0sJDg==} + dependencies: + resolve-pkg-maps: 1.0.0 + dev: true + /getpass@0.1.7: resolution: {integrity: sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==} dependencies: @@ -10738,7 +11234,6 @@ packages: /glob-to-regexp@0.4.1: resolution: {integrity: sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==} - dev: false /glob@5.0.15: resolution: {integrity: sha512-c9IPMazfRITpmAAKi22dK1VKxGDX9ehhqfABDriL/lzO92xcUKEJPQHrVA/2YHSNFB4iFlykVmWvwo48nr3OxA==} @@ -10804,6 +11299,17 @@ packages: once: 1.4.0 path-is-absolute: 1.0.1 + /glob@8.1.0: + resolution: {integrity: sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==} + engines: {node: '>=12'} + dependencies: + fs.realpath: 1.0.0 + inflight: 1.0.6 + inherits: 2.0.4 + minimatch: 5.1.6 + once: 1.4.0 + dev: true + /global-modules@2.0.0: resolution: {integrity: sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==} engines: {node: '>=6'} @@ -11044,7 +11550,7 @@ packages: chalk: 2.4.2 chokidar: 3.5.3 ci-info: 2.0.0 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 enquirer: 2.3.6 env-paths: 2.2.1 ethereum-cryptography: 1.2.0 @@ -11067,7 +11573,7 @@ packages: solc: 0.7.3(debug@4.3.4) source-map-support: 0.5.21 stacktrace-parser: 0.1.10 - ts-node: 10.9.1(@types/node@18.13.0)(typescript@4.7.2) + ts-node: 10.9.1(@types/node@20.4.5)(typescript@4.7.2) tsort: 0.0.1 typescript: 4.7.2 undici: 5.22.1 @@ -11138,7 +11644,6 @@ packages: inherits: 2.0.4 readable-stream: 3.6.2 safe-buffer: 5.2.1 - dev: true /hash.js@1.1.3: resolution: {integrity: sha512-/UETyP0W22QILqS+6HowevwhEFJ3MBJnwTf75Qob9Wz9t0DPuisL8kW8YZMK62dHAKE1c1p+gY1TtOLY+USEHA==} @@ -11152,7 +11657,6 @@ packages: dependencies: inherits: 2.0.4 minimalistic-assert: 1.0.1 - dev: true /hashlru@2.3.0: resolution: {integrity: sha512-0cMsjjIC8I+D3M44pOQdsy0OHXGLVz6Z0beRuufhKa0KfaD2wGwAev6jILzXsd3/vpnNQJmWyZtIILqM1N+n5A==} @@ -11171,7 +11675,6 @@ packages: hash.js: 1.1.7 minimalistic-assert: 1.0.1 minimalistic-crypto-utils: 1.0.1 - dev: true /hoopy@0.1.4: resolution: {integrity: sha512-HRcs+2mr52W0K+x8RzcLzuPPmVIKMSv97RGHy0Ea9y/mpcaK+xTrjICA04KAHi4GRzxliNqNJEFYWHghy3rSfQ==} @@ -11296,7 +11799,7 @@ packages: dependencies: '@tootallnate/once': 1.1.2 agent-base: 6.0.2 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 transitivePeerDependencies: - supports-color @@ -11324,7 +11827,7 @@ packages: engines: {node: '>=8.0.0'} dependencies: eventemitter3: 4.0.7 - follow-redirects: 1.15.2(debug@4.3.4) + follow-redirects: 1.15.2 requires-port: 1.0.0 transitivePeerDependencies: - debug @@ -11383,12 +11886,15 @@ packages: resolve-alpn: 1.2.1 dev: true + /https-browserify@1.0.0: + resolution: {integrity: sha512-J+FkSdyD+0mA0N+81tMotaRMfSL9SGi+xpD3T6YApKsc3bGSXJlfXri3VyFOeYkfLRQisDk1W+jIFFKBeUBbBg==} + /https-proxy-agent@5.0.1: resolution: {integrity: sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==} engines: {node: '>= 6'} dependencies: agent-base: 6.0.2 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 transitivePeerDependencies: - supports-color @@ -11660,14 +12166,14 @@ packages: - supports-color dev: true - /ipfs-core-types@0.5.2(node-fetch@3.3.1): + /ipfs-core-types@0.5.2(node-fetch@3.3.2): resolution: {integrity: sha512-DOQeL+GFGYMTlnbdtMeBzvfVnyAalSgCfPr8XUCI+FVBZZWwzkt5jZZzGDmF87HVRrMR3FuVyBKZj772mcXKyQ==} deprecated: js-IPFS has been deprecated in favour of Helia - please see https://github.com/ipfs/js-ipfs/issues/4336 for details dependencies: cids: 1.1.9 interface-datastore: 4.0.2 ipld-block: 0.11.1 - multiaddr: 9.0.2(node-fetch@3.3.1) + multiaddr: 9.0.2(node-fetch@3.3.2) multibase: 4.0.6 transitivePeerDependencies: - node-fetch @@ -11704,7 +12210,7 @@ packages: - supports-color dev: true - /ipfs-core-utils@0.8.3(node-fetch@3.3.1): + /ipfs-core-utils@0.8.3(node-fetch@3.3.2): resolution: {integrity: sha512-PY7PkCgCtVYtNOe1C3ew1+5D9NqXqizb886R/lyGWe+KsmWtBQkQIk0ZIDwKyHGvG2KA2QQeIDzdOmzBQBJtHQ==} deprecated: js-IPFS has been deprecated in favour of Helia - please see https://github.com/ipfs/js-ipfs/issues/4336 for details dependencies: @@ -11713,14 +12219,14 @@ packages: browser-readablestream-to-it: 1.0.3 cids: 1.1.9 err-code: 3.0.1 - ipfs-core-types: 0.5.2(node-fetch@3.3.1) + ipfs-core-types: 0.5.2(node-fetch@3.3.2) ipfs-unixfs: 4.0.3 ipfs-utils: 8.1.6 it-all: 1.0.6 it-map: 1.0.6 it-peekable: 1.0.3 - multiaddr: 9.0.2(node-fetch@3.3.1) - multiaddr-to-uri: 7.0.0(node-fetch@3.3.1) + multiaddr: 9.0.2(node-fetch@3.3.2) + multiaddr-to-uri: 7.0.0(node-fetch@3.3.2) parse-duration: 1.1.0 timeout-abort-controller: 1.1.1 uint8arrays: 2.1.10 @@ -11729,7 +12235,7 @@ packages: - supports-color dev: true - /ipfs-http-client@50.1.2(node-fetch@3.3.1): + /ipfs-http-client@50.1.2(node-fetch@3.3.2): resolution: {integrity: sha512-ZbJlED4wqwFXQFVB9FQDs20ygdq7O/zSq4AvO9KRAmkqUj2TsCWCteUz2fBMnGWLh2tExxeSl/rQbHbJptb8JQ==} engines: {node: '>=14.0.0', npm: '>=3.0.0'} deprecated: js-IPFS has been deprecated in favour of Helia - please see https://github.com/ipfs/js-ipfs/issues/4336 for details @@ -11737,10 +12243,10 @@ packages: abort-controller: 3.0.0 any-signal: 2.1.2 cids: 1.1.9 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 form-data: 4.0.0 - ipfs-core-types: 0.5.2(node-fetch@3.3.1) - ipfs-core-utils: 0.8.3(node-fetch@3.3.1) + ipfs-core-types: 0.5.2(node-fetch@3.3.2) + ipfs-core-utils: 0.8.3(node-fetch@3.3.2) ipfs-unixfs: 4.0.3 ipfs-utils: 8.1.6 ipld-block: 0.11.1 @@ -11752,7 +12258,7 @@ packages: it-tar: 3.0.0 it-to-stream: 1.0.0 merge-options: 3.0.4 - multiaddr: 9.0.2(node-fetch@3.3.1) + multiaddr: 9.0.2(node-fetch@3.3.2) multibase: 4.0.6 multicodec: 3.2.1 multihashes: 4.0.3 @@ -11848,8 +12354,8 @@ packages: it-to-stream: 1.0.0 merge-options: 3.0.4 nanoid: 3.3.6 - native-fetch: 3.0.0(node-fetch@2.6.11) - node-fetch: 2.6.11 + native-fetch: 3.0.0(node-fetch@2.6.12) + node-fetch: 2.6.12 react-native-fetch-api: 3.0.0 stream-to-it: 0.2.4 transitivePeerDependencies: @@ -11999,7 +12505,6 @@ packages: engines: {node: '>= 0.4'} dependencies: has-tostringtag: 1.0.0 - dev: true /is-glob@4.0.3: resolution: {integrity: sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==} @@ -12039,6 +12544,13 @@ packages: /is-module@1.0.0: resolution: {integrity: sha512-51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g==} + /is-nan@1.3.2: + resolution: {integrity: sha512-E+zBKpQ2t6MEo1VsonYmluk9NxGrbzpeeLC2xIViuO2EjU2xsXsBPwTr3Ykv9l08UYEVEdWeRZNouaZqF6RN0w==} + engines: {node: '>= 0.4'} + dependencies: + call-bind: 1.0.2 + define-properties: 1.2.0 + /is-natural-number@4.0.1: resolution: {integrity: sha512-Y4LTamMe0DDQIIAlaer9eKebAlDSV6huy+TWhJVPlzZh2o4tRP5SQWFlLn5N0To4mDD22/qdOq+veo1cSISLgQ==} dev: true @@ -12089,6 +12601,12 @@ packages: '@types/estree': 1.0.1 dev: true + /is-reference@3.0.1: + resolution: {integrity: sha512-baJJdQLiYaJdvFbJqXrcGv3WU3QCzBlUcI5QhbesIm6/xPsvmO+2CDoi/GMOFBQEQm+PXkwOPrp9KK5ozZsp2w==} + dependencies: + '@types/estree': 1.0.1 + dev: true + /is-regex@1.1.4: resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==} engines: {node: '>= 0.4'} @@ -12208,6 +12726,10 @@ packages: resolution: {integrity: sha512-9JPDgCN4B7QPkLtYAAOrEuAWvP9rWvR5offAr0/SeF046wIkglqH3VXgYYP6NcsKslH80UIVgmPqNe3j7tG2ng==} engines: {node: '>=12'} + /isomorphic-timers-promises@1.0.1: + resolution: {integrity: sha512-u4sej9B1LPSxTGKB/HiuzvEQnXH0ECYkSVQU39koSwmFAxhlEAFl9RdTvLv4TOTQUgBS5O3O5fwUxk6byBZ+IQ==} + engines: {node: '>=10'} + /isstream@0.1.2: resolution: {integrity: sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==} dev: true @@ -12240,7 +12762,7 @@ packages: resolution: {integrity: sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==} engines: {node: '>=10'} dependencies: - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 istanbul-lib-coverage: 3.2.0 source-map: 0.6.1 transitivePeerDependencies: @@ -12649,7 +13171,7 @@ packages: '@jest/expect': 28.1.3 '@jest/test-result': 28.1.3 '@jest/types': 28.1.3 - '@types/node': 18.13.0 + '@types/node': 20.4.5 chalk: 4.1.2 co: 4.6.0 dedent: 0.7.0 @@ -12668,7 +13190,7 @@ packages: - supports-color dev: true - /jest-cli@27.5.1(ts-node@10.9.1): + /jest-cli@27.5.1: resolution: {integrity: sha512-Hc6HOOwYq4/74/c62dEE3r5elx8wjYqxY0r0G/nFrLDPMFRu6RA/u8qINOIkvhxG7mMQ5EJsOGfRpI8L6eFUVw==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} hasBin: true @@ -12678,14 +13200,14 @@ packages: node-notifier: optional: true dependencies: - '@jest/core': 27.5.1(ts-node@10.9.1) + '@jest/core': 27.5.1 '@jest/test-result': 27.5.1 '@jest/types': 27.5.1 chalk: 4.1.2 exit: 0.1.2 graceful-fs: 4.2.11 import-local: 3.1.0 - jest-config: 27.5.1(ts-node@10.9.1) + jest-config: 27.5.1 jest-util: 27.5.1 jest-validate: 27.5.1 prompts: 2.4.2 @@ -12696,10 +13218,11 @@ packages: - supports-color - ts-node - utf-8-validate + dev: false - /jest-cli@28.1.3(@types/node@16.11.59)(ts-node@10.9.1): - resolution: {integrity: sha512-roY3kvrv57Azn1yPgdTebPAXvdR2xfezaKKYzVxZ6It/5NCxzJym6tUI5P1zkdWhfUYkxEI9uZWcQdaFLo8mJQ==} - engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} + /jest-cli@27.5.1(ts-node@10.9.1): + resolution: {integrity: sha512-Hc6HOOwYq4/74/c62dEE3r5elx8wjYqxY0r0G/nFrLDPMFRu6RA/u8qINOIkvhxG7mMQ5EJsOGfRpI8L6eFUVw==} + engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} hasBin: true peerDependencies: node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0 @@ -12707,14 +13230,44 @@ packages: node-notifier: optional: true dependencies: - '@jest/core': 28.1.3(ts-node@10.9.1) - '@jest/test-result': 28.1.3 + '@jest/core': 27.5.1(ts-node@10.9.1) + '@jest/test-result': 27.5.1 + '@jest/types': 27.5.1 + chalk: 4.1.2 + exit: 0.1.2 + graceful-fs: 4.2.11 + import-local: 3.1.0 + jest-config: 27.5.1(ts-node@10.9.1) + jest-util: 27.5.1 + jest-validate: 27.5.1 + prompts: 2.4.2 + yargs: 16.2.0 + transitivePeerDependencies: + - bufferutil + - canvas + - supports-color + - ts-node + - utf-8-validate + dev: true + + /jest-cli@28.1.3(@types/node@16.11.59): + resolution: {integrity: sha512-roY3kvrv57Azn1yPgdTebPAXvdR2xfezaKKYzVxZ6It/5NCxzJym6tUI5P1zkdWhfUYkxEI9uZWcQdaFLo8mJQ==} + engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} + hasBin: true + peerDependencies: + node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0 + peerDependenciesMeta: + node-notifier: + optional: true + dependencies: + '@jest/core': 28.1.3 + '@jest/test-result': 28.1.3 '@jest/types': 28.1.3 chalk: 4.1.2 exit: 0.1.2 graceful-fs: 4.2.11 import-local: 3.1.0 - jest-config: 28.1.3(@types/node@16.11.59)(ts-node@10.9.1) + jest-config: 28.1.3(@types/node@16.11.59) jest-util: 28.1.3 jest-validate: 28.1.3 prompts: 2.4.2 @@ -12725,6 +13278,46 @@ packages: - ts-node dev: true + /jest-config@27.5.1: + resolution: {integrity: sha512-5sAsjm6tGdsVbW9ahcChPAFCk4IlkQUknH5AvKjuLTSlcO/wCZKyFdn7Rg0EkC+OGgWODEy2hDpWB1PgzH0JNA==} + engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} + peerDependencies: + ts-node: '>=9.0.0' + peerDependenciesMeta: + ts-node: + optional: true + dependencies: + '@babel/core': 7.22.5 + '@jest/test-sequencer': 27.5.1 + '@jest/types': 27.5.1 + babel-jest: 27.5.1(@babel/core@7.22.5) + chalk: 4.1.2 + ci-info: 3.8.0 + deepmerge: 4.3.1 + glob: 7.2.3 + graceful-fs: 4.2.11 + jest-circus: 27.5.1 + jest-environment-jsdom: 27.5.1 + jest-environment-node: 27.5.1 + jest-get-type: 27.5.1 + jest-jasmine2: 27.5.1 + jest-regex-util: 27.5.1 + jest-resolve: 27.5.1 + jest-runner: 27.5.1 + jest-util: 27.5.1 + jest-validate: 27.5.1 + micromatch: 4.0.5 + parse-json: 5.2.0 + pretty-format: 27.5.1 + slash: 3.0.0 + strip-json-comments: 3.1.1 + transitivePeerDependencies: + - bufferutil + - canvas + - supports-color + - utf-8-validate + dev: false + /jest-config@27.5.1(ts-node@10.9.1): resolution: {integrity: sha512-5sAsjm6tGdsVbW9ahcChPAFCk4IlkQUknH5AvKjuLTSlcO/wCZKyFdn7Rg0EkC+OGgWODEy2hDpWB1PgzH0JNA==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} @@ -12764,8 +13357,9 @@ packages: - canvas - supports-color - utf-8-validate + dev: true - /jest-config@28.1.3(@types/node@16.11.59)(ts-node@10.9.1): + /jest-config@28.1.3(@types/node@16.11.59): resolution: {integrity: sha512-MG3INjByJ0J4AsNBm7T3hsuxKQqFIiRo/AUqb1q9LRKI5UU6Aar9JHbr9Ivn1TVwfUD9KirRoM/T6u8XlcQPHQ==} engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} peerDependencies: @@ -12800,12 +13394,11 @@ packages: pretty-format: 28.1.3 slash: 3.0.0 strip-json-comments: 3.1.1 - ts-node: 10.9.1(@types/node@18.13.0)(typescript@4.7.2) transitivePeerDependencies: - supports-color dev: true - /jest-config@28.1.3(@types/node@18.13.0)(ts-node@10.9.1): + /jest-config@28.1.3(@types/node@20.4.5): resolution: {integrity: sha512-MG3INjByJ0J4AsNBm7T3hsuxKQqFIiRo/AUqb1q9LRKI5UU6Aar9JHbr9Ivn1TVwfUD9KirRoM/T6u8XlcQPHQ==} engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} peerDependencies: @@ -12820,7 +13413,7 @@ packages: '@babel/core': 7.22.5 '@jest/test-sequencer': 28.1.3 '@jest/types': 28.1.3 - '@types/node': 18.13.0 + '@types/node': 20.4.5 babel-jest: 28.1.3(@babel/core@7.22.5) chalk: 4.1.2 ci-info: 3.8.0 @@ -12840,7 +13433,6 @@ packages: pretty-format: 28.1.3 slash: 3.0.0 strip-json-comments: 3.1.1 - ts-node: 10.9.1(@types/node@18.13.0)(typescript@4.7.2) transitivePeerDependencies: - supports-color dev: true @@ -12933,7 +13525,7 @@ packages: '@jest/environment': 28.1.3 '@jest/fake-timers': 28.1.3 '@jest/types': 28.1.3 - '@types/node': 18.13.0 + '@types/node': 20.4.5 jest-mock: 28.1.3 jest-util: 28.1.3 dev: true @@ -12972,7 +13564,7 @@ packages: dependencies: '@jest/types': 28.1.3 '@types/graceful-fs': 4.1.6 - '@types/node': 18.13.0 + '@types/node': 20.4.5 anymatch: 3.1.3 fb-watchman: 2.0.2 graceful-fs: 4.2.11 @@ -13083,7 +13675,7 @@ packages: engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} dependencies: '@jest/types': 28.1.3 - '@types/node': 18.13.0 + '@types/node': 20.4.5 dev: true /jest-pnp-resolver@1.2.3(jest-resolve@27.5.1): @@ -13207,7 +13799,7 @@ packages: '@jest/test-result': 28.1.3 '@jest/transform': 28.1.3 '@jest/types': 28.1.3 - '@types/node': 18.13.0 + '@types/node': 20.4.5 chalk: 4.1.2 emittery: 0.10.2 graceful-fs: 4.2.11 @@ -13358,7 +13950,7 @@ packages: engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: '@jest/types': 27.5.1 - '@types/node': 18.13.0 + '@types/node': 20.4.5 chalk: 4.1.2 ci-info: 3.8.0 graceful-fs: 4.2.11 @@ -13369,7 +13961,7 @@ packages: engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} dependencies: '@jest/types': 28.1.3 - '@types/node': 18.13.0 + '@types/node': 20.4.5 chalk: 4.1.2 ci-info: 3.8.0 graceful-fs: 4.2.11 @@ -13406,7 +13998,7 @@ packages: dependencies: ansi-escapes: 4.3.2 chalk: 4.1.2 - jest: 27.5.1(ts-node@10.9.1) + jest: 27.5.1 jest-regex-util: 28.0.2 jest-watcher: 28.1.3 slash: 4.0.0 @@ -13432,7 +14024,7 @@ packages: dependencies: '@jest/test-result': 28.1.3 '@jest/types': 28.1.3 - '@types/node': 18.13.0 + '@types/node': 20.4.5 ansi-escapes: 4.3.2 chalk: 4.1.2 emittery: 0.10.2 @@ -13443,7 +14035,7 @@ packages: resolution: {integrity: sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==} engines: {node: '>= 10.13.0'} dependencies: - '@types/node': 18.13.0 + '@types/node': 20.4.5 merge-stream: 2.0.0 supports-color: 7.2.0 @@ -13459,10 +14051,31 @@ packages: resolution: {integrity: sha512-CqRA220YV/6jCo8VWvAt1KKx6eek1VIHMPeLEbpcfSfkEeWyBNppynM/o6q+Wmw+sOhos2ml34wZbSX3G13//g==} engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} dependencies: - '@types/node': 18.13.0 + '@types/node': 20.4.5 merge-stream: 2.0.0 supports-color: 8.1.1 + /jest@27.5.1: + resolution: {integrity: sha512-Yn0mADZB89zTtjkPJEXwrac3LHudkQMR+Paqa8uxJHCBr9agxztUifWCyiYrjhMPBoUVBjyny0I7XH6ozDr7QQ==} + engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} + hasBin: true + peerDependencies: + node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0 + peerDependenciesMeta: + node-notifier: + optional: true + dependencies: + '@jest/core': 27.5.1 + import-local: 3.1.0 + jest-cli: 27.5.1 + transitivePeerDependencies: + - bufferutil + - canvas + - supports-color + - ts-node + - utf-8-validate + dev: false + /jest@27.5.1(ts-node@10.9.1): resolution: {integrity: sha512-Yn0mADZB89zTtjkPJEXwrac3LHudkQMR+Paqa8uxJHCBr9agxztUifWCyiYrjhMPBoUVBjyny0I7XH6ozDr7QQ==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} @@ -13482,8 +14095,9 @@ packages: - supports-color - ts-node - utf-8-validate + dev: true - /jest@28.1.0(@types/node@16.11.59)(ts-node@10.9.1): + /jest@28.1.0(@types/node@16.11.59): resolution: {integrity: sha512-TZR+tHxopPhzw3c3560IJXZWLNHgpcz1Zh0w5A65vynLGNcg/5pZ+VildAd7+XGOu6jd58XMY/HNn0IkZIXVXg==} engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} hasBin: true @@ -13493,9 +14107,9 @@ packages: node-notifier: optional: true dependencies: - '@jest/core': 28.1.3(ts-node@10.9.1) + '@jest/core': 28.1.3 import-local: 3.1.0 - jest-cli: 28.1.3(@types/node@16.11.59)(ts-node@10.9.1) + jest-cli: 28.1.3(@types/node@16.11.59) transitivePeerDependencies: - '@types/node' - supports-color @@ -13863,7 +14477,7 @@ packages: resolution: {integrity: sha512-3KjzNEIWhi+VoOamLvgKKUE/xqwxSw/JYqsBnfMhAWVRvRtosROtVT03wci2XbuuowCYw+/hEX1xKJIR1w5n0A==} dependencies: abortable-iterator: 3.0.2 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 err-code: 3.0.1 it-length-prefixed: 5.0.3 it-pipe: 1.1.0 @@ -13880,17 +14494,17 @@ packages: - supports-color dev: true - /libp2p-interfaces@4.0.6(node-fetch@3.3.1): + /libp2p-interfaces@4.0.6(node-fetch@3.3.2): resolution: {integrity: sha512-3KjzNEIWhi+VoOamLvgKKUE/xqwxSw/JYqsBnfMhAWVRvRtosROtVT03wci2XbuuowCYw+/hEX1xKJIR1w5n0A==} dependencies: abortable-iterator: 3.0.2 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 err-code: 3.0.1 it-length-prefixed: 5.0.3 it-pipe: 1.1.0 it-pushable: 1.4.2 libp2p-crypto: 0.21.2 - multiaddr: 10.0.1(node-fetch@3.3.1) + multiaddr: 10.0.1(node-fetch@3.3.2) multiformats: 9.9.0 p-queue: 6.6.2 peer-id: 0.16.0 @@ -13906,7 +14520,7 @@ packages: dependencies: abortable-iterator: 3.0.2 bl: 5.1.0 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 err-code: 3.0.1 it-pipe: 1.1.0 it-pushable: 1.4.2 @@ -13919,7 +14533,7 @@ packages: resolution: {integrity: sha512-kq/US2unamiyY+YwP47dO1uqpAdcbdYI2Fzi9JIEhjfPBaD1MR/uyQ/YP7ABthl3EaxAjIQYd1TVp85d6QKAtQ==} dependencies: abortable-iterator: 3.0.2 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 err-code: 3.0.1 ip-address: 8.1.0 is-loopback-addr: 1.0.1 @@ -13930,15 +14544,15 @@ packages: - supports-color dev: true - /libp2p-utils@0.4.1(node-fetch@3.3.1): + /libp2p-utils@0.4.1(node-fetch@3.3.2): resolution: {integrity: sha512-kq/US2unamiyY+YwP47dO1uqpAdcbdYI2Fzi9JIEhjfPBaD1MR/uyQ/YP7ABthl3EaxAjIQYd1TVp85d6QKAtQ==} dependencies: abortable-iterator: 3.0.2 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 err-code: 3.0.1 ip-address: 8.1.0 is-loopback-addr: 1.0.1 - multiaddr: 10.0.1(node-fetch@3.3.1) + multiaddr: 10.0.1(node-fetch@3.3.2) private-ip: 2.3.4 transitivePeerDependencies: - node-fetch @@ -13950,7 +14564,7 @@ packages: dependencies: abortable-iterator: 3.0.2 class-is: 1.1.0 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 err-code: 3.0.1 ipfs-utils: 9.0.14 it-ws: 4.0.0 @@ -13968,19 +14582,19 @@ packages: - utf-8-validate dev: true - /libp2p-websockets@0.16.2(node-fetch@3.3.1): + /libp2p-websockets@0.16.2(node-fetch@3.3.2): resolution: {integrity: sha512-QGfo8jX1Ks16yi8C67CCyMW7k9cfCYiQ0lzKVJBud0fV3ymbMO2L8gzU6iXUUZTHILo8ka26zKhwQ4lmUMI+nA==} dependencies: abortable-iterator: 3.0.2 class-is: 1.1.0 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 err-code: 3.0.1 ipfs-utils: 9.0.14 it-ws: 4.0.0 - libp2p-utils: 0.4.1(node-fetch@3.3.1) - mafmt: 10.0.0(node-fetch@3.3.1) - multiaddr: 10.0.1(node-fetch@3.3.1) - multiaddr-to-uri: 8.0.0(node-fetch@3.3.1) + libp2p-utils: 0.4.1(node-fetch@3.3.2) + mafmt: 10.0.0(node-fetch@3.3.2) + multiaddr: 10.0.1(node-fetch@3.3.2) + multiaddr-to-uri: 8.0.0(node-fetch@3.3.2) p-defer: 3.0.0 p-timeout: 4.1.0 transitivePeerDependencies: @@ -14002,7 +14616,7 @@ packages: bignumber.js: 9.1.1 class-is: 1.1.0 datastore-core: 7.0.3 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 err-code: 3.0.1 es6-promisify: 7.0.0 events: 3.3.0 @@ -14054,7 +14668,7 @@ packages: - supports-color dev: true - /libp2p@0.36.2(node-fetch@3.3.1): + /libp2p@0.36.2(node-fetch@3.3.2): resolution: {integrity: sha512-UpNYBMQVivMu56zoibdGitopv39uBBAybIBOEGWmFy/I2NnTVGUutLPrxo47AuN2kntYgo/TNJfW+PpswUgSaw==} engines: {node: '>=15.0.0'} dependencies: @@ -14065,7 +14679,7 @@ packages: bignumber.js: 9.1.1 class-is: 1.1.0 datastore-core: 7.0.3 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 err-code: 3.0.1 es6-promisify: 7.0.0 events: 3.3.0 @@ -14085,12 +14699,12 @@ packages: it-sort: 1.0.1 it-take: 1.0.2 libp2p-crypto: 0.21.2 - libp2p-interfaces: 4.0.6(node-fetch@3.3.1) - libp2p-utils: 0.4.1(node-fetch@3.3.1) - mafmt: 10.0.0(node-fetch@3.3.1) + libp2p-interfaces: 4.0.6(node-fetch@3.3.2) + libp2p-utils: 0.4.1(node-fetch@3.3.2) + mafmt: 10.0.0(node-fetch@3.3.2) merge-options: 3.0.4 mortice: 2.0.1 - multiaddr: 10.0.1(node-fetch@3.3.1) + multiaddr: 10.0.1(node-fetch@3.3.2) multiformats: 9.9.0 multistream-select: 3.0.2 mutable-proxy: 1.0.0 @@ -14203,7 +14817,6 @@ packages: /loader-runner@4.3.0: resolution: {integrity: sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==} engines: {node: '>=6.11.5'} - dev: false /loader-utils@2.0.4: resolution: {integrity: sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==} @@ -14212,7 +14825,6 @@ packages: big.js: 5.2.2 emojis-list: 3.0.0 json5: 2.2.3 - dev: false /loader-utils@3.2.1: resolution: {integrity: sha512-ZvFw1KWS3GVyYBYb7qkmRM/WwL2TQQBxgCK62rlvm4WpVQ23Nb4tYjApUlfjrEGvOs7KHEsmyUn75OHZrJMWPw==} @@ -14392,10 +15004,10 @@ packages: - supports-color dev: true - /mafmt@10.0.0(node-fetch@3.3.1): + /mafmt@10.0.0(node-fetch@3.3.2): resolution: {integrity: sha512-K1bziJOXcnepfztu+2Xy9FLKVLaFMDuspmiyJIYRxnO0WOxFSV7XKSdMxMrVZxcvg1+YjlTIvSGTImUHU2k4Aw==} dependencies: - multiaddr: 10.0.1(node-fetch@3.3.1) + multiaddr: 10.0.1(node-fetch@3.3.2) transitivePeerDependencies: - node-fetch - supports-color @@ -14406,11 +15018,24 @@ packages: dependencies: sourcemap-codec: 1.4.8 + /magic-string@0.26.7: + resolution: {integrity: sha512-hX9XH3ziStPoPhJxLq1syWuZMxbDvGNbVchfrdCtanC7D13888bMFow61x8axrx+GfHLtVeAx2kxL7tTGRl+Ow==} + engines: {node: '>=12'} + dependencies: + sourcemap-codec: 1.4.8 + dev: true + /magic-string@0.27.0: resolution: {integrity: sha512-8UnnX2PeRAPZuN12svgR9j7M1uWMovg/CEnIwIG0LFkXSJJe4PdfUGiTGl8V9bsBHFUtfVINcSyYxd7q+kx9fA==} engines: {node: '>=12'} dependencies: '@jridgewell/sourcemap-codec': 1.4.15 + + /magic-string@0.30.2: + resolution: {integrity: sha512-lNZdu7pewtq/ZvWUp9Wpf/x7WzMTsR26TWV03BRZrXFsv+BI6dy8RAiKgm1uM/kyR0rCfUcqvOlXKG66KhIGug==} + engines: {node: '>=12'} + dependencies: + '@jridgewell/sourcemap-codec': 1.4.15 dev: true /make-dir@1.3.0: @@ -14428,6 +15053,7 @@ packages: /make-error@1.3.6: resolution: {integrity: sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==} + dev: true /makeerror@1.0.12: resolution: {integrity: sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==} @@ -14459,7 +15085,6 @@ packages: hash-base: 3.1.0 inherits: 2.0.4 safe-buffer: 5.2.1 - dev: true /mdn-data@2.0.14: resolution: {integrity: sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==} @@ -14519,7 +15144,7 @@ packages: resolution: {integrity: sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==} engines: {node: '>= 0.6'} - /microbundle@0.15.1(ts-node@10.9.1): + /microbundle@0.15.1: resolution: {integrity: sha512-aAF+nwFbkSIJGfrJk+HyzmJOq3KFaimH6OIFBU6J2DPjQeg1jXIYlIyEv81Gyisb9moUkudn+wj7zLNYMOv75Q==} hasBin: true dependencies: @@ -14556,7 +15181,7 @@ packages: pretty-bytes: 5.6.0 rollup: 2.79.1 rollup-plugin-bundle-size: 1.0.3 - rollup-plugin-postcss: 4.0.2(postcss@8.4.24)(ts-node@10.9.1) + rollup-plugin-postcss: 4.0.2(postcss@8.4.24) rollup-plugin-terser: 7.0.2(rollup@2.79.1) rollup-plugin-typescript2: 0.32.1(rollup@2.79.1)(typescript@4.7.2) rollup-plugin-visualizer: 5.9.2(rollup@2.79.1) @@ -14584,7 +15209,6 @@ packages: dependencies: bn.js: 4.12.0 brorand: 1.1.0 - dev: true /mime-db@1.33.0: resolution: {integrity: sha512-BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ==} @@ -14653,7 +15277,6 @@ packages: /minimalistic-crypto-utils@1.0.1: resolution: {integrity: sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg==} - dev: true /minimatch@3.0.4: resolution: {integrity: sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==} @@ -14861,11 +15484,11 @@ packages: /ms@2.1.3: resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==} - /multiaddr-to-uri@7.0.0(node-fetch@3.3.1): + /multiaddr-to-uri@7.0.0(node-fetch@3.3.2): resolution: {integrity: sha512-VbscDpLcbV0m25tJqfnZSfbjVUuNlPa4BbD5l/7me1t0lc3SWI0XAoO5E/PNJF0e1qUlbdq7yjVFEQjUT+9r0g==} deprecated: This module is deprecated, please upgrade to @multiformats/multiaddr-to-uri dependencies: - multiaddr: 9.0.2(node-fetch@3.3.1) + multiaddr: 9.0.2(node-fetch@3.3.2) transitivePeerDependencies: - node-fetch - supports-color @@ -14881,11 +15504,11 @@ packages: - supports-color dev: true - /multiaddr-to-uri@8.0.0(node-fetch@3.3.1): + /multiaddr-to-uri@8.0.0(node-fetch@3.3.2): resolution: {integrity: sha512-dq4p/vsOOUdVEd1J1gl+R2GFrXJQH8yjLtz4hodqdVbieg39LvBOdMQRdQnfbg5LSM/q1BYNVf5CBbwZFFqBgA==} deprecated: This module is deprecated, please upgrade to @multiformats/multiaddr-to-uri dependencies: - multiaddr: 10.0.1(node-fetch@3.3.1) + multiaddr: 10.0.1(node-fetch@3.3.2) transitivePeerDependencies: - node-fetch - supports-color @@ -14906,11 +15529,11 @@ packages: - supports-color dev: true - /multiaddr@10.0.1(node-fetch@3.3.1): + /multiaddr@10.0.1(node-fetch@3.3.2): resolution: {integrity: sha512-G5upNcGzEGuTHkzxezPrrD6CaIHR9uo+7MwqhNVcXTs33IInon4y7nMiGxl2CY5hG7chvYQUQhz5V52/Qe3cbg==} deprecated: This module is deprecated, please upgrade to @multiformats/multiaddr dependencies: - dns-over-http-resolver: 1.2.3(node-fetch@3.3.1) + dns-over-http-resolver: 1.2.3(node-fetch@3.3.2) err-code: 3.0.1 is-ip: 3.1.0 multiformats: 9.9.0 @@ -14921,12 +15544,12 @@ packages: - supports-color dev: true - /multiaddr@9.0.2(node-fetch@3.3.1): + /multiaddr@9.0.2(node-fetch@3.3.2): resolution: {integrity: sha512-YFaEb9t4yXSbaGksSEdg+Kn2U02s7w4wXUgyEMQmPxFJj7CfVHY10WOsScAX/rK6Soa15S1zXYadqH9TtlVreQ==} deprecated: This module is deprecated, please upgrade to @multiformats/multiaddr dependencies: cids: 1.1.9 - dns-over-http-resolver: 1.2.3(node-fetch@3.3.1) + dns-over-http-resolver: 1.2.3(node-fetch@3.3.2) err-code: 3.0.1 is-ip: 3.1.0 multibase: 4.0.6 @@ -15048,7 +15671,7 @@ packages: dependencies: abortable-iterator: 3.0.2 bl: 5.1.0 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 err-code: 3.0.1 it-first: 1.0.7 it-handshake: 2.0.0 @@ -15117,7 +15740,7 @@ packages: engines: {node: '>=10.0.0'} dependencies: async: 3.2.4 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 default-gateway: 6.0.3 request: 2.88.2 unordered-array-remove: 1.0.2 @@ -15150,12 +15773,20 @@ packages: node-fetch: 2.6.11 dev: true - /native-fetch@3.0.0(node-fetch@3.3.1): + /native-fetch@3.0.0(node-fetch@2.6.12): + resolution: {integrity: sha512-G3Z7vx0IFb/FQ4JxvtqGABsOTIqRWvgQz6e+erkB+JJD6LrszQtMozEHI4EkmgZQvnGHrpLVzUWk7t4sJCIkVw==} + peerDependencies: + node-fetch: '*' + dependencies: + node-fetch: 2.6.12 + dev: true + + /native-fetch@3.0.0(node-fetch@3.3.2): resolution: {integrity: sha512-G3Z7vx0IFb/FQ4JxvtqGABsOTIqRWvgQz6e+erkB+JJD6LrszQtMozEHI4EkmgZQvnGHrpLVzUWk7t4sJCIkVw==} peerDependencies: node-fetch: '*' dependencies: - node-fetch: 3.3.1 + node-fetch: 3.3.2 dev: true /native-fetch@4.0.2(undici@5.22.1): @@ -15246,6 +15877,17 @@ packages: whatwg-url: 5.0.0 dev: true + /node-fetch@2.6.12: + resolution: {integrity: sha512-C/fGU2E8ToujUivIO0H+tpQ6HWo4eEmchoPIoXtxCrVghxdKq+QOHqEZW7tuP3KlV3bC8FRMO5nMCC7Zm1VP6g==} + engines: {node: 4.x || >=6.0.0} + peerDependencies: + encoding: ^0.1.0 + peerDependenciesMeta: + encoding: + optional: true + dependencies: + whatwg-url: 5.0.0 + /node-fetch@2.6.7: resolution: {integrity: sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==} engines: {node: 4.x || >=6.0.0} @@ -15258,8 +15900,8 @@ packages: whatwg-url: 5.0.0 dev: true - /node-fetch@3.3.1: - resolution: {integrity: sha512-cRVc/kyto/7E5shrWca1Wsea4y6tL9iYJE5FBCius3JQfb/4P4I295PfhgbJQBLTx6lATE4z+wK0rPM4VS2uow==} + /node-fetch@3.3.2: + resolution: {integrity: sha512-dRB78srN/l6gqWulah9SrxeYnxeddIG30+GOqK/9OlLVyLg3HPnr6SqOWTWOXKRwC2eGYCkZ59NNuSgvSrpgOA==} engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} dependencies: data-uri-to-buffer: 4.0.1 @@ -15284,9 +15926,75 @@ packages: /node-int64@0.4.0: resolution: {integrity: sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==} + /node-polyfill-webpack-plugin@2.0.1(webpack@5.88.2): + resolution: {integrity: sha512-ZUMiCnZkP1LF0Th2caY6J/eKKoA0TefpoVa68m/LQU1I/mE8rGt4fNYGgNuCcK+aG8P8P43nbeJ2RqJMOL/Y1A==} + engines: {node: '>=12'} + peerDependencies: + webpack: '>=5' + dependencies: + assert: 2.0.0 + browserify-zlib: 0.2.0 + buffer: 6.0.3 + console-browserify: 1.2.0 + constants-browserify: 1.0.0 + crypto-browserify: 3.12.0 + domain-browser: 4.22.0 + events: 3.3.0 + filter-obj: 2.0.2 + https-browserify: 1.0.0 + os-browserify: 0.3.0 + path-browserify: 1.0.1 + process: 0.11.10 + punycode: 2.3.0 + querystring-es3: 0.2.1 + readable-stream: 4.4.2 + stream-browserify: 3.0.0 + stream-http: 3.2.0 + string_decoder: 1.3.0 + timers-browserify: 2.0.12 + tty-browserify: 0.0.1 + type-fest: 2.19.0 + url: 0.11.1 + util: 0.12.5 + vm-browserify: 1.1.2 + webpack: 5.88.2 + dev: true + /node-releases@2.0.12: resolution: {integrity: sha512-QzsYKWhXTWx8h1kIvqfnC++o0pEmpRQA/aenALsL2F4pqNVr7YzcdMlDij5WBnwftRbJCNJL/O7zdKaxKPHqgQ==} + /node-stdlib-browser@1.2.0: + resolution: {integrity: sha512-VSjFxUhRhkyed8AtLwSCkMrJRfQ3e2lGtG3sP6FEgaLKBBbxM/dLfjRe1+iLhjvyLFW3tBQ8+c0pcOtXGbAZJg==} + engines: {node: '>=10'} + dependencies: + assert: 2.0.0 + browser-resolve: 2.0.0 + browserify-zlib: 0.2.0 + buffer: 5.7.1 + console-browserify: 1.2.0 + constants-browserify: 1.0.0 + create-require: 1.1.1 + crypto-browserify: 3.12.0 + domain-browser: 4.22.0 + events: 3.3.0 + https-browserify: 1.0.0 + isomorphic-timers-promises: 1.0.1 + os-browserify: 0.3.0 + path-browserify: 1.0.1 + pkg-dir: 5.0.0 + process: 0.11.10 + punycode: 1.4.1 + querystring-es3: 0.2.1 + readable-stream: 3.6.2 + stream-browserify: 3.0.0 + stream-http: 3.2.0 + string_decoder: 1.3.0 + timers-browserify: 2.0.12 + tty-browserify: 0.0.1 + url: 0.11.1 + util: 0.12.5 + vm-browserify: 1.1.2 + /nofilter@3.1.0: resolution: {integrity: sha512-l2NNj07e9afPnhAhvgVrCD/oy2Ai1yfLpuo3EpiO1jFTsB4sFz6oIfAfSZyQzVpkZQ9xS8ZS5g1jCBgq4Hwo0g==} engines: {node: '>=12.19'} @@ -15371,7 +16079,6 @@ packages: dependencies: call-bind: 1.0.2 define-properties: 1.2.0 - dev: false /object-keys@1.1.1: resolution: {integrity: sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==} @@ -15559,6 +16266,9 @@ packages: resolution: {integrity: sha512-cMddMgb2QElm8G7vdaa02jhUNbTSrhsgAGUz1OokD83uJTwSUn+nKoNoKVVaRa08yF6sgfO7Maou1+bgLd9rdQ==} dev: true + /os-browserify@0.3.0: + resolution: {integrity: sha512-gjcpUc3clBf9+210TRaDWbf+rZZZEshZ+DlXMRCeAjp0xhTrnQsKHypIy1J3d5hKdUzj69t708EHtU8P6bUn0A==} + /os-tmpdir@1.0.2: resolution: {integrity: sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==} engines: {node: '>=0.10.0'} @@ -15788,7 +16498,6 @@ packages: evp_bytestokey: 1.0.3 pbkdf2: 3.1.2 safe-buffer: 5.2.1 - dev: true /parse-cache-control@1.0.1: resolution: {integrity: sha512-60zvsJReQPX5/QP0Kzfd/VrpjScIQ7SHBW6bFCYfEP+fp0Eppr1SHhIO5nd1PjZtvclzSzES9D/p5nFJurwfWg==} @@ -15891,7 +16600,6 @@ packages: ripemd160: 2.0.2 safe-buffer: 5.2.1 sha.js: 2.4.11 - dev: true /peer-id@0.15.4: resolution: {integrity: sha512-MDoBIMZYwQIAHaZQUwsIcvoFgdbIl5GtZMwSkXpIYvc5v0TSDv+u8WsTKrKt2Vv28tHFFDJQdVzu3T4qTPzK+w==} @@ -16012,6 +16720,12 @@ packages: dependencies: find-up: 4.1.0 + /pkg-dir@5.0.0: + resolution: {integrity: sha512-NPE8TDbzl/3YQYY7CSS228s3g2ollTFnc+Qi3tqmqJp9Vg2ovUpixcJEo2HJScN2Ez+kEaal6y70c0ehqJBJeA==} + engines: {node: '>=10'} + dependencies: + find-up: 5.0.0 + /pkg-types@1.0.3: resolution: {integrity: sha512-nN7pYi0AQqJnoLPC9eHFQ8AcyaixBUOwvqc5TDnIKCMEE6I0y8P7OKA7fPexsXGCGxQDl/cmrLAp26LhcwxZ4A==} dependencies: @@ -16322,7 +17036,7 @@ packages: postcss-value-parser: 4.2.0 dev: false - /postcss-load-config@3.1.4(postcss@8.4.24)(ts-node@10.9.1): + /postcss-load-config@3.1.4(postcss@8.4.24): resolution: {integrity: sha512-6DiM4E7v4coTE4uzA8U//WhtPwyhiim3eyjEMFCnUpzbrkK9wJHgKDT2mR+HbtSrd/NubVaYTOpSpjUl8NQeRg==} engines: {node: '>= 10'} peerDependencies: @@ -16336,11 +17050,10 @@ packages: dependencies: lilconfig: 2.1.0 postcss: 8.4.24 - ts-node: 10.9.1(@types/node@18.13.0)(typescript@4.7.2) yaml: 1.10.2 dev: true - /postcss-load-config@4.0.1(postcss@8.4.24)(ts-node@10.9.1): + /postcss-load-config@4.0.1(postcss@8.4.24): resolution: {integrity: sha512-vEJIc8RdiBRu3oRAI0ymerOn+7rPuMvRXslTvZUKZonDHFIczxztIyJ1urxM1x9JXEikvpWWTUUqal5j/8QgvA==} engines: {node: '>= 14'} peerDependencies: @@ -16354,7 +17067,6 @@ packages: dependencies: lilconfig: 2.1.0 postcss: 8.4.24 - ts-node: 10.9.1(@types/node@18.13.0)(typescript@4.7.2) yaml: 2.3.1 dev: false @@ -16954,7 +17666,7 @@ packages: '@protobufjs/pool': 1.1.0 '@protobufjs/utf8': 1.1.0 '@types/long': 4.0.2 - '@types/node': 18.13.0 + '@types/node': 20.4.5 long: 4.0.0 dev: true @@ -16973,7 +17685,7 @@ packages: '@protobufjs/path': 1.1.2 '@protobufjs/pool': 1.1.0 '@protobufjs/utf8': 1.1.0 - '@types/node': 18.13.0 + '@types/node': 20.4.5 long: 5.2.3 /protons-runtime@4.0.2(uint8arraylist@2.4.3): @@ -17019,7 +17731,6 @@ packages: parse-asn1: 5.1.6 randombytes: 2.1.0 safe-buffer: 5.2.1 - dev: true /pump@3.0.0: resolution: {integrity: sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==} @@ -17030,7 +17741,6 @@ packages: /punycode@1.4.1: resolution: {integrity: sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==} - dev: false /punycode@2.1.0: resolution: {integrity: sha512-Yxz2kRwT90aPiWEMHVYnEf4+rhwF1tBmmZ4KepCP+Wkium9JxtWnUm1nqGwpiAHr/tnTSeHqr3wb++jgSkXjhA==} @@ -17052,7 +17762,7 @@ packages: dependencies: chromium-bidi: 0.4.4(devtools-protocol@0.0.1094867) cross-fetch: 3.1.5 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 devtools-protocol: 0.0.1094867 extract-zip: 2.0.1 https-proxy-agent: 5.0.1 @@ -17103,7 +17813,6 @@ packages: engines: {node: '>=0.6'} dependencies: side-channel: 1.0.4 - dev: true /qs@6.5.3: resolution: {integrity: sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==} @@ -17129,6 +17838,10 @@ packages: strict-uri-encode: 2.0.0 dev: true + /querystring-es3@0.2.1: + resolution: {integrity: sha512-773xhDQnZBMFobEiztv8LIl70ch5MSF/jUQVlhwFyBILqq96anmoctVIYz+ZRp0qbCKATTn6ev02M3r7Ga5vqA==} + engines: {node: '>=0.4.x'} + /querystringify@2.2.0: resolution: {integrity: sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==} @@ -17288,7 +18001,7 @@ packages: engines: {node: '>=0.10.0'} dev: false - /react-scripts@5.0.1(@babel/plugin-syntax-flow@7.22.5)(@babel/plugin-transform-react-jsx@7.22.5)(eslint@8.43.0)(react@18.2.0)(ts-node@10.9.1)(typescript@4.9.5): + /react-scripts@5.0.1(@babel/plugin-syntax-flow@7.22.5)(@babel/plugin-transform-react-jsx@7.22.5)(eslint@8.43.0)(react@18.2.0)(typescript@4.9.5): resolution: {integrity: sha512-8VAmEm/ZAwQzJ+GOMLbBsTdDKOpuZh7RPs0UymvBR2vRk4iZWCskjbFnxqjrzoIvlNNRZ3QJFx6/qDSi6zSnaQ==} engines: {node: '>=14.0.0'} hasBin: true @@ -17322,7 +18035,7 @@ packages: fs-extra: 10.1.0 html-webpack-plugin: 5.5.3(webpack@5.87.0) identity-obj-proxy: 3.0.0 - jest: 27.5.1(ts-node@10.9.1) + jest: 27.5.1 jest-resolve: 27.5.1 jest-watch-typeahead: 1.1.0(jest@27.5.1) mini-css-extract-plugin: 2.7.6(webpack@5.87.0) @@ -17342,7 +18055,7 @@ packages: semver: 7.5.2 source-map-loader: 3.0.2(webpack@5.87.0) style-loader: 3.3.3(webpack@5.87.0) - tailwindcss: 3.3.2(ts-node@10.9.1) + tailwindcss: 3.3.2 terser-webpack-plugin: 5.3.9(webpack@5.87.0) typescript: 4.9.5 webpack: 5.87.0 @@ -17417,6 +18130,17 @@ packages: string_decoder: 1.3.0 util-deprecate: 1.0.2 + /readable-stream@4.4.2: + resolution: {integrity: sha512-Lk/fICSyIhodxy1IDK2HazkeGjSmezAWX2egdtJnYhtzKEsBPJowlI6F6LPb5tqIQILrMbx22S5o3GuJavPusA==} + engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + dependencies: + abort-controller: 3.0.0 + buffer: 6.0.3 + events: 3.3.0 + process: 0.11.10 + string_decoder: 1.3.0 + dev: true + /readdirp@3.2.0: resolution: {integrity: sha512-crk4Qu3pmXwgxdSgGhgA/eXiJAPQiX4GMOZZMXnqKxHX7TaoL+3gQVo/WeuAiogr07DpnfjIMpXXa+PAIvwPGQ==} engines: {node: '>= 8'} @@ -17640,6 +18364,10 @@ packages: resolution: {integrity: sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==} engines: {node: '>=8'} + /resolve-pkg-maps@1.0.0: + resolution: {integrity: sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==} + dev: true + /resolve-url-loader@4.0.0: resolution: {integrity: sha512-05VEMczVREcbtT7Bz+C+96eUO5HDNvdthIiMB34t7FcF8ehcu4wC0sSgPUubs3XW2Q3CNLJk/BJrCU9wVRymiA==} engines: {node: '>=8.9'} @@ -17743,7 +18471,6 @@ packages: dependencies: hash-base: 3.1.0 inherits: 2.0.4 - dev: true /rlp@2.2.7: resolution: {integrity: sha512-d5gdPmgQ0Z+AklL2NVXr/IoSjNZFfTVvQWzL/AM2AOcSzYP2xjlb0AC8YyCLc41MSNf6P6QVtjgPdmVtzb+4lQ==} @@ -17759,7 +18486,34 @@ packages: maxmin: 2.1.0 dev: true - /rollup-plugin-postcss@4.0.2(postcss@8.4.24)(ts-node@10.9.1): + /rollup-plugin-cjs-es@2.0.0(rollup@3.25.1): + resolution: {integrity: sha512-ks9SqJEC5iBY5x1DpC7H1ckLMwQQFDauFXVirH8IhC+HfkQ7dhT7ukRGiUKFNBC9+lTB8Ge4ZnJD30wSue5+OQ==} + engines: {node: '>= 7.10'} + peerDependencies: + rollup: ^3.2.2 + dependencies: + '@rollup/pluginutils': 5.0.2(rollup@3.25.1) + cjs-es: 0.9.2 + es-info: 0.4.0 + rollup: 3.25.1 + dev: true + + /rollup-plugin-inject@3.0.2: + resolution: {integrity: sha512-ptg9PQwzs3orn4jkgXJ74bfs5vYz1NCZlSQMBUA0wKcGp5i5pA1AO3fOUEte8enhGUC+iapTCzEWw2jEFFUO/w==} + deprecated: This package has been deprecated and is no longer maintained. Please use @rollup/plugin-inject. + dependencies: + estree-walker: 0.6.1 + magic-string: 0.25.9 + rollup-pluginutils: 2.8.2 + dev: true + + /rollup-plugin-node-polyfills@0.2.1: + resolution: {integrity: sha512-4kCrKPTJ6sK4/gLL/U5QzVT8cxJcofO0OU74tnB19F40cmuAKSzH5/siithxlofFEjwvw1YAhPmbvGNA6jEroA==} + dependencies: + rollup-plugin-inject: 3.0.2 + dev: true + + /rollup-plugin-postcss@4.0.2(postcss@8.4.24): resolution: {integrity: sha512-05EaY6zvZdmvPUDi3uCcAQoESDcYnv8ogJJQRp6V5kZ6J6P7uAVJlrTZcaaA20wTH527YTnKfkAoPxWI/jPp4w==} engines: {node: '>=10'} peerDependencies: @@ -17772,7 +18526,7 @@ packages: p-queue: 6.6.2 pify: 5.0.0 postcss: 8.4.24 - postcss-load-config: 3.1.4(postcss@8.4.24)(ts-node@10.9.1) + postcss-load-config: 3.1.4(postcss@8.4.24) postcss-modules: 4.3.1(postcss@8.4.24) promise.series: 0.2.0 resolve: 1.22.2 @@ -17846,7 +18600,6 @@ packages: hasBin: true optionalDependencies: fsevents: 2.3.2 - dev: true /run-async@3.0.0: resolution: {integrity: sha512-540WwVDOMxA6dN6We19EcT9sc3hkXPw5mzRNGM3FkdN/vtE9NFvj5lFAPNwUDmJjXidm3v7TC1cTE7t17Ulm1Q==} @@ -18017,7 +18770,6 @@ packages: '@types/json-schema': 7.0.12 ajv: 6.12.6 ajv-keywords: 3.5.2(ajv@6.12.6) - dev: false /schema-utils@4.2.0: resolution: {integrity: sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==} @@ -18120,7 +18872,6 @@ packages: resolution: {integrity: sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==} dependencies: randombytes: 2.1.0 - dev: false /serve-handler@6.1.5: resolution: {integrity: sha512-ijPFle6Hwe8zfmBxJdE+5fta53fdIY0lHISJvuikXB3VYFafRjMRpOffSPvCYsbKyBA7pvy9oYr/BT1O3EArlg==} @@ -18187,7 +18938,6 @@ packages: /setimmediate@1.0.5: resolution: {integrity: sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==} - dev: true /setprototypeof@1.1.0: resolution: {integrity: sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==} @@ -18202,7 +18952,6 @@ packages: dependencies: inherits: 2.0.4 safe-buffer: 5.2.1 - dev: true /sha1@1.1.1: resolution: {integrity: sha512-dZBS6OrMjtgVkopB1Gmo4RQCDKiZsqcpAQpkV/aaj+FCrCg8r4I4qMkDPQjBgLIxlmu9k4nUbWq6ohXahOneYA==} @@ -18365,7 +19114,6 @@ packages: /source-list-map@2.0.1: resolution: {integrity: sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==} - dev: false /source-map-js@1.0.2: resolution: {integrity: sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==} @@ -18427,7 +19175,7 @@ packages: /spdy-transport@3.0.0: resolution: {integrity: sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==} dependencies: - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 detect-node: 2.1.0 hpack.js: 2.1.6 obuf: 1.1.2 @@ -18441,7 +19189,7 @@ packages: resolution: {integrity: sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==} engines: {node: '>=6.0.0'} dependencies: - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 handle-thing: 2.0.1 http-deceiver: 1.2.7 select-hose: 2.0.0 @@ -18532,6 +19280,20 @@ packages: internal-slot: 1.0.5 dev: false + /stream-browserify@3.0.0: + resolution: {integrity: sha512-H73RAHsVBapbim0tU2JwwOiXUj+fikfiaoYAKHF3VJfA0pe2BCzkhAHBlLG6REzE+2WNZcxOXjK7lkso+9euLA==} + dependencies: + inherits: 2.0.4 + readable-stream: 3.6.2 + + /stream-http@3.2.0: + resolution: {integrity: sha512-Oq1bLqisTyK3TSCXpPbT4sdeYNdmyZJv1LxpEm2vu1ZhK89kSE5YXwZc3cWk0MagGaKriBh9mCFbVGtO+vY29A==} + dependencies: + builtin-status-codes: 3.0.0 + inherits: 2.0.4 + readable-stream: 3.6.2 + xtend: 4.0.2 + /stream-shift@1.0.1: resolution: {integrity: sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==} dev: true @@ -18952,7 +19714,7 @@ packages: strip-ansi: 6.0.1 dev: true - /tailwindcss@3.3.2(ts-node@10.9.1): + /tailwindcss@3.3.2: resolution: {integrity: sha512-9jPkMiIBXvPc2KywkraqsUfbfj+dHDb+JPWtSJa9MLFdrPyazI7q6WX2sUrm7R9eVR7qqv3Pas7EvQFzxKnI6w==} engines: {node: '>=14.0.0'} hasBin: true @@ -18974,7 +19736,7 @@ packages: postcss: 8.4.24 postcss-import: 15.1.0(postcss@8.4.24) postcss-js: 4.0.1(postcss@8.4.24) - postcss-load-config: 4.0.1(postcss@8.4.24)(ts-node@10.9.1) + postcss-load-config: 4.0.1(postcss@8.4.24) postcss-nested: 6.0.1(postcss@8.4.24) postcss-selector-parser: 6.0.13 postcss-value-parser: 4.2.0 @@ -18992,7 +19754,6 @@ packages: /tapable@2.2.1: resolution: {integrity: sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==} engines: {node: '>=6'} - dev: false /tar-fs@2.1.1: resolution: {integrity: sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==} @@ -19085,6 +19846,29 @@ packages: webpack: 5.87.0 dev: false + /terser-webpack-plugin@5.3.9(webpack@5.88.2): + resolution: {integrity: sha512-ZuXsqE07EcggTWQjXUj+Aot/OMcD0bMKGgF63f7UxYcu5/AJF53aIpK1YoP5xR9l6s/Hy2b+t1AM0bLNPRuhwA==} + engines: {node: '>= 10.13.0'} + peerDependencies: + '@swc/core': '*' + esbuild: '*' + uglify-js: '*' + webpack: ^5.1.0 + peerDependenciesMeta: + '@swc/core': + optional: true + esbuild: + optional: true + uglify-js: + optional: true + dependencies: + '@jridgewell/trace-mapping': 0.3.18 + jest-worker: 27.5.1 + schema-utils: 3.3.0 + serialize-javascript: 6.0.1 + terser: 5.18.1 + webpack: 5.88.2 + /terser@5.18.1: resolution: {integrity: sha512-j1n0Ao919h/Ai5r43VAnfV/7azUYW43GPxK7qSATzrsERfW7+y2QW9Cp9ufnRF5CQUWbnLSo7UJokSWCqg4tsQ==} engines: {node: '>=10'} @@ -19147,7 +19931,7 @@ packages: resolution: {integrity: sha512-Mx5NBSHX3sQYR6iI9VYbgHKBLisyB+xROCBGjjWm1O9wb9vfLxdaGtmT/KCjUqMsSNW6nERzCW3T6H43LqjDZQ==} dependencies: callsites: 3.1.0 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 is-observable: 2.1.0 observable-fns: 0.6.1 optionalDependencies: @@ -19183,6 +19967,12 @@ packages: dependencies: retimer: 3.0.0 + /timers-browserify@2.0.12: + resolution: {integrity: sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==} + engines: {node: '>=0.6.0'} + dependencies: + setimmediate: 1.0.5 + /tiny-glob@0.2.9: resolution: {integrity: sha512-g/55ssRPUjShh+xkfx9UPDXqhckHEsHr4Vd9zX55oSdGZc/MD0m3sferOkwWtp98bv+kcVfEHtRJgBVJzelrzg==} dependencies: @@ -19263,7 +20053,6 @@ packages: /tr46@0.0.3: resolution: {integrity: sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==} - dev: true /tr46@1.0.1: resolution: {integrity: sha512-dTpowEjclQ7Kgx5SdBkqRzVhERQXov8/l9Ft9dVM9fmg0W0KQSVaXX9T4i6twCPNtYiZM53lpSSUAwJbFPOHxA==} @@ -19315,6 +20104,40 @@ packages: resolution: {integrity: sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==} dev: false + /ts-jest@27.1.5(@babel/core@7.22.5)(jest@27.5.1)(typescript@4.7.2): + resolution: {integrity: sha512-Xv6jBQPoBEvBq/5i2TeSG9tt/nqkbpcurrEG1b+2yfBrcJelOZF9Ml6dmyMh7bcW9JyFbRYpR5rxROSlBLTZHA==} + engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} + hasBin: true + peerDependencies: + '@babel/core': '>=7.0.0-beta.0 <8' + '@types/jest': ^27.0.0 + babel-jest: '>=27.0.0 <28' + esbuild: '*' + jest: ^27.0.0 + typescript: '>=3.8 <5.0' + peerDependenciesMeta: + '@babel/core': + optional: true + '@types/jest': + optional: true + babel-jest: + optional: true + esbuild: + optional: true + dependencies: + '@babel/core': 7.22.5 + bs-logger: 0.2.6 + fast-json-stable-stringify: 2.1.0 + jest: 27.5.1(ts-node@10.9.1) + jest-util: 27.5.1 + json5: 2.2.3 + lodash.memoize: 4.1.2 + make-error: 1.3.6 + semver: 7.5.2 + typescript: 4.7.2 + yargs-parser: 20.2.9 + dev: true + /ts-jest@27.1.5(jest@27.5.1)(typescript@4.7.2): resolution: {integrity: sha512-Xv6jBQPoBEvBq/5i2TeSG9tt/nqkbpcurrEG1b+2yfBrcJelOZF9Ml6dmyMh7bcW9JyFbRYpR5rxROSlBLTZHA==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} @@ -19373,7 +20196,7 @@ packages: '@types/jest': 28.1.0 bs-logger: 0.2.6 fast-json-stable-stringify: 2.1.0 - jest: 28.1.0(@types/node@16.11.59)(ts-node@10.9.1) + jest: 28.1.0(@types/node@16.11.59) jest-util: 28.1.3 json5: 2.2.3 lodash.memoize: 4.1.2 @@ -19383,6 +20206,21 @@ packages: yargs-parser: 20.2.9 dev: true + /ts-loader@9.4.4(typescript@4.7.2)(webpack@5.88.2): + resolution: {integrity: sha512-MLukxDHBl8OJ5Dk3y69IsKVFRA/6MwzEqBgh+OXMPB/OD01KQuWPFd1WAQP8a5PeSCAxfnkhiuWqfmFJzJQt9w==} + engines: {node: '>=12.0.0'} + peerDependencies: + typescript: '*' + webpack: ^5.0.0 + dependencies: + chalk: 4.1.2 + enhanced-resolve: 5.15.0 + micromatch: 4.0.5 + semver: 7.5.2 + typescript: 4.7.2 + webpack: 5.88.2 + dev: true + /ts-node@10.9.1(@types/node@18.13.0)(typescript@4.7.2): resolution: {integrity: sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==} hasBin: true @@ -19412,6 +20250,38 @@ packages: typescript: 4.7.2 v8-compile-cache-lib: 3.0.1 yn: 3.1.1 + dev: true + + /ts-node@10.9.1(@types/node@20.4.5)(typescript@4.7.2): + resolution: {integrity: sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==} + hasBin: true + peerDependencies: + '@swc/core': '>=1.2.50' + '@swc/wasm': '>=1.2.50' + '@types/node': '*' + typescript: '>=2.7' + peerDependenciesMeta: + '@swc/core': + optional: true + '@swc/wasm': + optional: true + dependencies: + '@cspotcode/source-map-support': 0.8.1 + '@tsconfig/node10': 1.0.9 + '@tsconfig/node12': 1.0.11 + '@tsconfig/node14': 1.0.3 + '@tsconfig/node16': 1.0.4 + '@types/node': 20.4.5 + acorn: 8.9.0 + acorn-walk: 8.2.0 + arg: 4.1.3 + create-require: 1.1.1 + diff: 4.0.2 + make-error: 1.3.6 + typescript: 4.7.2 + v8-compile-cache-lib: 3.0.1 + yn: 3.1.1 + dev: true /ts-pattern@3.3.3: resolution: {integrity: sha512-Z5EFi6g6wyX3uDFHqxF5W5c5h663oZg9O6aOiAT7fqNu0HPSfCxtHzrQ7SblTy738Mrg2Ezorky8H5aUOm8Pvg==} @@ -19458,6 +20328,9 @@ packages: typescript: 4.9.5 dev: false + /tty-browserify@0.0.1: + resolution: {integrity: sha512-C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw==} + /tunnel-agent@0.6.0: resolution: {integrity: sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==} dependencies: @@ -19512,6 +20385,11 @@ packages: engines: {node: '>=8'} dev: true + /type-fest@2.19.0: + resolution: {integrity: sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==} + engines: {node: '>=12.20'} + dev: true + /type-is@1.6.18: resolution: {integrity: sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==} engines: {node: '>= 0.6'} @@ -19534,7 +20412,7 @@ packages: typescript: '>=4.3.0' dependencies: '@types/prettier': 2.7.3 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 fs-extra: 7.0.1 glob: 7.1.7 js-sha3: 0.8.0 @@ -19568,6 +20446,7 @@ packages: resolution: {integrity: sha512-Mamb1iX2FDUpcTRzltPxgWMKy3fhg0TN378ylbktPGPK/99KbDtMQ4W1hwgsbPAsG3a0xKa1vmw4VKZQbkvz5A==} engines: {node: '>=4.2.0'} hasBin: true + dev: true /typescript@4.9.5: resolution: {integrity: sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==} @@ -19575,6 +20454,12 @@ packages: hasBin: true dev: false + /typescript@5.1.6: + resolution: {integrity: sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA==} + engines: {node: '>=14.17'} + hasBin: true + dev: true + /typical@4.0.0: resolution: {integrity: sha512-VAH4IvQ7BDFYglMd7BPRDfLgxZZX4O4TFcRDA6EN5X7erNJJq+McIEp8np9aVtxrCJ6qx4GTYVfOWNjcqwZgRw==} engines: {node: '>=8'} @@ -19629,7 +20514,7 @@ packages: resolution: {integrity: sha512-b+aKlI2oTnxnfeSQWV1sMacqSNxqhtXySaH6bflvONGxF8V/fT3ZlYH7z2qgGfydsvpVo4JUgM/Ylyfl2YouCg==} engines: {node: '>=16.0.0', npm: '>=7.0.0'} dependencies: - multiformats: 11.0.1 + multiformats: 11.0.2 /ultron@1.1.1: resolution: {integrity: sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==} @@ -19755,6 +20640,12 @@ packages: resolution: {integrity: sha512-3AChu4NiXquPfeckE5R5cGdiHCMWJx1dwCWOmWIL4KHAziJNOFIYJlpGFeKDvwLPHovZRCxK3cYlwzqI9Vp+Gg==} dev: true + /url@0.11.1: + resolution: {integrity: sha512-rWS3H04/+mzzJkv0eZ7vEDGiQbgquI1fGfOad6zKvgYQi1SzMmhl7c/DdRGxhaWrVH6z0qWITo8rpnxK/RfEhA==} + dependencies: + punycode: 1.4.1 + qs: 6.11.2 + /ursa-optional@0.10.2: resolution: {integrity: sha512-TKdwuLboBn7M34RcvVTuQyhvrA8gYKapuVdm0nBP0mnBc7oECOfUQZrY91cefL3/nm64ZyrejSRrhTVdX7NG/A==} engines: {node: '>=4'} @@ -19799,7 +20690,6 @@ packages: is-generator-function: 1.0.10 is-typed-array: 1.1.10 which-typed-array: 1.1.9 - dev: true /utila@0.4.0: resolution: {integrity: sha512-Z0DbgELS9/L/75wZbro8xAnT50pBVFQZ+hUEueGDU5FN51YSCYM+jdxsfCiHjwNP/4LCDD0i/graKpeBnOXKRA==} @@ -19837,6 +20727,7 @@ packages: /v8-compile-cache-lib@3.0.1: resolution: {integrity: sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==} + dev: true /v8-to-istanbul@8.1.1: resolution: {integrity: sha512-FGtKtv3xIpR6BYhvgH8MI/y78oT7d8Au3ww4QIxymrCtZEh5b8gCw2siywE+puhEmuWKDtmfrvF5UlB298ut3w==} @@ -19875,17 +20766,17 @@ packages: extsprintf: 1.3.0 dev: true - /vite-node@0.29.7(@types/node@18.13.0): + /vite-node@0.29.7(@types/node@20.4.5): resolution: {integrity: sha512-PakCZLvz37yFfUPWBnLa1OYHPCGm5v4pmRrTcFN4V/N/T3I6tyP3z07S//9w+DdeL7vVd0VSeyMZuAh+449ZWw==} engines: {node: '>=v14.16.0'} hasBin: true dependencies: cac: 6.7.14 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 mlly: 1.3.0 pathe: 1.1.1 picocolors: 1.0.0 - vite: 4.0.4(@types/node@18.13.0) + vite: 4.0.4(@types/node@20.4.5) transitivePeerDependencies: - '@types/node' - less @@ -19896,20 +20787,80 @@ packages: - terser dev: true + /vite-plugin-commonjs@0.8.2: + resolution: {integrity: sha512-UJlvuioutS7Tno3p3Dqxkr0G4xXt8ILYsJzOiyvFlEsyAxFRofsBGHN/Sl15q0Y4vtvvC7+QZCc6GuUxOM6Cmg==} + dependencies: + acorn: 8.9.0 + fast-glob: 3.2.12 + magic-string: 0.30.2 + vite-plugin-dynamic-import: 1.5.0 + dev: true + + /vite-plugin-dynamic-import@1.5.0: + resolution: {integrity: sha512-Qp85c+AVJmLa8MLni74U4BDiWpUeFNx7NJqbGZyR2XJOU7mgW0cb7nwlAMucFyM4arEd92Nfxp4j44xPi6Fu7g==} + dependencies: + acorn: 8.9.0 + es-module-lexer: 1.3.0 + fast-glob: 3.2.12 + magic-string: 0.30.2 + dev: true + + /vite-plugin-external@1.2.8: + resolution: {integrity: sha512-w5xDuYoXPd7rPC6OVuee63Y4HSYeOuIFlEYyP6PWTE+o5MKF4qFH79RiLmpdopPxNmTGjQvlUes+UY1MVU+BMA==} + dependencies: + fs-extra: 10.1.0 + dev: true + + /vite-plugin-externals@0.6.2(vite@4.0.4): + resolution: {integrity: sha512-R5oVY8xDJjLXLTs2XDYzvYbc/RTZuIwOx2xcFbYf+/VXB6eJuatDgt8jzQ7kZ+IrgwQhe6tU8U2fTyy72C25CQ==} + engines: {node: ^14.18.0 || >=16.0.0} + peerDependencies: + vite: '>=2.0.0' + dependencies: + acorn: 8.9.0 + es-module-lexer: 0.4.1 + fs-extra: 10.1.0 + magic-string: 0.25.9 + vite: 4.0.4 + dev: true + + /vite-plugin-node-polyfills@0.9.0(vite@4.0.4): + resolution: {integrity: sha512-+i+WPUuIBhJy+ODfxx6S6FTl28URCxUszbl/IL4GwrZvbqqY/8VDIp+zpjMS8Us/a7GwN4Iaqr/fVIBtkNQojQ==} + peerDependencies: + vite: ^2.0.0 || ^3.0.0 || ^4.0.0 + dependencies: + '@rollup/plugin-inject': 5.0.3 + node-stdlib-browser: 1.2.0 + vite: 4.0.4(@types/node@16.11.59) + transitivePeerDependencies: + - rollup + dev: false + /vite-plugin-replace@0.1.1(vite@4.0.4): resolution: {integrity: sha512-v+okl3JNt2pf1jDYijw+WPVt6h9FWa/atTi+qnSFBqmKThLTDhlesx0r3bh+oFPmxRJmis5tNx9HtN6lGFoqWg==} peerDependencies: vite: ^2 dependencies: - vite: 4.0.4(@types/node@16.11.59) + vite: 4.0.4 dev: true + /vite-plugin-require-transform@1.0.21: + resolution: {integrity: sha512-A3SrHhVg9tCW35O7E8kcuB71YTEdVd3EaM1zh6gbH4zxy4WzXSfcNf0UiWmaHHhr6wdFhiiAGdpR6S0SUxXkGQ==} + dependencies: + '@babel/generator': 7.22.5 + '@babel/parser': 7.22.5 + '@babel/traverse': 7.22.5 + '@babel/types': 7.22.5 + transitivePeerDependencies: + - supports-color + dev: false + /vite-tsconfig-paths@4.0.3(typescript@4.7.2)(vite@4.0.4): resolution: {integrity: sha512-gRO2Q/tOkV+9kMht5tz90+IaEKvW2zCnvwJV3tp2ruPNZOTM5rF+yXorJT4ggmAMYEaJ3nyXjx5P5jY5FwiZ+A==} peerDependencies: vite: '>2.0.0-0' dependencies: - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 globrex: 0.1.2 tsconfck: 2.1.1(typescript@4.7.2) vite: 4.0.4(@types/node@16.11.59) @@ -19918,6 +20869,39 @@ packages: - typescript dev: true + /vite@4.0.4: + resolution: {integrity: sha512-xevPU7M8FU0i/80DMR+YhgrzR5KS2ORy1B4xcX/cXLsvnUWvfHuqMmVU6N0YiJ4JWGRJJsLCgjEzKjG9/GKoSw==} + engines: {node: ^14.18.0 || >=16.0.0} + hasBin: true + peerDependencies: + '@types/node': '>= 14' + less: '*' + sass: '*' + stylus: '*' + sugarss: '*' + terser: ^5.4.0 + peerDependenciesMeta: + '@types/node': + optional: true + less: + optional: true + sass: + optional: true + stylus: + optional: true + sugarss: + optional: true + terser: + optional: true + dependencies: + esbuild: 0.16.17 + postcss: 8.4.24 + resolve: 1.22.2 + rollup: 3.25.1 + optionalDependencies: + fsevents: 2.3.2 + dev: true + /vite@4.0.4(@types/node@16.11.59): resolution: {integrity: sha512-xevPU7M8FU0i/80DMR+YhgrzR5KS2ORy1B4xcX/cXLsvnUWvfHuqMmVU6N0YiJ4JWGRJJsLCgjEzKjG9/GKoSw==} engines: {node: ^14.18.0 || >=16.0.0} @@ -19950,9 +20934,8 @@ packages: rollup: 3.25.1 optionalDependencies: fsevents: 2.3.2 - dev: true - /vite@4.0.4(@types/node@18.13.0): + /vite@4.0.4(@types/node@20.4.5): resolution: {integrity: sha512-xevPU7M8FU0i/80DMR+YhgrzR5KS2ORy1B4xcX/cXLsvnUWvfHuqMmVU6N0YiJ4JWGRJJsLCgjEzKjG9/GKoSw==} engines: {node: ^14.18.0 || >=16.0.0} hasBin: true @@ -19977,7 +20960,7 @@ packages: terser: optional: true dependencies: - '@types/node': 18.13.0 + '@types/node': 20.4.5 esbuild: 0.16.17 postcss: 8.4.24 resolve: 1.22.2 @@ -20016,7 +20999,7 @@ packages: dependencies: '@types/chai': 4.3.5 '@types/chai-subset': 1.3.3 - '@types/node': 18.13.0 + '@types/node': 20.4.5 '@vitest/expect': 0.29.7 '@vitest/runner': 0.29.7 '@vitest/spy': 0.29.7 @@ -20025,7 +21008,7 @@ packages: acorn-walk: 8.2.0 cac: 6.7.14 chai: 4.3.7 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 local-pkg: 0.4.3 pathe: 1.1.1 picocolors: 1.0.0 @@ -20035,8 +21018,8 @@ packages: tinybench: 2.5.0 tinypool: 0.4.0 tinyspy: 1.1.1 - vite: 4.0.4(@types/node@18.13.0) - vite-node: 0.29.7(@types/node@18.13.0) + vite: 4.0.4(@types/node@20.4.5) + vite-node: 0.29.7(@types/node@20.4.5) why-is-node-running: 2.2.2 transitivePeerDependencies: - less @@ -20047,6 +21030,9 @@ packages: - terser dev: true + /vm-browserify@1.1.2: + resolution: {integrity: sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==} + /w3c-hr-time@1.0.2: resolution: {integrity: sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==} deprecated: Use your platform's native performance.now() and performance.timeOrigin. @@ -20070,7 +21056,6 @@ packages: dependencies: glob-to-regexp: 0.4.1 graceful-fs: 4.2.11 - dev: false /wbuf@1.7.3: resolution: {integrity: sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==} @@ -20634,7 +21619,6 @@ packages: /webidl-conversions@3.0.1: resolution: {integrity: sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==} - dev: true /webidl-conversions@4.0.2: resolution: {integrity: sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==} @@ -20729,7 +21713,6 @@ packages: dependencies: source-list-map: 2.0.1 source-map: 0.6.1 - dev: false /webpack-sources@2.3.1: resolution: {integrity: sha512-y9EI9AO42JjEcrTJFOYmVywVZdKVUfOvDUPsJea5GIr1JOEGFVqwlY2K098fFoIjOkDzHn2AjRvM8dsBZu+gCA==} @@ -20742,7 +21725,6 @@ packages: /webpack-sources@3.2.3: resolution: {integrity: sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==} engines: {node: '>=10.13.0'} - dev: false /webpack@5.87.0: resolution: {integrity: sha512-GOu1tNbQ7p1bDEoFRs2YPcfyGs8xq52yyPBZ3m2VGnXGtV9MxjrkABHm4V9Ia280OefsSLzvbVoXcfLxjKY/Iw==} @@ -20784,6 +21766,45 @@ packages: - uglify-js dev: false + /webpack@5.88.2: + resolution: {integrity: sha512-JmcgNZ1iKj+aiR0OvTYtWQqJwq37Pf683dY9bVORwVbUrDhLhdn/PlO2sHsFHPkj7sHNQF3JwaAkp49V+Sq1tQ==} + engines: {node: '>=10.13.0'} + hasBin: true + peerDependencies: + webpack-cli: '*' + peerDependenciesMeta: + webpack-cli: + optional: true + dependencies: + '@types/eslint-scope': 3.7.4 + '@types/estree': 1.0.1 + '@webassemblyjs/ast': 1.11.6 + '@webassemblyjs/wasm-edit': 1.11.6 + '@webassemblyjs/wasm-parser': 1.11.6 + acorn: 8.9.0 + acorn-import-assertions: 1.9.0(acorn@8.9.0) + browserslist: 4.21.9 + chrome-trace-event: 1.0.3 + enhanced-resolve: 5.15.0 + es-module-lexer: 1.3.0 + eslint-scope: 5.1.1 + events: 3.3.0 + glob-to-regexp: 0.4.1 + graceful-fs: 4.2.11 + json-parse-even-better-errors: 2.3.1 + loader-runner: 4.3.0 + mime-types: 2.1.35 + neo-async: 2.6.2 + schema-utils: 3.3.0 + tapable: 2.2.1 + terser-webpack-plugin: 5.3.9(webpack@5.88.2) + watchpack: 2.4.0 + webpack-sources: 3.2.3 + transitivePeerDependencies: + - '@swc/core' + - esbuild + - uglify-js + /websocket-driver@0.7.4: resolution: {integrity: sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==} engines: {node: '>=0.8.0'} @@ -20836,7 +21857,6 @@ packages: dependencies: tr46: 0.0.3 webidl-conversions: 3.0.1 - dev: true /whatwg-url@7.1.0: resolution: {integrity: sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==} @@ -21309,7 +22329,6 @@ packages: /xtend@4.0.2: resolution: {integrity: sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==} engines: {node: '>=0.4'} - dev: true /y18n@4.0.3: resolution: {integrity: sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==} @@ -21438,6 +22457,7 @@ packages: /yn@3.1.1: resolution: {integrity: sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==} engines: {node: '>=6'} + dev: true /yocto-queue@0.1.0: resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==} From 84406d4f2fd04813e97b59118c8a39b2e519911d Mon Sep 17 00:00:00 2001 From: Akim Mamedov Date: Wed, 2 Aug 2023 00:19:55 +0700 Subject: [PATCH 02/48] Finalizing test fixes --- packages/client/js-client.node/package.json | 8 +- packages/client/js-client.node/src/index.ts | 11 +- packages/client/js-client.node/vite.config.js | 31 ++-- .../js-client.web.standalone/src/index.ts | 2 +- packages/core/marine-worker/build.ts | 68 +++++++++ packages/core/marine-worker/package.json | 14 +- packages/core/marine-worker/src/index.ts | 9 +- packages/core/marine-worker/vite.config.js | 24 ---- pnpm-lock.yaml | 134 +++++++++++++++++- 9 files changed, 250 insertions(+), 51 deletions(-) create mode 100644 packages/core/marine-worker/build.ts delete mode 100644 packages/core/marine-worker/vite.config.js diff --git a/packages/client/js-client.node/package.json b/packages/client/js-client.node/package.json index 6c2bacf1a..6b65d98ce 100644 --- a/packages/client/js-client.node/package.json +++ b/packages/client/js-client.node/package.json @@ -28,13 +28,19 @@ "@fluencelabs/marine-js": "0.3.45", "@fluencelabs/marine-worker": "workspace:*", "cross-fetch": "4.0.0", + "data-urls": "4.0.0", + "js-base64": "3.7.5", "platform": "1.3.6", "threads": "1.7.0", - "vite-plugin-require-transform": "1.0.21" + "vite-plugin-require-transform": "1.0.21", + "ws": "8.13.0" }, "devDependencies": { "@rollup/plugin-commonjs": "25.0.3", "@rollup/plugin-dynamic-import-vars": "2.0.4", + "@rollup/plugin-inject": "5.0.3", + "@rollup/plugin-node-resolve": "15.1.0", + "@types/data-urls": "3.0.1", "@types/platform": "1.3.4", "rollup-plugin-cjs-es": "2.0.0", "vite": "4.0.4", diff --git a/packages/client/js-client.node/src/index.ts b/packages/client/js-client.node/src/index.ts index e00a29b95..060bf0718 100644 --- a/packages/client/js-client.node/src/index.ts +++ b/packages/client/js-client.node/src/index.ts @@ -23,11 +23,13 @@ import { MarineBasedAvmRunner } from '@fluencelabs/js-peer/dist/jsPeer/avm.js'; import { MarineBackgroundRunner } from '@fluencelabs/js-peer/dist/marine/worker/index.js'; import { WasmLoaderFromNpm } from '@fluencelabs/js-peer/dist/marine/deps-loader/node.js'; import { doRegisterNodeUtils } from '@fluencelabs/js-peer/dist/services/NodeUtils.js'; +import { encode, decode } from 'js-base64'; +import parseDataURL from "data-urls"; + import WorkerInlineUrl from '@fluencelabs/marine-worker/dist/marine-worker.umd.сjs?url'; // @ts-ignore -import { BlobWorker } from 'threads'; -import fetch from 'cross-fetch'; +import { BlobWorker, Worker } from 'threads'; throwIfNotSupported(); @@ -43,8 +45,9 @@ export const defaultNames = { }; const createClient = async (relay: RelayOptions, config: ClientConfig): Promise => { - const workerBlob = await fetch(WorkerInlineUrl).then(res => res.blob()); - const workerLoader = new BlobWorker(workerBlob); + const data = /data:application\/\w+?;base64,(.+)/.exec(WorkerInlineUrl)?.[1]!; + + const workerLoader = BlobWorker.fromText(decode(data)); const controlModuleLoader = new WasmLoaderFromNpm(defaultNames.marine.package, defaultNames.marine.file); const avmModuleLoader = new WasmLoaderFromNpm(defaultNames.avm.package, defaultNames.avm.file); diff --git a/packages/client/js-client.node/vite.config.js b/packages/client/js-client.node/vite.config.js index d52341835..7fbb75b6e 100644 --- a/packages/client/js-client.node/vite.config.js +++ b/packages/client/js-client.node/vite.config.js @@ -2,6 +2,7 @@ import {defineConfig} from 'vite' import {resolve} from 'path'; import {builtinModules} from "module"; import { replaceCodePlugin } from "vite-plugin-replace"; +import inject from '@rollup/plugin-inject'; export default defineConfig({ build: { @@ -11,16 +12,28 @@ export default defineConfig({ name: 'JSClient', }, rollupOptions: { - external: builtinModules + external: [...builtinModules, ...builtinModules.map(bm => `node:${bm}`), 'ws', 'worker_threads'], + plugins: [ + inject({ + 'WebSocket': ['ws', 'WebSocket'], + self: 'global', + 'WorkerScope': ['worker_threads', '*'], + 'Worker': ['worker_threads', 'Worker'], + 'isMainThread': ['worker_threads', 'isMainThread'], + }) + ] }, - commonjsOptions: { - esmExternals: true, - dynamicRequireRoot: '/Users/a.mamedov/WebstormProjects/js-client/node_modules/.pnpm', - dynamicRequireTargets: ['./default-gateway@6.0.3/node_modules/default-gateway/*.js'], - ignoreDynamicRequires: true, - } }, plugins: [replaceCodePlugin({ - replacements: [{from: 'require(`./${file}.js`)', to: ''}] - })] + replacements: [ + {from: 'require(`./${file}.js`)', to: 'require(`./linux.js`)'}, + {from: 'const { name, version } = req(\'../../package.json\')', to: 'const { name, version } = { name: \'ssdp\', version: \'4.0.4\' }'}, + {from: 'eval("require")("worker_threads")', to: 'WorkerScope'}, + {from: 'eval("require")("worker_threads")', to: 'WorkerScope'}, + ] + })], + resolve: { + browserField: false, + conditions: ['node'] + } }) \ No newline at end of file diff --git a/packages/client/js-client.web.standalone/src/index.ts b/packages/client/js-client.web.standalone/src/index.ts index 8b02f1693..531f198f0 100644 --- a/packages/client/js-client.web.standalone/src/index.ts +++ b/packages/client/js-client.web.standalone/src/index.ts @@ -23,7 +23,7 @@ import { InlinedWorkerLoader, InlinedWasmLoader } from '@fluencelabs/js-peer/dis import { BlobWorker } from 'threads'; import fetch from 'cross-fetch'; -import WorkerInlineUrl from '@fluencelabs/marine-worker/dist/marine-worker.umd.сjs?url'; +import WorkerInlineUrl from '@fluencelabs/marine-worker/dist/marine-worker.js?url'; const createClient = async (relay: RelayOptions, config: ClientConfig): Promise => { const workerBlob = await fetch(WorkerInlineUrl).then(res => res.blob()); diff --git a/packages/core/marine-worker/build.ts b/packages/core/marine-worker/build.ts new file mode 100644 index 000000000..083494c1c --- /dev/null +++ b/packages/core/marine-worker/build.ts @@ -0,0 +1,68 @@ +import { build, defineConfig, InlineConfig, PluginOption, UserConfig, UserConfigExport } from 'vite' +import { dirname, resolve } from 'path'; +import { builtinModules, createRequire } from 'module'; +import inject from '@rollup/plugin-inject'; +// @ts-ignore +import merge from 'deepmerge'; +import { fileURLToPath } from 'url'; +import { replaceCodePlugin } from 'vite-plugin-replace'; + +const require = createRequire(import.meta.url); +const esbuildShim = require.resolve('node-stdlib-browser/helpers/esbuild/shim'); + +const commonConfig = defineConfig({ + build: { + lib: { + entry: resolve(dirname(fileURLToPath(import.meta.url)), 'src/index.ts'), + name: 'MarineWorker' + }, + }, +}) as UserConfig; + +const browserConfig: InlineConfig = await merge(commonConfig, defineConfig({ + build: { + outDir: 'dist/browser', + }, + plugins: [{ + // @ts-ignore + ...inject({ + global: [esbuildShim, 'global'], + process: [esbuildShim, 'process'], + Buffer: [esbuildShim, 'Buffer'] + }), enforce: 'post' + } as PluginOption], +}) as UserConfig); + +const nodeConfig: InlineConfig = await merge(commonConfig, defineConfig({ + build: { + target: 'es2022', + outDir: 'dist/node', + rollupOptions: { + external: [...builtinModules], + plugins: [ + // @ts-ignore + inject({ + self: 'global', + 'WorkerScope': ['worker_threads', '*'], + 'Worker': ['worker_threads', 'Worker'], + 'isMainThread': ['worker_threads', 'isMainThread'], + }) + ] + } + }, + plugins: [ + replaceCodePlugin({ + replacements: [ + { from: 'eval("require")("worker_threads")', to: 'WorkerScope' }, + { from: 'eval("require")("worker_threads")', to: 'WorkerScope' }, + ] + }) + ], + resolve: { + browserField: false, + } +}) as UserConfig); + + +await build(browserConfig!); +await build(nodeConfig!); \ No newline at end of file diff --git a/packages/core/marine-worker/package.json b/packages/core/marine-worker/package.json index f404a6bdc..03d439ae4 100644 --- a/packages/core/marine-worker/package.json +++ b/packages/core/marine-worker/package.json @@ -8,21 +8,19 @@ "main": "./dist/marine-worker.umd.cjs", "module": "/dist/marine-worker.js", "exports": { - ".": { - "import": "./dist/marine-worker.js", - "require": "./dist/marine-worker.umd.cjs" - }, "./dist/marine-worker.js": { - "import": "./dist/marine-worker.js" + "node": "./dist/node/marine-worker.js", + "browser": "./dist/browser/marine-worker.js" }, "./dist/marine-worker.umd.сjs": { - "import": "./dist/marine-worker.umd.cjs" + "node": "./dist/node/marine-worker.umd.cjs", + "browser": "./dist/browser/marine-worker.umd.cjs" } }, "type": "module", "scripts": { "test": "echo \"Error: no test specified\" && exit 1", - "build": "vite build" + "build": "node --loader ts-node/esm build.ts" }, "repository": "https://github.com/fluencelabs/fluence-js", "author": "Fluence Labs", @@ -31,9 +29,11 @@ "devDependencies": { "@rollup/plugin-inject": "5.0.3", "@types/node": "20.4.5", + "deepmerge": "4.3.1", "node-stdlib-browser": "1.2.0", "typescript": "5.1.6", "vite": "4.0.4", + "vite-plugin-replace": "0.1.1", "vitest": "0.29.7" }, "dependencies": { diff --git a/packages/core/marine-worker/src/index.ts b/packages/core/marine-worker/src/index.ts index 5d7fe4355..5ecfd1a34 100644 --- a/packages/core/marine-worker/src/index.ts +++ b/packages/core/marine-worker/src/index.ts @@ -20,6 +20,7 @@ import type { JSONArray, JSONObject, LogMessage } from '@fluencelabs/marine-js/d import { Observable, Subject } from 'observable-fns'; // @ts-ignore no types provided for package import { expose } from 'threads'; +import * as Buffer from 'buffer'; let marineServices = new Map(); let controlModule: WebAssembly.Module | undefined; @@ -27,12 +28,12 @@ let controlModule: WebAssembly.Module | undefined; const onLogMessage = new Subject(); const toExpose = { - init: async (controlModuleWasm: ArrayBuffer): Promise => { - controlModule = await WebAssembly.compile(controlModuleWasm); + init: async (controlModuleWasm: SharedArrayBuffer | Buffer): Promise => { + controlModule = await WebAssembly.compile(new Uint8Array(controlModuleWasm)); }, createService: async ( - wasm: ArrayBuffer, + wasm: SharedArrayBuffer | Buffer, serviceId: string, marineConfig?: MarineServiceConfig, envs?: Env, @@ -41,7 +42,7 @@ const toExpose = { throw new Error('MarineJS is not initialized. To initialize call `init` function'); } - const service = await WebAssembly.compile(wasm); + const service = await WebAssembly.compile(new Uint8Array(wasm)); const srv = new MarineService( controlModule, service, diff --git a/packages/core/marine-worker/vite.config.js b/packages/core/marine-worker/vite.config.js deleted file mode 100644 index 1fb966855..000000000 --- a/packages/core/marine-worker/vite.config.js +++ /dev/null @@ -1,24 +0,0 @@ -import {defineConfig} from 'vite' -import {resolve} from 'path'; -import {createRequire} from "module"; -import inject from "@rollup/plugin-inject"; - -const require = createRequire(import.meta.url); -const esbuildShim = require.resolve('node-stdlib-browser/helpers/esbuild/shim'); - -export default defineConfig({ - build: { - target: 'es6', - lib: { - entry: resolve(__dirname, 'src/index.ts'), - name: 'MarineWorker', - }, - }, - plugins: [{ - ...inject({ - global: [esbuildShim, 'global'], - process: [esbuildShim, 'process'], - Buffer: [esbuildShim, 'Buffer'] - }), enforce: 'post' - }] -}) \ No newline at end of file diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 7c4031c6a..76e963466 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -177,6 +177,12 @@ importers: cross-fetch: specifier: 4.0.0 version: 4.0.0 + data-urls: + specifier: 4.0.0 + version: 4.0.0 + js-base64: + specifier: 3.7.5 + version: 3.7.5 platform: specifier: 1.3.6 version: 1.3.6 @@ -186,6 +192,9 @@ importers: vite-plugin-require-transform: specifier: 1.0.21 version: 1.0.21 + ws: + specifier: 8.13.0 + version: 8.13.0 devDependencies: '@rollup/plugin-commonjs': specifier: 25.0.3 @@ -193,6 +202,15 @@ importers: '@rollup/plugin-dynamic-import-vars': specifier: 2.0.4 version: 2.0.4(rollup@3.25.1) + '@rollup/plugin-inject': + specifier: 5.0.3 + version: 5.0.3(rollup@3.25.1) + '@rollup/plugin-node-resolve': + specifier: 15.1.0 + version: 15.1.0(rollup@3.25.1) + '@types/data-urls': + specifier: 3.0.1 + version: 3.0.1 '@types/platform': specifier: 1.3.4 version: 1.3.4 @@ -470,6 +488,9 @@ importers: '@types/node': specifier: 20.4.5 version: 20.4.5 + deepmerge: + specifier: 4.3.1 + version: 4.3.1 node-stdlib-browser: specifier: 1.2.0 version: 1.2.0 @@ -479,6 +500,9 @@ importers: vite: specifier: 4.0.4 version: 4.0.4(@types/node@20.4.5) + vite-plugin-replace: + specifier: 0.1.1 + version: 0.1.1(vite@4.0.4) vitest: specifier: 0.29.7 version: 0.29.7 @@ -5173,6 +5197,21 @@ packages: estree-walker: 2.0.2 magic-string: 0.27.0 + /@rollup/plugin-inject@5.0.3(rollup@3.25.1): + resolution: {integrity: sha512-411QlbL+z2yXpRWFXSmw/teQRMkXcAAC8aYTemc15gwJRpvEVDQwoe+N/HTFD8RFG8+88Bme9DK2V9CVm7hJdA==} + engines: {node: '>=14.0.0'} + peerDependencies: + rollup: ^1.20.0||^2.0.0||^3.0.0 + peerDependenciesMeta: + rollup: + optional: true + dependencies: + '@rollup/pluginutils': 5.0.2(rollup@3.25.1) + estree-walker: 2.0.2 + magic-string: 0.27.0 + rollup: 3.25.1 + dev: true + /@rollup/plugin-json@4.1.0(rollup@2.79.1): resolution: {integrity: sha512-yfLbTdNS6amI/2OpmbiBoW12vngr5NW2jCJVZSBEz+H5KfUJZ2M7sDjk0U6GOOdCWFVScShte29o9NezJ53TPw==} peerDependencies: @@ -5196,6 +5235,24 @@ packages: resolve: 1.22.2 rollup: 2.79.1 + /@rollup/plugin-node-resolve@15.1.0(rollup@3.25.1): + resolution: {integrity: sha512-xeZHCgsiZ9pzYVgAo9580eCGqwh/XCEUM9q6iQfGNocjgkufHAqC3exA+45URvhiYV8sBF9RlBai650eNs7AsA==} + engines: {node: '>=14.0.0'} + peerDependencies: + rollup: ^2.78.0||^3.0.0 + peerDependenciesMeta: + rollup: + optional: true + dependencies: + '@rollup/pluginutils': 5.0.2(rollup@3.25.1) + '@types/resolve': 1.20.2 + deepmerge: 4.3.1 + is-builtin-module: 3.2.1 + is-module: 1.0.0 + resolve: 1.22.2 + rollup: 3.25.1 + dev: true + /@rollup/plugin-replace@2.4.2(rollup@2.79.1): resolution: {integrity: sha512-IGcu+cydlUMZ5En85jxHH4qj2hta/11BHq95iHEyb2sbgiN0eCdzvUcHw5gt9pBL5lTi4JDYJ1acCoMGpTvEZg==} peerDependencies: @@ -5893,6 +5950,13 @@ packages: '@types/node': 20.4.5 dev: false + /@types/data-urls@3.0.1: + resolution: {integrity: sha512-ZWfL03uxzUh0SkotNrcAAa9NCYxp05/UUmrDNgvJrQYFoYczQVOmFJAIN7yXII6xcxyrmAJMpF5yiJyBuGvF9w==} + dependencies: + '@types/whatwg-mimetype': 3.0.0 + '@types/whatwg-url': 11.0.0 + dev: true + /@types/debug@4.1.7: resolution: {integrity: sha512-9AonUzyTjXXhEOa0DnqpzZi6VHlqKMswga9EXjpXnnqxwLtdvPPtlO8evrI5D9S6asFRCQ6v+wpiUKbw+vKqyg==} dependencies: @@ -6120,6 +6184,10 @@ packages: dependencies: '@types/node': 20.4.5 + /@types/resolve@1.20.2: + resolution: {integrity: sha512-60BCwRFOZCQhDncwQdxxeOEEkbc5dIMccYLwbxsS4TUNeVECQ/pBJ0j09mrHOl/JJvpRPGwO9SvE4nR2Nb/a4Q==} + dev: true + /@types/responselike@1.0.0: resolution: {integrity: sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==} dependencies: @@ -6196,6 +6264,20 @@ packages: resolution: {integrity: sha512-u40ViizKDmdl5FhOXn9WQbulpigYCaiD5hD4KqR3xyQww6l3+0ND+A9TeFla8tFpqvR+UAkJdYb/8jdaQG4/nw==} dev: true + /@types/webidl-conversions@7.0.0: + resolution: {integrity: sha512-xTE1E+YF4aWPJJeUzaZI5DRntlkY3+BCVJi0axFptnjGmAoWxkyREIh/XMrfxVLejwQxMCfDXdICo0VLxThrog==} + dev: true + + /@types/whatwg-mimetype@3.0.0: + resolution: {integrity: sha512-xHFOhd41VpUR6Y0k8ZinlyFv5cyhC/r2zghJgWWN8oNxqNo45Nf0qCBInJsFeifLeoHcIF4voEfap4A2GYHWkw==} + dev: true + + /@types/whatwg-url@11.0.0: + resolution: {integrity: sha512-4F6szvZP3FM5HvJAmcInXBfrAhvM4tLIc8MO1nXwabG5TZVOLxVmAXRpICqXYd3lBlomSRGmLCopYV+yTocgpQ==} + dependencies: + '@types/webidl-conversions': 7.0.0 + dev: true + /@types/ws@8.5.5: resolution: {integrity: sha512-lwhs8hktwxSjf9UaZ9tG5M03PGogvFaH8gUgLNbN9HKIg0dvv6q+gkSuJ8HN4/VbyxkuLzCjlN7GquQ0gUJfIg==} dependencies: @@ -8985,6 +9067,15 @@ packages: whatwg-mimetype: 2.3.0 whatwg-url: 8.7.0 + /data-urls@4.0.0: + resolution: {integrity: sha512-/mMTei/JXPqvFqQtfyTowxmJVwr2PVAeCcDxyFf6LhoOu/09TX2OX3kb2wzi4DMXcfj4OItwDOnhl5oziPnT6g==} + engines: {node: '>=14'} + dependencies: + abab: 2.0.6 + whatwg-mimetype: 3.0.0 + whatwg-url: 12.0.1 + dev: false + /datastore-core@7.0.3: resolution: {integrity: sha512-DmPsUux63daOfCszxLkcp6LjdJ0k/BQNhIMtoAi5mbraYQnEQkFtKORmTu6XmDX6ujbtaBkeuJAiCBNI7MZklw==} engines: {node: '>=16.0.0', npm: '>=7.0.0'} @@ -12447,6 +12538,13 @@ packages: engines: {node: '>=4'} dev: true + /is-builtin-module@3.2.1: + resolution: {integrity: sha512-BSLE3HnV2syZ0FK0iMA/yUGplUeMmNz4AW5fnTunbCIqZi4vG3WjJT9FHMy5D69xmAYBHXQhJdALdpwVxV501A==} + engines: {node: '>=6'} + dependencies: + builtin-modules: 3.3.0 + dev: true + /is-callable@1.2.7: resolution: {integrity: sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==} engines: {node: '>= 0.4'} @@ -15368,6 +15466,15 @@ packages: ufo: 1.1.2 dev: true + /mlly@1.4.0: + resolution: {integrity: sha512-ua8PAThnTwpprIaU47EPeZ/bPUVp2QYBbWMphUQpVdBI3Lgqzm5KZQ45Agm3YJedHXaIHl6pBGabaLSUPPSptg==} + dependencies: + acorn: 8.9.0 + pathe: 1.1.1 + pkg-types: 1.0.3 + ufo: 1.1.2 + dev: true + /mnemonist@0.38.5: resolution: {integrity: sha512-bZTFT5rrPKtPJxj8KSV0WkPyNxl72vQepqqVUAW2ARUpUSF2qXMB6jZj7hW5/k7C1rtpzqbD/IIbJwLXUjCHeg==} dependencies: @@ -16730,7 +16837,7 @@ packages: resolution: {integrity: sha512-nN7pYi0AQqJnoLPC9eHFQ8AcyaixBUOwvqc5TDnIKCMEE6I0y8P7OKA7fPexsXGCGxQDl/cmrLAp26LhcwxZ4A==} dependencies: jsonc-parser: 3.2.0 - mlly: 1.3.0 + mlly: 1.4.0 pathe: 1.1.1 dev: true @@ -20066,6 +20173,13 @@ packages: dependencies: punycode: 2.3.0 + /tr46@4.1.1: + resolution: {integrity: sha512-2lv/66T7e5yNyhAAC4NaKe5nVavzuGJQVVtRYLyQ2OI8tsJ61PMLlelehb0wi2Hx6+hT/OJUWZcw8MjlSRnxvw==} + engines: {node: '>=14'} + dependencies: + punycode: 2.3.0 + dev: false + /trim-repeated@2.0.0: resolution: {integrity: sha512-QUHBFTJGdOwmp0tbOG505xAgOp/YliZP/6UgafFXYZ26WT1bvQmSMJUvkeVSASuJJHbqsFbynTvkd5W8RBTipg==} engines: {node: '>=12'} @@ -21632,6 +21746,11 @@ packages: resolution: {integrity: sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==} engines: {node: '>=10.4'} + /webidl-conversions@7.0.0: + resolution: {integrity: sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==} + engines: {node: '>=12'} + dev: false + /webpack-dev-middleware@5.3.3(webpack@5.87.0): resolution: {integrity: sha512-hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA==} engines: {node: '>= 12.13.0'} @@ -21852,6 +21971,19 @@ packages: /whatwg-mimetype@2.3.0: resolution: {integrity: sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==} + /whatwg-mimetype@3.0.0: + resolution: {integrity: sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==} + engines: {node: '>=12'} + dev: false + + /whatwg-url@12.0.1: + resolution: {integrity: sha512-Ed/LrqB8EPlGxjS+TrsXcpUond1mhccS3pchLhzSgPCnTimUCKj3IZE75pAs5m6heB2U2TMerKFUXheyHY+VDQ==} + engines: {node: '>=14'} + dependencies: + tr46: 4.1.1 + webidl-conversions: 7.0.0 + dev: false + /whatwg-url@5.0.0: resolution: {integrity: sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==} dependencies: From de39c0c641cd6ce176d613c7cce4dd8ecc7bd108 Mon Sep 17 00:00:00 2001 From: shamsartem Date: Fri, 21 Jul 2023 18:43:55 +0200 Subject: [PATCH 03/48] fix: rename back to Fluence CLI (#320) chore: rename back to Fluence CLI --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index b8d94efc6..fbbfd87de 100644 --- a/README.md +++ b/README.md @@ -82,12 +82,12 @@ If you are using TypeScript: ## Usage in an Application -Once you've added the client, you can compile [Aqua](https://github.com/fluencelabs/aqua) and run it in your application. To compile Aqua, use [flox](https://github.com/fluencelabs/flox). +Once you've added the client, you can compile [Aqua](https://github.com/fluencelabs/aqua) and run it in your application. To compile Aqua, use [Fluence CLI](https://github.com/fluencelabs/cli). 1. Install the package: ``` - npm i -D "@fluencelabs/flox" + npm i -D @fluencelabs/cli ``` 2. Add a directory in your project for Aqua code, e.g., `_aqua`. From 48d2d1b32e4a786c9028536a7ea181acef990be2 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 8 Aug 2023 09:45:40 -0500 Subject: [PATCH 04/48] fix(deps): update dependency @fluencelabs/avm to v0.43.1 (#322) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- packages/client/api/package.json | 2 +- .../js-client.web.standalone/package.json | 2 +- packages/core/interfaces/package.json | 2 +- packages/core/js-peer/package.json | 2 +- pnpm-lock.yaml | 26 ++++++++++--------- 5 files changed, 18 insertions(+), 16 deletions(-) diff --git a/packages/client/api/package.json b/packages/client/api/package.json index 147401dc5..11fc56447 100644 --- a/packages/client/api/package.json +++ b/packages/client/api/package.json @@ -28,7 +28,7 @@ "@fluencelabs/interfaces": "0.8.0" }, "devDependencies": { - "@fluencelabs/avm": "0.40.0", + "@fluencelabs/avm": "0.43.1", "@fluencelabs/marine-js": "0.3.45", "microbundle": "0.15.1", "dts-bundle-generator": "7.2.0" diff --git a/packages/client/js-client.web.standalone/package.json b/packages/client/js-client.web.standalone/package.json index 6b4269bcf..1fef56567 100644 --- a/packages/client/js-client.web.standalone/package.json +++ b/packages/client/js-client.web.standalone/package.json @@ -27,7 +27,7 @@ "webpack": "5.88.2" }, "devDependencies": { - "@fluencelabs/avm": "0.40.0", + "@fluencelabs/avm": "0.43.1", "@fluencelabs/marine-js": "0.3.45", "@rollup/plugin-inject": "5.0.3", "@types/jest": "28.1.0", diff --git a/packages/core/interfaces/package.json b/packages/core/interfaces/package.json index 6c8ef073d..8452efcfe 100644 --- a/packages/core/interfaces/package.json +++ b/packages/core/interfaces/package.json @@ -50,7 +50,7 @@ "dependencies": {}, "devDependencies": { "@multiformats/multiaddr": "11.3.0", - "@fluencelabs/avm": "0.40.0", + "@fluencelabs/avm": "0.43.1", "@fluencelabs/marine-js": "0.3.45" } } diff --git a/packages/core/js-peer/package.json b/packages/core/js-peer/package.json index 8e584599a..1a3934c45 100644 --- a/packages/core/js-peer/package.json +++ b/packages/core/js-peer/package.json @@ -18,7 +18,7 @@ "license": "Apache-2.0", "dependencies": { "@fluencelabs/interfaces": "0.8.0", - "@fluencelabs/avm": "0.40.0", + "@fluencelabs/avm": "0.43.1", "@fluencelabs/marine-js": "0.3.45", "multiformats": "11.0.1", "debug": "4.3.4", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 76e963466..abe07e9bc 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -145,8 +145,8 @@ importers: version: link:../../core/interfaces devDependencies: '@fluencelabs/avm': - specifier: 0.40.0 - version: 0.40.0 + specifier: 0.43.1 + version: 0.43.1 '@fluencelabs/marine-js': specifier: 0.3.45 version: 0.3.45 @@ -160,8 +160,8 @@ importers: packages/client/js-client.node: dependencies: '@fluencelabs/avm': - specifier: 0.40.0 - version: 0.40.0 + specifier: 0.43.1 + version: 0.43.1 '@fluencelabs/interfaces': specifier: 0.8.0 version: link:../../core/interfaces @@ -280,8 +280,8 @@ importers: version: 5.88.2 devDependencies: '@fluencelabs/avm': - specifier: 0.40.0 - version: 0.40.0 + specifier: 0.43.1 + version: 0.43.1 '@fluencelabs/marine-js': specifier: 0.3.45 version: 0.3.45 @@ -346,8 +346,8 @@ importers: packages/core/interfaces: devDependencies: '@fluencelabs/avm': - specifier: 0.40.0 - version: 0.40.0 + specifier: 0.43.1 + version: 0.43.1 '@fluencelabs/marine-js': specifier: 0.3.45 version: 0.3.45 @@ -361,8 +361,8 @@ importers: specifier: 11.0.0 version: 11.0.0 '@fluencelabs/avm': - specifier: 0.40.0 - version: 0.40.0 + specifier: 0.43.1 + version: 0.43.1 '@fluencelabs/interfaces': specifier: 0.8.0 version: link:../interfaces @@ -3033,8 +3033,8 @@ packages: resolution: {integrity: sha512-Y5mPPCmAUUKc5CDO12IL8mGEreWa7maVdX0MWCAH4+GvfLPFN1FxOMSKRYEtvkyVEL88pc9pd8cm5IRCBkFthg==} dev: true - /@fluencelabs/avm@0.40.0: - resolution: {integrity: sha512-DkCht5+Tg8txRlLIXdP/CPKXmvZqWvJk8Nb89r0JmykPelgI2xTlSkKcAtVrNnGIhp0ghS+HXq2KXVYwu2Il1Q==} + /@fluencelabs/avm@0.43.1: + resolution: {integrity: sha512-6tGOMT/2S3ANrqvPLjPUUHgnZCibdIJQH25lsfPN9wBhAcS+0DsYuh1rQWiiJ7xVpps/tuwzFX7gecMmr7hsnQ==} /@fluencelabs/cli@0.3.9(@ethersproject/abi@5.7.0)(@ethersproject/providers@5.7.2)(@nomicfoundation/hardhat-chai-matchers@1.0.6)(@nomicfoundation/hardhat-network-helpers@1.0.8)(@nomiclabs/hardhat-ethers@2.2.3)(@nomiclabs/hardhat-etherscan@3.1.7)(@typechain/ethers-v5@10.2.1)(@typechain/hardhat@6.1.6)(@types/chai@4.3.5)(@types/mocha@9.1.1)(@types/node@20.4.5)(chai@4.3.7)(hardhat-gas-reporter@1.0.9)(hardhat@2.15.0)(jest@27.5.1)(solidity-coverage@0.7.22)(ts-node@10.9.1)(typechain@8.2.0)(typescript@4.7.2): resolution: {integrity: sha512-xJYi7+AHrWt6RgWnr7Efr8Jpv0dNLoWhiCMvgSbXoFpIZzQAyNDgk5hnCdwIQ/eiJcNg0GHY0gyC+Q/d5YKc1Q==} @@ -7024,6 +7024,7 @@ packages: /amdefine@1.0.1: resolution: {integrity: sha512-S2Hw0TtNkMJhIabBwIojKL9YHO5T0n5eNqWJ7Lrlel/zDbftQpxpapi8tZs3X1HWa+u+QeydGmzzNU0m09+Rcg==} engines: {node: '>=0.4.2'} + requiresBuild: true dev: true optional: true @@ -10312,6 +10313,7 @@ packages: /esm@3.2.25: resolution: {integrity: sha512-U1suiZ2oDVWv4zPO56S0NcR5QriEahGtdN2OR6FiOG4WJvcjBVFB0qI4+eKoWFH483PKGuLuu6V8Z4T5g63UVA==} engines: {node: '>=6'} + requiresBuild: true optional: true /espree@9.5.2: From a152db2396b8703650856b3f341a6b4389c41df9 Mon Sep 17 00:00:00 2001 From: fluencebot <116741523+fluencebot@users.noreply.github.com> Date: Wed, 9 Aug 2023 13:34:57 +0300 Subject: [PATCH 05/48] chore: release master (#324) * chore: release master * chore: Regenerate pnpm lock file --- .github/release-please/manifest.json | 12 +++---- .github/workflows/e2e.yml | 3 +- packages/client/api/CHANGELOG.md | 14 ++++++++ packages/client/api/package.json | 4 +-- packages/client/js-client.node/CHANGELOG.md | 15 ++++++++ packages/client/js-client.node/package.json | 34 +++++-------------- .../js-client.web.standalone/CHANGELOG.md | 15 ++++++++ .../js-client.web.standalone/package.json | 7 ++-- packages/client/js-client.web/CHANGELOG.md | 7 ++++ packages/client/js-client.web/package.json | 6 ++-- packages/core/interfaces/CHANGELOG.md | 7 ++++ packages/core/interfaces/package.json | 2 +- packages/core/js-peer/CHANGELOG.md | 14 ++++++++ packages/core/js-peer/package.json | 4 +-- pnpm-lock.yaml | 16 ++++----- 15 files changed, 108 insertions(+), 52 deletions(-) diff --git a/.github/release-please/manifest.json b/.github/release-please/manifest.json index 2040e3699..c02b07dee 100644 --- a/.github/release-please/manifest.json +++ b/.github/release-please/manifest.json @@ -1,9 +1,9 @@ { - "packages/client/api": "0.12.0", - "packages/client/js-client.node": "0.7.0", - "packages/client/js-client.web": "0.2.4", - "packages/client/js-client.web.standalone": "0.14.0", + "packages/client/api": "0.12.1", + "packages/client/js-client.node": "0.7.1", + "packages/client/js-client.web": "0.2.5", + "packages/client/js-client.web.standalone": "0.14.1", "packages/client/tools": "0.2.1", - "packages/core/interfaces": "0.8.0", - "packages/core/js-peer": "0.9.0" + "packages/core/interfaces": "0.8.1", + "packages/core/js-peer": "0.9.1" } diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 04cb7a2d7..cc3e8fb0d 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -50,4 +50,5 @@ jobs: uses: fluencelabs/flox/.github/workflows/tests.yml@main with: - js-client-snapshots: "${{ needs.js-client.outputs.js-client-snapshots }}" \ No newline at end of file + js-client-snapshots: "${{ needs.js-client.outputs.js-client-snapshots }}" + nox-image: "fluencelabs/nox:unstable_minimal" \ No newline at end of file diff --git a/packages/client/api/CHANGELOG.md b/packages/client/api/CHANGELOG.md index 93b46b505..8a678f5b7 100644 --- a/packages/client/api/CHANGELOG.md +++ b/packages/client/api/CHANGELOG.md @@ -12,6 +12,20 @@ * dependencies * @fluencelabs/interfaces bumped from 0.7.3 to 0.7.4 +## [0.12.1](https://github.com/fluencelabs/js-client/compare/js-client.api-v0.12.0...js-client.api-v0.12.1) (2023-08-08) + + +### Bug Fixes + +* **deps:** update dependency @fluencelabs/avm to v0.43.1 ([#322](https://github.com/fluencelabs/js-client/issues/322)) ([c1d1fa6](https://github.com/fluencelabs/js-client/commit/c1d1fa6659b6dc2c6707786748b3410fab7f1bcd)) + + +### Dependencies + +* The following workspace dependencies were updated + * dependencies + * @fluencelabs/interfaces bumped from 0.8.0 to 0.8.1 + ## [0.12.0](https://github.com/fluencelabs/js-client/compare/js-client.api-v0.11.7...js-client.api-v0.12.0) (2023-06-29) diff --git a/packages/client/api/package.json b/packages/client/api/package.json index 11fc56447..897043a5f 100644 --- a/packages/client/api/package.json +++ b/packages/client/api/package.json @@ -1,6 +1,6 @@ { "name": "@fluencelabs/js-client.api", - "version": "0.12.0", + "version": "0.12.1", "description": "JS Client API", "engines": { "node": ">=10", @@ -25,7 +25,7 @@ "author": "Fluence Labs", "license": "Apache-2.0", "dependencies": { - "@fluencelabs/interfaces": "0.8.0" + "@fluencelabs/interfaces": "0.8.1" }, "devDependencies": { "@fluencelabs/avm": "0.43.1", diff --git a/packages/client/js-client.node/CHANGELOG.md b/packages/client/js-client.node/CHANGELOG.md index b734a883f..1a5d389ce 100644 --- a/packages/client/js-client.node/CHANGELOG.md +++ b/packages/client/js-client.node/CHANGELOG.md @@ -30,6 +30,21 @@ * dependencies * @fluencelabs/js-peer bumped from 0.8.8 to 0.8.9 +## [0.7.1](https://github.com/fluencelabs/js-client/compare/js-client.node-v0.7.0...js-client.node-v0.7.1) (2023-08-08) + + +### Bug Fixes + +* **deps:** update dependency @fluencelabs/avm to v0.43.1 ([#322](https://github.com/fluencelabs/js-client/issues/322)) ([c1d1fa6](https://github.com/fluencelabs/js-client/commit/c1d1fa6659b6dc2c6707786748b3410fab7f1bcd)) + + +### Dependencies + +* The following workspace dependencies were updated + * dependencies + * @fluencelabs/js-peer bumped from 0.9.0 to 0.9.1 + * @fluencelabs/interfaces bumped from 0.8.0 to 0.8.1 + ## [0.7.0](https://github.com/fluencelabs/js-client/compare/js-client.node-v0.6.11...js-client.node-v0.7.0) (2023-06-29) diff --git a/packages/client/js-client.node/package.json b/packages/client/js-client.node/package.json index 6b65d98ce..402e97295 100644 --- a/packages/client/js-client.node/package.json +++ b/packages/client/js-client.node/package.json @@ -1,8 +1,8 @@ { "name": "@fluencelabs/js-client.node", - "version": "0.7.0", + "version": "0.7.1", "description": "TypeScript implementation of Fluence Peer", - "main": "./dist/js-client.node.js", + "main": "./dist/index.js", "typings": "./dist/index.d.ts", "engines": { "node": ">=10", @@ -10,41 +10,25 @@ }, "exports": { ".": { - "import": "./dist/js-client.node.js", + "import": "./dist/index.js", "types": "./dist/index.d.ts" } }, "type": "module", "scripts": { - "build": "vite build" + "build": "tsc" }, "repository": "https://github.com/fluencelabs/fluence-js", "author": "Fluence Labs", "license": "Apache-2.0", "dependencies": { - "@fluencelabs/avm": "0.40.0", - "@fluencelabs/interfaces": "0.8.0", - "@fluencelabs/js-peer": "0.9.0", + "@fluencelabs/js-peer": "0.9.1", + "@fluencelabs/interfaces": "0.8.1", + "@fluencelabs/avm": "0.43.1", "@fluencelabs/marine-js": "0.3.45", - "@fluencelabs/marine-worker": "workspace:*", - "cross-fetch": "4.0.0", - "data-urls": "4.0.0", - "js-base64": "3.7.5", - "platform": "1.3.6", - "threads": "1.7.0", - "vite-plugin-require-transform": "1.0.21", - "ws": "8.13.0" + "platform": "1.3.6" }, "devDependencies": { - "@rollup/plugin-commonjs": "25.0.3", - "@rollup/plugin-dynamic-import-vars": "2.0.4", - "@rollup/plugin-inject": "5.0.3", - "@rollup/plugin-node-resolve": "15.1.0", - "@types/data-urls": "3.0.1", - "@types/platform": "1.3.4", - "rollup-plugin-cjs-es": "2.0.0", - "vite": "4.0.4", - "vite-plugin-commonjs": "0.8.2", - "vite-plugin-replace": "0.1.1" + "@types/platform": "1.3.4" } } diff --git a/packages/client/js-client.web.standalone/CHANGELOG.md b/packages/client/js-client.web.standalone/CHANGELOG.md index d03618578..b5c44a006 100644 --- a/packages/client/js-client.web.standalone/CHANGELOG.md +++ b/packages/client/js-client.web.standalone/CHANGELOG.md @@ -24,6 +24,21 @@ * dependencies * @fluencelabs/js-peer bumped from 0.8.8 to 0.8.9 +## [0.14.1](https://github.com/fluencelabs/js-client/compare/js-client.web.standalone-v0.14.0...js-client.web.standalone-v0.14.1) (2023-08-08) + + +### Bug Fixes + +* **deps:** update dependency @fluencelabs/avm to v0.43.1 ([#322](https://github.com/fluencelabs/js-client/issues/322)) ([c1d1fa6](https://github.com/fluencelabs/js-client/commit/c1d1fa6659b6dc2c6707786748b3410fab7f1bcd)) + + +### Dependencies + +* The following workspace dependencies were updated + * dependencies + * @fluencelabs/js-peer bumped from 0.9.0 to 0.9.1 + * @fluencelabs/interfaces bumped from 0.8.0 to 0.8.1 + ## [0.14.0](https://github.com/fluencelabs/js-client/compare/js-client.web.standalone-v0.13.10...js-client.web.standalone-v0.14.0) (2023-06-29) diff --git a/packages/client/js-client.web.standalone/package.json b/packages/client/js-client.web.standalone/package.json index 1fef56567..123afc861 100644 --- a/packages/client/js-client.web.standalone/package.json +++ b/packages/client/js-client.web.standalone/package.json @@ -1,6 +1,6 @@ { "name": "@fluencelabs/js-client.web.standalone", - "version": "0.14.0", + "version": "0.14.1", "description": "TypeScript implementation of Fluence Peer", "main": "./dist/index.js", "typings": "./dist/index.d.ts", @@ -16,9 +16,8 @@ "author": "Fluence Labs", "license": "Apache-2.0", "dependencies": { - "@fluencelabs/interfaces": "0.8.0", - "@fluencelabs/js-peer": "0.9.0", - "@fluencelabs/marine-worker": "workspace:*", + "@fluencelabs/js-peer": "0.9.1", + "@fluencelabs/interfaces": "0.8.1", "buffer": "6.0.3", "cross-fetch": "4.0.0", "process": "0.11.10", diff --git a/packages/client/js-client.web/CHANGELOG.md b/packages/client/js-client.web/CHANGELOG.md index 6323b966c..124b90e07 100644 --- a/packages/client/js-client.web/CHANGELOG.md +++ b/packages/client/js-client.web/CHANGELOG.md @@ -19,6 +19,13 @@ * @fluencelabs/js-peer bumped from 0.8.10 to 0.9.0 * @fluencelabs/interfaces bumped from 0.7.6 to 0.8.0 +### Dependencies + +* The following workspace dependencies were updated + * dependencies + * @fluencelabs/js-peer bumped from 0.9.0 to 0.9.1 + * @fluencelabs/interfaces bumped from 0.8.0 to 0.8.1 + ## [0.2.3](https://github.com/fluencelabs/js-client/compare/js-client.web-v0.2.2...js-client.web-v0.2.3) (2023-06-20) diff --git a/packages/client/js-client.web/package.json b/packages/client/js-client.web/package.json index fcdbda845..2308038a0 100644 --- a/packages/client/js-client.web/package.json +++ b/packages/client/js-client.web/package.json @@ -1,6 +1,6 @@ { "name": "@fluencelabs/js-client.web", - "version": "0.2.4", + "version": "0.2.5", "description": "TypeScript implementation of Fluence Peer", "main": "./dist/index.js", "typings": "./dist/index.d.ts", @@ -16,8 +16,8 @@ "author": "Fluence Labs", "license": "Apache-2.0", "dependencies": { - "@fluencelabs/js-peer": "0.9.0", - "@fluencelabs/interfaces": "0.8.0" + "@fluencelabs/js-peer": "0.9.1", + "@fluencelabs/interfaces": "0.8.1" }, "devDependencies": { "@types/node": "16.11.59", diff --git a/packages/core/interfaces/CHANGELOG.md b/packages/core/interfaces/CHANGELOG.md index 403b5bd48..1af9198ad 100644 --- a/packages/core/interfaces/CHANGELOG.md +++ b/packages/core/interfaces/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.8.1](https://github.com/fluencelabs/js-client/compare/interfaces-v0.8.0...interfaces-v0.8.1) (2023-08-08) + + +### Bug Fixes + +* **deps:** update dependency @fluencelabs/avm to v0.43.1 ([#322](https://github.com/fluencelabs/js-client/issues/322)) ([c1d1fa6](https://github.com/fluencelabs/js-client/commit/c1d1fa6659b6dc2c6707786748b3410fab7f1bcd)) + ## [0.8.0](https://github.com/fluencelabs/js-client/compare/interfaces-v0.7.6...interfaces-v0.8.0) (2023-06-29) diff --git a/packages/core/interfaces/package.json b/packages/core/interfaces/package.json index 8452efcfe..75024ebae 100644 --- a/packages/core/interfaces/package.json +++ b/packages/core/interfaces/package.json @@ -1,7 +1,7 @@ { "name": "@fluencelabs/interfaces", "type": "module", - "version": "0.8.0", + "version": "0.8.1", "description": "Interfaces", "main": "./dist/index.js", "typings": "./dist/index.d.ts", diff --git a/packages/core/js-peer/CHANGELOG.md b/packages/core/js-peer/CHANGELOG.md index 23311f6d9..c0a16617e 100644 --- a/packages/core/js-peer/CHANGELOG.md +++ b/packages/core/js-peer/CHANGELOG.md @@ -1,5 +1,19 @@ # Changelog +## [0.9.1](https://github.com/fluencelabs/js-client/compare/js-peer-v0.9.0...js-peer-v0.9.1) (2023-08-08) + + +### Bug Fixes + +* **deps:** update dependency @fluencelabs/avm to v0.43.1 ([#322](https://github.com/fluencelabs/js-client/issues/322)) ([c1d1fa6](https://github.com/fluencelabs/js-client/commit/c1d1fa6659b6dc2c6707786748b3410fab7f1bcd)) + + +### Dependencies + +* The following workspace dependencies were updated + * dependencies + * @fluencelabs/interfaces bumped from 0.8.0 to 0.8.1 + ## [0.9.0](https://github.com/fluencelabs/js-client/compare/js-peer-v0.8.10...js-peer-v0.9.0) (2023-06-29) diff --git a/packages/core/js-peer/package.json b/packages/core/js-peer/package.json index 1a3934c45..4eec46390 100644 --- a/packages/core/js-peer/package.json +++ b/packages/core/js-peer/package.json @@ -1,6 +1,6 @@ { "name": "@fluencelabs/js-peer", - "version": "0.9.0", + "version": "0.9.1", "description": "TypeScript implementation of Fluence Peer", "main": "./dist/index.js", "typings": "./dist/index.d.ts", @@ -17,7 +17,7 @@ "author": "Fluence Labs", "license": "Apache-2.0", "dependencies": { - "@fluencelabs/interfaces": "0.8.0", + "@fluencelabs/interfaces": "0.8.1", "@fluencelabs/avm": "0.43.1", "@fluencelabs/marine-js": "0.3.45", "multiformats": "11.0.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index abe07e9bc..1251dd823 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -141,7 +141,7 @@ importers: packages/client/api: dependencies: '@fluencelabs/interfaces': - specifier: 0.8.0 + specifier: 0.8.1 version: link:../../core/interfaces devDependencies: '@fluencelabs/avm': @@ -163,10 +163,10 @@ importers: specifier: 0.43.1 version: 0.43.1 '@fluencelabs/interfaces': - specifier: 0.8.0 + specifier: 0.8.1 version: link:../../core/interfaces '@fluencelabs/js-peer': - specifier: 0.9.0 + specifier: 0.9.1 version: link:../../core/js-peer '@fluencelabs/marine-js': specifier: 0.3.45 @@ -230,10 +230,10 @@ importers: packages/client/js-client.web: dependencies: '@fluencelabs/interfaces': - specifier: 0.8.0 + specifier: 0.8.1 version: link:../../core/interfaces '@fluencelabs/js-peer': - specifier: 0.9.0 + specifier: 0.9.1 version: link:../../core/js-peer devDependencies: '@types/jest': @@ -252,10 +252,10 @@ importers: packages/client/js-client.web.standalone: dependencies: '@fluencelabs/interfaces': - specifier: 0.8.0 + specifier: 0.8.1 version: link:../../core/interfaces '@fluencelabs/js-peer': - specifier: 0.9.0 + specifier: 0.9.1 version: link:../../core/js-peer '@fluencelabs/marine-worker': specifier: workspace:* @@ -364,7 +364,7 @@ importers: specifier: 0.43.1 version: 0.43.1 '@fluencelabs/interfaces': - specifier: 0.8.0 + specifier: 0.8.1 version: link:../interfaces '@fluencelabs/marine-js': specifier: 0.3.45 From 9276deee5cfc8dcdacf236da8d42bb5b577eaf8a Mon Sep 17 00:00:00 2001 From: Valery Antopol Date: Wed, 9 Aug 2023 15:38:40 +0300 Subject: [PATCH 06/48] feat: use marine-js 0.7.2 (#321) * use marine-js 0.5.0 * increace some timeouts * increace some timeouts * use latest marine + remove larger timeouts * propagate CallParameters type * use marine 0.7.2 * Temp use node 18 and 20 * Comment out node 20.x --------- Co-authored-by: Anatoly Laskaris --- .github/workflows/tests.yml | 2 +- packages/client/api/package.json | 2 +- packages/client/js-client.node/package.json | 2 +- .../js-client.web.standalone/package.json | 26 +- packages/core/interfaces/package.json | 2 +- packages/core/js-peer/package.json | 2 +- .../core/js-peer/src/jsPeer/FluencePeer.ts | 6 +- packages/core/js-peer/src/jsPeer/avm.ts | 3 +- .../core/js-peer/src/marine/interfaces.ts | 4 +- .../js-peer/src/marine/worker-script/index.ts | 32 +- .../core/js-peer/src/marine/worker/index.ts | 6 +- packages/core/js-peer/src/util/commonTypes.ts | 2 + pnpm-lock.yaml | 1784 +++-------------- 13 files changed, 367 insertions(+), 1506 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index f451d2f45..e991e712e 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -37,8 +37,8 @@ jobs: strategy: matrix: node-version: - - 16.x - 18.x + # - 20.x steps: - name: Import secrets diff --git a/packages/client/api/package.json b/packages/client/api/package.json index 897043a5f..ba2aafeef 100644 --- a/packages/client/api/package.json +++ b/packages/client/api/package.json @@ -29,7 +29,7 @@ }, "devDependencies": { "@fluencelabs/avm": "0.43.1", - "@fluencelabs/marine-js": "0.3.45", + "@fluencelabs/marine-js": "0.7.2", "microbundle": "0.15.1", "dts-bundle-generator": "7.2.0" } diff --git a/packages/client/js-client.node/package.json b/packages/client/js-client.node/package.json index 402e97295..e57ed1a21 100644 --- a/packages/client/js-client.node/package.json +++ b/packages/client/js-client.node/package.json @@ -25,7 +25,7 @@ "@fluencelabs/js-peer": "0.9.1", "@fluencelabs/interfaces": "0.8.1", "@fluencelabs/avm": "0.43.1", - "@fluencelabs/marine-js": "0.3.45", + "@fluencelabs/marine-js": "0.7.2", "platform": "1.3.6" }, "devDependencies": { diff --git a/packages/client/js-client.web.standalone/package.json b/packages/client/js-client.web.standalone/package.json index 123afc861..abcd02757 100644 --- a/packages/client/js-client.web.standalone/package.json +++ b/packages/client/js-client.web.standalone/package.json @@ -10,7 +10,7 @@ }, "type": "module", "scripts": { - "build": "node --loader ts-node/esm -C browser ./build.ts" + "build": "node --loader ts-node/esm ./build.ts" }, "repository": "https://github.com/fluencelabs/fluence-js", "author": "Fluence Labs", @@ -19,31 +19,19 @@ "@fluencelabs/js-peer": "0.9.1", "@fluencelabs/interfaces": "0.8.1", "buffer": "6.0.3", - "cross-fetch": "4.0.0", - "process": "0.11.10", - "threads": "1.7.0", - "vite-plugin-node-polyfills": "0.9.0", - "webpack": "5.88.2" + "process": "0.11.10" }, "devDependencies": { "@fluencelabs/avm": "0.43.1", - "@fluencelabs/marine-js": "0.3.45", - "@rollup/plugin-inject": "5.0.3", - "@types/jest": "28.1.0", + "@fluencelabs/marine-js": "0.7.2", "@types/node": "16.11.59", - "crypto-browserify": "3.12.0", - "esbuild-loader": "3.0.1", + "@types/jest": "28.1.0", "jest": "28.1.0", - "js-base64": "3.7.5", - "node-polyfill-webpack-plugin": "2.0.1", - "node-stdlib-browser": "1.2.0", - "rollup-plugin-node-polyfills": "0.2.1", "ts-jest": "28.0.2", - "ts-loader": "9.4.4", - "vite": "4.0.4", - "vite-plugin-external": "1.2.8", - "vite-plugin-externals": "0.6.2", + "js-base64": "3.7.5", + "@rollup/plugin-inject": "5.0.3", "vite-plugin-replace": "0.1.1", + "vite": "4.0.4", "vite-tsconfig-paths": "4.0.3" } } diff --git a/packages/core/interfaces/package.json b/packages/core/interfaces/package.json index 75024ebae..25ea3e263 100644 --- a/packages/core/interfaces/package.json +++ b/packages/core/interfaces/package.json @@ -51,6 +51,6 @@ "devDependencies": { "@multiformats/multiaddr": "11.3.0", "@fluencelabs/avm": "0.43.1", - "@fluencelabs/marine-js": "0.3.45" + "@fluencelabs/marine-js": "0.7.2" } } diff --git a/packages/core/js-peer/package.json b/packages/core/js-peer/package.json index 4eec46390..2ba78b98a 100644 --- a/packages/core/js-peer/package.json +++ b/packages/core/js-peer/package.json @@ -19,7 +19,7 @@ "dependencies": { "@fluencelabs/interfaces": "0.8.1", "@fluencelabs/avm": "0.43.1", - "@fluencelabs/marine-js": "0.3.45", + "@fluencelabs/marine-js": "0.7.2", "multiformats": "11.0.1", "debug": "4.3.4", "async": "3.2.4", diff --git a/packages/core/js-peer/src/jsPeer/FluencePeer.ts b/packages/core/js-peer/src/jsPeer/FluencePeer.ts index eedf9791e..f6af5f16e 100644 --- a/packages/core/js-peer/src/jsPeer/FluencePeer.ts +++ b/packages/core/js-peer/src/jsPeer/FluencePeer.ts @@ -25,6 +25,7 @@ import { ParticleExecutionStage, ParticleQueueItem, } from '../particle/Particle.js'; +import { defaultCallParameters } from "@fluencelabs/marine-js/dist/types" import { jsonify, isString } from '../util/utils.js'; import { concatMap, filter, pipe, Subject, tap, Unsubscribable } from 'rxjs'; import { defaultSigGuard, Sig } from '../services/Sig.js'; @@ -184,7 +185,7 @@ export abstract class FluencePeer { new Error("Can't use avm: peer is not initialized"); } - const res = await this.marineHost.callService('avm', 'ast', [air], undefined); + const res = await this.marineHost.callService('avm', 'ast', [air], defaultCallParameters); if (!isString(res)) { throw new Error(`Call to avm:ast expected to return string. Actual return: ${res}`); } @@ -521,7 +522,8 @@ export abstract class FluencePeer { log_particle.trace('id %s. executing call service handler %j', particleId, req); if (this.marineHost && this.marineHost.hasService(req.serviceId)) { - const result = await this.marineHost.callService(req.serviceId, req.fnName, req.args, undefined); + // TODO build correct CallParameters instead of default ones + const result = await this.marineHost.callService(req.serviceId, req.fnName, req.args, defaultCallParameters); return { retCode: ResultCodes.success, diff --git a/packages/core/js-peer/src/jsPeer/avm.ts b/packages/core/js-peer/src/jsPeer/avm.ts index d9b4c578b..d351b0848 100644 --- a/packages/core/js-peer/src/jsPeer/avm.ts +++ b/packages/core/js-peer/src/jsPeer/avm.ts @@ -16,6 +16,7 @@ import type { CallResultsArray, InterpreterResult, RunParameters } from '@fluencelabs/avm'; import { deserializeAvmResult, serializeAvmArgs } from '@fluencelabs/avm'; import { IAvmRunner, IMarineHost, IWasmLoader } from '../marine/interfaces.js'; +import { defaultCallParameters } from "@fluencelabs/marine-js/dist/types" export class MarineBasedAvmRunner implements IAvmRunner { constructor(private marine: IMarineHost, private avmWasmLoader: IWasmLoader) {} @@ -31,7 +32,7 @@ export class MarineBasedAvmRunner implements IAvmRunner { let avmCallResult: InterpreterResult | Error; try { - const res = await this.marine.callService('avm', 'invoke', args, undefined); + const res = await this.marine.callService('avm', 'invoke', args, defaultCallParameters); avmCallResult = deserializeAvmResult(res); } catch (e) { avmCallResult = e instanceof Error ? e : new Error((e as any).toString()); diff --git a/packages/core/js-peer/src/marine/interfaces.ts b/packages/core/js-peer/src/marine/interfaces.ts index 3789ed8fe..a9b0828ef 100644 --- a/packages/core/js-peer/src/marine/interfaces.ts +++ b/packages/core/js-peer/src/marine/interfaces.ts @@ -14,7 +14,7 @@ * limitations under the License. */ import { CallResultsArray, InterpreterResult, RunParameters } from '@fluencelabs/avm'; -import { IStartable, JSONArray, JSONObject } from '../util/commonTypes.js'; +import { IStartable, JSONArray, JSONObject, CallParameters } from '../util/commonTypes.js'; import { Buffer } from 'buffer'; // @ts-ignore import type { WorkerImplementation } from 'threads/dist/types/master'; @@ -45,7 +45,7 @@ export interface IMarineHost extends IStartable { serviceId: string, functionName: string, args: JSONArray | JSONObject, - callParams: any, + callParams: CallParameters, ): Promise; } diff --git a/packages/core/js-peer/src/marine/worker-script/index.ts b/packages/core/js-peer/src/marine/worker-script/index.ts index 8bfa62420..b01ea0e0d 100644 --- a/packages/core/js-peer/src/marine/worker-script/index.ts +++ b/packages/core/js-peer/src/marine/worker-script/index.ts @@ -15,8 +15,8 @@ */ import { MarineService } from '@fluencelabs/marine-js/dist/MarineService'; -import type { Env, MarineServiceConfig } from '@fluencelabs/marine-js/dist/config'; -import type { JSONArray, JSONObject, LogMessage } from '@fluencelabs/marine-js/dist/types'; +import type { Env, MarineModuleConfig, MarineServiceConfig, ModuleDescriptor } from '@fluencelabs/marine-js/dist/config' +import type { JSONArray, JSONObject, LogMessage, CallParameters } from '@fluencelabs/marine-js/dist/types'; import { Buffer } from 'buffer'; // @ts-ignore import { Observable, Subject } from 'threads/observable'; @@ -26,6 +26,26 @@ import { expose } from 'threads/worker'; let marineServices = new Map(); let controlModule: WebAssembly.Module | undefined; +const createSimpleModuleDescriptor = (name: string, envs?: Env): ModuleDescriptor => { + return { + import_name: name, + config: { + logger_enabled: true, + logging_mask: 0, + wasi: { + envs: {...envs}, + preopened_files: new Set(), + mapped_dirs: new Map, + } + } + } +} +const createSimpleMarineService = (name: string, env? : Env): MarineServiceConfig => { + return { + modules_config: [createSimpleModuleDescriptor(name, env)], + } +} + const onLogMessage = new Subject(); const asArray = (buf: SharedArrayBuffer | Buffer) => { @@ -40,20 +60,20 @@ const toExpose = { createService: async ( wasm: SharedArrayBuffer | Buffer, serviceId: string, - marineConfig?: MarineServiceConfig, envs?: Env, ): Promise => { if (!controlModule) { throw new Error('MarineJS is not initialized. To initialize call `init` function'); } - const service = await WebAssembly.compile(asArray(wasm)); + const marineConfig = createSimpleMarineService(serviceId, envs); + const modules = {[serviceId]: new Uint8Array(wasm)} const srv = new MarineService( controlModule, - service, serviceId, onLogMessage.next.bind(onLogMessage), marineConfig, + modules, envs, ); await srv.init(); @@ -67,7 +87,7 @@ const toExpose = { onLogMessage.complete(); }, - callService: (serviceId: string, functionName: string, args: JSONArray | JSONObject, callParams: any): unknown => { + callService: (serviceId: string, functionName: string, args: JSONArray | JSONObject, callParams: CallParameters): unknown => { const srv = marineServices.get(serviceId); if (!srv) { throw new Error(`service with id=${serviceId} not found`); diff --git a/packages/core/js-peer/src/marine/worker/index.ts b/packages/core/js-peer/src/marine/worker/index.ts index 67fdb348e..058a60952 100644 --- a/packages/core/js-peer/src/marine/worker/index.ts +++ b/packages/core/js-peer/src/marine/worker/index.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import type { JSONArray, JSONObject } from '@fluencelabs/marine-js/dist/types'; +import type { JSONArray, JSONObject, CallParameters } from '@fluencelabs/marine-js/dist/types'; import { LogFunction, logLevelToEnv } from '@fluencelabs/marine-js/dist/types'; import type { MarineBackgroundInterface } from '../worker-script/index.js'; // @ts-ignore @@ -73,7 +73,7 @@ export class MarineBackgroundRunner implements IMarineHost { // We enable all possible log levels passing the control for exact printouts to the logger const env = logLevelToEnv('trace'); this.loggers.set(serviceId, marineLogger(serviceId)); - await this.workerThread.createService(serviceModule, serviceId, undefined, env); + await this.workerThread.createService(serviceModule, serviceId, env); this.marineServices.add(serviceId); } @@ -81,7 +81,7 @@ export class MarineBackgroundRunner implements IMarineHost { serviceId: string, functionName: string, args: JSONArray | JSONObject, - callParams: any, + callParams: CallParameters, ): Promise { if (!this.workerThread) { throw 'Worker is not initialized'; diff --git a/packages/core/js-peer/src/util/commonTypes.ts b/packages/core/js-peer/src/util/commonTypes.ts index 7a34d6a6c..bdbd50171 100644 --- a/packages/core/js-peer/src/util/commonTypes.ts +++ b/packages/core/js-peer/src/util/commonTypes.ts @@ -14,6 +14,8 @@ * limitations under the License. */ +export { CallParameters} from "@fluencelabs/marine-js/dist/types"; + export interface IStartable { start(): Promise; stop(): Promise; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1251dd823..3f6efdd11 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -10,7 +10,7 @@ importers: devDependencies: '@fluencelabs/aqua': specifier: 0.9.1-374 - version: 0.9.1-374(@babel/core@7.22.5)(jest@27.5.1)(node-fetch@3.3.2)(typescript@4.7.2) + version: 0.9.1-374(jest@27.5.1)(node-fetch@3.3.1)(typescript@4.7.2) '@fluencelabs/aqua-lib': specifier: 0.6.0 version: 0.6.0 @@ -44,7 +44,7 @@ importers: version: 0.6.0 '@fluencelabs/cli': specifier: 0.3.9 - version: 0.3.9(@ethersproject/abi@5.7.0)(@ethersproject/providers@5.7.2)(@nomicfoundation/hardhat-chai-matchers@1.0.6)(@nomicfoundation/hardhat-network-helpers@1.0.8)(@nomiclabs/hardhat-ethers@2.2.3)(@nomiclabs/hardhat-etherscan@3.1.7)(@typechain/ethers-v5@10.2.1)(@typechain/hardhat@6.1.6)(@types/chai@4.3.5)(@types/mocha@9.1.1)(@types/node@20.4.5)(chai@4.3.7)(hardhat-gas-reporter@1.0.9)(hardhat@2.15.0)(jest@27.5.1)(solidity-coverage@0.7.22)(ts-node@10.9.1)(typechain@8.2.0)(typescript@4.7.2) + version: 0.3.9(@ethersproject/abi@5.7.0)(@ethersproject/providers@5.7.2)(@nomicfoundation/hardhat-chai-matchers@1.0.6)(@nomicfoundation/hardhat-network-helpers@1.0.8)(@nomiclabs/hardhat-ethers@2.2.3)(@nomiclabs/hardhat-etherscan@3.1.7)(@typechain/ethers-v5@10.2.1)(@typechain/hardhat@6.1.6)(@types/chai@4.3.5)(@types/mocha@9.1.1)(@types/node@18.13.0)(chai@4.3.7)(hardhat-gas-reporter@1.0.9)(hardhat@2.15.0)(jest@27.5.1)(solidity-coverage@0.7.22)(ts-node@10.9.1)(typechain@8.2.0)(typescript@4.7.2) '@fluencelabs/registry': specifier: 0.8.2 version: 0.8.2 @@ -61,7 +61,7 @@ importers: specifier: workspace:^ version: link:../../../client/js-client.node '@test/aqua_for_test': - specifier: workspace:../../aqua + specifier: workspace:^ version: link:../../aqua packages/@tests/smoke/web: @@ -70,7 +70,7 @@ importers: specifier: workspace:^ version: link:../../../client/js-client.web.standalone '@test/test-utils': - specifier: workspace:../../test-utils + specifier: workspace:^ version: link:../../test-utils packages/@tests/smoke/web-cra-ts: @@ -110,7 +110,7 @@ importers: version: 18.2.0(react@18.2.0) react-scripts: specifier: 5.0.1 - version: 5.0.1(@babel/plugin-syntax-flow@7.22.5)(@babel/plugin-transform-react-jsx@7.22.5)(eslint@8.43.0)(react@18.2.0)(typescript@4.9.5) + version: 5.0.1(@babel/plugin-syntax-flow@7.22.5)(@babel/plugin-transform-react-jsx@7.22.5)(eslint@8.43.0)(react@18.2.0)(ts-node@10.9.1)(typescript@4.9.5) typescript: specifier: 4.9.5 version: 4.9.5 @@ -148,14 +148,14 @@ importers: specifier: 0.43.1 version: 0.43.1 '@fluencelabs/marine-js': - specifier: 0.3.45 - version: 0.3.45 + specifier: 0.7.2 + version: 0.7.2 dts-bundle-generator: specifier: 7.2.0 version: 7.2.0 microbundle: specifier: 0.15.1 - version: 0.15.1 + version: 0.15.1(ts-node@10.9.1) packages/client/js-client.node: dependencies: @@ -169,63 +169,15 @@ importers: specifier: 0.9.1 version: link:../../core/js-peer '@fluencelabs/marine-js': - specifier: 0.3.45 - version: 0.3.45 - '@fluencelabs/marine-worker': - specifier: workspace:* - version: link:../../core/marine-worker - cross-fetch: - specifier: 4.0.0 - version: 4.0.0 - data-urls: - specifier: 4.0.0 - version: 4.0.0 - js-base64: - specifier: 3.7.5 - version: 3.7.5 + specifier: 0.7.2 + version: 0.7.2 platform: specifier: 1.3.6 version: 1.3.6 - threads: - specifier: 1.7.0 - version: 1.7.0 - vite-plugin-require-transform: - specifier: 1.0.21 - version: 1.0.21 - ws: - specifier: 8.13.0 - version: 8.13.0 devDependencies: - '@rollup/plugin-commonjs': - specifier: 25.0.3 - version: 25.0.3(rollup@3.25.1) - '@rollup/plugin-dynamic-import-vars': - specifier: 2.0.4 - version: 2.0.4(rollup@3.25.1) - '@rollup/plugin-inject': - specifier: 5.0.3 - version: 5.0.3(rollup@3.25.1) - '@rollup/plugin-node-resolve': - specifier: 15.1.0 - version: 15.1.0(rollup@3.25.1) - '@types/data-urls': - specifier: 3.0.1 - version: 3.0.1 '@types/platform': specifier: 1.3.4 version: 1.3.4 - rollup-plugin-cjs-es: - specifier: 2.0.0 - version: 2.0.0(rollup@3.25.1) - vite: - specifier: 4.0.4 - version: 4.0.4 - vite-plugin-commonjs: - specifier: 0.8.2 - version: 0.8.2 - vite-plugin-replace: - specifier: 0.1.1 - version: 0.1.1(vite@4.0.4) packages/client/js-client.web: dependencies: @@ -244,7 +196,7 @@ importers: version: 16.11.59 jest: specifier: 28.1.0 - version: 28.1.0(@types/node@16.11.59) + version: 28.1.0(@types/node@16.11.59)(ts-node@10.9.1) ts-jest: specifier: 28.0.2 version: 28.0.2(@babel/core@7.22.5)(@types/jest@28.1.0)(jest@28.1.0)(typescript@4.7.2) @@ -257,34 +209,19 @@ importers: '@fluencelabs/js-peer': specifier: 0.9.1 version: link:../../core/js-peer - '@fluencelabs/marine-worker': - specifier: workspace:* - version: link:../../core/marine-worker buffer: specifier: 6.0.3 version: 6.0.3 - cross-fetch: - specifier: 4.0.0 - version: 4.0.0 process: specifier: 0.11.10 version: 0.11.10 - threads: - specifier: 1.7.0 - version: 1.7.0 - vite-plugin-node-polyfills: - specifier: 0.9.0 - version: 0.9.0(vite@4.0.4) - webpack: - specifier: 5.88.2 - version: 5.88.2 devDependencies: '@fluencelabs/avm': specifier: 0.43.1 version: 0.43.1 '@fluencelabs/marine-js': - specifier: 0.3.45 - version: 0.3.45 + specifier: 0.7.2 + version: 0.7.2 '@rollup/plugin-inject': specifier: 5.0.3 version: 5.0.3 @@ -294,42 +231,18 @@ importers: '@types/node': specifier: 16.11.59 version: 16.11.59 - crypto-browserify: - specifier: 3.12.0 - version: 3.12.0 - esbuild-loader: - specifier: 3.0.1 - version: 3.0.1(webpack@5.88.2) jest: specifier: 28.1.0 - version: 28.1.0(@types/node@16.11.59) + version: 28.1.0(@types/node@16.11.59)(ts-node@10.9.1) js-base64: specifier: 3.7.5 version: 3.7.5 - node-polyfill-webpack-plugin: - specifier: 2.0.1 - version: 2.0.1(webpack@5.88.2) - node-stdlib-browser: - specifier: 1.2.0 - version: 1.2.0 - rollup-plugin-node-polyfills: - specifier: 0.2.1 - version: 0.2.1 ts-jest: specifier: 28.0.2 version: 28.0.2(@babel/core@7.22.5)(@types/jest@28.1.0)(jest@28.1.0)(typescript@4.7.2) - ts-loader: - specifier: 9.4.4 - version: 9.4.4(typescript@4.7.2)(webpack@5.88.2) vite: specifier: 4.0.4 version: 4.0.4(@types/node@16.11.59) - vite-plugin-external: - specifier: 1.2.8 - version: 1.2.8 - vite-plugin-externals: - specifier: 0.6.2 - version: 0.6.2(vite@4.0.4) vite-plugin-replace: specifier: 0.1.1 version: 0.1.1(vite@4.0.4) @@ -349,8 +262,8 @@ importers: specifier: 0.43.1 version: 0.43.1 '@fluencelabs/marine-js': - specifier: 0.3.45 - version: 0.3.45 + specifier: 0.7.2 + version: 0.7.2 '@multiformats/multiaddr': specifier: 11.3.0 version: 11.3.0 @@ -367,11 +280,8 @@ importers: specifier: 0.8.1 version: link:../interfaces '@fluencelabs/marine-js': - specifier: 0.3.45 - version: 0.3.45 - '@fluencelabs/marine-worker': - specifier: workspace:* - version: link:../marine-worker + specifier: 0.7.2 + version: 0.7.2 '@libp2p/crypto': specifier: 1.0.8 version: 1.0.8(uint8arraylist@2.4.3) @@ -413,7 +323,7 @@ importers: version: 6.0.3 debug: specifier: 4.3.4 - version: 4.3.4 + version: 4.3.4(supports-color@8.1.1) it-length-prefixed: specifier: 8.0.4 version: 8.0.4 @@ -470,43 +380,6 @@ importers: specifier: 0.29.7 version: 0.29.7 - packages/core/marine-worker: - dependencies: - '@fluencelabs/marine-js': - specifier: 0.3.45 - version: 0.3.45 - observable-fns: - specifier: 0.6.1 - version: 0.6.1 - threads: - specifier: 1.7.0 - version: 1.7.0 - devDependencies: - '@rollup/plugin-inject': - specifier: 5.0.3 - version: 5.0.3 - '@types/node': - specifier: 20.4.5 - version: 20.4.5 - deepmerge: - specifier: 4.3.1 - version: 4.3.1 - node-stdlib-browser: - specifier: 1.2.0 - version: 1.2.0 - typescript: - specifier: 5.1.6 - version: 5.1.6 - vite: - specifier: 4.0.4 - version: 4.0.4(@types/node@20.4.5) - vite-plugin-replace: - specifier: 0.1.1 - version: 0.1.1(vite@4.0.4) - vitest: - specifier: 0.29.7 - version: 0.29.7 - packages: /@achingbrain/ip-address@8.1.0: @@ -601,7 +474,7 @@ packages: '@babel/traverse': 7.22.5 '@babel/types': 7.22.5 convert-source-map: 1.9.0 - debug: 4.3.4 + debug: 4.3.4(supports-color@8.1.1) gensync: 1.0.0-beta.2 json5: 2.2.3 semver: 6.3.0 @@ -694,7 +567,7 @@ packages: '@babel/core': 7.22.5 '@babel/helper-compilation-targets': 7.22.5(@babel/core@7.22.5) '@babel/helper-plugin-utils': 7.22.5 - debug: 4.3.4 + debug: 4.3.4(supports-color@8.1.1) lodash.debounce: 4.0.8 resolve: 1.22.2 semver: 6.3.0 @@ -1959,7 +1832,7 @@ packages: '@babel/helper-split-export-declaration': 7.22.5 '@babel/parser': 7.22.5 '@babel/types': 7.22.5 - debug: 4.3.4 + debug: 4.3.4(supports-color@8.1.1) globals: 11.12.0 transitivePeerDependencies: - supports-color @@ -2016,7 +1889,7 @@ packages: '@stablelib/hkdf': 1.0.1 '@stablelib/sha256': 1.0.1 '@stablelib/x25519': 1.0.3 - debug: 4.3.4 + debug: 4.3.4(supports-color@8.1.1) it-buffer: 0.1.3 it-length-prefixed: 5.0.3 it-pair: 1.0.0 @@ -2067,7 +1940,6 @@ packages: engines: {node: '>=12'} dependencies: '@jridgewell/trace-mapping': 0.3.9 - dev: true /@csstools/normalize.css@12.0.0: resolution: {integrity: sha512-M0qqxAcwCsIVfpFQSlGN5XjXWu8l5JDZN+fPt1LeW5SZexQTgnaEvgXAY+CeygRw0EeppWHi12JxESWiWrB0Sg==} @@ -2232,14 +2104,6 @@ packages: cpu: [arm64] os: [android] requiresBuild: true - optional: true - - /@esbuild/android-arm64@0.17.19: - resolution: {integrity: sha512-KBMWvEZooR7+kzY0BtbTQn0OAYY7CsiydT63pVEaPtVYF0hXbUaOyZog37DKxK7NF3XacBJOpYT4adIJh+avxA==} - engines: {node: '>=12'} - cpu: [arm64] - os: [android] - requiresBuild: true dev: true optional: true @@ -2249,14 +2113,6 @@ packages: cpu: [arm] os: [android] requiresBuild: true - optional: true - - /@esbuild/android-arm@0.17.19: - resolution: {integrity: sha512-rIKddzqhmav7MSmoFCmDIb6e2W57geRsM94gV2l38fzhXMwq7hZoClug9USI2pFRGL06f4IOPHHpFNOkWieR8A==} - engines: {node: '>=12'} - cpu: [arm] - os: [android] - requiresBuild: true dev: true optional: true @@ -2266,14 +2122,6 @@ packages: cpu: [x64] os: [android] requiresBuild: true - optional: true - - /@esbuild/android-x64@0.17.19: - resolution: {integrity: sha512-uUTTc4xGNDT7YSArp/zbtmbhO0uEEK9/ETW29Wk1thYUJBz3IVnvgEiEwEa9IeLyvnpKrWK64Utw2bgUmDveww==} - engines: {node: '>=12'} - cpu: [x64] - os: [android] - requiresBuild: true dev: true optional: true @@ -2283,14 +2131,6 @@ packages: cpu: [arm64] os: [darwin] requiresBuild: true - optional: true - - /@esbuild/darwin-arm64@0.17.19: - resolution: {integrity: sha512-80wEoCfF/hFKM6WE1FyBHc9SfUblloAWx6FJkFWTWiCoht9Mc0ARGEM47e67W9rI09YoUxJL68WHfDRYEAvOhg==} - engines: {node: '>=12'} - cpu: [arm64] - os: [darwin] - requiresBuild: true dev: true optional: true @@ -2300,14 +2140,6 @@ packages: cpu: [x64] os: [darwin] requiresBuild: true - optional: true - - /@esbuild/darwin-x64@0.17.19: - resolution: {integrity: sha512-IJM4JJsLhRYr9xdtLytPLSH9k/oxR3boaUIYiHkAawtwNOXKE8KoU8tMvryogdcT8AU+Bflmh81Xn6Q0vTZbQw==} - engines: {node: '>=12'} - cpu: [x64] - os: [darwin] - requiresBuild: true dev: true optional: true @@ -2317,14 +2149,6 @@ packages: cpu: [arm64] os: [freebsd] requiresBuild: true - optional: true - - /@esbuild/freebsd-arm64@0.17.19: - resolution: {integrity: sha512-pBwbc7DufluUeGdjSU5Si+P3SoMF5DQ/F/UmTSb8HXO80ZEAJmrykPyzo1IfNbAoaqw48YRpv8shwd1NoI0jcQ==} - engines: {node: '>=12'} - cpu: [arm64] - os: [freebsd] - requiresBuild: true dev: true optional: true @@ -2334,14 +2158,6 @@ packages: cpu: [x64] os: [freebsd] requiresBuild: true - optional: true - - /@esbuild/freebsd-x64@0.17.19: - resolution: {integrity: sha512-4lu+n8Wk0XlajEhbEffdy2xy53dpR06SlzvhGByyg36qJw6Kpfk7cp45DR/62aPH9mtJRmIyrXAS5UWBrJT6TQ==} - engines: {node: '>=12'} - cpu: [x64] - os: [freebsd] - requiresBuild: true dev: true optional: true @@ -2351,14 +2167,6 @@ packages: cpu: [arm64] os: [linux] requiresBuild: true - optional: true - - /@esbuild/linux-arm64@0.17.19: - resolution: {integrity: sha512-ct1Tg3WGwd3P+oZYqic+YZF4snNl2bsnMKRkb3ozHmnM0dGWuxcPTTntAF6bOP0Sp4x0PjSF+4uHQ1xvxfRKqg==} - engines: {node: '>=12'} - cpu: [arm64] - os: [linux] - requiresBuild: true dev: true optional: true @@ -2368,14 +2176,6 @@ packages: cpu: [arm] os: [linux] requiresBuild: true - optional: true - - /@esbuild/linux-arm@0.17.19: - resolution: {integrity: sha512-cdmT3KxjlOQ/gZ2cjfrQOtmhG4HJs6hhvm3mWSRDPtZ/lP5oe8FWceS10JaSJC13GBd4eH/haHnqf7hhGNLerA==} - engines: {node: '>=12'} - cpu: [arm] - os: [linux] - requiresBuild: true dev: true optional: true @@ -2385,14 +2185,6 @@ packages: cpu: [ia32] os: [linux] requiresBuild: true - optional: true - - /@esbuild/linux-ia32@0.17.19: - resolution: {integrity: sha512-w4IRhSy1VbsNxHRQpeGCHEmibqdTUx61Vc38APcsRbuVgK0OPEnQ0YD39Brymn96mOx48Y2laBQGqgZ0j9w6SQ==} - engines: {node: '>=12'} - cpu: [ia32] - os: [linux] - requiresBuild: true dev: true optional: true @@ -2402,14 +2194,6 @@ packages: cpu: [loong64] os: [linux] requiresBuild: true - optional: true - - /@esbuild/linux-loong64@0.17.19: - resolution: {integrity: sha512-2iAngUbBPMq439a+z//gE+9WBldoMp1s5GWsUSgqHLzLJ9WoZLZhpwWuym0u0u/4XmZ3gpHmzV84PonE+9IIdQ==} - engines: {node: '>=12'} - cpu: [loong64] - os: [linux] - requiresBuild: true dev: true optional: true @@ -2419,14 +2203,6 @@ packages: cpu: [mips64el] os: [linux] requiresBuild: true - optional: true - - /@esbuild/linux-mips64el@0.17.19: - resolution: {integrity: sha512-LKJltc4LVdMKHsrFe4MGNPp0hqDFA1Wpt3jE1gEyM3nKUvOiO//9PheZZHfYRfYl6AwdTH4aTcXSqBerX0ml4A==} - engines: {node: '>=12'} - cpu: [mips64el] - os: [linux] - requiresBuild: true dev: true optional: true @@ -2436,14 +2212,6 @@ packages: cpu: [ppc64] os: [linux] requiresBuild: true - optional: true - - /@esbuild/linux-ppc64@0.17.19: - resolution: {integrity: sha512-/c/DGybs95WXNS8y3Ti/ytqETiW7EU44MEKuCAcpPto3YjQbyK3IQVKfF6nbghD7EcLUGl0NbiL5Rt5DMhn5tg==} - engines: {node: '>=12'} - cpu: [ppc64] - os: [linux] - requiresBuild: true dev: true optional: true @@ -2453,14 +2221,6 @@ packages: cpu: [riscv64] os: [linux] requiresBuild: true - optional: true - - /@esbuild/linux-riscv64@0.17.19: - resolution: {integrity: sha512-FC3nUAWhvFoutlhAkgHf8f5HwFWUL6bYdvLc/TTuxKlvLi3+pPzdZiFKSWz/PF30TB1K19SuCxDTI5KcqASJqA==} - engines: {node: '>=12'} - cpu: [riscv64] - os: [linux] - requiresBuild: true dev: true optional: true @@ -2470,14 +2230,6 @@ packages: cpu: [s390x] os: [linux] requiresBuild: true - optional: true - - /@esbuild/linux-s390x@0.17.19: - resolution: {integrity: sha512-IbFsFbxMWLuKEbH+7sTkKzL6NJmG2vRyy6K7JJo55w+8xDk7RElYn6xvXtDW8HCfoKBFK69f3pgBJSUSQPr+4Q==} - engines: {node: '>=12'} - cpu: [s390x] - os: [linux] - requiresBuild: true dev: true optional: true @@ -2487,14 +2239,6 @@ packages: cpu: [x64] os: [linux] requiresBuild: true - optional: true - - /@esbuild/linux-x64@0.17.19: - resolution: {integrity: sha512-68ngA9lg2H6zkZcyp22tsVt38mlhWde8l3eJLWkyLrp4HwMUr3c1s/M2t7+kHIhvMjglIBrFpncX1SzMckomGw==} - engines: {node: '>=12'} - cpu: [x64] - os: [linux] - requiresBuild: true dev: true optional: true @@ -2504,14 +2248,6 @@ packages: cpu: [x64] os: [netbsd] requiresBuild: true - optional: true - - /@esbuild/netbsd-x64@0.17.19: - resolution: {integrity: sha512-CwFq42rXCR8TYIjIfpXCbRX0rp1jo6cPIUPSaWwzbVI4aOfX96OXY8M6KNmtPcg7QjYeDmN+DD0Wp3LaBOLf4Q==} - engines: {node: '>=12'} - cpu: [x64] - os: [netbsd] - requiresBuild: true dev: true optional: true @@ -2521,14 +2257,6 @@ packages: cpu: [x64] os: [openbsd] requiresBuild: true - optional: true - - /@esbuild/openbsd-x64@0.17.19: - resolution: {integrity: sha512-cnq5brJYrSZ2CF6c35eCmviIN3k3RczmHz8eYaVlNasVqsNY+JKohZU5MKmaOI+KkllCdzOKKdPs762VCPC20g==} - engines: {node: '>=12'} - cpu: [x64] - os: [openbsd] - requiresBuild: true dev: true optional: true @@ -2538,14 +2266,6 @@ packages: cpu: [x64] os: [sunos] requiresBuild: true - optional: true - - /@esbuild/sunos-x64@0.17.19: - resolution: {integrity: sha512-vCRT7yP3zX+bKWFeP/zdS6SqdWB8OIpaRq/mbXQxTGHnIxspRtigpkUcDMlSCOejlHowLqII7K2JKevwyRP2rg==} - engines: {node: '>=12'} - cpu: [x64] - os: [sunos] - requiresBuild: true dev: true optional: true @@ -2555,14 +2275,6 @@ packages: cpu: [arm64] os: [win32] requiresBuild: true - optional: true - - /@esbuild/win32-arm64@0.17.19: - resolution: {integrity: sha512-yYx+8jwowUstVdorcMdNlzklLYhPxjniHWFKgRqH7IFlUEa0Umu3KuYplf1HUZZ422e3NU9F4LGb+4O0Kdcaag==} - engines: {node: '>=12'} - cpu: [arm64] - os: [win32] - requiresBuild: true dev: true optional: true @@ -2572,14 +2284,6 @@ packages: cpu: [ia32] os: [win32] requiresBuild: true - optional: true - - /@esbuild/win32-ia32@0.17.19: - resolution: {integrity: sha512-eggDKanJszUtCdlVs0RB+h35wNlb5v4TWEkq4vZcmVt5u/HiDZrTXe2bWFQUez3RgNHwx/x4sk5++4NSSicKkw==} - engines: {node: '>=12'} - cpu: [ia32] - os: [win32] - requiresBuild: true dev: true optional: true @@ -2589,14 +2293,6 @@ packages: cpu: [x64] os: [win32] requiresBuild: true - optional: true - - /@esbuild/win32-x64@0.17.19: - resolution: {integrity: sha512-lAhycmKnVOuRYNtRtatQR1LPQf2oYCkRGkSFnseDAKPl8lu5SOsK/e1sXe5a0Pc5kHIHe6P2I/ilntNv2xf3cA==} - engines: {node: '>=12'} - cpu: [x64] - os: [win32] - requiresBuild: true dev: true optional: true @@ -2620,7 +2316,7 @@ packages: engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dependencies: ajv: 6.12.6 - debug: 4.3.4 + debug: 4.3.4(supports-color@8.1.1) espree: 9.5.2 globals: 13.20.0 ignore: 5.2.4 @@ -3002,15 +2698,15 @@ packages: resolution: {integrity: sha512-ifjtCM93KO3LhzPkMxqmXhwLmrg/scjOiyTihEVg7ns5N+BVzaK1eWzdOdqGdl9ZVoah43pdlQUepEo7VdRmsw==} dev: true - /@fluencelabs/aqua@0.9.1-374(@babel/core@7.22.5)(jest@27.5.1)(node-fetch@3.3.2)(typescript@4.7.2): + /@fluencelabs/aqua@0.9.1-374(jest@27.5.1)(node-fetch@3.3.1)(typescript@4.7.2): resolution: {integrity: sha512-jF6oVE4h7bP/dQArKEfsy4UxbQbzACfVIBY/TFUL5D3np4ssjxrh15Y3gl1PwSWjlaPcDeFvAuStmcqfYQmLqQ==} hasBin: true dependencies: '@fluencelabs/aqua-ipfs': 0.5.8 '@fluencelabs/aqua-lib': 0.6.0 - '@fluencelabs/fluence': 0.27.5(@babel/core@7.22.5)(jest@27.5.1)(node-fetch@3.3.2)(typescript@4.7.2) + '@fluencelabs/fluence': 0.27.5(jest@27.5.1)(node-fetch@3.3.1)(typescript@4.7.2) '@fluencelabs/fluence-network-environment': 1.0.13 - ipfs-http-client: 50.1.2(node-fetch@3.3.2) + ipfs-http-client: 50.1.2(node-fetch@3.3.1) transitivePeerDependencies: - '@babel/core' - '@types/jest' @@ -3036,22 +2732,22 @@ packages: /@fluencelabs/avm@0.43.1: resolution: {integrity: sha512-6tGOMT/2S3ANrqvPLjPUUHgnZCibdIJQH25lsfPN9wBhAcS+0DsYuh1rQWiiJ7xVpps/tuwzFX7gecMmr7hsnQ==} - /@fluencelabs/cli@0.3.9(@ethersproject/abi@5.7.0)(@ethersproject/providers@5.7.2)(@nomicfoundation/hardhat-chai-matchers@1.0.6)(@nomicfoundation/hardhat-network-helpers@1.0.8)(@nomiclabs/hardhat-ethers@2.2.3)(@nomiclabs/hardhat-etherscan@3.1.7)(@typechain/ethers-v5@10.2.1)(@typechain/hardhat@6.1.6)(@types/chai@4.3.5)(@types/mocha@9.1.1)(@types/node@20.4.5)(chai@4.3.7)(hardhat-gas-reporter@1.0.9)(hardhat@2.15.0)(jest@27.5.1)(solidity-coverage@0.7.22)(ts-node@10.9.1)(typechain@8.2.0)(typescript@4.7.2): + /@fluencelabs/cli@0.3.9(@ethersproject/abi@5.7.0)(@ethersproject/providers@5.7.2)(@nomicfoundation/hardhat-chai-matchers@1.0.6)(@nomicfoundation/hardhat-network-helpers@1.0.8)(@nomiclabs/hardhat-ethers@2.2.3)(@nomiclabs/hardhat-etherscan@3.1.7)(@typechain/ethers-v5@10.2.1)(@typechain/hardhat@6.1.6)(@types/chai@4.3.5)(@types/mocha@9.1.1)(@types/node@18.13.0)(chai@4.3.7)(hardhat-gas-reporter@1.0.9)(hardhat@2.15.0)(jest@27.5.1)(solidity-coverage@0.7.22)(ts-node@10.9.1)(typechain@8.2.0)(typescript@4.7.2): resolution: {integrity: sha512-xJYi7+AHrWt6RgWnr7Efr8Jpv0dNLoWhiCMvgSbXoFpIZzQAyNDgk5hnCdwIQ/eiJcNg0GHY0gyC+Q/d5YKc1Q==} engines: {node: '=16'} hasBin: true dependencies: '@fluencelabs/aqua-api': 0.10.6 - '@fluencelabs/deal-aurora': 0.1.12(@ethersproject/abi@5.7.0)(@ethersproject/providers@5.7.2)(@nomicfoundation/hardhat-chai-matchers@1.0.6)(@nomicfoundation/hardhat-network-helpers@1.0.8)(@nomiclabs/hardhat-ethers@2.2.3)(@nomiclabs/hardhat-etherscan@3.1.7)(@typechain/ethers-v5@10.2.1)(@typechain/hardhat@6.1.6)(@types/chai@4.3.5)(@types/mocha@9.1.1)(@types/node@20.4.5)(chai@4.3.7)(ethers@5.7.2)(hardhat-gas-reporter@1.0.9)(hardhat@2.15.0)(solidity-coverage@0.7.22)(ts-node@10.9.1)(typechain@8.2.0)(typescript@4.7.2) + '@fluencelabs/deal-aurora': 0.1.12(@ethersproject/abi@5.7.0)(@ethersproject/providers@5.7.2)(@nomicfoundation/hardhat-chai-matchers@1.0.6)(@nomicfoundation/hardhat-network-helpers@1.0.8)(@nomiclabs/hardhat-ethers@2.2.3)(@nomiclabs/hardhat-etherscan@3.1.7)(@typechain/ethers-v5@10.2.1)(@typechain/hardhat@6.1.6)(@types/chai@4.3.5)(@types/mocha@9.1.1)(@types/node@18.13.0)(chai@4.3.7)(ethers@5.7.2)(hardhat-gas-reporter@1.0.9)(hardhat@2.15.0)(solidity-coverage@0.7.22)(ts-node@10.9.1)(typechain@8.2.0)(typescript@4.7.2) '@fluencelabs/fluence': 0.28.0(jest@27.5.1)(node-fetch@2.6.11)(typescript@4.7.2) '@fluencelabs/fluence-network-environment': 1.0.14 '@iarna/toml': 2.2.5 '@mswjs/interceptors': 0.19.5 '@oclif/color': 1.0.6 - '@oclif/core': 2.8.7(@types/node@20.4.5)(typescript@4.7.2) - '@oclif/plugin-autocomplete': 2.3.0(@types/node@20.4.5)(typescript@4.7.2) - '@oclif/plugin-help': 5.2.10(@types/node@20.4.5)(typescript@4.7.2) - '@oclif/plugin-not-found': 2.3.26(@types/node@20.4.5)(typescript@4.7.2) + '@oclif/core': 2.8.7(@types/node@18.13.0)(typescript@4.7.2) + '@oclif/plugin-autocomplete': 2.3.0(@types/node@18.13.0)(typescript@4.7.2) + '@oclif/plugin-help': 5.2.10(@types/node@18.13.0)(typescript@4.7.2) + '@oclif/plugin-not-found': 2.3.26(@types/node@18.13.0)(typescript@4.7.2) '@walletconnect/universal-provider': 2.8.1(lokijs@1.5.12) ajv: 8.12.0 camelcase: 7.0.1 @@ -3132,7 +2828,7 @@ packages: - utf-8-validate dev: true - /@fluencelabs/connection@0.2.0(node-fetch@3.3.2): + /@fluencelabs/connection@0.2.0(node-fetch@3.3.1): resolution: {integrity: sha512-0jTRI1h/j/fR2VaLIlcIm6VoP3j2jL2lI6/OaYaOnwGXmI6CbZWHNeq9eaKWycT9B1vpN9wHu0Vi7vH3pFplhg==} engines: {node: '>=10', pnpm: '>=3'} dependencies: @@ -3142,12 +2838,12 @@ packages: buffer: 6.0.3 it-length-prefixed: 5.0.3 it-pipe: 1.1.0 - libp2p: 0.36.2(node-fetch@3.3.2) - libp2p-interfaces: 4.0.6(node-fetch@3.3.2) + libp2p: 0.36.2(node-fetch@3.3.1) + libp2p-interfaces: 4.0.6(node-fetch@3.3.1) libp2p-mplex: 0.10.7 - libp2p-websockets: 0.16.2(node-fetch@3.3.2) + libp2p-websockets: 0.16.2(node-fetch@3.3.1) loglevel: 1.8.0 - multiaddr: 10.0.1(node-fetch@3.3.2) + multiaddr: 10.0.1(node-fetch@3.3.1) peer-id: 0.16.0 transitivePeerDependencies: - bufferutil @@ -3157,10 +2853,10 @@ packages: - utf-8-validate dev: true - /@fluencelabs/deal-aurora@0.1.12(@ethersproject/abi@5.7.0)(@ethersproject/providers@5.7.2)(@nomicfoundation/hardhat-chai-matchers@1.0.6)(@nomicfoundation/hardhat-network-helpers@1.0.8)(@nomiclabs/hardhat-ethers@2.2.3)(@nomiclabs/hardhat-etherscan@3.1.7)(@typechain/ethers-v5@10.2.1)(@typechain/hardhat@6.1.6)(@types/chai@4.3.5)(@types/mocha@9.1.1)(@types/node@20.4.5)(chai@4.3.7)(ethers@5.7.2)(hardhat-gas-reporter@1.0.9)(hardhat@2.15.0)(solidity-coverage@0.7.22)(ts-node@10.9.1)(typechain@8.2.0)(typescript@4.7.2): + /@fluencelabs/deal-aurora@0.1.12(@ethersproject/abi@5.7.0)(@ethersproject/providers@5.7.2)(@nomicfoundation/hardhat-chai-matchers@1.0.6)(@nomicfoundation/hardhat-network-helpers@1.0.8)(@nomiclabs/hardhat-ethers@2.2.3)(@nomiclabs/hardhat-etherscan@3.1.7)(@typechain/ethers-v5@10.2.1)(@typechain/hardhat@6.1.6)(@types/chai@4.3.5)(@types/mocha@9.1.1)(@types/node@18.13.0)(chai@4.3.7)(ethers@5.7.2)(hardhat-gas-reporter@1.0.9)(hardhat@2.15.0)(solidity-coverage@0.7.22)(ts-node@10.9.1)(typechain@8.2.0)(typescript@4.7.2): resolution: {integrity: sha512-CcmcDIC8DJI2aVzN+ZMB4vYRuML0IHF9VfaL/GMjhkpe4iADPJq4YS527I1nPH335Ik3hTlncz71F/2jD35A+A==} dependencies: - '@nomicfoundation/hardhat-toolbox': 1.0.2(@ethersproject/abi@5.7.0)(@ethersproject/providers@5.7.2)(@nomicfoundation/hardhat-chai-matchers@1.0.6)(@nomicfoundation/hardhat-network-helpers@1.0.8)(@nomiclabs/hardhat-ethers@2.2.3)(@nomiclabs/hardhat-etherscan@3.1.7)(@typechain/ethers-v5@10.2.1)(@typechain/hardhat@6.1.6)(@types/chai@4.3.5)(@types/mocha@9.1.1)(@types/node@20.4.5)(chai@4.3.7)(ethers@5.7.2)(hardhat-gas-reporter@1.0.9)(hardhat@2.15.0)(solidity-coverage@0.7.22)(ts-node@10.9.1)(typechain@8.2.0)(typescript@4.7.2) + '@nomicfoundation/hardhat-toolbox': 1.0.2(@ethersproject/abi@5.7.0)(@ethersproject/providers@5.7.2)(@nomicfoundation/hardhat-chai-matchers@1.0.6)(@nomicfoundation/hardhat-network-helpers@1.0.8)(@nomiclabs/hardhat-ethers@2.2.3)(@nomiclabs/hardhat-etherscan@3.1.7)(@typechain/ethers-v5@10.2.1)(@typechain/hardhat@6.1.6)(@types/chai@4.3.5)(@types/mocha@9.1.1)(@types/node@18.13.0)(chai@4.3.7)(ethers@5.7.2)(hardhat-gas-reporter@1.0.9)(hardhat@2.15.0)(solidity-coverage@0.7.22)(ts-node@10.9.1)(typechain@8.2.0)(typescript@4.7.2) '@openzeppelin/contracts': 4.9.2 '@openzeppelin/contracts-upgradeable': 4.9.2 dotenv: 16.3.1 @@ -3194,17 +2890,17 @@ packages: resolution: {integrity: sha512-lMiH+7obmJW2Q+PMUR/vNAuX6TcVqlKmsWAHvnBogH7s8IeMT+UGN8qrweILWmE57G7MfauB302dIFQowR9tug==} dev: true - /@fluencelabs/fluence@0.27.5(@babel/core@7.22.5)(jest@27.5.1)(node-fetch@3.3.2)(typescript@4.7.2): + /@fluencelabs/fluence@0.27.5(jest@27.5.1)(node-fetch@3.3.1)(typescript@4.7.2): resolution: {integrity: sha512-nMCzd/oHHk5/yWdg/+rPB+sc8X+fQ5YgwPhGVDoxFs8/CmIr1G5Na8Y6l8rrigasgQd+LV5GtAyh50Oq7/IXkg==} engines: {node: '>=10', pnpm: '>=3'} deprecated: fluencelabs/fluence is deprecated in favor of a thinner CDN-distributed .js bundle, please see the following link for installation instructions https://github.com/fluencelabs/js-client#installation hasBin: true dependencies: '@fluencelabs/avm': 0.31.10 - '@fluencelabs/connection': 0.2.0(node-fetch@3.3.2) + '@fluencelabs/connection': 0.2.0(node-fetch@3.3.1) '@fluencelabs/interfaces': 0.1.0 '@fluencelabs/keypair': 0.2.0 - '@fluencelabs/marine-js': 0.3.37(@babel/core@7.22.5)(jest@27.5.1)(typescript@4.7.2) + '@fluencelabs/marine-js': 0.3.37(jest@27.5.1)(typescript@4.7.2) async: 3.2.4 base64-js: 1.5.1 browser-or-node: 2.0.0 @@ -3284,25 +2980,6 @@ packages: peer-id: 0.16.0 dev: true - /@fluencelabs/marine-js@0.3.37(@babel/core@7.22.5)(jest@27.5.1)(typescript@4.7.2): - resolution: {integrity: sha512-/Kpu3S+aDOfrOpKBAK1VeWSHKCoD36/dxtHEWHbj3Lsro0GB9zkoaZPHlFFL7rorCB+hyjAJqLDuBGI8f3l/qg==} - dependencies: - '@wasmer/wasi': 0.12.0 - '@wasmer/wasmfs': 0.12.0 - browser-or-node: 2.0.0 - buffer: 6.0.3 - threads: 1.7.0 - ts-jest: 27.1.5(@babel/core@7.22.5)(jest@27.5.1)(typescript@4.7.2) - transitivePeerDependencies: - - '@babel/core' - - '@types/jest' - - babel-jest - - esbuild - - jest - - supports-color - - typescript - dev: true - /@fluencelabs/marine-js@0.3.37(jest@27.5.1)(typescript@4.7.2): resolution: {integrity: sha512-/Kpu3S+aDOfrOpKBAK1VeWSHKCoD36/dxtHEWHbj3Lsro0GB9zkoaZPHlFFL7rorCB+hyjAJqLDuBGI8f3l/qg==} dependencies: @@ -3322,8 +2999,8 @@ packages: - typescript dev: true - /@fluencelabs/marine-js@0.3.45: - resolution: {integrity: sha512-GmeTvaC9n6zM6FPPyoHXwe2I8F9mEeE9DKzJcqy4FkUmpI11Fu4HrTvKgJyTURJkZSu8cfrjA7ZVeYuDGHeimQ==} + /@fluencelabs/marine-js@0.7.2: + resolution: {integrity: sha512-etjbXDgzyZkK82UZvtuIU3bfy5f52siDUy1m+T5Y5r70k82xYdZZ8vgWVgB6ivi2f3aDyQjgNTfzWQjKFpAReQ==} dependencies: '@wasmer/wasi': 0.12.0 '@wasmer/wasmfs': 0.12.0 @@ -3353,7 +3030,7 @@ packages: engines: {node: '>=10.10.0'} dependencies: '@humanwhocodes/object-schema': 1.2.1 - debug: 4.3.4 + debug: 4.3.4(supports-color@8.1.1) minimatch: 3.1.2 transitivePeerDependencies: - supports-color @@ -3425,57 +3102,12 @@ packages: engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} dependencies: '@jest/types': 28.1.3 - '@types/node': 20.4.5 + '@types/node': 18.13.0 chalk: 4.1.2 jest-message-util: 28.1.3 jest-util: 28.1.3 slash: 3.0.0 - /@jest/core@27.5.1: - resolution: {integrity: sha512-AK6/UTrvQD0Cd24NSqmIA6rKsu0tKIxfiCducZvqxYdmMisOYAsdItspT+fQDQYARPf8XgjAFZi0ogW2agH5nQ==} - engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} - peerDependencies: - node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0 - peerDependenciesMeta: - node-notifier: - optional: true - dependencies: - '@jest/console': 27.5.1 - '@jest/reporters': 27.5.1 - '@jest/test-result': 27.5.1 - '@jest/transform': 27.5.1 - '@jest/types': 27.5.1 - '@types/node': 20.4.5 - ansi-escapes: 4.3.2 - chalk: 4.1.2 - emittery: 0.8.1 - exit: 0.1.2 - graceful-fs: 4.2.11 - jest-changed-files: 27.5.1 - jest-config: 27.5.1 - jest-haste-map: 27.5.1 - jest-message-util: 27.5.1 - jest-regex-util: 27.5.1 - jest-resolve: 27.5.1 - jest-resolve-dependencies: 27.5.1 - jest-runner: 27.5.1 - jest-runtime: 27.5.1 - jest-snapshot: 27.5.1 - jest-util: 27.5.1 - jest-validate: 27.5.1 - jest-watcher: 27.5.1 - micromatch: 4.0.5 - rimraf: 3.0.2 - slash: 3.0.0 - strip-ansi: 6.0.1 - transitivePeerDependencies: - - bufferutil - - canvas - - supports-color - - ts-node - - utf-8-validate - dev: false - /@jest/core@27.5.1(ts-node@10.9.1): resolution: {integrity: sha512-AK6/UTrvQD0Cd24NSqmIA6rKsu0tKIxfiCducZvqxYdmMisOYAsdItspT+fQDQYARPf8XgjAFZi0ogW2agH5nQ==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} @@ -3519,9 +3151,8 @@ packages: - supports-color - ts-node - utf-8-validate - dev: true - /@jest/core@28.1.3: + /@jest/core@28.1.3(ts-node@10.9.1): resolution: {integrity: sha512-CIKBrlaKOzA7YG19BEqCw3SLIsEwjZkeJzf5bdooVnW4bH5cktqe3JX+G2YV1aK5vP8N9na1IGWFzYaTp6k6NA==} engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} peerDependencies: @@ -3535,14 +3166,14 @@ packages: '@jest/test-result': 28.1.3 '@jest/transform': 28.1.3 '@jest/types': 28.1.3 - '@types/node': 20.4.5 + '@types/node': 18.13.0 ansi-escapes: 4.3.2 chalk: 4.1.2 ci-info: 3.8.0 exit: 0.1.2 graceful-fs: 4.2.11 jest-changed-files: 28.1.3 - jest-config: 28.1.3(@types/node@20.4.5) + jest-config: 28.1.3(@types/node@18.13.0)(ts-node@10.9.1) jest-haste-map: 28.1.3 jest-message-util: 28.1.3 jest-regex-util: 28.0.2 @@ -3579,7 +3210,7 @@ packages: dependencies: '@jest/fake-timers': 28.1.3 '@jest/types': 28.1.3 - '@types/node': 20.4.5 + '@types/node': 18.13.0 jest-mock: 28.1.3 dev: true @@ -3617,7 +3248,7 @@ packages: dependencies: '@jest/types': 28.1.3 '@sinonjs/fake-timers': 9.1.2 - '@types/node': 20.4.5 + '@types/node': 18.13.0 jest-message-util: 28.1.3 jest-mock: 28.1.3 jest-util: 28.1.3 @@ -3694,7 +3325,7 @@ packages: '@jest/transform': 28.1.3 '@jest/types': 28.1.3 '@jridgewell/trace-mapping': 0.3.18 - '@types/node': 20.4.5 + '@types/node': 18.13.0 chalk: 4.1.2 collect-v8-coverage: 1.0.1 exit: 0.1.2 @@ -3830,7 +3461,7 @@ packages: dependencies: '@types/istanbul-lib-coverage': 2.0.4 '@types/istanbul-reports': 3.0.1 - '@types/node': 20.4.5 + '@types/node': 18.13.0 '@types/yargs': 16.0.5 chalk: 4.1.2 @@ -3841,7 +3472,7 @@ packages: '@jest/schemas': 28.1.3 '@types/istanbul-lib-coverage': 2.0.4 '@types/istanbul-reports': 3.0.1 - '@types/node': 20.4.5 + '@types/node': 18.13.0 '@types/yargs': 17.0.24 chalk: 4.1.2 @@ -3860,7 +3491,6 @@ packages: /@jridgewell/resolve-uri@3.1.1: resolution: {integrity: sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==} engines: {node: '>=6.0.0'} - dev: true /@jridgewell/set-array@1.1.2: resolution: {integrity: sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==} @@ -3889,7 +3519,6 @@ packages: dependencies: '@jridgewell/resolve-uri': 3.1.1 '@jridgewell/sourcemap-codec': 1.4.15 - dev: true /@json-rpc-tools/provider@1.7.6: resolution: {integrity: sha512-z7D3xvJ33UfCGv77n40lbzOYjZKVM3k2+5cV7xS8G6SCvKTzMkhkUYuD/qzQUNT4cG/lv0e9mRToweEEVLVVmA==} @@ -4242,7 +3871,7 @@ packages: dependencies: '@libp2p/interface-peer-id': 2.0.2 '@multiformats/multiaddr': 12.1.3 - debug: 4.3.4 + debug: 4.3.4(supports-color@8.1.1) interface-datastore: 8.2.3 multiformats: 11.0.2 transitivePeerDependencies: @@ -4437,7 +4066,7 @@ packages: '@open-draft/until': 1.0.3 '@remix-run/web-fetch': 4.3.4 '@types/debug': 4.1.7 - debug: 4.3.4 + debug: 4.3.4(supports-color@8.1.1) headers-polyfill: 3.1.2 outvariant: 1.4.0 strict-event-emitter: 0.4.6 @@ -4556,7 +4185,7 @@ packages: '@nomicfoundation/ethereumjs-tx': 5.0.1 '@nomicfoundation/ethereumjs-util': 9.0.1 abstract-level: 1.0.3 - debug: 4.3.4 + debug: 4.3.4(supports-color@8.1.1) ethereum-cryptography: 0.1.3 level: 8.0.0 lru-cache: 5.1.1 @@ -4597,7 +4226,7 @@ packages: '@nomicfoundation/ethereumjs-common': 4.0.1 '@nomicfoundation/ethereumjs-tx': 5.0.1 '@nomicfoundation/ethereumjs-util': 9.0.1 - debug: 4.3.4 + debug: 4.3.4(supports-color@8.1.1) ethereum-cryptography: 0.1.3 mcl-wasm: 0.7.9 rustbn.js: 0.2.0 @@ -4618,7 +4247,7 @@ packages: dependencies: '@nomicfoundation/ethereumjs-common': 4.0.1 '@nomicfoundation/ethereumjs-rlp': 5.0.1 - debug: 4.3.4 + debug: 4.3.4(supports-color@8.1.1) ethereum-cryptography: 0.1.3 ethers: 5.7.2 js-sdsl: 4.4.1 @@ -4676,7 +4305,7 @@ packages: '@nomicfoundation/ethereumjs-trie': 6.0.1 '@nomicfoundation/ethereumjs-tx': 5.0.1 '@nomicfoundation/ethereumjs-util': 9.0.1 - debug: 4.3.4 + debug: 4.3.4(supports-color@8.1.1) ethereum-cryptography: 0.1.3 mcl-wasm: 0.7.9 rustbn.js: 0.2.0 @@ -4714,7 +4343,7 @@ packages: hardhat: 2.15.0(ts-node@10.9.1)(typescript@4.7.2) dev: true - /@nomicfoundation/hardhat-toolbox@1.0.2(@ethersproject/abi@5.7.0)(@ethersproject/providers@5.7.2)(@nomicfoundation/hardhat-chai-matchers@1.0.6)(@nomicfoundation/hardhat-network-helpers@1.0.8)(@nomiclabs/hardhat-ethers@2.2.3)(@nomiclabs/hardhat-etherscan@3.1.7)(@typechain/ethers-v5@10.2.1)(@typechain/hardhat@6.1.6)(@types/chai@4.3.5)(@types/mocha@9.1.1)(@types/node@20.4.5)(chai@4.3.7)(ethers@5.7.2)(hardhat-gas-reporter@1.0.9)(hardhat@2.15.0)(solidity-coverage@0.7.22)(ts-node@10.9.1)(typechain@8.2.0)(typescript@4.7.2): + /@nomicfoundation/hardhat-toolbox@1.0.2(@ethersproject/abi@5.7.0)(@ethersproject/providers@5.7.2)(@nomicfoundation/hardhat-chai-matchers@1.0.6)(@nomicfoundation/hardhat-network-helpers@1.0.8)(@nomiclabs/hardhat-ethers@2.2.3)(@nomiclabs/hardhat-etherscan@3.1.7)(@typechain/ethers-v5@10.2.1)(@typechain/hardhat@6.1.6)(@types/chai@4.3.5)(@types/mocha@9.1.1)(@types/node@18.13.0)(chai@4.3.7)(ethers@5.7.2)(hardhat-gas-reporter@1.0.9)(hardhat@2.15.0)(solidity-coverage@0.7.22)(ts-node@10.9.1)(typechain@8.2.0)(typescript@4.7.2): resolution: {integrity: sha512-8CEgWSKUK2aMit+76Sez8n7UB0Ze1lwT+LcWxj4EFP30lQWOwOws048t6MTPfThH0BlSWjC6hJRr0LncIkc1Sw==} peerDependencies: '@ethersproject/abi': ^5.4.7 @@ -4747,13 +4376,13 @@ packages: '@typechain/hardhat': 6.1.6(@ethersproject/abi@5.7.0)(@ethersproject/providers@5.7.2)(@typechain/ethers-v5@10.2.1)(ethers@5.7.2)(hardhat@2.15.0)(typechain@8.2.0) '@types/chai': 4.3.5 '@types/mocha': 9.1.1 - '@types/node': 20.4.5 + '@types/node': 18.13.0 chai: 4.3.7 ethers: 5.7.2 hardhat: 2.15.0(ts-node@10.9.1)(typescript@4.7.2) hardhat-gas-reporter: 1.0.9(hardhat@2.15.0) solidity-coverage: 0.7.22 - ts-node: 10.9.1(@types/node@20.4.5)(typescript@4.7.2) + ts-node: 10.9.1(@types/node@18.13.0)(typescript@4.7.2) typechain: 8.2.0(typescript@4.7.2) typescript: 4.7.2 dev: true @@ -4883,7 +4512,7 @@ packages: '@ethersproject/address': 5.7.0 cbor: 8.1.0 chalk: 2.4.2 - debug: 4.3.4 + debug: 4.3.4(supports-color@8.1.1) fs-extra: 7.0.1 hardhat: 2.15.0(ts-node@10.9.1)(typescript@4.7.2) lodash: 4.17.21 @@ -4905,7 +4534,7 @@ packages: tslib: 2.5.3 dev: true - /@oclif/core@2.8.7(@types/node@20.4.5)(typescript@4.7.2): + /@oclif/core@2.8.7(@types/node@18.13.0)(typescript@4.7.2): resolution: {integrity: sha512-WTZUFgANYGyHQOmGc2YsczEdqdlG2/ZEfqksHnuYbz3egozpka/R9LrFwNfWPZETi9ydzcjDWwJKUGQmJG3ixA==} engines: {node: '>=14.0.0'} dependencies: @@ -4933,7 +4562,7 @@ packages: strip-ansi: 6.0.1 supports-color: 8.1.1 supports-hyperlinks: 2.3.0 - ts-node: 10.9.1(@types/node@20.4.5)(typescript@4.7.2) + ts-node: 10.9.1(@types/node@18.13.0)(typescript@4.7.2) tslib: 2.5.3 widest-line: 3.1.0 wordwrap: 1.0.0 @@ -4945,13 +4574,13 @@ packages: - typescript dev: true - /@oclif/plugin-autocomplete@2.3.0(@types/node@20.4.5)(typescript@4.7.2): + /@oclif/plugin-autocomplete@2.3.0(@types/node@18.13.0)(typescript@4.7.2): resolution: {integrity: sha512-32gdneCAQbtjAvpX7lYFYrxsMPAfOh2hyvP4QEMspTiZkygT8m/NwayBVA+Ua5EM3/rk7jxTKYFQ7Gm/ZgSFuA==} engines: {node: '>=12.0.0'} dependencies: - '@oclif/core': 2.8.7(@types/node@20.4.5)(typescript@4.7.2) + '@oclif/core': 2.8.7(@types/node@18.13.0)(typescript@4.7.2) chalk: 4.1.2 - debug: 4.3.4 + debug: 4.3.4(supports-color@8.1.1) fs-extra: 9.1.0 transitivePeerDependencies: - '@swc/core' @@ -4961,11 +4590,11 @@ packages: - typescript dev: true - /@oclif/plugin-help@5.2.10(@types/node@20.4.5)(typescript@4.7.2): + /@oclif/plugin-help@5.2.10(@types/node@18.13.0)(typescript@4.7.2): resolution: {integrity: sha512-l3hnloPkXOLGGrepLLdj8NsBpVhhEpg4jclIeIBaZzIo6+c+/uqcL2LjvOogmSEf5g4zooRtxivwUpcFiBSaBg==} engines: {node: '>=12.0.0'} dependencies: - '@oclif/core': 2.8.7(@types/node@20.4.5)(typescript@4.7.2) + '@oclif/core': 2.8.7(@types/node@18.13.0)(typescript@4.7.2) transitivePeerDependencies: - '@swc/core' - '@swc/wasm' @@ -4973,12 +4602,12 @@ packages: - typescript dev: true - /@oclif/plugin-not-found@2.3.26(@types/node@20.4.5)(typescript@4.7.2): + /@oclif/plugin-not-found@2.3.26(@types/node@18.13.0)(typescript@4.7.2): resolution: {integrity: sha512-a8WfN8km1A9Q0lXWo1LZgFEjVFYIbOOp/QG++zyHt2Hnsp2b5Zr0p8EQLBK7v6na6C0Mrr+GlMI8zE40hYWMbw==} engines: {node: '>=12.0.0'} dependencies: '@oclif/color': 1.0.6 - '@oclif/core': 2.8.7(@types/node@20.4.5)(typescript@4.7.2) + '@oclif/core': 2.8.7(@types/node@18.13.0)(typescript@4.7.2) fast-levenshtein: 3.0.0 transitivePeerDependencies: - '@swc/core' @@ -5150,40 +4779,6 @@ packages: rollup: 2.79.1 dev: true - /@rollup/plugin-commonjs@25.0.3(rollup@3.25.1): - resolution: {integrity: sha512-uBdtWr/H3BVcgm97MUdq2oJmqBR23ny1hOrWe2PKo9FTbjsGqg32jfasJUKYAI5ouqacjRnj65mBB/S79F+GQA==} - engines: {node: '>=14.0.0'} - peerDependencies: - rollup: ^2.68.0||^3.0.0 - peerDependenciesMeta: - rollup: - optional: true - dependencies: - '@rollup/pluginutils': 5.0.2(rollup@3.25.1) - commondir: 1.0.1 - estree-walker: 2.0.2 - glob: 8.1.0 - is-reference: 1.2.1 - magic-string: 0.27.0 - rollup: 3.25.1 - dev: true - - /@rollup/plugin-dynamic-import-vars@2.0.4(rollup@3.25.1): - resolution: {integrity: sha512-aAD4eJ657PfQFgsIP0tvpPF6d4viSAf64BgAJQEBsxL75KrOVVr/QBlfdCnB0w7fJrVDfo9guZwz0k+xEj2FJA==} - engines: {node: '>=14.0.0'} - peerDependencies: - rollup: ^1.20.0||^2.0.0||^3.0.0 - peerDependenciesMeta: - rollup: - optional: true - dependencies: - '@rollup/pluginutils': 5.0.2(rollup@3.25.1) - estree-walker: 2.0.2 - fast-glob: 3.2.12 - magic-string: 0.27.0 - rollup: 3.25.1 - dev: true - /@rollup/plugin-inject@5.0.3: resolution: {integrity: sha512-411QlbL+z2yXpRWFXSmw/teQRMkXcAAC8aYTemc15gwJRpvEVDQwoe+N/HTFD8RFG8+88Bme9DK2V9CVm7hJdA==} engines: {node: '>=14.0.0'} @@ -5196,20 +4791,6 @@ packages: '@rollup/pluginutils': 5.0.2 estree-walker: 2.0.2 magic-string: 0.27.0 - - /@rollup/plugin-inject@5.0.3(rollup@3.25.1): - resolution: {integrity: sha512-411QlbL+z2yXpRWFXSmw/teQRMkXcAAC8aYTemc15gwJRpvEVDQwoe+N/HTFD8RFG8+88Bme9DK2V9CVm7hJdA==} - engines: {node: '>=14.0.0'} - peerDependencies: - rollup: ^1.20.0||^2.0.0||^3.0.0 - peerDependenciesMeta: - rollup: - optional: true - dependencies: - '@rollup/pluginutils': 5.0.2(rollup@3.25.1) - estree-walker: 2.0.2 - magic-string: 0.27.0 - rollup: 3.25.1 dev: true /@rollup/plugin-json@4.1.0(rollup@2.79.1): @@ -5235,24 +4816,6 @@ packages: resolve: 1.22.2 rollup: 2.79.1 - /@rollup/plugin-node-resolve@15.1.0(rollup@3.25.1): - resolution: {integrity: sha512-xeZHCgsiZ9pzYVgAo9580eCGqwh/XCEUM9q6iQfGNocjgkufHAqC3exA+45URvhiYV8sBF9RlBai650eNs7AsA==} - engines: {node: '>=14.0.0'} - peerDependencies: - rollup: ^2.78.0||^3.0.0 - peerDependenciesMeta: - rollup: - optional: true - dependencies: - '@rollup/pluginutils': 5.0.2(rollup@3.25.1) - '@types/resolve': 1.20.2 - deepmerge: 4.3.1 - is-builtin-module: 3.2.1 - is-module: 1.0.0 - resolve: 1.22.2 - rollup: 3.25.1 - dev: true - /@rollup/plugin-replace@2.4.2(rollup@2.79.1): resolution: {integrity: sha512-IGcu+cydlUMZ5En85jxHH4qj2hta/11BHq95iHEyb2sbgiN0eCdzvUcHw5gt9pBL5lTi4JDYJ1acCoMGpTvEZg==} peerDependencies: @@ -5294,20 +4857,6 @@ packages: '@types/estree': 1.0.1 estree-walker: 2.0.2 picomatch: 2.3.1 - - /@rollup/pluginutils@5.0.2(rollup@3.25.1): - resolution: {integrity: sha512-pTd9rIsP92h+B6wWwFbW8RkZv4hiR/xKsqre4SIuAOaOEQRxi0lqLke9k2/7WegC85GgUs9pjmOjCUi3In4vwA==} - engines: {node: '>=14.0.0'} - peerDependencies: - rollup: ^1.20.0||^2.0.0||^3.0.0 - peerDependenciesMeta: - rollup: - optional: true - dependencies: - '@types/estree': 1.0.1 - estree-walker: 2.0.2 - picomatch: 2.3.1 - rollup: 3.25.1 dev: true /@rushstack/eslint-patch@1.3.2: @@ -5774,7 +5323,7 @@ packages: dependencies: '@truffle/error': 0.1.1 '@truffle/interface-adapter': 0.5.34 - debug: 4.3.4 + debug: 4.3.4(supports-color@8.1.1) web3: 1.7.4 transitivePeerDependencies: - bufferutil @@ -5789,19 +5338,15 @@ packages: /@tsconfig/node10@1.0.9: resolution: {integrity: sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA==} - dev: true /@tsconfig/node12@1.0.11: resolution: {integrity: sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==} - dev: true /@tsconfig/node14@1.0.3: resolution: {integrity: sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==} - dev: true /@tsconfig/node16@1.0.4: resolution: {integrity: sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==} - dev: true /@typechain/ethers-v5@10.2.1(@ethersproject/abi@5.7.0)(@ethersproject/providers@5.7.2)(ethers@5.7.2)(typechain@8.2.0)(typescript@4.7.2): resolution: {integrity: sha512-n3tQmCZjRE6IU4h6lqUGiQ1j866n5MTCBJreNEHHVWXa2u9GJTaeYyU1/k+1qLutkyw+sS6VAN+AbeiTqsxd/A==} @@ -5872,26 +5417,26 @@ packages: /@types/bn.js@4.11.6: resolution: {integrity: sha512-pqr857jrp2kPuO9uRjZ3PwnJTjoQy+fcdxvBTvHm6dkmEL9q+hDD/2j/0ELOBPtPnS8LjCX0gI9nbl8lVkadpg==} dependencies: - '@types/node': 20.4.5 + '@types/node': 18.13.0 dev: true /@types/bn.js@5.1.1: resolution: {integrity: sha512-qNrYbZqMx0uJAfKnKclPh+dTwK33KfLHYqtyODwd5HnXOjnkhc4qgn3BrK6RWyGZm5+sIFE7Q7Vz6QQtJB7w7g==} dependencies: - '@types/node': 20.4.5 + '@types/node': 18.13.0 dev: true /@types/body-parser@1.19.2: resolution: {integrity: sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==} dependencies: '@types/connect': 3.4.35 - '@types/node': 20.4.5 + '@types/node': 18.13.0 dev: false /@types/bonjour@3.5.10: resolution: {integrity: sha512-p7ienRMiS41Nu2/igbJxxLDWrSZ0WxM8UQgCeO9KhoVF7cOVFkrKsiDr1EsJIla8vV3oEEjGcz11jc5yimhzZw==} dependencies: - '@types/node': 20.4.5 + '@types/node': 18.13.0 dev: false /@types/bs58@4.0.1: @@ -5905,7 +5450,7 @@ packages: dependencies: '@types/http-cache-semantics': 4.0.1 '@types/keyv': 3.1.4 - '@types/node': 20.4.5 + '@types/node': 18.13.0 '@types/responselike': 1.0.0 dev: true @@ -5928,35 +5473,28 @@ packages: /@types/cli-progress@3.11.0: resolution: {integrity: sha512-XhXhBv1R/q2ahF3BM7qT5HLzJNlIL0wbcGyZVjqOTqAybAnsLisd7gy1UCyIqpL+5Iv6XhlSyzjLCnI2sIdbCg==} dependencies: - '@types/node': 20.4.5 + '@types/node': 18.13.0 dev: true /@types/concat-stream@1.6.1: resolution: {integrity: sha512-eHE4cQPoj6ngxBZMvVf6Hw7Mh4jMW4U9lpGmS5GBPB9RYxlFg+CHaVN7ErNY4W9XfLIEn20b4VDYaIrbq0q4uA==} dependencies: - '@types/node': 20.4.5 + '@types/node': 18.13.0 dev: true /@types/connect-history-api-fallback@1.5.0: resolution: {integrity: sha512-4x5FkPpLipqwthjPsF7ZRbOv3uoLUFkTA9G9v583qi4pACvq0uTELrB8OLUzPWUI4IJIyvM85vzkV1nyiI2Lig==} dependencies: '@types/express-serve-static-core': 4.17.35 - '@types/node': 20.4.5 + '@types/node': 18.13.0 dev: false /@types/connect@3.4.35: resolution: {integrity: sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==} dependencies: - '@types/node': 20.4.5 + '@types/node': 18.13.0 dev: false - /@types/data-urls@3.0.1: - resolution: {integrity: sha512-ZWfL03uxzUh0SkotNrcAAa9NCYxp05/UUmrDNgvJrQYFoYczQVOmFJAIN7yXII6xcxyrmAJMpF5yiJyBuGvF9w==} - dependencies: - '@types/whatwg-mimetype': 3.0.0 - '@types/whatwg-url': 11.0.0 - dev: true - /@types/debug@4.1.7: resolution: {integrity: sha512-9AonUzyTjXXhEOa0DnqpzZi6VHlqKMswga9EXjpXnnqxwLtdvPPtlO8evrI5D9S6asFRCQ6v+wpiUKbw+vKqyg==} dependencies: @@ -5968,12 +5506,14 @@ packages: dependencies: '@types/eslint': 8.40.2 '@types/estree': 1.0.1 + dev: false /@types/eslint@8.40.2: resolution: {integrity: sha512-PRVjQ4Eh9z9pmmtaq8nTjZjQwKFk7YIHIud3lRoKRBgUQjgjRmoGxxGEPXQkF+lH7QkHJRNr5F4aBgYCW0lqpQ==} dependencies: '@types/estree': 1.0.1 '@types/json-schema': 7.0.12 + dev: false /@types/estree@0.0.39: resolution: {integrity: sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==} @@ -5984,7 +5524,7 @@ packages: /@types/express-serve-static-core@4.17.35: resolution: {integrity: sha512-wALWQwrgiB2AWTT91CB62b6Yt0sNHpznUXeZEcnPU3DRdlDIz74x8Qg1UUYKSVFi+va5vKOLYRBI1bRKiLLKIg==} dependencies: - '@types/node': 20.4.5 + '@types/node': 18.13.0 '@types/qs': 6.9.7 '@types/range-parser': 1.2.4 '@types/send': 0.17.1 @@ -6002,14 +5542,14 @@ packages: /@types/form-data@0.0.33: resolution: {integrity: sha512-8BSvG1kGm83cyJITQMZSulnl6QV8jqAGreJsc5tPu1Jq0vTSOiY/k24Wx82JRpWwZSqrala6sd5rWi6aNXvqcw==} dependencies: - '@types/node': 20.4.5 + '@types/node': 18.13.0 dev: true /@types/glob@7.2.0: resolution: {integrity: sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==} dependencies: '@types/minimatch': 5.1.2 - '@types/node': 20.4.5 + '@types/node': 18.13.0 dev: true /@types/graceful-fs@4.1.6: @@ -6028,7 +5568,7 @@ packages: /@types/http-proxy@1.17.11: resolution: {integrity: sha512-HC8G7c1WmaF2ekqpnFq626xd3Zz0uvaqFmBJNRZCGEZCXkvSdJoNFn/8Ygbd9fKNQj8UzLdCETaI0UWPAjK7IA==} dependencies: - '@types/node': 20.4.5 + '@types/node': 18.13.0 dev: false /@types/istanbul-lib-coverage@2.0.4: @@ -6059,6 +5599,7 @@ packages: /@types/json-schema@7.0.12: resolution: {integrity: sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA==} + dev: false /@types/json5@0.0.29: resolution: {integrity: sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==} @@ -6067,7 +5608,7 @@ packages: /@types/keyv@3.1.4: resolution: {integrity: sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==} dependencies: - '@types/node': 20.4.5 + '@types/node': 18.13.0 dev: true /@types/long@4.0.2: @@ -6112,6 +5653,7 @@ packages: /@types/node@16.11.59: resolution: {integrity: sha512-6u+36Dj3aDzhfBVUf/mfmc92OEdzQ2kx2jcXGdigfl70E/neV21ZHE6UCz4MDzTRcVqGAM27fk+DLXvyDsn3Jw==} + dev: true /@types/node@16.18.12: resolution: {integrity: sha512-vzLe5NaNMjIE3mcddFVGlAXN1LEWueUsMsOJWaT6wWMJGyljHAWHznqfnKUQWGzu7TLPrGvWdNAsvQYW+C0xtw==} @@ -6120,9 +5662,6 @@ packages: /@types/node@18.13.0: resolution: {integrity: sha512-gC3TazRzGoOnoKAhUx+Q0t8S9Tzs74z7m0ipwGpSqQrleP14hKxP4/JUeEQcD3W1/aIpnWl8pHowI7WokuZpXg==} - /@types/node@20.4.5: - resolution: {integrity: sha512-rt40Nk13II9JwQBdeYqmbn2Q6IVTA5uPhvSO+JVqdXw/6/4glI6oR9ezty/A9Hg5u7JH4OmYmuQ+XvjKm0Datg==} - /@types/node@8.10.66: resolution: {integrity: sha512-tktOkFUA4kXx2hhhrB8bIFb5TbwzS4uOhKEmwiD+NoiL0qtP2OQ9mFldbgD4dV1djrlBYP6eBuQZiWjuHUpqFw==} dev: true @@ -6133,7 +5672,7 @@ packages: /@types/pbkdf2@3.1.0: resolution: {integrity: sha512-Cf63Rv7jCQ0LaL8tNXmEyqTHuIJxRdlS5vMh1mj5voN4+QFhVZnlZruezqpWYDiJ8UTzhP0VmeLXCmBk66YrMQ==} dependencies: - '@types/node': 20.4.5 + '@types/node': 18.13.0 dev: true /@types/platform@1.3.4: @@ -6175,23 +5714,19 @@ packages: /@types/readable-stream@2.3.15: resolution: {integrity: sha512-oM5JSKQCcICF1wvGgmecmHldZ48OZamtMxcGGVICOJA8o8cahXC1zEVAif8iwoc5j8etxFaRFnf095+CDsuoFQ==} dependencies: - '@types/node': 20.4.5 + '@types/node': 18.13.0 safe-buffer: 5.1.2 dev: true /@types/resolve@1.17.1: resolution: {integrity: sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==} dependencies: - '@types/node': 20.4.5 - - /@types/resolve@1.20.2: - resolution: {integrity: sha512-60BCwRFOZCQhDncwQdxxeOEEkbc5dIMccYLwbxsS4TUNeVECQ/pBJ0j09mrHOl/JJvpRPGwO9SvE4nR2Nb/a4Q==} - dev: true + '@types/node': 18.13.0 /@types/responselike@1.0.0: resolution: {integrity: sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==} dependencies: - '@types/node': 20.4.5 + '@types/node': 18.13.0 dev: true /@types/retry@0.12.0: @@ -6208,7 +5743,7 @@ packages: /@types/secp256k1@4.0.3: resolution: {integrity: sha512-Da66lEIFeIz9ltsdMZcpQvmrmmoqrfju8pm1BH8WbYjZSwUgCwXLb9C+9XYogwBITnbsSaMdVPb2ekf7TV+03w==} dependencies: - '@types/node': 20.4.5 + '@types/node': 18.13.0 dev: true /@types/semver@7.5.0: @@ -6219,7 +5754,7 @@ packages: resolution: {integrity: sha512-Cwo8LE/0rnvX7kIIa3QHCkcuF21c05Ayb0ZfxPiv0W8VRiZiNW/WuRupHKpqqGVGf7SUA44QSOUKaEd9lIrd/Q==} dependencies: '@types/mime': 1.3.2 - '@types/node': 20.4.5 + '@types/node': 18.13.0 dev: false /@types/serve-handler@6.1.1: @@ -6238,13 +5773,13 @@ packages: resolution: {integrity: sha512-NUo5XNiAdULrJENtJXZZ3fHtfMolzZwczzBbnAeBbqBwG+LaG6YaJtuwzwGSQZ2wsCrxjEhNNjAkKigy3n8teQ==} dependencies: '@types/mime': 3.0.1 - '@types/node': 20.4.5 + '@types/node': 18.13.0 dev: false /@types/sockjs@0.3.33: resolution: {integrity: sha512-f0KEEe05NvUnat+boPTZ0dgaLZ4SfSouXUgv5noUiefG2ajgKjmETo9ZJyuqsl7dfl2aHlLJUiki6B4ZYldiiw==} dependencies: - '@types/node': 20.4.5 + '@types/node': 18.13.0 dev: false /@types/stack-utils@2.0.1: @@ -6264,24 +5799,10 @@ packages: resolution: {integrity: sha512-u40ViizKDmdl5FhOXn9WQbulpigYCaiD5hD4KqR3xyQww6l3+0ND+A9TeFla8tFpqvR+UAkJdYb/8jdaQG4/nw==} dev: true - /@types/webidl-conversions@7.0.0: - resolution: {integrity: sha512-xTE1E+YF4aWPJJeUzaZI5DRntlkY3+BCVJi0axFptnjGmAoWxkyREIh/XMrfxVLejwQxMCfDXdICo0VLxThrog==} - dev: true - - /@types/whatwg-mimetype@3.0.0: - resolution: {integrity: sha512-xHFOhd41VpUR6Y0k8ZinlyFv5cyhC/r2zghJgWWN8oNxqNo45Nf0qCBInJsFeifLeoHcIF4voEfap4A2GYHWkw==} - dev: true - - /@types/whatwg-url@11.0.0: - resolution: {integrity: sha512-4F6szvZP3FM5HvJAmcInXBfrAhvM4tLIc8MO1nXwabG5TZVOLxVmAXRpICqXYd3lBlomSRGmLCopYV+yTocgpQ==} - dependencies: - '@types/webidl-conversions': 7.0.0 - dev: true - /@types/ws@8.5.5: resolution: {integrity: sha512-lwhs8hktwxSjf9UaZ9tG5M03PGogvFaH8gUgLNbN9HKIg0dvv6q+gkSuJ8HN4/VbyxkuLzCjlN7GquQ0gUJfIg==} dependencies: - '@types/node': 20.4.5 + '@types/node': 18.13.0 dev: false /@types/yargs-parser@21.0.0: @@ -6301,7 +5822,7 @@ packages: resolution: {integrity: sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==} requiresBuild: true dependencies: - '@types/node': 20.4.5 + '@types/node': 18.13.0 dev: true optional: true @@ -6321,7 +5842,7 @@ packages: '@typescript-eslint/scope-manager': 5.60.0 '@typescript-eslint/type-utils': 5.60.0(eslint@8.43.0)(typescript@4.9.5) '@typescript-eslint/utils': 5.60.0(eslint@8.43.0)(typescript@4.9.5) - debug: 4.3.4 + debug: 4.3.4(supports-color@8.1.1) eslint: 8.43.0 grapheme-splitter: 1.0.4 ignore: 5.2.4 @@ -6359,7 +5880,7 @@ packages: '@typescript-eslint/scope-manager': 5.60.0 '@typescript-eslint/types': 5.60.0 '@typescript-eslint/typescript-estree': 5.60.0(typescript@4.9.5) - debug: 4.3.4 + debug: 4.3.4(supports-color@8.1.1) eslint: 8.43.0 typescript: 4.9.5 transitivePeerDependencies: @@ -6386,7 +5907,7 @@ packages: dependencies: '@typescript-eslint/typescript-estree': 5.60.0(typescript@4.9.5) '@typescript-eslint/utils': 5.60.0(eslint@8.43.0)(typescript@4.9.5) - debug: 4.3.4 + debug: 4.3.4(supports-color@8.1.1) eslint: 8.43.0 tsutils: 3.21.0(typescript@4.9.5) typescript: 4.9.5 @@ -6410,7 +5931,7 @@ packages: dependencies: '@typescript-eslint/types': 5.60.0 '@typescript-eslint/visitor-keys': 5.60.0 - debug: 4.3.4 + debug: 4.3.4(supports-color@8.1.1) globby: 11.1.0 is-glob: 4.0.3 semver: 7.5.2 @@ -6744,15 +6265,19 @@ packages: dependencies: '@webassemblyjs/helper-numbers': 1.11.6 '@webassemblyjs/helper-wasm-bytecode': 1.11.6 + dev: false /@webassemblyjs/floating-point-hex-parser@1.11.6: resolution: {integrity: sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==} + dev: false /@webassemblyjs/helper-api-error@1.11.6: resolution: {integrity: sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==} + dev: false /@webassemblyjs/helper-buffer@1.11.6: resolution: {integrity: sha512-z3nFzdcp1mb8nEOFFk8DrYLpHvhKC3grJD2ardfKOzmbmJvEf/tPIqCY+sNcwZIY8ZD7IkB2l7/pqhUhqm7hLA==} + dev: false /@webassemblyjs/helper-numbers@1.11.6: resolution: {integrity: sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==} @@ -6760,9 +6285,11 @@ packages: '@webassemblyjs/floating-point-hex-parser': 1.11.6 '@webassemblyjs/helper-api-error': 1.11.6 '@xtuc/long': 4.2.2 + dev: false /@webassemblyjs/helper-wasm-bytecode@1.11.6: resolution: {integrity: sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==} + dev: false /@webassemblyjs/helper-wasm-section@1.11.6: resolution: {integrity: sha512-LPpZbSOwTpEC2cgn4hTydySy1Ke+XEu+ETXuoyvuyezHO3Kjdu90KK95Sh9xTbmjrCsUwvWwCOQQNta37VrS9g==} @@ -6771,19 +6298,23 @@ packages: '@webassemblyjs/helper-buffer': 1.11.6 '@webassemblyjs/helper-wasm-bytecode': 1.11.6 '@webassemblyjs/wasm-gen': 1.11.6 + dev: false /@webassemblyjs/ieee754@1.11.6: resolution: {integrity: sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==} dependencies: '@xtuc/ieee754': 1.2.0 + dev: false /@webassemblyjs/leb128@1.11.6: resolution: {integrity: sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==} dependencies: '@xtuc/long': 4.2.2 + dev: false /@webassemblyjs/utf8@1.11.6: resolution: {integrity: sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==} + dev: false /@webassemblyjs/wasm-edit@1.11.6: resolution: {integrity: sha512-Ybn2I6fnfIGuCR+Faaz7YcvtBKxvoLV3Lebn1tM4o/IAJzmi9AWYIPWpyBfU8cC+JxAO57bk4+zdsTjJR+VTOw==} @@ -6796,6 +6327,7 @@ packages: '@webassemblyjs/wasm-opt': 1.11.6 '@webassemblyjs/wasm-parser': 1.11.6 '@webassemblyjs/wast-printer': 1.11.6 + dev: false /@webassemblyjs/wasm-gen@1.11.6: resolution: {integrity: sha512-3XOqkZP/y6B4F0PBAXvI1/bky7GryoogUtfwExeP/v7Nzwo1QLcq5oQmpKlftZLbT+ERUOAZVQjuNVak6UXjPA==} @@ -6805,6 +6337,7 @@ packages: '@webassemblyjs/ieee754': 1.11.6 '@webassemblyjs/leb128': 1.11.6 '@webassemblyjs/utf8': 1.11.6 + dev: false /@webassemblyjs/wasm-opt@1.11.6: resolution: {integrity: sha512-cOrKuLRE7PCe6AsOVl7WasYf3wbSo4CeOk6PkrjS7g57MFfVUF9u6ysQBBODX0LdgSvQqRiGz3CXvIDKcPNy4g==} @@ -6813,6 +6346,7 @@ packages: '@webassemblyjs/helper-buffer': 1.11.6 '@webassemblyjs/wasm-gen': 1.11.6 '@webassemblyjs/wasm-parser': 1.11.6 + dev: false /@webassemblyjs/wasm-parser@1.11.6: resolution: {integrity: sha512-6ZwPeGzMJM3Dqp3hCsLgESxBGtT/OeCvCZ4TA1JUPYgmhAx38tTPR9JaKy0S5H3evQpO/h2uWs2j6Yc/fjkpTQ==} @@ -6823,18 +6357,22 @@ packages: '@webassemblyjs/ieee754': 1.11.6 '@webassemblyjs/leb128': 1.11.6 '@webassemblyjs/utf8': 1.11.6 + dev: false /@webassemblyjs/wast-printer@1.11.6: resolution: {integrity: sha512-JM7AhRcE+yW2GWYaKeHL5vt4xqee5N2WcezptmgyhNS+ScggqcT1OtXykhAb13Sn5Yas0j2uv9tHgrjwvzAP4A==} dependencies: '@webassemblyjs/ast': 1.11.6 '@xtuc/long': 4.2.2 + dev: false /@xtuc/ieee754@1.2.0: resolution: {integrity: sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==} + dev: false /@xtuc/long@4.2.2: resolution: {integrity: sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==} + dev: false /@zxing/text-encoding@0.9.0: resolution: {integrity: sha512-U/4aVJ2mxI0aDNI8Uq0wEhMgY+u4CNtEb0om3+y3+niDAsoTCOB33UF0sxpzqzdqXLqmvc+vZyAt4O8pPdfkwA==} @@ -6913,6 +6451,7 @@ packages: acorn: ^8 dependencies: acorn: 8.9.0 + dev: false /acorn-jsx@5.3.2(acorn@8.9.0): resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==} @@ -6929,7 +6468,6 @@ packages: /acorn-walk@8.2.0: resolution: {integrity: sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==} engines: {node: '>=0.4.0'} - dev: true /acorn@7.4.1: resolution: {integrity: sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==} @@ -6966,7 +6504,7 @@ packages: resolution: {integrity: sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==} engines: {node: '>= 6.0.0'} dependencies: - debug: 4.3.4 + debug: 4.3.4(supports-color@8.1.1) transitivePeerDependencies: - supports-color @@ -6995,6 +6533,7 @@ packages: ajv: ^6.9.1 dependencies: ajv: 6.12.6 + dev: false /ajv-keywords@5.1.0(ajv@8.12.0): resolution: {integrity: sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==} @@ -7140,7 +6679,6 @@ packages: /arg@4.1.3: resolution: {integrity: sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==} - dev: true /arg@5.0.2: resolution: {integrity: sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==} @@ -7259,6 +6797,7 @@ packages: inherits: 2.0.4 minimalistic-assert: 1.0.1 safer-buffer: 2.1.2 + dev: true /asn1@0.2.6: resolution: {integrity: sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==} @@ -7271,14 +6810,6 @@ packages: engines: {node: '>=0.8'} dev: true - /assert@2.0.0: - resolution: {integrity: sha512-se5Cd+js9dXJnu6Ag2JFc00t+HmHOen+8Q+L7O9zI0PqQXr20uk2J0XQqMxZEeo5U50o8Nvmmx7dZrl+Ufr35A==} - dependencies: - es6-object-assign: 1.1.0 - is-nan: 1.3.2 - object-is: 1.1.5 - util: 0.12.5 - /assertion-error@1.1.0: resolution: {integrity: sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==} dev: true @@ -7360,7 +6891,7 @@ packages: /axios@0.21.4: resolution: {integrity: sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==} dependencies: - follow-redirects: 1.15.2 + follow-redirects: 1.15.2(debug@4.3.4) transitivePeerDependencies: - debug dev: true @@ -7638,6 +7169,7 @@ packages: /big.js@5.2.2: resolution: {integrity: sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==} + dev: false /bigint-crypto-utils@3.2.2: resolution: {integrity: sha512-U1RbE3aX9ayCUVcIPHuPDPKcK3SFOXf93J1UK/iHlJuQB7bhagPIX06/CLpLEsDThJ7KA4Dhrnzynl+d2weTiw==} @@ -7706,9 +7238,11 @@ packages: /bn.js@4.12.0: resolution: {integrity: sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==} + dev: true /bn.js@5.2.1: resolution: {integrity: sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==} + dev: true /body-parser@1.20.1: resolution: {integrity: sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==} @@ -7794,6 +7328,7 @@ packages: /brorand@1.1.0: resolution: {integrity: sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w==} + dev: true /brotli-size@4.0.0: resolution: {integrity: sha512-uA9fOtlTRC0iqKfzff1W34DXUA3GyVqbUaeo3Rw3d4gd1eavKVCETXrn3NzO74W+UVkG3UHu8WxUi+XvKI/huA==} @@ -7827,11 +7362,6 @@ packages: engines: {node: '>=16.0.0', npm: '>=7.0.0'} dev: true - /browser-resolve@2.0.0: - resolution: {integrity: sha512-7sWsQlYL2rGLy2IWm8WL8DCTJvYLc/qlOnsakDac87SOoCd16WLsaAMdCiAqsTNHIe+SXfaqyxyo6THoWqs8WQ==} - dependencies: - resolve: 1.22.2 - /browser-stdout@1.3.1: resolution: {integrity: sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==} dev: true @@ -7845,6 +7375,7 @@ packages: evp_bytestokey: 1.0.3 inherits: 2.0.4 safe-buffer: 5.2.1 + dev: true /browserify-cipher@1.0.1: resolution: {integrity: sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==} @@ -7852,6 +7383,7 @@ packages: browserify-aes: 1.2.0 browserify-des: 1.0.2 evp_bytestokey: 1.0.3 + dev: true /browserify-des@1.0.2: resolution: {integrity: sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==} @@ -7860,12 +7392,14 @@ packages: des.js: 1.1.0 inherits: 2.0.4 safe-buffer: 5.2.1 + dev: true /browserify-rsa@4.1.0: resolution: {integrity: sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==} dependencies: bn.js: 5.2.1 randombytes: 2.1.0 + dev: true /browserify-sign@4.2.1: resolution: {integrity: sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==} @@ -7879,11 +7413,7 @@ packages: parse-asn1: 5.1.6 readable-stream: 3.6.2 safe-buffer: 5.2.1 - - /browserify-zlib@0.2.0: - resolution: {integrity: sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==} - dependencies: - pako: 1.0.11 + dev: true /browserslist@4.21.9: resolution: {integrity: sha512-M0MFoZzbUrRU4KNfCrDLnvyE7gub+peetoTid3TBIqtunaDJyXlwhakT+/VkvSXcfIzFfK/nkCs4nmyTmxdNSg==} @@ -7957,6 +7487,7 @@ packages: /buffer-xor@1.0.3: resolution: {integrity: sha512-571s0T7nZWK6vB67HI5dyUF7wXiNcfaPPPTl6zYCNApANjIvYJTg7hlud/+cJpdAhS7dVzqMLmfhfHR3rAcOjQ==} + dev: true /buffer@5.7.1: resolution: {integrity: sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==} @@ -7982,9 +7513,6 @@ packages: resolution: {integrity: sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==} engines: {node: '>=6'} - /builtin-status-codes@3.0.0: - resolution: {integrity: sha512-HpGFw18DgFWlncDfjTa2rcQ4W88O1mC8e8yZ2AvQY5KDaktSTwo+KRf6nHK6FRI5FyRyb/5T6+TSxfP7QyGsmQ==} - /busboy@1.6.0: resolution: {integrity: sha512-8SFQbg/0hQ9xy3UNTB0YEnsNBbWfhf7RtnzpL7TkBiTBRfrQ9Fxcnz7VJsleJpyp6rVLvXiuORqjlHi5q+PYuA==} engines: {node: '>=10.16.0'} @@ -8255,6 +7783,7 @@ packages: /chrome-trace-event@1.0.3: resolution: {integrity: sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==} engines: {node: '>=6.0'} + dev: false /chromium-bidi@0.4.4(devtools-protocol@0.0.1094867): resolution: {integrity: sha512-4BX5cSaponuvVT1+SbLYTOAgDoVtX/Khoc9UsbFJ/AsPVUeFAM3RiIDFI6XFhLYMi9WmVJqh1ZH+dRpNKkKwiQ==} @@ -8301,14 +7830,6 @@ packages: dependencies: inherits: 2.0.4 safe-buffer: 5.2.1 - - /cjs-es@0.9.2: - resolution: {integrity: sha512-b3dU5kkUWO8slt5DHHgKFgV5ghWbyBCQVa6lJnDA3+zfgil6MnL8JtoqoM01xabrDcgoazizriwvObCm1sXFgg==} - dependencies: - '@rollup/pluginutils': 4.2.1 - estree-walker: 3.0.3 - is-reference: 3.0.1 - magic-string: 0.26.7 dev: true /cjs-module-lexer@1.2.3: @@ -8584,12 +8105,6 @@ packages: engines: {node: '>=0.8'} dev: false - /console-browserify@1.2.0: - resolution: {integrity: sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==} - - /constants-browserify@1.0.0: - resolution: {integrity: sha512-xFxOwqIzR/e1k1gLiWEophSCMqXcwVHIH7akf7b/vxcUeGunlj3hvZaaqxwHsTgn+IndtkQJgSztIDWeumWJDQ==} - /content-disposition@0.5.2: resolution: {integrity: sha512-kRGRZw3bLlFISDBgwTSA1TMBFN6J6GWDeubmDE3AF+3+yXL8hTWv8r5rkLbqYXY4RjPk/EzHnClI3zQf1cFmHA==} engines: {node: '>= 0.6'} @@ -8713,6 +8228,7 @@ packages: dependencies: bn.js: 4.12.0 elliptic: 6.5.4 + dev: true /create-hash@1.2.0: resolution: {integrity: sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==} @@ -8722,6 +8238,7 @@ packages: md5.js: 1.3.5 ripemd160: 2.0.2 sha.js: 2.4.11 + dev: true /create-hmac@1.1.7: resolution: {integrity: sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==} @@ -8732,6 +8249,7 @@ packages: ripemd160: 2.0.2 safe-buffer: 5.2.1 sha.js: 2.4.11 + dev: true /create-require@1.1.1: resolution: {integrity: sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==} @@ -8747,19 +8265,11 @@ packages: /cross-fetch@3.1.6: resolution: {integrity: sha512-riRvo06crlE8HiqOwIpQhxwdOk4fOeR7FVM/wXoxchFEqMNUjvbs3bfo4OTgMEMHzppd4DxFBDbyySj8Cv781g==} dependencies: - node-fetch: 2.6.12 + node-fetch: 2.6.11 transitivePeerDependencies: - encoding dev: true - /cross-fetch@4.0.0: - resolution: {integrity: sha512-e4a5N8lVvuLgAWgnCrLr2PP0YyDOTHa9H/Rj54dirp61qXnNq46m82bRhNqIA5VccJtWBvPTFRV3TtvHUKPB1g==} - dependencies: - node-fetch: 2.6.12 - transitivePeerDependencies: - - encoding - dev: false - /cross-spawn@6.0.5: resolution: {integrity: sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==} engines: {node: '>=4.8'} @@ -8797,6 +8307,7 @@ packages: public-encrypt: 4.0.3 randombytes: 2.1.0 randomfill: 1.0.4 + dev: true /crypto-random-string@2.0.0: resolution: {integrity: sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==} @@ -9068,20 +8579,11 @@ packages: whatwg-mimetype: 2.3.0 whatwg-url: 8.7.0 - /data-urls@4.0.0: - resolution: {integrity: sha512-/mMTei/JXPqvFqQtfyTowxmJVwr2PVAeCcDxyFf6LhoOu/09TX2OX3kb2wzi4DMXcfj4OItwDOnhl5oziPnT6g==} - engines: {node: '>=14'} - dependencies: - abab: 2.0.6 - whatwg-mimetype: 3.0.0 - whatwg-url: 12.0.1 - dev: false - /datastore-core@7.0.3: resolution: {integrity: sha512-DmPsUux63daOfCszxLkcp6LjdJ0k/BQNhIMtoAi5mbraYQnEQkFtKORmTu6XmDX6ujbtaBkeuJAiCBNI7MZklw==} engines: {node: '>=16.0.0', npm: '>=7.0.0'} dependencies: - debug: 4.3.4 + debug: 4.3.4(supports-color@8.1.1) err-code: 3.0.1 interface-datastore: 6.1.1 it-drain: 1.0.5 @@ -9153,17 +8655,6 @@ packages: dependencies: ms: 2.1.3 - /debug@4.3.4: - resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==} - engines: {node: '>=6.0'} - peerDependencies: - supports-color: '*' - peerDependenciesMeta: - supports-color: - optional: true - dependencies: - ms: 2.1.2 - /debug@4.3.4(supports-color@8.1.1): resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==} engines: {node: '>=6.0'} @@ -9175,7 +8666,6 @@ packages: dependencies: ms: 2.1.2 supports-color: 8.1.1 - dev: true /decamelize@1.2.0: resolution: {integrity: sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==} @@ -9366,6 +8856,7 @@ packages: dependencies: inherits: 2.0.4 minimalistic-assert: 1.0.1 + dev: true /destroy@1.2.0: resolution: {integrity: sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==} @@ -9399,7 +8890,7 @@ packages: hasBin: true dependencies: address: 1.2.2 - debug: 4.3.4 + debug: 4.3.4(supports-color@8.1.1) transitivePeerDependencies: - supports-color dev: true @@ -9429,7 +8920,6 @@ packages: /diff@4.0.2: resolution: {integrity: sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==} engines: {node: '>=0.3.1'} - dev: true /diff@5.0.0: resolution: {integrity: sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==} @@ -9447,6 +8937,7 @@ packages: bn.js: 4.12.0 miller-rabin: 4.0.1 randombytes: 2.1.0 + dev: true /dir-glob@3.0.1: resolution: {integrity: sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==} @@ -9465,7 +8956,7 @@ packages: /dns-over-http-resolver@1.2.3(node-fetch@2.6.11): resolution: {integrity: sha512-miDiVSI6KSNbi4SVifzO/reD8rMnxgrlnkrlkugOLQpWQTe2qMdHsZp5DmfKjxNE+/T3VAAYLQUZMv9SMr6+AA==} dependencies: - debug: 4.3.4 + debug: 4.3.4(supports-color@8.1.1) native-fetch: 3.0.0(node-fetch@2.6.11) receptacle: 1.3.2 transitivePeerDependencies: @@ -9473,11 +8964,11 @@ packages: - supports-color dev: true - /dns-over-http-resolver@1.2.3(node-fetch@3.3.2): + /dns-over-http-resolver@1.2.3(node-fetch@3.3.1): resolution: {integrity: sha512-miDiVSI6KSNbi4SVifzO/reD8rMnxgrlnkrlkugOLQpWQTe2qMdHsZp5DmfKjxNE+/T3VAAYLQUZMv9SMr6+AA==} dependencies: - debug: 4.3.4 - native-fetch: 3.0.0(node-fetch@3.3.2) + debug: 4.3.4(supports-color@8.1.1) + native-fetch: 3.0.0(node-fetch@3.3.1) receptacle: 1.3.2 transitivePeerDependencies: - node-fetch @@ -9488,7 +8979,7 @@ packages: resolution: {integrity: sha512-Lm/eXB7yAQLJ5WxlBGwYfBY7utduXPZykcSmcG6K7ozM0wrZFvxZavhT6PqI0kd/5CUTfev/RrEFQqyU4CGPew==} engines: {node: '>=16.0.0', npm: '>=7.0.0'} dependencies: - debug: 4.3.4 + debug: 4.3.4(supports-color@8.1.1) native-fetch: 4.0.2(undici@5.22.1) receptacle: 1.3.2 undici: 5.22.1 @@ -9544,10 +9035,6 @@ packages: resolution: {integrity: sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w==} dev: true - /domain-browser@4.22.0: - resolution: {integrity: sha512-IGBwjF7tNk3cwypFNH/7bfzBcgSCbaMOD3GsaY1AU/JRrnHnYgEM0+9kQt52iZxjNsjBtJYtao146V+f8jFZNw==} - engines: {node: '>=10'} - /domelementtype@1.3.1: resolution: {integrity: sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==} dev: false @@ -9682,6 +9169,7 @@ packages: inherits: 2.0.4 minimalistic-assert: 1.0.1 minimalistic-crypto-utils: 1.0.1 + dev: true /emittery@0.10.2: resolution: {integrity: sha512-aITqOwnLanpHLNXZJENbOgjUBeHocD+xsSJmNrjovKBW5HbSpW3d1pEls7GFQPUWXiwG9+0P4GtHfEqC/4M0Iw==} @@ -9704,6 +9192,7 @@ packages: /emojis-list@3.0.0: resolution: {integrity: sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==} engines: {node: '>= 4'} + dev: false /encodeurl@1.0.2: resolution: {integrity: sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==} @@ -9726,6 +9215,7 @@ packages: dependencies: graceful-fs: 4.2.11 tapable: 2.2.1 + dev: false /enquirer@2.3.6: resolution: {integrity: sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==} @@ -9812,20 +9302,9 @@ packages: stop-iteration-iterator: 1.0.0 dev: false - /es-info@0.4.0: - resolution: {integrity: sha512-fH+6WU7kIhEFM0tkQwMlpVn9N+Kk1oj8IxuwiNj55fEMiSrJG9e73C/WKYvk5Eeg+X3zsr+nfGd1588Th+DmtQ==} - dependencies: - '@rollup/pluginutils': 4.2.1 - estree-walker: 3.0.3 - is-reference: 3.0.1 - dev: true - - /es-module-lexer@0.4.1: - resolution: {integrity: sha512-ooYciCUtfw6/d2w56UVeqHPcoCFAiJdz5XOkYpv/Txl1HMUozpXjz/2RIQgqwKdXNDPSF1W7mJCFse3G+HDyAA==} - dev: true - /es-module-lexer@1.3.0: resolution: {integrity: sha512-vZK7T0N2CBmBOixhmjdqx2gWVbFZ4DXZ/NyRMZVlJXPa7CyFS+/a4QQsDGDQy9ZfEzxFuNEsMLeQJnKP2p5/JA==} + dev: false /es-set-tostringtag@2.0.1: resolution: {integrity: sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==} @@ -9867,9 +9346,6 @@ packages: es6-symbol: 3.1.3 dev: true - /es6-object-assign@1.1.0: - resolution: {integrity: sha512-MEl9uirslVwqQU369iHNWZXsI8yaZYGg/D65aOgZkeyFJwHYSxilf7rQzXKI7DdDuBPrBXbfk3sl9hJhmd5AUw==} - /es6-promise@4.2.8: resolution: {integrity: sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==} dev: true @@ -9886,18 +9362,6 @@ packages: ext: 1.7.0 dev: true - /esbuild-loader@3.0.1(webpack@5.88.2): - resolution: {integrity: sha512-aZfGybqTeuyCd4AsVvWOOfkhIuN+wfZFjMyh3gyQEU1Uvsl8L6vye9HqP93iRa0iTA+6Jclap514PJIC3cLnMA==} - peerDependencies: - webpack: ^4.40.0 || ^5.0.0 - dependencies: - esbuild: 0.17.19 - get-tsconfig: 4.6.2 - loader-utils: 2.0.4 - webpack: 5.88.2 - webpack-sources: 1.4.3 - dev: true - /esbuild@0.16.17: resolution: {integrity: sha512-G8LEkV0XzDMNwXKgM0Jwu3nY3lSTwSGY6XbxM9cr9+s0T/qSV1q1JVPBGzm3dcjhCic9+emZDmMffkwgPeOeLg==} engines: {node: '>=12'} @@ -9926,35 +9390,6 @@ packages: '@esbuild/win32-arm64': 0.16.17 '@esbuild/win32-ia32': 0.16.17 '@esbuild/win32-x64': 0.16.17 - - /esbuild@0.17.19: - resolution: {integrity: sha512-XQ0jAPFkK/u3LcVRcvVHQcTIqD6E2H1fvZMA5dQPSOWb3suUbWbfbRf94pjc0bNzRYLfIrDRQXr7X+LHIm5oHw==} - engines: {node: '>=12'} - hasBin: true - requiresBuild: true - optionalDependencies: - '@esbuild/android-arm': 0.17.19 - '@esbuild/android-arm64': 0.17.19 - '@esbuild/android-x64': 0.17.19 - '@esbuild/darwin-arm64': 0.17.19 - '@esbuild/darwin-x64': 0.17.19 - '@esbuild/freebsd-arm64': 0.17.19 - '@esbuild/freebsd-x64': 0.17.19 - '@esbuild/linux-arm': 0.17.19 - '@esbuild/linux-arm64': 0.17.19 - '@esbuild/linux-ia32': 0.17.19 - '@esbuild/linux-loong64': 0.17.19 - '@esbuild/linux-mips64el': 0.17.19 - '@esbuild/linux-ppc64': 0.17.19 - '@esbuild/linux-riscv64': 0.17.19 - '@esbuild/linux-s390x': 0.17.19 - '@esbuild/linux-x64': 0.17.19 - '@esbuild/netbsd-x64': 0.17.19 - '@esbuild/openbsd-x64': 0.17.19 - '@esbuild/sunos-x64': 0.17.19 - '@esbuild/win32-arm64': 0.17.19 - '@esbuild/win32-ia32': 0.17.19 - '@esbuild/win32-x64': 0.17.19 dev: true /escalade@3.1.1: @@ -10144,7 +9579,7 @@ packages: '@typescript-eslint/eslint-plugin': 5.60.0(@typescript-eslint/parser@5.60.0)(eslint@8.43.0)(typescript@4.9.5) '@typescript-eslint/experimental-utils': 5.60.0(eslint@8.43.0)(typescript@4.9.5) eslint: 8.43.0 - jest: 27.5.1 + jest: 27.5.1(ts-node@10.9.1) transitivePeerDependencies: - supports-color - typescript @@ -10227,6 +9662,7 @@ packages: dependencies: esrecurse: 4.3.0 estraverse: 4.3.0 + dev: false /eslint-scope@7.2.0: resolution: {integrity: sha512-DYj5deGlHBfMt15J7rdtyKNq/Nqlv5KfU4iodrQ019XESsRnwXH9KAE0y3cwtUHDo2ob7CypAnCqefh6vioWRw==} @@ -10277,7 +9713,7 @@ packages: ajv: 6.12.6 chalk: 4.1.2 cross-spawn: 7.0.3 - debug: 4.3.4 + debug: 4.3.4(supports-color@8.1.1) doctrine: 3.0.0 escape-string-regexp: 4.0.0 eslint-scope: 7.2.0 @@ -10348,6 +9784,7 @@ packages: engines: {node: '>=4.0'} dependencies: estraverse: 5.3.0 + dev: false /estraverse@1.9.3: resolution: {integrity: sha512-25w1fMXQrGdoquWnScXZGckOv+Wes+JDnuN/+7ex3SauFRS72r2lFDec0EKPt2YD1wUJ/IrfEex+9yp4hfSOJA==} @@ -10357,6 +9794,7 @@ packages: /estraverse@4.3.0: resolution: {integrity: sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==} engines: {node: '>=4.0'} + dev: false /estraverse@5.3.0: resolution: {integrity: sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==} @@ -10371,11 +9809,6 @@ packages: /estree-walker@2.0.2: resolution: {integrity: sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==} - - /estree-walker@3.0.3: - resolution: {integrity: sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==} - dependencies: - '@types/estree': 1.0.1 dev: true /esutils@2.0.3: @@ -10598,6 +10031,7 @@ packages: dependencies: md5.js: 1.3.5 safe-buffer: 5.2.1 + dev: true /execa@5.1.1: resolution: {integrity: sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==} @@ -10699,7 +10133,7 @@ packages: engines: {node: '>= 10.17.0'} hasBin: true dependencies: - debug: 4.3.4 + debug: 4.3.4(supports-color@8.1.1) get-stream: 5.2.0 yauzl: 2.10.0 optionalDependencies: @@ -10888,11 +10322,6 @@ packages: engines: {node: '>=0.10.0'} dev: true - /filter-obj@2.0.2: - resolution: {integrity: sha512-lO3ttPjHZRfjMcxWKb1j1eDhTFsu4meeR3lnMcnBFhk6RuLhvEiuALu2TlfL310ph4lCYYwgF/ElIjdP739tdg==} - engines: {node: '>=8'} - dev: true - /finalhandler@1.2.0: resolution: {integrity: sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==} engines: {node: '>= 0.8'} @@ -10973,15 +10402,6 @@ packages: resolution: {integrity: sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==} dev: false - /follow-redirects@1.15.2: - resolution: {integrity: sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==} - engines: {node: '>=4.0'} - peerDependencies: - debug: '*' - peerDependenciesMeta: - debug: - optional: true - /follow-redirects@1.15.2(debug@4.3.4): resolution: {integrity: sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==} engines: {node: '>=4.0'} @@ -10991,8 +10411,7 @@ packages: debug: optional: true dependencies: - debug: 4.3.4 - dev: true + debug: 4.3.4(supports-color@8.1.1) /for-each@0.3.3: resolution: {integrity: sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==} @@ -11292,12 +10711,6 @@ packages: call-bind: 1.0.2 get-intrinsic: 1.2.1 - /get-tsconfig@4.6.2: - resolution: {integrity: sha512-E5XrT4CbbXcXWy+1jChlZmrmCwd5KGx502kDCXJJ7y898TtWW9FwoG5HfOLVRKmlmDGkWN2HM9Ho+/Y8F0sJDg==} - dependencies: - resolve-pkg-maps: 1.0.0 - dev: true - /getpass@0.1.7: resolution: {integrity: sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==} dependencies: @@ -11327,6 +10740,7 @@ packages: /glob-to-regexp@0.4.1: resolution: {integrity: sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==} + dev: false /glob@5.0.15: resolution: {integrity: sha512-c9IPMazfRITpmAAKi22dK1VKxGDX9ehhqfABDriL/lzO92xcUKEJPQHrVA/2YHSNFB4iFlykVmWvwo48nr3OxA==} @@ -11392,17 +10806,6 @@ packages: once: 1.4.0 path-is-absolute: 1.0.1 - /glob@8.1.0: - resolution: {integrity: sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==} - engines: {node: '>=12'} - dependencies: - fs.realpath: 1.0.0 - inflight: 1.0.6 - inherits: 2.0.4 - minimatch: 5.1.6 - once: 1.4.0 - dev: true - /global-modules@2.0.0: resolution: {integrity: sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==} engines: {node: '>=6'} @@ -11643,7 +11046,7 @@ packages: chalk: 2.4.2 chokidar: 3.5.3 ci-info: 2.0.0 - debug: 4.3.4 + debug: 4.3.4(supports-color@8.1.1) enquirer: 2.3.6 env-paths: 2.2.1 ethereum-cryptography: 1.2.0 @@ -11666,7 +11069,7 @@ packages: solc: 0.7.3(debug@4.3.4) source-map-support: 0.5.21 stacktrace-parser: 0.1.10 - ts-node: 10.9.1(@types/node@20.4.5)(typescript@4.7.2) + ts-node: 10.9.1(@types/node@18.13.0)(typescript@4.7.2) tsort: 0.0.1 typescript: 4.7.2 undici: 5.22.1 @@ -11737,6 +11140,7 @@ packages: inherits: 2.0.4 readable-stream: 3.6.2 safe-buffer: 5.2.1 + dev: true /hash.js@1.1.3: resolution: {integrity: sha512-/UETyP0W22QILqS+6HowevwhEFJ3MBJnwTf75Qob9Wz9t0DPuisL8kW8YZMK62dHAKE1c1p+gY1TtOLY+USEHA==} @@ -11750,6 +11154,7 @@ packages: dependencies: inherits: 2.0.4 minimalistic-assert: 1.0.1 + dev: true /hashlru@2.3.0: resolution: {integrity: sha512-0cMsjjIC8I+D3M44pOQdsy0OHXGLVz6Z0beRuufhKa0KfaD2wGwAev6jILzXsd3/vpnNQJmWyZtIILqM1N+n5A==} @@ -11768,6 +11173,7 @@ packages: hash.js: 1.1.7 minimalistic-assert: 1.0.1 minimalistic-crypto-utils: 1.0.1 + dev: true /hoopy@0.1.4: resolution: {integrity: sha512-HRcs+2mr52W0K+x8RzcLzuPPmVIKMSv97RGHy0Ea9y/mpcaK+xTrjICA04KAHi4GRzxliNqNJEFYWHghy3rSfQ==} @@ -11892,7 +11298,7 @@ packages: dependencies: '@tootallnate/once': 1.1.2 agent-base: 6.0.2 - debug: 4.3.4 + debug: 4.3.4(supports-color@8.1.1) transitivePeerDependencies: - supports-color @@ -11920,7 +11326,7 @@ packages: engines: {node: '>=8.0.0'} dependencies: eventemitter3: 4.0.7 - follow-redirects: 1.15.2 + follow-redirects: 1.15.2(debug@4.3.4) requires-port: 1.0.0 transitivePeerDependencies: - debug @@ -11979,15 +11385,12 @@ packages: resolve-alpn: 1.2.1 dev: true - /https-browserify@1.0.0: - resolution: {integrity: sha512-J+FkSdyD+0mA0N+81tMotaRMfSL9SGi+xpD3T6YApKsc3bGSXJlfXri3VyFOeYkfLRQisDk1W+jIFFKBeUBbBg==} - /https-proxy-agent@5.0.1: resolution: {integrity: sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==} engines: {node: '>= 6'} dependencies: agent-base: 6.0.2 - debug: 4.3.4 + debug: 4.3.4(supports-color@8.1.1) transitivePeerDependencies: - supports-color @@ -12259,14 +11662,14 @@ packages: - supports-color dev: true - /ipfs-core-types@0.5.2(node-fetch@3.3.2): + /ipfs-core-types@0.5.2(node-fetch@3.3.1): resolution: {integrity: sha512-DOQeL+GFGYMTlnbdtMeBzvfVnyAalSgCfPr8XUCI+FVBZZWwzkt5jZZzGDmF87HVRrMR3FuVyBKZj772mcXKyQ==} deprecated: js-IPFS has been deprecated in favour of Helia - please see https://github.com/ipfs/js-ipfs/issues/4336 for details dependencies: cids: 1.1.9 interface-datastore: 4.0.2 ipld-block: 0.11.1 - multiaddr: 9.0.2(node-fetch@3.3.2) + multiaddr: 9.0.2(node-fetch@3.3.1) multibase: 4.0.6 transitivePeerDependencies: - node-fetch @@ -12303,7 +11706,7 @@ packages: - supports-color dev: true - /ipfs-core-utils@0.8.3(node-fetch@3.3.2): + /ipfs-core-utils@0.8.3(node-fetch@3.3.1): resolution: {integrity: sha512-PY7PkCgCtVYtNOe1C3ew1+5D9NqXqizb886R/lyGWe+KsmWtBQkQIk0ZIDwKyHGvG2KA2QQeIDzdOmzBQBJtHQ==} deprecated: js-IPFS has been deprecated in favour of Helia - please see https://github.com/ipfs/js-ipfs/issues/4336 for details dependencies: @@ -12312,14 +11715,14 @@ packages: browser-readablestream-to-it: 1.0.3 cids: 1.1.9 err-code: 3.0.1 - ipfs-core-types: 0.5.2(node-fetch@3.3.2) + ipfs-core-types: 0.5.2(node-fetch@3.3.1) ipfs-unixfs: 4.0.3 ipfs-utils: 8.1.6 it-all: 1.0.6 it-map: 1.0.6 it-peekable: 1.0.3 - multiaddr: 9.0.2(node-fetch@3.3.2) - multiaddr-to-uri: 7.0.0(node-fetch@3.3.2) + multiaddr: 9.0.2(node-fetch@3.3.1) + multiaddr-to-uri: 7.0.0(node-fetch@3.3.1) parse-duration: 1.1.0 timeout-abort-controller: 1.1.1 uint8arrays: 2.1.10 @@ -12328,7 +11731,7 @@ packages: - supports-color dev: true - /ipfs-http-client@50.1.2(node-fetch@3.3.2): + /ipfs-http-client@50.1.2(node-fetch@3.3.1): resolution: {integrity: sha512-ZbJlED4wqwFXQFVB9FQDs20ygdq7O/zSq4AvO9KRAmkqUj2TsCWCteUz2fBMnGWLh2tExxeSl/rQbHbJptb8JQ==} engines: {node: '>=14.0.0', npm: '>=3.0.0'} deprecated: js-IPFS has been deprecated in favour of Helia - please see https://github.com/ipfs/js-ipfs/issues/4336 for details @@ -12336,10 +11739,10 @@ packages: abort-controller: 3.0.0 any-signal: 2.1.2 cids: 1.1.9 - debug: 4.3.4 + debug: 4.3.4(supports-color@8.1.1) form-data: 4.0.0 - ipfs-core-types: 0.5.2(node-fetch@3.3.2) - ipfs-core-utils: 0.8.3(node-fetch@3.3.2) + ipfs-core-types: 0.5.2(node-fetch@3.3.1) + ipfs-core-utils: 0.8.3(node-fetch@3.3.1) ipfs-unixfs: 4.0.3 ipfs-utils: 8.1.6 ipld-block: 0.11.1 @@ -12351,7 +11754,7 @@ packages: it-tar: 3.0.0 it-to-stream: 1.0.0 merge-options: 3.0.4 - multiaddr: 9.0.2(node-fetch@3.3.2) + multiaddr: 9.0.2(node-fetch@3.3.1) multibase: 4.0.6 multicodec: 3.2.1 multihashes: 4.0.3 @@ -12447,8 +11850,8 @@ packages: it-to-stream: 1.0.0 merge-options: 3.0.4 nanoid: 3.3.6 - native-fetch: 3.0.0(node-fetch@2.6.12) - node-fetch: 2.6.12 + native-fetch: 3.0.0(node-fetch@2.6.11) + node-fetch: 2.6.11 react-native-fetch-api: 3.0.0 stream-to-it: 0.2.4 transitivePeerDependencies: @@ -12540,13 +11943,6 @@ packages: engines: {node: '>=4'} dev: true - /is-builtin-module@3.2.1: - resolution: {integrity: sha512-BSLE3HnV2syZ0FK0iMA/yUGplUeMmNz4AW5fnTunbCIqZi4vG3WjJT9FHMy5D69xmAYBHXQhJdALdpwVxV501A==} - engines: {node: '>=6'} - dependencies: - builtin-modules: 3.3.0 - dev: true - /is-callable@1.2.7: resolution: {integrity: sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==} engines: {node: '>= 0.4'} @@ -12605,6 +12001,7 @@ packages: engines: {node: '>= 0.4'} dependencies: has-tostringtag: 1.0.0 + dev: true /is-glob@4.0.3: resolution: {integrity: sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==} @@ -12644,13 +12041,6 @@ packages: /is-module@1.0.0: resolution: {integrity: sha512-51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g==} - /is-nan@1.3.2: - resolution: {integrity: sha512-E+zBKpQ2t6MEo1VsonYmluk9NxGrbzpeeLC2xIViuO2EjU2xsXsBPwTr3Ykv9l08UYEVEdWeRZNouaZqF6RN0w==} - engines: {node: '>= 0.4'} - dependencies: - call-bind: 1.0.2 - define-properties: 1.2.0 - /is-natural-number@4.0.1: resolution: {integrity: sha512-Y4LTamMe0DDQIIAlaer9eKebAlDSV6huy+TWhJVPlzZh2o4tRP5SQWFlLn5N0To4mDD22/qdOq+veo1cSISLgQ==} dev: true @@ -12701,12 +12091,6 @@ packages: '@types/estree': 1.0.1 dev: true - /is-reference@3.0.1: - resolution: {integrity: sha512-baJJdQLiYaJdvFbJqXrcGv3WU3QCzBlUcI5QhbesIm6/xPsvmO+2CDoi/GMOFBQEQm+PXkwOPrp9KK5ozZsp2w==} - dependencies: - '@types/estree': 1.0.1 - dev: true - /is-regex@1.1.4: resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==} engines: {node: '>= 0.4'} @@ -12826,10 +12210,6 @@ packages: resolution: {integrity: sha512-9JPDgCN4B7QPkLtYAAOrEuAWvP9rWvR5offAr0/SeF046wIkglqH3VXgYYP6NcsKslH80UIVgmPqNe3j7tG2ng==} engines: {node: '>=12'} - /isomorphic-timers-promises@1.0.1: - resolution: {integrity: sha512-u4sej9B1LPSxTGKB/HiuzvEQnXH0ECYkSVQU39koSwmFAxhlEAFl9RdTvLv4TOTQUgBS5O3O5fwUxk6byBZ+IQ==} - engines: {node: '>=10'} - /isstream@0.1.2: resolution: {integrity: sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==} dev: true @@ -12862,7 +12242,7 @@ packages: resolution: {integrity: sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==} engines: {node: '>=10'} dependencies: - debug: 4.3.4 + debug: 4.3.4(supports-color@8.1.1) istanbul-lib-coverage: 3.2.0 source-map: 0.6.1 transitivePeerDependencies: @@ -13271,7 +12651,7 @@ packages: '@jest/expect': 28.1.3 '@jest/test-result': 28.1.3 '@jest/types': 28.1.3 - '@types/node': 20.4.5 + '@types/node': 18.13.0 chalk: 4.1.2 co: 4.6.0 dedent: 0.7.0 @@ -13290,36 +12670,6 @@ packages: - supports-color dev: true - /jest-cli@27.5.1: - resolution: {integrity: sha512-Hc6HOOwYq4/74/c62dEE3r5elx8wjYqxY0r0G/nFrLDPMFRu6RA/u8qINOIkvhxG7mMQ5EJsOGfRpI8L6eFUVw==} - engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} - hasBin: true - peerDependencies: - node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0 - peerDependenciesMeta: - node-notifier: - optional: true - dependencies: - '@jest/core': 27.5.1 - '@jest/test-result': 27.5.1 - '@jest/types': 27.5.1 - chalk: 4.1.2 - exit: 0.1.2 - graceful-fs: 4.2.11 - import-local: 3.1.0 - jest-config: 27.5.1 - jest-util: 27.5.1 - jest-validate: 27.5.1 - prompts: 2.4.2 - yargs: 16.2.0 - transitivePeerDependencies: - - bufferutil - - canvas - - supports-color - - ts-node - - utf-8-validate - dev: false - /jest-cli@27.5.1(ts-node@10.9.1): resolution: {integrity: sha512-Hc6HOOwYq4/74/c62dEE3r5elx8wjYqxY0r0G/nFrLDPMFRu6RA/u8qINOIkvhxG7mMQ5EJsOGfRpI8L6eFUVw==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} @@ -13348,9 +12698,8 @@ packages: - supports-color - ts-node - utf-8-validate - dev: true - /jest-cli@28.1.3(@types/node@16.11.59): + /jest-cli@28.1.3(@types/node@16.11.59)(ts-node@10.9.1): resolution: {integrity: sha512-roY3kvrv57Azn1yPgdTebPAXvdR2xfezaKKYzVxZ6It/5NCxzJym6tUI5P1zkdWhfUYkxEI9uZWcQdaFLo8mJQ==} engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} hasBin: true @@ -13360,14 +12709,14 @@ packages: node-notifier: optional: true dependencies: - '@jest/core': 28.1.3 + '@jest/core': 28.1.3(ts-node@10.9.1) '@jest/test-result': 28.1.3 '@jest/types': 28.1.3 chalk: 4.1.2 exit: 0.1.2 graceful-fs: 4.2.11 import-local: 3.1.0 - jest-config: 28.1.3(@types/node@16.11.59) + jest-config: 28.1.3(@types/node@16.11.59)(ts-node@10.9.1) jest-util: 28.1.3 jest-validate: 28.1.3 prompts: 2.4.2 @@ -13378,46 +12727,6 @@ packages: - ts-node dev: true - /jest-config@27.5.1: - resolution: {integrity: sha512-5sAsjm6tGdsVbW9ahcChPAFCk4IlkQUknH5AvKjuLTSlcO/wCZKyFdn7Rg0EkC+OGgWODEy2hDpWB1PgzH0JNA==} - engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} - peerDependencies: - ts-node: '>=9.0.0' - peerDependenciesMeta: - ts-node: - optional: true - dependencies: - '@babel/core': 7.22.5 - '@jest/test-sequencer': 27.5.1 - '@jest/types': 27.5.1 - babel-jest: 27.5.1(@babel/core@7.22.5) - chalk: 4.1.2 - ci-info: 3.8.0 - deepmerge: 4.3.1 - glob: 7.2.3 - graceful-fs: 4.2.11 - jest-circus: 27.5.1 - jest-environment-jsdom: 27.5.1 - jest-environment-node: 27.5.1 - jest-get-type: 27.5.1 - jest-jasmine2: 27.5.1 - jest-regex-util: 27.5.1 - jest-resolve: 27.5.1 - jest-runner: 27.5.1 - jest-util: 27.5.1 - jest-validate: 27.5.1 - micromatch: 4.0.5 - parse-json: 5.2.0 - pretty-format: 27.5.1 - slash: 3.0.0 - strip-json-comments: 3.1.1 - transitivePeerDependencies: - - bufferutil - - canvas - - supports-color - - utf-8-validate - dev: false - /jest-config@27.5.1(ts-node@10.9.1): resolution: {integrity: sha512-5sAsjm6tGdsVbW9ahcChPAFCk4IlkQUknH5AvKjuLTSlcO/wCZKyFdn7Rg0EkC+OGgWODEy2hDpWB1PgzH0JNA==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} @@ -13457,9 +12766,8 @@ packages: - canvas - supports-color - utf-8-validate - dev: true - /jest-config@28.1.3(@types/node@16.11.59): + /jest-config@28.1.3(@types/node@16.11.59)(ts-node@10.9.1): resolution: {integrity: sha512-MG3INjByJ0J4AsNBm7T3hsuxKQqFIiRo/AUqb1q9LRKI5UU6Aar9JHbr9Ivn1TVwfUD9KirRoM/T6u8XlcQPHQ==} engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} peerDependencies: @@ -13494,11 +12802,12 @@ packages: pretty-format: 28.1.3 slash: 3.0.0 strip-json-comments: 3.1.1 + ts-node: 10.9.1(@types/node@18.13.0)(typescript@4.7.2) transitivePeerDependencies: - supports-color dev: true - /jest-config@28.1.3(@types/node@20.4.5): + /jest-config@28.1.3(@types/node@18.13.0)(ts-node@10.9.1): resolution: {integrity: sha512-MG3INjByJ0J4AsNBm7T3hsuxKQqFIiRo/AUqb1q9LRKI5UU6Aar9JHbr9Ivn1TVwfUD9KirRoM/T6u8XlcQPHQ==} engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} peerDependencies: @@ -13513,7 +12822,7 @@ packages: '@babel/core': 7.22.5 '@jest/test-sequencer': 28.1.3 '@jest/types': 28.1.3 - '@types/node': 20.4.5 + '@types/node': 18.13.0 babel-jest: 28.1.3(@babel/core@7.22.5) chalk: 4.1.2 ci-info: 3.8.0 @@ -13533,6 +12842,7 @@ packages: pretty-format: 28.1.3 slash: 3.0.0 strip-json-comments: 3.1.1 + ts-node: 10.9.1(@types/node@18.13.0)(typescript@4.7.2) transitivePeerDependencies: - supports-color dev: true @@ -13625,7 +12935,7 @@ packages: '@jest/environment': 28.1.3 '@jest/fake-timers': 28.1.3 '@jest/types': 28.1.3 - '@types/node': 20.4.5 + '@types/node': 18.13.0 jest-mock: 28.1.3 jest-util: 28.1.3 dev: true @@ -13664,7 +12974,7 @@ packages: dependencies: '@jest/types': 28.1.3 '@types/graceful-fs': 4.1.6 - '@types/node': 20.4.5 + '@types/node': 18.13.0 anymatch: 3.1.3 fb-watchman: 2.0.2 graceful-fs: 4.2.11 @@ -13775,7 +13085,7 @@ packages: engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} dependencies: '@jest/types': 28.1.3 - '@types/node': 20.4.5 + '@types/node': 18.13.0 dev: true /jest-pnp-resolver@1.2.3(jest-resolve@27.5.1): @@ -13899,7 +13209,7 @@ packages: '@jest/test-result': 28.1.3 '@jest/transform': 28.1.3 '@jest/types': 28.1.3 - '@types/node': 20.4.5 + '@types/node': 18.13.0 chalk: 4.1.2 emittery: 0.10.2 graceful-fs: 4.2.11 @@ -14050,7 +13360,7 @@ packages: engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: '@jest/types': 27.5.1 - '@types/node': 20.4.5 + '@types/node': 18.13.0 chalk: 4.1.2 ci-info: 3.8.0 graceful-fs: 4.2.11 @@ -14061,7 +13371,7 @@ packages: engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} dependencies: '@jest/types': 28.1.3 - '@types/node': 20.4.5 + '@types/node': 18.13.0 chalk: 4.1.2 ci-info: 3.8.0 graceful-fs: 4.2.11 @@ -14098,7 +13408,7 @@ packages: dependencies: ansi-escapes: 4.3.2 chalk: 4.1.2 - jest: 27.5.1 + jest: 27.5.1(ts-node@10.9.1) jest-regex-util: 28.0.2 jest-watcher: 28.1.3 slash: 4.0.0 @@ -14124,7 +13434,7 @@ packages: dependencies: '@jest/test-result': 28.1.3 '@jest/types': 28.1.3 - '@types/node': 20.4.5 + '@types/node': 18.13.0 ansi-escapes: 4.3.2 chalk: 4.1.2 emittery: 0.10.2 @@ -14135,7 +13445,7 @@ packages: resolution: {integrity: sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==} engines: {node: '>= 10.13.0'} dependencies: - '@types/node': 20.4.5 + '@types/node': 18.13.0 merge-stream: 2.0.0 supports-color: 7.2.0 @@ -14151,31 +13461,10 @@ packages: resolution: {integrity: sha512-CqRA220YV/6jCo8VWvAt1KKx6eek1VIHMPeLEbpcfSfkEeWyBNppynM/o6q+Wmw+sOhos2ml34wZbSX3G13//g==} engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} dependencies: - '@types/node': 20.4.5 + '@types/node': 18.13.0 merge-stream: 2.0.0 supports-color: 8.1.1 - /jest@27.5.1: - resolution: {integrity: sha512-Yn0mADZB89zTtjkPJEXwrac3LHudkQMR+Paqa8uxJHCBr9agxztUifWCyiYrjhMPBoUVBjyny0I7XH6ozDr7QQ==} - engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} - hasBin: true - peerDependencies: - node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0 - peerDependenciesMeta: - node-notifier: - optional: true - dependencies: - '@jest/core': 27.5.1 - import-local: 3.1.0 - jest-cli: 27.5.1 - transitivePeerDependencies: - - bufferutil - - canvas - - supports-color - - ts-node - - utf-8-validate - dev: false - /jest@27.5.1(ts-node@10.9.1): resolution: {integrity: sha512-Yn0mADZB89zTtjkPJEXwrac3LHudkQMR+Paqa8uxJHCBr9agxztUifWCyiYrjhMPBoUVBjyny0I7XH6ozDr7QQ==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} @@ -14195,9 +13484,8 @@ packages: - supports-color - ts-node - utf-8-validate - dev: true - /jest@28.1.0(@types/node@16.11.59): + /jest@28.1.0(@types/node@16.11.59)(ts-node@10.9.1): resolution: {integrity: sha512-TZR+tHxopPhzw3c3560IJXZWLNHgpcz1Zh0w5A65vynLGNcg/5pZ+VildAd7+XGOu6jd58XMY/HNn0IkZIXVXg==} engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} hasBin: true @@ -14207,9 +13495,9 @@ packages: node-notifier: optional: true dependencies: - '@jest/core': 28.1.3 + '@jest/core': 28.1.3(ts-node@10.9.1) import-local: 3.1.0 - jest-cli: 28.1.3(@types/node@16.11.59) + jest-cli: 28.1.3(@types/node@16.11.59)(ts-node@10.9.1) transitivePeerDependencies: - '@types/node' - supports-color @@ -14577,7 +13865,7 @@ packages: resolution: {integrity: sha512-3KjzNEIWhi+VoOamLvgKKUE/xqwxSw/JYqsBnfMhAWVRvRtosROtVT03wci2XbuuowCYw+/hEX1xKJIR1w5n0A==} dependencies: abortable-iterator: 3.0.2 - debug: 4.3.4 + debug: 4.3.4(supports-color@8.1.1) err-code: 3.0.1 it-length-prefixed: 5.0.3 it-pipe: 1.1.0 @@ -14594,17 +13882,17 @@ packages: - supports-color dev: true - /libp2p-interfaces@4.0.6(node-fetch@3.3.2): + /libp2p-interfaces@4.0.6(node-fetch@3.3.1): resolution: {integrity: sha512-3KjzNEIWhi+VoOamLvgKKUE/xqwxSw/JYqsBnfMhAWVRvRtosROtVT03wci2XbuuowCYw+/hEX1xKJIR1w5n0A==} dependencies: abortable-iterator: 3.0.2 - debug: 4.3.4 + debug: 4.3.4(supports-color@8.1.1) err-code: 3.0.1 it-length-prefixed: 5.0.3 it-pipe: 1.1.0 it-pushable: 1.4.2 libp2p-crypto: 0.21.2 - multiaddr: 10.0.1(node-fetch@3.3.2) + multiaddr: 10.0.1(node-fetch@3.3.1) multiformats: 9.9.0 p-queue: 6.6.2 peer-id: 0.16.0 @@ -14620,7 +13908,7 @@ packages: dependencies: abortable-iterator: 3.0.2 bl: 5.1.0 - debug: 4.3.4 + debug: 4.3.4(supports-color@8.1.1) err-code: 3.0.1 it-pipe: 1.1.0 it-pushable: 1.4.2 @@ -14633,7 +13921,7 @@ packages: resolution: {integrity: sha512-kq/US2unamiyY+YwP47dO1uqpAdcbdYI2Fzi9JIEhjfPBaD1MR/uyQ/YP7ABthl3EaxAjIQYd1TVp85d6QKAtQ==} dependencies: abortable-iterator: 3.0.2 - debug: 4.3.4 + debug: 4.3.4(supports-color@8.1.1) err-code: 3.0.1 ip-address: 8.1.0 is-loopback-addr: 1.0.1 @@ -14644,15 +13932,15 @@ packages: - supports-color dev: true - /libp2p-utils@0.4.1(node-fetch@3.3.2): + /libp2p-utils@0.4.1(node-fetch@3.3.1): resolution: {integrity: sha512-kq/US2unamiyY+YwP47dO1uqpAdcbdYI2Fzi9JIEhjfPBaD1MR/uyQ/YP7ABthl3EaxAjIQYd1TVp85d6QKAtQ==} dependencies: abortable-iterator: 3.0.2 - debug: 4.3.4 + debug: 4.3.4(supports-color@8.1.1) err-code: 3.0.1 ip-address: 8.1.0 is-loopback-addr: 1.0.1 - multiaddr: 10.0.1(node-fetch@3.3.2) + multiaddr: 10.0.1(node-fetch@3.3.1) private-ip: 2.3.4 transitivePeerDependencies: - node-fetch @@ -14664,7 +13952,7 @@ packages: dependencies: abortable-iterator: 3.0.2 class-is: 1.1.0 - debug: 4.3.4 + debug: 4.3.4(supports-color@8.1.1) err-code: 3.0.1 ipfs-utils: 9.0.14 it-ws: 4.0.0 @@ -14682,19 +13970,19 @@ packages: - utf-8-validate dev: true - /libp2p-websockets@0.16.2(node-fetch@3.3.2): + /libp2p-websockets@0.16.2(node-fetch@3.3.1): resolution: {integrity: sha512-QGfo8jX1Ks16yi8C67CCyMW7k9cfCYiQ0lzKVJBud0fV3ymbMO2L8gzU6iXUUZTHILo8ka26zKhwQ4lmUMI+nA==} dependencies: abortable-iterator: 3.0.2 class-is: 1.1.0 - debug: 4.3.4 + debug: 4.3.4(supports-color@8.1.1) err-code: 3.0.1 ipfs-utils: 9.0.14 it-ws: 4.0.0 - libp2p-utils: 0.4.1(node-fetch@3.3.2) - mafmt: 10.0.0(node-fetch@3.3.2) - multiaddr: 10.0.1(node-fetch@3.3.2) - multiaddr-to-uri: 8.0.0(node-fetch@3.3.2) + libp2p-utils: 0.4.1(node-fetch@3.3.1) + mafmt: 10.0.0(node-fetch@3.3.1) + multiaddr: 10.0.1(node-fetch@3.3.1) + multiaddr-to-uri: 8.0.0(node-fetch@3.3.1) p-defer: 3.0.0 p-timeout: 4.1.0 transitivePeerDependencies: @@ -14716,7 +14004,7 @@ packages: bignumber.js: 9.1.1 class-is: 1.1.0 datastore-core: 7.0.3 - debug: 4.3.4 + debug: 4.3.4(supports-color@8.1.1) err-code: 3.0.1 es6-promisify: 7.0.0 events: 3.3.0 @@ -14768,7 +14056,7 @@ packages: - supports-color dev: true - /libp2p@0.36.2(node-fetch@3.3.2): + /libp2p@0.36.2(node-fetch@3.3.1): resolution: {integrity: sha512-UpNYBMQVivMu56zoibdGitopv39uBBAybIBOEGWmFy/I2NnTVGUutLPrxo47AuN2kntYgo/TNJfW+PpswUgSaw==} engines: {node: '>=15.0.0'} dependencies: @@ -14779,7 +14067,7 @@ packages: bignumber.js: 9.1.1 class-is: 1.1.0 datastore-core: 7.0.3 - debug: 4.3.4 + debug: 4.3.4(supports-color@8.1.1) err-code: 3.0.1 es6-promisify: 7.0.0 events: 3.3.0 @@ -14799,12 +14087,12 @@ packages: it-sort: 1.0.1 it-take: 1.0.2 libp2p-crypto: 0.21.2 - libp2p-interfaces: 4.0.6(node-fetch@3.3.2) - libp2p-utils: 0.4.1(node-fetch@3.3.2) - mafmt: 10.0.0(node-fetch@3.3.2) + libp2p-interfaces: 4.0.6(node-fetch@3.3.1) + libp2p-utils: 0.4.1(node-fetch@3.3.1) + mafmt: 10.0.0(node-fetch@3.3.1) merge-options: 3.0.4 mortice: 2.0.1 - multiaddr: 10.0.1(node-fetch@3.3.2) + multiaddr: 10.0.1(node-fetch@3.3.1) multiformats: 9.9.0 multistream-select: 3.0.2 mutable-proxy: 1.0.0 @@ -14917,6 +14205,7 @@ packages: /loader-runner@4.3.0: resolution: {integrity: sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==} engines: {node: '>=6.11.5'} + dev: false /loader-utils@2.0.4: resolution: {integrity: sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==} @@ -14925,6 +14214,7 @@ packages: big.js: 5.2.2 emojis-list: 3.0.0 json5: 2.2.3 + dev: false /loader-utils@3.2.1: resolution: {integrity: sha512-ZvFw1KWS3GVyYBYb7qkmRM/WwL2TQQBxgCK62rlvm4WpVQ23Nb4tYjApUlfjrEGvOs7KHEsmyUn75OHZrJMWPw==} @@ -15104,10 +14394,10 @@ packages: - supports-color dev: true - /mafmt@10.0.0(node-fetch@3.3.2): + /mafmt@10.0.0(node-fetch@3.3.1): resolution: {integrity: sha512-K1bziJOXcnepfztu+2Xy9FLKVLaFMDuspmiyJIYRxnO0WOxFSV7XKSdMxMrVZxcvg1+YjlTIvSGTImUHU2k4Aw==} dependencies: - multiaddr: 10.0.1(node-fetch@3.3.2) + multiaddr: 10.0.1(node-fetch@3.3.1) transitivePeerDependencies: - node-fetch - supports-color @@ -15118,24 +14408,11 @@ packages: dependencies: sourcemap-codec: 1.4.8 - /magic-string@0.26.7: - resolution: {integrity: sha512-hX9XH3ziStPoPhJxLq1syWuZMxbDvGNbVchfrdCtanC7D13888bMFow61x8axrx+GfHLtVeAx2kxL7tTGRl+Ow==} - engines: {node: '>=12'} - dependencies: - sourcemap-codec: 1.4.8 - dev: true - /magic-string@0.27.0: resolution: {integrity: sha512-8UnnX2PeRAPZuN12svgR9j7M1uWMovg/CEnIwIG0LFkXSJJe4PdfUGiTGl8V9bsBHFUtfVINcSyYxd7q+kx9fA==} engines: {node: '>=12'} dependencies: '@jridgewell/sourcemap-codec': 1.4.15 - - /magic-string@0.30.2: - resolution: {integrity: sha512-lNZdu7pewtq/ZvWUp9Wpf/x7WzMTsR26TWV03BRZrXFsv+BI6dy8RAiKgm1uM/kyR0rCfUcqvOlXKG66KhIGug==} - engines: {node: '>=12'} - dependencies: - '@jridgewell/sourcemap-codec': 1.4.15 dev: true /make-dir@1.3.0: @@ -15153,7 +14430,6 @@ packages: /make-error@1.3.6: resolution: {integrity: sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==} - dev: true /makeerror@1.0.12: resolution: {integrity: sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==} @@ -15185,6 +14461,7 @@ packages: hash-base: 3.1.0 inherits: 2.0.4 safe-buffer: 5.2.1 + dev: true /mdn-data@2.0.14: resolution: {integrity: sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==} @@ -15244,7 +14521,7 @@ packages: resolution: {integrity: sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==} engines: {node: '>= 0.6'} - /microbundle@0.15.1: + /microbundle@0.15.1(ts-node@10.9.1): resolution: {integrity: sha512-aAF+nwFbkSIJGfrJk+HyzmJOq3KFaimH6OIFBU6J2DPjQeg1jXIYlIyEv81Gyisb9moUkudn+wj7zLNYMOv75Q==} hasBin: true dependencies: @@ -15281,7 +14558,7 @@ packages: pretty-bytes: 5.6.0 rollup: 2.79.1 rollup-plugin-bundle-size: 1.0.3 - rollup-plugin-postcss: 4.0.2(postcss@8.4.24) + rollup-plugin-postcss: 4.0.2(postcss@8.4.24)(ts-node@10.9.1) rollup-plugin-terser: 7.0.2(rollup@2.79.1) rollup-plugin-typescript2: 0.32.1(rollup@2.79.1)(typescript@4.7.2) rollup-plugin-visualizer: 5.9.2(rollup@2.79.1) @@ -15309,6 +14586,7 @@ packages: dependencies: bn.js: 4.12.0 brorand: 1.1.0 + dev: true /mime-db@1.33.0: resolution: {integrity: sha512-BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ==} @@ -15377,6 +14655,7 @@ packages: /minimalistic-crypto-utils@1.0.1: resolution: {integrity: sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg==} + dev: true /minimatch@3.0.4: resolution: {integrity: sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==} @@ -15468,15 +14747,6 @@ packages: ufo: 1.1.2 dev: true - /mlly@1.4.0: - resolution: {integrity: sha512-ua8PAThnTwpprIaU47EPeZ/bPUVp2QYBbWMphUQpVdBI3Lgqzm5KZQ45Agm3YJedHXaIHl6pBGabaLSUPPSptg==} - dependencies: - acorn: 8.9.0 - pathe: 1.1.1 - pkg-types: 1.0.3 - ufo: 1.1.2 - dev: true - /mnemonist@0.38.5: resolution: {integrity: sha512-bZTFT5rrPKtPJxj8KSV0WkPyNxl72vQepqqVUAW2ARUpUSF2qXMB6jZj7hW5/k7C1rtpzqbD/IIbJwLXUjCHeg==} dependencies: @@ -15593,11 +14863,11 @@ packages: /ms@2.1.3: resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==} - /multiaddr-to-uri@7.0.0(node-fetch@3.3.2): + /multiaddr-to-uri@7.0.0(node-fetch@3.3.1): resolution: {integrity: sha512-VbscDpLcbV0m25tJqfnZSfbjVUuNlPa4BbD5l/7me1t0lc3SWI0XAoO5E/PNJF0e1qUlbdq7yjVFEQjUT+9r0g==} deprecated: This module is deprecated, please upgrade to @multiformats/multiaddr-to-uri dependencies: - multiaddr: 9.0.2(node-fetch@3.3.2) + multiaddr: 9.0.2(node-fetch@3.3.1) transitivePeerDependencies: - node-fetch - supports-color @@ -15613,11 +14883,11 @@ packages: - supports-color dev: true - /multiaddr-to-uri@8.0.0(node-fetch@3.3.2): + /multiaddr-to-uri@8.0.0(node-fetch@3.3.1): resolution: {integrity: sha512-dq4p/vsOOUdVEd1J1gl+R2GFrXJQH8yjLtz4hodqdVbieg39LvBOdMQRdQnfbg5LSM/q1BYNVf5CBbwZFFqBgA==} deprecated: This module is deprecated, please upgrade to @multiformats/multiaddr-to-uri dependencies: - multiaddr: 10.0.1(node-fetch@3.3.2) + multiaddr: 10.0.1(node-fetch@3.3.1) transitivePeerDependencies: - node-fetch - supports-color @@ -15638,11 +14908,11 @@ packages: - supports-color dev: true - /multiaddr@10.0.1(node-fetch@3.3.2): + /multiaddr@10.0.1(node-fetch@3.3.1): resolution: {integrity: sha512-G5upNcGzEGuTHkzxezPrrD6CaIHR9uo+7MwqhNVcXTs33IInon4y7nMiGxl2CY5hG7chvYQUQhz5V52/Qe3cbg==} deprecated: This module is deprecated, please upgrade to @multiformats/multiaddr dependencies: - dns-over-http-resolver: 1.2.3(node-fetch@3.3.2) + dns-over-http-resolver: 1.2.3(node-fetch@3.3.1) err-code: 3.0.1 is-ip: 3.1.0 multiformats: 9.9.0 @@ -15653,12 +14923,12 @@ packages: - supports-color dev: true - /multiaddr@9.0.2(node-fetch@3.3.2): + /multiaddr@9.0.2(node-fetch@3.3.1): resolution: {integrity: sha512-YFaEb9t4yXSbaGksSEdg+Kn2U02s7w4wXUgyEMQmPxFJj7CfVHY10WOsScAX/rK6Soa15S1zXYadqH9TtlVreQ==} deprecated: This module is deprecated, please upgrade to @multiformats/multiaddr dependencies: cids: 1.1.9 - dns-over-http-resolver: 1.2.3(node-fetch@3.3.2) + dns-over-http-resolver: 1.2.3(node-fetch@3.3.1) err-code: 3.0.1 is-ip: 3.1.0 multibase: 4.0.6 @@ -15780,7 +15050,7 @@ packages: dependencies: abortable-iterator: 3.0.2 bl: 5.1.0 - debug: 4.3.4 + debug: 4.3.4(supports-color@8.1.1) err-code: 3.0.1 it-first: 1.0.7 it-handshake: 2.0.0 @@ -15849,7 +15119,7 @@ packages: engines: {node: '>=10.0.0'} dependencies: async: 3.2.4 - debug: 4.3.4 + debug: 4.3.4(supports-color@8.1.1) default-gateway: 6.0.3 request: 2.88.2 unordered-array-remove: 1.0.2 @@ -15882,20 +15152,12 @@ packages: node-fetch: 2.6.11 dev: true - /native-fetch@3.0.0(node-fetch@2.6.12): - resolution: {integrity: sha512-G3Z7vx0IFb/FQ4JxvtqGABsOTIqRWvgQz6e+erkB+JJD6LrszQtMozEHI4EkmgZQvnGHrpLVzUWk7t4sJCIkVw==} - peerDependencies: - node-fetch: '*' - dependencies: - node-fetch: 2.6.12 - dev: true - - /native-fetch@3.0.0(node-fetch@3.3.2): + /native-fetch@3.0.0(node-fetch@3.3.1): resolution: {integrity: sha512-G3Z7vx0IFb/FQ4JxvtqGABsOTIqRWvgQz6e+erkB+JJD6LrszQtMozEHI4EkmgZQvnGHrpLVzUWk7t4sJCIkVw==} peerDependencies: node-fetch: '*' dependencies: - node-fetch: 3.3.2 + node-fetch: 3.3.1 dev: true /native-fetch@4.0.2(undici@5.22.1): @@ -15986,17 +15248,6 @@ packages: whatwg-url: 5.0.0 dev: true - /node-fetch@2.6.12: - resolution: {integrity: sha512-C/fGU2E8ToujUivIO0H+tpQ6HWo4eEmchoPIoXtxCrVghxdKq+QOHqEZW7tuP3KlV3bC8FRMO5nMCC7Zm1VP6g==} - engines: {node: 4.x || >=6.0.0} - peerDependencies: - encoding: ^0.1.0 - peerDependenciesMeta: - encoding: - optional: true - dependencies: - whatwg-url: 5.0.0 - /node-fetch@2.6.7: resolution: {integrity: sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==} engines: {node: 4.x || >=6.0.0} @@ -16009,8 +15260,8 @@ packages: whatwg-url: 5.0.0 dev: true - /node-fetch@3.3.2: - resolution: {integrity: sha512-dRB78srN/l6gqWulah9SrxeYnxeddIG30+GOqK/9OlLVyLg3HPnr6SqOWTWOXKRwC2eGYCkZ59NNuSgvSrpgOA==} + /node-fetch@3.3.1: + resolution: {integrity: sha512-cRVc/kyto/7E5shrWca1Wsea4y6tL9iYJE5FBCius3JQfb/4P4I295PfhgbJQBLTx6lATE4z+wK0rPM4VS2uow==} engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} dependencies: data-uri-to-buffer: 4.0.1 @@ -16035,75 +15286,9 @@ packages: /node-int64@0.4.0: resolution: {integrity: sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==} - /node-polyfill-webpack-plugin@2.0.1(webpack@5.88.2): - resolution: {integrity: sha512-ZUMiCnZkP1LF0Th2caY6J/eKKoA0TefpoVa68m/LQU1I/mE8rGt4fNYGgNuCcK+aG8P8P43nbeJ2RqJMOL/Y1A==} - engines: {node: '>=12'} - peerDependencies: - webpack: '>=5' - dependencies: - assert: 2.0.0 - browserify-zlib: 0.2.0 - buffer: 6.0.3 - console-browserify: 1.2.0 - constants-browserify: 1.0.0 - crypto-browserify: 3.12.0 - domain-browser: 4.22.0 - events: 3.3.0 - filter-obj: 2.0.2 - https-browserify: 1.0.0 - os-browserify: 0.3.0 - path-browserify: 1.0.1 - process: 0.11.10 - punycode: 2.3.0 - querystring-es3: 0.2.1 - readable-stream: 4.4.2 - stream-browserify: 3.0.0 - stream-http: 3.2.0 - string_decoder: 1.3.0 - timers-browserify: 2.0.12 - tty-browserify: 0.0.1 - type-fest: 2.19.0 - url: 0.11.1 - util: 0.12.5 - vm-browserify: 1.1.2 - webpack: 5.88.2 - dev: true - /node-releases@2.0.12: resolution: {integrity: sha512-QzsYKWhXTWx8h1kIvqfnC++o0pEmpRQA/aenALsL2F4pqNVr7YzcdMlDij5WBnwftRbJCNJL/O7zdKaxKPHqgQ==} - /node-stdlib-browser@1.2.0: - resolution: {integrity: sha512-VSjFxUhRhkyed8AtLwSCkMrJRfQ3e2lGtG3sP6FEgaLKBBbxM/dLfjRe1+iLhjvyLFW3tBQ8+c0pcOtXGbAZJg==} - engines: {node: '>=10'} - dependencies: - assert: 2.0.0 - browser-resolve: 2.0.0 - browserify-zlib: 0.2.0 - buffer: 5.7.1 - console-browserify: 1.2.0 - constants-browserify: 1.0.0 - create-require: 1.1.1 - crypto-browserify: 3.12.0 - domain-browser: 4.22.0 - events: 3.3.0 - https-browserify: 1.0.0 - isomorphic-timers-promises: 1.0.1 - os-browserify: 0.3.0 - path-browserify: 1.0.1 - pkg-dir: 5.0.0 - process: 0.11.10 - punycode: 1.4.1 - querystring-es3: 0.2.1 - readable-stream: 3.6.2 - stream-browserify: 3.0.0 - stream-http: 3.2.0 - string_decoder: 1.3.0 - timers-browserify: 2.0.12 - tty-browserify: 0.0.1 - url: 0.11.1 - util: 0.12.5 - vm-browserify: 1.1.2 - /nofilter@3.1.0: resolution: {integrity: sha512-l2NNj07e9afPnhAhvgVrCD/oy2Ai1yfLpuo3EpiO1jFTsB4sFz6oIfAfSZyQzVpkZQ9xS8ZS5g1jCBgq4Hwo0g==} engines: {node: '>=12.19'} @@ -16188,6 +15373,7 @@ packages: dependencies: call-bind: 1.0.2 define-properties: 1.2.0 + dev: false /object-keys@1.1.1: resolution: {integrity: sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==} @@ -16375,9 +15561,6 @@ packages: resolution: {integrity: sha512-cMddMgb2QElm8G7vdaa02jhUNbTSrhsgAGUz1OokD83uJTwSUn+nKoNoKVVaRa08yF6sgfO7Maou1+bgLd9rdQ==} dev: true - /os-browserify@0.3.0: - resolution: {integrity: sha512-gjcpUc3clBf9+210TRaDWbf+rZZZEshZ+DlXMRCeAjp0xhTrnQsKHypIy1J3d5hKdUzj69t708EHtU8P6bUn0A==} - /os-tmpdir@1.0.2: resolution: {integrity: sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==} engines: {node: '>=0.10.0'} @@ -16607,6 +15790,7 @@ packages: evp_bytestokey: 1.0.3 pbkdf2: 3.1.2 safe-buffer: 5.2.1 + dev: true /parse-cache-control@1.0.1: resolution: {integrity: sha512-60zvsJReQPX5/QP0Kzfd/VrpjScIQ7SHBW6bFCYfEP+fp0Eppr1SHhIO5nd1PjZtvclzSzES9D/p5nFJurwfWg==} @@ -16709,6 +15893,7 @@ packages: ripemd160: 2.0.2 safe-buffer: 5.2.1 sha.js: 2.4.11 + dev: true /peer-id@0.15.4: resolution: {integrity: sha512-MDoBIMZYwQIAHaZQUwsIcvoFgdbIl5GtZMwSkXpIYvc5v0TSDv+u8WsTKrKt2Vv28tHFFDJQdVzu3T4qTPzK+w==} @@ -16829,17 +16014,11 @@ packages: dependencies: find-up: 4.1.0 - /pkg-dir@5.0.0: - resolution: {integrity: sha512-NPE8TDbzl/3YQYY7CSS228s3g2ollTFnc+Qi3tqmqJp9Vg2ovUpixcJEo2HJScN2Ez+kEaal6y70c0ehqJBJeA==} - engines: {node: '>=10'} - dependencies: - find-up: 5.0.0 - /pkg-types@1.0.3: resolution: {integrity: sha512-nN7pYi0AQqJnoLPC9eHFQ8AcyaixBUOwvqc5TDnIKCMEE6I0y8P7OKA7fPexsXGCGxQDl/cmrLAp26LhcwxZ4A==} dependencies: jsonc-parser: 3.2.0 - mlly: 1.4.0 + mlly: 1.3.0 pathe: 1.1.1 dev: true @@ -17145,7 +16324,7 @@ packages: postcss-value-parser: 4.2.0 dev: false - /postcss-load-config@3.1.4(postcss@8.4.24): + /postcss-load-config@3.1.4(postcss@8.4.24)(ts-node@10.9.1): resolution: {integrity: sha512-6DiM4E7v4coTE4uzA8U//WhtPwyhiim3eyjEMFCnUpzbrkK9wJHgKDT2mR+HbtSrd/NubVaYTOpSpjUl8NQeRg==} engines: {node: '>= 10'} peerDependencies: @@ -17159,10 +16338,11 @@ packages: dependencies: lilconfig: 2.1.0 postcss: 8.4.24 + ts-node: 10.9.1(@types/node@18.13.0)(typescript@4.7.2) yaml: 1.10.2 dev: true - /postcss-load-config@4.0.1(postcss@8.4.24): + /postcss-load-config@4.0.1(postcss@8.4.24)(ts-node@10.9.1): resolution: {integrity: sha512-vEJIc8RdiBRu3oRAI0ymerOn+7rPuMvRXslTvZUKZonDHFIczxztIyJ1urxM1x9JXEikvpWWTUUqal5j/8QgvA==} engines: {node: '>= 14'} peerDependencies: @@ -17176,6 +16356,7 @@ packages: dependencies: lilconfig: 2.1.0 postcss: 8.4.24 + ts-node: 10.9.1(@types/node@18.13.0)(typescript@4.7.2) yaml: 2.3.1 dev: false @@ -17775,7 +16956,7 @@ packages: '@protobufjs/pool': 1.1.0 '@protobufjs/utf8': 1.1.0 '@types/long': 4.0.2 - '@types/node': 20.4.5 + '@types/node': 18.13.0 long: 4.0.0 dev: true @@ -17794,7 +16975,7 @@ packages: '@protobufjs/path': 1.1.2 '@protobufjs/pool': 1.1.0 '@protobufjs/utf8': 1.1.0 - '@types/node': 20.4.5 + '@types/node': 18.13.0 long: 5.2.3 /protons-runtime@4.0.2(uint8arraylist@2.4.3): @@ -17840,6 +17021,7 @@ packages: parse-asn1: 5.1.6 randombytes: 2.1.0 safe-buffer: 5.2.1 + dev: true /pump@3.0.0: resolution: {integrity: sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==} @@ -17850,6 +17032,7 @@ packages: /punycode@1.4.1: resolution: {integrity: sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==} + dev: false /punycode@2.1.0: resolution: {integrity: sha512-Yxz2kRwT90aPiWEMHVYnEf4+rhwF1tBmmZ4KepCP+Wkium9JxtWnUm1nqGwpiAHr/tnTSeHqr3wb++jgSkXjhA==} @@ -17871,7 +17054,7 @@ packages: dependencies: chromium-bidi: 0.4.4(devtools-protocol@0.0.1094867) cross-fetch: 3.1.5 - debug: 4.3.4 + debug: 4.3.4(supports-color@8.1.1) devtools-protocol: 0.0.1094867 extract-zip: 2.0.1 https-proxy-agent: 5.0.1 @@ -17922,6 +17105,7 @@ packages: engines: {node: '>=0.6'} dependencies: side-channel: 1.0.4 + dev: true /qs@6.5.3: resolution: {integrity: sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==} @@ -17947,10 +17131,6 @@ packages: strict-uri-encode: 2.0.0 dev: true - /querystring-es3@0.2.1: - resolution: {integrity: sha512-773xhDQnZBMFobEiztv8LIl70ch5MSF/jUQVlhwFyBILqq96anmoctVIYz+ZRp0qbCKATTn6ev02M3r7Ga5vqA==} - engines: {node: '>=0.4.x'} - /querystringify@2.2.0: resolution: {integrity: sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==} @@ -18110,7 +17290,7 @@ packages: engines: {node: '>=0.10.0'} dev: false - /react-scripts@5.0.1(@babel/plugin-syntax-flow@7.22.5)(@babel/plugin-transform-react-jsx@7.22.5)(eslint@8.43.0)(react@18.2.0)(typescript@4.9.5): + /react-scripts@5.0.1(@babel/plugin-syntax-flow@7.22.5)(@babel/plugin-transform-react-jsx@7.22.5)(eslint@8.43.0)(react@18.2.0)(ts-node@10.9.1)(typescript@4.9.5): resolution: {integrity: sha512-8VAmEm/ZAwQzJ+GOMLbBsTdDKOpuZh7RPs0UymvBR2vRk4iZWCskjbFnxqjrzoIvlNNRZ3QJFx6/qDSi6zSnaQ==} engines: {node: '>=14.0.0'} hasBin: true @@ -18144,7 +17324,7 @@ packages: fs-extra: 10.1.0 html-webpack-plugin: 5.5.3(webpack@5.87.0) identity-obj-proxy: 3.0.0 - jest: 27.5.1 + jest: 27.5.1(ts-node@10.9.1) jest-resolve: 27.5.1 jest-watch-typeahead: 1.1.0(jest@27.5.1) mini-css-extract-plugin: 2.7.6(webpack@5.87.0) @@ -18164,7 +17344,7 @@ packages: semver: 7.5.2 source-map-loader: 3.0.2(webpack@5.87.0) style-loader: 3.3.3(webpack@5.87.0) - tailwindcss: 3.3.2 + tailwindcss: 3.3.2(ts-node@10.9.1) terser-webpack-plugin: 5.3.9(webpack@5.87.0) typescript: 4.9.5 webpack: 5.87.0 @@ -18239,17 +17419,6 @@ packages: string_decoder: 1.3.0 util-deprecate: 1.0.2 - /readable-stream@4.4.2: - resolution: {integrity: sha512-Lk/fICSyIhodxy1IDK2HazkeGjSmezAWX2egdtJnYhtzKEsBPJowlI6F6LPb5tqIQILrMbx22S5o3GuJavPusA==} - engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} - dependencies: - abort-controller: 3.0.0 - buffer: 6.0.3 - events: 3.3.0 - process: 0.11.10 - string_decoder: 1.3.0 - dev: true - /readdirp@3.2.0: resolution: {integrity: sha512-crk4Qu3pmXwgxdSgGhgA/eXiJAPQiX4GMOZZMXnqKxHX7TaoL+3gQVo/WeuAiogr07DpnfjIMpXXa+PAIvwPGQ==} engines: {node: '>= 8'} @@ -18473,10 +17642,6 @@ packages: resolution: {integrity: sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==} engines: {node: '>=8'} - /resolve-pkg-maps@1.0.0: - resolution: {integrity: sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==} - dev: true - /resolve-url-loader@4.0.0: resolution: {integrity: sha512-05VEMczVREcbtT7Bz+C+96eUO5HDNvdthIiMB34t7FcF8ehcu4wC0sSgPUubs3XW2Q3CNLJk/BJrCU9wVRymiA==} engines: {node: '>=8.9'} @@ -18580,6 +17745,7 @@ packages: dependencies: hash-base: 3.1.0 inherits: 2.0.4 + dev: true /rlp@2.2.7: resolution: {integrity: sha512-d5gdPmgQ0Z+AklL2NVXr/IoSjNZFfTVvQWzL/AM2AOcSzYP2xjlb0AC8YyCLc41MSNf6P6QVtjgPdmVtzb+4lQ==} @@ -18595,38 +17761,11 @@ packages: maxmin: 2.1.0 dev: true - /rollup-plugin-cjs-es@2.0.0(rollup@3.25.1): - resolution: {integrity: sha512-ks9SqJEC5iBY5x1DpC7H1ckLMwQQFDauFXVirH8IhC+HfkQ7dhT7ukRGiUKFNBC9+lTB8Ge4ZnJD30wSue5+OQ==} - engines: {node: '>= 7.10'} + /rollup-plugin-postcss@4.0.2(postcss@8.4.24)(ts-node@10.9.1): + resolution: {integrity: sha512-05EaY6zvZdmvPUDi3uCcAQoESDcYnv8ogJJQRp6V5kZ6J6P7uAVJlrTZcaaA20wTH527YTnKfkAoPxWI/jPp4w==} + engines: {node: '>=10'} peerDependencies: - rollup: ^3.2.2 - dependencies: - '@rollup/pluginutils': 5.0.2(rollup@3.25.1) - cjs-es: 0.9.2 - es-info: 0.4.0 - rollup: 3.25.1 - dev: true - - /rollup-plugin-inject@3.0.2: - resolution: {integrity: sha512-ptg9PQwzs3orn4jkgXJ74bfs5vYz1NCZlSQMBUA0wKcGp5i5pA1AO3fOUEte8enhGUC+iapTCzEWw2jEFFUO/w==} - deprecated: This package has been deprecated and is no longer maintained. Please use @rollup/plugin-inject. - dependencies: - estree-walker: 0.6.1 - magic-string: 0.25.9 - rollup-pluginutils: 2.8.2 - dev: true - - /rollup-plugin-node-polyfills@0.2.1: - resolution: {integrity: sha512-4kCrKPTJ6sK4/gLL/U5QzVT8cxJcofO0OU74tnB19F40cmuAKSzH5/siithxlofFEjwvw1YAhPmbvGNA6jEroA==} - dependencies: - rollup-plugin-inject: 3.0.2 - dev: true - - /rollup-plugin-postcss@4.0.2(postcss@8.4.24): - resolution: {integrity: sha512-05EaY6zvZdmvPUDi3uCcAQoESDcYnv8ogJJQRp6V5kZ6J6P7uAVJlrTZcaaA20wTH527YTnKfkAoPxWI/jPp4w==} - engines: {node: '>=10'} - peerDependencies: - postcss: 8.x + postcss: 8.x dependencies: chalk: 4.1.2 concat-with-sourcemaps: 1.1.0 @@ -18635,7 +17774,7 @@ packages: p-queue: 6.6.2 pify: 5.0.0 postcss: 8.4.24 - postcss-load-config: 3.1.4(postcss@8.4.24) + postcss-load-config: 3.1.4(postcss@8.4.24)(ts-node@10.9.1) postcss-modules: 4.3.1(postcss@8.4.24) promise.series: 0.2.0 resolve: 1.22.2 @@ -18709,6 +17848,7 @@ packages: hasBin: true optionalDependencies: fsevents: 2.3.2 + dev: true /run-async@3.0.0: resolution: {integrity: sha512-540WwVDOMxA6dN6We19EcT9sc3hkXPw5mzRNGM3FkdN/vtE9NFvj5lFAPNwUDmJjXidm3v7TC1cTE7t17Ulm1Q==} @@ -18879,6 +18019,7 @@ packages: '@types/json-schema': 7.0.12 ajv: 6.12.6 ajv-keywords: 3.5.2(ajv@6.12.6) + dev: false /schema-utils@4.2.0: resolution: {integrity: sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==} @@ -18981,6 +18122,7 @@ packages: resolution: {integrity: sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==} dependencies: randombytes: 2.1.0 + dev: false /serve-handler@6.1.5: resolution: {integrity: sha512-ijPFle6Hwe8zfmBxJdE+5fta53fdIY0lHISJvuikXB3VYFafRjMRpOffSPvCYsbKyBA7pvy9oYr/BT1O3EArlg==} @@ -19047,6 +18189,7 @@ packages: /setimmediate@1.0.5: resolution: {integrity: sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==} + dev: true /setprototypeof@1.1.0: resolution: {integrity: sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==} @@ -19061,6 +18204,7 @@ packages: dependencies: inherits: 2.0.4 safe-buffer: 5.2.1 + dev: true /sha1@1.1.1: resolution: {integrity: sha512-dZBS6OrMjtgVkopB1Gmo4RQCDKiZsqcpAQpkV/aaj+FCrCg8r4I4qMkDPQjBgLIxlmu9k4nUbWq6ohXahOneYA==} @@ -19223,6 +18367,7 @@ packages: /source-list-map@2.0.1: resolution: {integrity: sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==} + dev: false /source-map-js@1.0.2: resolution: {integrity: sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==} @@ -19284,7 +18429,7 @@ packages: /spdy-transport@3.0.0: resolution: {integrity: sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==} dependencies: - debug: 4.3.4 + debug: 4.3.4(supports-color@8.1.1) detect-node: 2.1.0 hpack.js: 2.1.6 obuf: 1.1.2 @@ -19298,7 +18443,7 @@ packages: resolution: {integrity: sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==} engines: {node: '>=6.0.0'} dependencies: - debug: 4.3.4 + debug: 4.3.4(supports-color@8.1.1) handle-thing: 2.0.1 http-deceiver: 1.2.7 select-hose: 2.0.0 @@ -19389,20 +18534,6 @@ packages: internal-slot: 1.0.5 dev: false - /stream-browserify@3.0.0: - resolution: {integrity: sha512-H73RAHsVBapbim0tU2JwwOiXUj+fikfiaoYAKHF3VJfA0pe2BCzkhAHBlLG6REzE+2WNZcxOXjK7lkso+9euLA==} - dependencies: - inherits: 2.0.4 - readable-stream: 3.6.2 - - /stream-http@3.2.0: - resolution: {integrity: sha512-Oq1bLqisTyK3TSCXpPbT4sdeYNdmyZJv1LxpEm2vu1ZhK89kSE5YXwZc3cWk0MagGaKriBh9mCFbVGtO+vY29A==} - dependencies: - builtin-status-codes: 3.0.0 - inherits: 2.0.4 - readable-stream: 3.6.2 - xtend: 4.0.2 - /stream-shift@1.0.1: resolution: {integrity: sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==} dev: true @@ -19823,7 +18954,7 @@ packages: strip-ansi: 6.0.1 dev: true - /tailwindcss@3.3.2: + /tailwindcss@3.3.2(ts-node@10.9.1): resolution: {integrity: sha512-9jPkMiIBXvPc2KywkraqsUfbfj+dHDb+JPWtSJa9MLFdrPyazI7q6WX2sUrm7R9eVR7qqv3Pas7EvQFzxKnI6w==} engines: {node: '>=14.0.0'} hasBin: true @@ -19845,7 +18976,7 @@ packages: postcss: 8.4.24 postcss-import: 15.1.0(postcss@8.4.24) postcss-js: 4.0.1(postcss@8.4.24) - postcss-load-config: 4.0.1(postcss@8.4.24) + postcss-load-config: 4.0.1(postcss@8.4.24)(ts-node@10.9.1) postcss-nested: 6.0.1(postcss@8.4.24) postcss-selector-parser: 6.0.13 postcss-value-parser: 4.2.0 @@ -19863,6 +18994,7 @@ packages: /tapable@2.2.1: resolution: {integrity: sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==} engines: {node: '>=6'} + dev: false /tar-fs@2.1.1: resolution: {integrity: sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==} @@ -19955,29 +19087,6 @@ packages: webpack: 5.87.0 dev: false - /terser-webpack-plugin@5.3.9(webpack@5.88.2): - resolution: {integrity: sha512-ZuXsqE07EcggTWQjXUj+Aot/OMcD0bMKGgF63f7UxYcu5/AJF53aIpK1YoP5xR9l6s/Hy2b+t1AM0bLNPRuhwA==} - engines: {node: '>= 10.13.0'} - peerDependencies: - '@swc/core': '*' - esbuild: '*' - uglify-js: '*' - webpack: ^5.1.0 - peerDependenciesMeta: - '@swc/core': - optional: true - esbuild: - optional: true - uglify-js: - optional: true - dependencies: - '@jridgewell/trace-mapping': 0.3.18 - jest-worker: 27.5.1 - schema-utils: 3.3.0 - serialize-javascript: 6.0.1 - terser: 5.18.1 - webpack: 5.88.2 - /terser@5.18.1: resolution: {integrity: sha512-j1n0Ao919h/Ai5r43VAnfV/7azUYW43GPxK7qSATzrsERfW7+y2QW9Cp9ufnRF5CQUWbnLSo7UJokSWCqg4tsQ==} engines: {node: '>=10'} @@ -20040,7 +19149,7 @@ packages: resolution: {integrity: sha512-Mx5NBSHX3sQYR6iI9VYbgHKBLisyB+xROCBGjjWm1O9wb9vfLxdaGtmT/KCjUqMsSNW6nERzCW3T6H43LqjDZQ==} dependencies: callsites: 3.1.0 - debug: 4.3.4 + debug: 4.3.4(supports-color@8.1.1) is-observable: 2.1.0 observable-fns: 0.6.1 optionalDependencies: @@ -20076,12 +19185,6 @@ packages: dependencies: retimer: 3.0.0 - /timers-browserify@2.0.12: - resolution: {integrity: sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==} - engines: {node: '>=0.6.0'} - dependencies: - setimmediate: 1.0.5 - /tiny-glob@0.2.9: resolution: {integrity: sha512-g/55ssRPUjShh+xkfx9UPDXqhckHEsHr4Vd9zX55oSdGZc/MD0m3sferOkwWtp98bv+kcVfEHtRJgBVJzelrzg==} dependencies: @@ -20162,6 +19265,7 @@ packages: /tr46@0.0.3: resolution: {integrity: sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==} + dev: true /tr46@1.0.1: resolution: {integrity: sha512-dTpowEjclQ7Kgx5SdBkqRzVhERQXov8/l9Ft9dVM9fmg0W0KQSVaXX9T4i6twCPNtYiZM53lpSSUAwJbFPOHxA==} @@ -20175,13 +19279,6 @@ packages: dependencies: punycode: 2.3.0 - /tr46@4.1.1: - resolution: {integrity: sha512-2lv/66T7e5yNyhAAC4NaKe5nVavzuGJQVVtRYLyQ2OI8tsJ61PMLlelehb0wi2Hx6+hT/OJUWZcw8MjlSRnxvw==} - engines: {node: '>=14'} - dependencies: - punycode: 2.3.0 - dev: false - /trim-repeated@2.0.0: resolution: {integrity: sha512-QUHBFTJGdOwmp0tbOG505xAgOp/YliZP/6UgafFXYZ26WT1bvQmSMJUvkeVSASuJJHbqsFbynTvkd5W8RBTipg==} engines: {node: '>=12'} @@ -20220,40 +19317,6 @@ packages: resolution: {integrity: sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==} dev: false - /ts-jest@27.1.5(@babel/core@7.22.5)(jest@27.5.1)(typescript@4.7.2): - resolution: {integrity: sha512-Xv6jBQPoBEvBq/5i2TeSG9tt/nqkbpcurrEG1b+2yfBrcJelOZF9Ml6dmyMh7bcW9JyFbRYpR5rxROSlBLTZHA==} - engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} - hasBin: true - peerDependencies: - '@babel/core': '>=7.0.0-beta.0 <8' - '@types/jest': ^27.0.0 - babel-jest: '>=27.0.0 <28' - esbuild: '*' - jest: ^27.0.0 - typescript: '>=3.8 <5.0' - peerDependenciesMeta: - '@babel/core': - optional: true - '@types/jest': - optional: true - babel-jest: - optional: true - esbuild: - optional: true - dependencies: - '@babel/core': 7.22.5 - bs-logger: 0.2.6 - fast-json-stable-stringify: 2.1.0 - jest: 27.5.1(ts-node@10.9.1) - jest-util: 27.5.1 - json5: 2.2.3 - lodash.memoize: 4.1.2 - make-error: 1.3.6 - semver: 7.5.2 - typescript: 4.7.2 - yargs-parser: 20.2.9 - dev: true - /ts-jest@27.1.5(jest@27.5.1)(typescript@4.7.2): resolution: {integrity: sha512-Xv6jBQPoBEvBq/5i2TeSG9tt/nqkbpcurrEG1b+2yfBrcJelOZF9Ml6dmyMh7bcW9JyFbRYpR5rxROSlBLTZHA==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} @@ -20312,7 +19375,7 @@ packages: '@types/jest': 28.1.0 bs-logger: 0.2.6 fast-json-stable-stringify: 2.1.0 - jest: 28.1.0(@types/node@16.11.59) + jest: 28.1.0(@types/node@16.11.59)(ts-node@10.9.1) jest-util: 28.1.3 json5: 2.2.3 lodash.memoize: 4.1.2 @@ -20322,21 +19385,6 @@ packages: yargs-parser: 20.2.9 dev: true - /ts-loader@9.4.4(typescript@4.7.2)(webpack@5.88.2): - resolution: {integrity: sha512-MLukxDHBl8OJ5Dk3y69IsKVFRA/6MwzEqBgh+OXMPB/OD01KQuWPFd1WAQP8a5PeSCAxfnkhiuWqfmFJzJQt9w==} - engines: {node: '>=12.0.0'} - peerDependencies: - typescript: '*' - webpack: ^5.0.0 - dependencies: - chalk: 4.1.2 - enhanced-resolve: 5.15.0 - micromatch: 4.0.5 - semver: 7.5.2 - typescript: 4.7.2 - webpack: 5.88.2 - dev: true - /ts-node@10.9.1(@types/node@18.13.0)(typescript@4.7.2): resolution: {integrity: sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==} hasBin: true @@ -20366,38 +19414,6 @@ packages: typescript: 4.7.2 v8-compile-cache-lib: 3.0.1 yn: 3.1.1 - dev: true - - /ts-node@10.9.1(@types/node@20.4.5)(typescript@4.7.2): - resolution: {integrity: sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==} - hasBin: true - peerDependencies: - '@swc/core': '>=1.2.50' - '@swc/wasm': '>=1.2.50' - '@types/node': '*' - typescript: '>=2.7' - peerDependenciesMeta: - '@swc/core': - optional: true - '@swc/wasm': - optional: true - dependencies: - '@cspotcode/source-map-support': 0.8.1 - '@tsconfig/node10': 1.0.9 - '@tsconfig/node12': 1.0.11 - '@tsconfig/node14': 1.0.3 - '@tsconfig/node16': 1.0.4 - '@types/node': 20.4.5 - acorn: 8.9.0 - acorn-walk: 8.2.0 - arg: 4.1.3 - create-require: 1.1.1 - diff: 4.0.2 - make-error: 1.3.6 - typescript: 4.7.2 - v8-compile-cache-lib: 3.0.1 - yn: 3.1.1 - dev: true /ts-pattern@3.3.3: resolution: {integrity: sha512-Z5EFi6g6wyX3uDFHqxF5W5c5h663oZg9O6aOiAT7fqNu0HPSfCxtHzrQ7SblTy738Mrg2Ezorky8H5aUOm8Pvg==} @@ -20444,9 +19460,6 @@ packages: typescript: 4.9.5 dev: false - /tty-browserify@0.0.1: - resolution: {integrity: sha512-C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw==} - /tunnel-agent@0.6.0: resolution: {integrity: sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==} dependencies: @@ -20501,11 +19514,6 @@ packages: engines: {node: '>=8'} dev: true - /type-fest@2.19.0: - resolution: {integrity: sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==} - engines: {node: '>=12.20'} - dev: true - /type-is@1.6.18: resolution: {integrity: sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==} engines: {node: '>= 0.6'} @@ -20528,7 +19536,7 @@ packages: typescript: '>=4.3.0' dependencies: '@types/prettier': 2.7.3 - debug: 4.3.4 + debug: 4.3.4(supports-color@8.1.1) fs-extra: 7.0.1 glob: 7.1.7 js-sha3: 0.8.0 @@ -20562,7 +19570,6 @@ packages: resolution: {integrity: sha512-Mamb1iX2FDUpcTRzltPxgWMKy3fhg0TN378ylbktPGPK/99KbDtMQ4W1hwgsbPAsG3a0xKa1vmw4VKZQbkvz5A==} engines: {node: '>=4.2.0'} hasBin: true - dev: true /typescript@4.9.5: resolution: {integrity: sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==} @@ -20570,12 +19577,6 @@ packages: hasBin: true dev: false - /typescript@5.1.6: - resolution: {integrity: sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA==} - engines: {node: '>=14.17'} - hasBin: true - dev: true - /typical@4.0.0: resolution: {integrity: sha512-VAH4IvQ7BDFYglMd7BPRDfLgxZZX4O4TFcRDA6EN5X7erNJJq+McIEp8np9aVtxrCJ6qx4GTYVfOWNjcqwZgRw==} engines: {node: '>=8'} @@ -20630,7 +19631,7 @@ packages: resolution: {integrity: sha512-b+aKlI2oTnxnfeSQWV1sMacqSNxqhtXySaH6bflvONGxF8V/fT3ZlYH7z2qgGfydsvpVo4JUgM/Ylyfl2YouCg==} engines: {node: '>=16.0.0', npm: '>=7.0.0'} dependencies: - multiformats: 11.0.2 + multiformats: 11.0.1 /ultron@1.1.1: resolution: {integrity: sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==} @@ -20756,12 +19757,6 @@ packages: resolution: {integrity: sha512-3AChu4NiXquPfeckE5R5cGdiHCMWJx1dwCWOmWIL4KHAziJNOFIYJlpGFeKDvwLPHovZRCxK3cYlwzqI9Vp+Gg==} dev: true - /url@0.11.1: - resolution: {integrity: sha512-rWS3H04/+mzzJkv0eZ7vEDGiQbgquI1fGfOad6zKvgYQi1SzMmhl7c/DdRGxhaWrVH6z0qWITo8rpnxK/RfEhA==} - dependencies: - punycode: 1.4.1 - qs: 6.11.2 - /ursa-optional@0.10.2: resolution: {integrity: sha512-TKdwuLboBn7M34RcvVTuQyhvrA8gYKapuVdm0nBP0mnBc7oECOfUQZrY91cefL3/nm64ZyrejSRrhTVdX7NG/A==} engines: {node: '>=4'} @@ -20806,6 +19801,7 @@ packages: is-generator-function: 1.0.10 is-typed-array: 1.1.10 which-typed-array: 1.1.9 + dev: true /utila@0.4.0: resolution: {integrity: sha512-Z0DbgELS9/L/75wZbro8xAnT50pBVFQZ+hUEueGDU5FN51YSCYM+jdxsfCiHjwNP/4LCDD0i/graKpeBnOXKRA==} @@ -20843,7 +19839,6 @@ packages: /v8-compile-cache-lib@3.0.1: resolution: {integrity: sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==} - dev: true /v8-to-istanbul@8.1.1: resolution: {integrity: sha512-FGtKtv3xIpR6BYhvgH8MI/y78oT7d8Au3ww4QIxymrCtZEh5b8gCw2siywE+puhEmuWKDtmfrvF5UlB298ut3w==} @@ -20882,17 +19877,17 @@ packages: extsprintf: 1.3.0 dev: true - /vite-node@0.29.7(@types/node@20.4.5): + /vite-node@0.29.7(@types/node@18.13.0): resolution: {integrity: sha512-PakCZLvz37yFfUPWBnLa1OYHPCGm5v4pmRrTcFN4V/N/T3I6tyP3z07S//9w+DdeL7vVd0VSeyMZuAh+449ZWw==} engines: {node: '>=v14.16.0'} hasBin: true dependencies: cac: 6.7.14 - debug: 4.3.4 + debug: 4.3.4(supports-color@8.1.1) mlly: 1.3.0 pathe: 1.1.1 picocolors: 1.0.0 - vite: 4.0.4(@types/node@20.4.5) + vite: 4.0.4(@types/node@18.13.0) transitivePeerDependencies: - '@types/node' - less @@ -20903,80 +19898,20 @@ packages: - terser dev: true - /vite-plugin-commonjs@0.8.2: - resolution: {integrity: sha512-UJlvuioutS7Tno3p3Dqxkr0G4xXt8ILYsJzOiyvFlEsyAxFRofsBGHN/Sl15q0Y4vtvvC7+QZCc6GuUxOM6Cmg==} - dependencies: - acorn: 8.9.0 - fast-glob: 3.2.12 - magic-string: 0.30.2 - vite-plugin-dynamic-import: 1.5.0 - dev: true - - /vite-plugin-dynamic-import@1.5.0: - resolution: {integrity: sha512-Qp85c+AVJmLa8MLni74U4BDiWpUeFNx7NJqbGZyR2XJOU7mgW0cb7nwlAMucFyM4arEd92Nfxp4j44xPi6Fu7g==} - dependencies: - acorn: 8.9.0 - es-module-lexer: 1.3.0 - fast-glob: 3.2.12 - magic-string: 0.30.2 - dev: true - - /vite-plugin-external@1.2.8: - resolution: {integrity: sha512-w5xDuYoXPd7rPC6OVuee63Y4HSYeOuIFlEYyP6PWTE+o5MKF4qFH79RiLmpdopPxNmTGjQvlUes+UY1MVU+BMA==} - dependencies: - fs-extra: 10.1.0 - dev: true - - /vite-plugin-externals@0.6.2(vite@4.0.4): - resolution: {integrity: sha512-R5oVY8xDJjLXLTs2XDYzvYbc/RTZuIwOx2xcFbYf+/VXB6eJuatDgt8jzQ7kZ+IrgwQhe6tU8U2fTyy72C25CQ==} - engines: {node: ^14.18.0 || >=16.0.0} - peerDependencies: - vite: '>=2.0.0' - dependencies: - acorn: 8.9.0 - es-module-lexer: 0.4.1 - fs-extra: 10.1.0 - magic-string: 0.25.9 - vite: 4.0.4 - dev: true - - /vite-plugin-node-polyfills@0.9.0(vite@4.0.4): - resolution: {integrity: sha512-+i+WPUuIBhJy+ODfxx6S6FTl28URCxUszbl/IL4GwrZvbqqY/8VDIp+zpjMS8Us/a7GwN4Iaqr/fVIBtkNQojQ==} - peerDependencies: - vite: ^2.0.0 || ^3.0.0 || ^4.0.0 - dependencies: - '@rollup/plugin-inject': 5.0.3 - node-stdlib-browser: 1.2.0 - vite: 4.0.4(@types/node@16.11.59) - transitivePeerDependencies: - - rollup - dev: false - /vite-plugin-replace@0.1.1(vite@4.0.4): resolution: {integrity: sha512-v+okl3JNt2pf1jDYijw+WPVt6h9FWa/atTi+qnSFBqmKThLTDhlesx0r3bh+oFPmxRJmis5tNx9HtN6lGFoqWg==} peerDependencies: vite: ^2 dependencies: - vite: 4.0.4 + vite: 4.0.4(@types/node@16.11.59) dev: true - /vite-plugin-require-transform@1.0.21: - resolution: {integrity: sha512-A3SrHhVg9tCW35O7E8kcuB71YTEdVd3EaM1zh6gbH4zxy4WzXSfcNf0UiWmaHHhr6wdFhiiAGdpR6S0SUxXkGQ==} - dependencies: - '@babel/generator': 7.22.5 - '@babel/parser': 7.22.5 - '@babel/traverse': 7.22.5 - '@babel/types': 7.22.5 - transitivePeerDependencies: - - supports-color - dev: false - /vite-tsconfig-paths@4.0.3(typescript@4.7.2)(vite@4.0.4): resolution: {integrity: sha512-gRO2Q/tOkV+9kMht5tz90+IaEKvW2zCnvwJV3tp2ruPNZOTM5rF+yXorJT4ggmAMYEaJ3nyXjx5P5jY5FwiZ+A==} peerDependencies: vite: '>2.0.0-0' dependencies: - debug: 4.3.4 + debug: 4.3.4(supports-color@8.1.1) globrex: 0.1.2 tsconfck: 2.1.1(typescript@4.7.2) vite: 4.0.4(@types/node@16.11.59) @@ -20985,39 +19920,6 @@ packages: - typescript dev: true - /vite@4.0.4: - resolution: {integrity: sha512-xevPU7M8FU0i/80DMR+YhgrzR5KS2ORy1B4xcX/cXLsvnUWvfHuqMmVU6N0YiJ4JWGRJJsLCgjEzKjG9/GKoSw==} - engines: {node: ^14.18.0 || >=16.0.0} - hasBin: true - peerDependencies: - '@types/node': '>= 14' - less: '*' - sass: '*' - stylus: '*' - sugarss: '*' - terser: ^5.4.0 - peerDependenciesMeta: - '@types/node': - optional: true - less: - optional: true - sass: - optional: true - stylus: - optional: true - sugarss: - optional: true - terser: - optional: true - dependencies: - esbuild: 0.16.17 - postcss: 8.4.24 - resolve: 1.22.2 - rollup: 3.25.1 - optionalDependencies: - fsevents: 2.3.2 - dev: true - /vite@4.0.4(@types/node@16.11.59): resolution: {integrity: sha512-xevPU7M8FU0i/80DMR+YhgrzR5KS2ORy1B4xcX/cXLsvnUWvfHuqMmVU6N0YiJ4JWGRJJsLCgjEzKjG9/GKoSw==} engines: {node: ^14.18.0 || >=16.0.0} @@ -21050,8 +19952,9 @@ packages: rollup: 3.25.1 optionalDependencies: fsevents: 2.3.2 + dev: true - /vite@4.0.4(@types/node@20.4.5): + /vite@4.0.4(@types/node@18.13.0): resolution: {integrity: sha512-xevPU7M8FU0i/80DMR+YhgrzR5KS2ORy1B4xcX/cXLsvnUWvfHuqMmVU6N0YiJ4JWGRJJsLCgjEzKjG9/GKoSw==} engines: {node: ^14.18.0 || >=16.0.0} hasBin: true @@ -21076,7 +19979,7 @@ packages: terser: optional: true dependencies: - '@types/node': 20.4.5 + '@types/node': 18.13.0 esbuild: 0.16.17 postcss: 8.4.24 resolve: 1.22.2 @@ -21115,7 +20018,7 @@ packages: dependencies: '@types/chai': 4.3.5 '@types/chai-subset': 1.3.3 - '@types/node': 20.4.5 + '@types/node': 18.13.0 '@vitest/expect': 0.29.7 '@vitest/runner': 0.29.7 '@vitest/spy': 0.29.7 @@ -21124,7 +20027,7 @@ packages: acorn-walk: 8.2.0 cac: 6.7.14 chai: 4.3.7 - debug: 4.3.4 + debug: 4.3.4(supports-color@8.1.1) local-pkg: 0.4.3 pathe: 1.1.1 picocolors: 1.0.0 @@ -21134,8 +20037,8 @@ packages: tinybench: 2.5.0 tinypool: 0.4.0 tinyspy: 1.1.1 - vite: 4.0.4(@types/node@20.4.5) - vite-node: 0.29.7(@types/node@20.4.5) + vite: 4.0.4(@types/node@18.13.0) + vite-node: 0.29.7(@types/node@18.13.0) why-is-node-running: 2.2.2 transitivePeerDependencies: - less @@ -21146,9 +20049,6 @@ packages: - terser dev: true - /vm-browserify@1.1.2: - resolution: {integrity: sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==} - /w3c-hr-time@1.0.2: resolution: {integrity: sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==} deprecated: Use your platform's native performance.now() and performance.timeOrigin. @@ -21172,6 +20072,7 @@ packages: dependencies: glob-to-regexp: 0.4.1 graceful-fs: 4.2.11 + dev: false /wbuf@1.7.3: resolution: {integrity: sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==} @@ -21735,6 +20636,7 @@ packages: /webidl-conversions@3.0.1: resolution: {integrity: sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==} + dev: true /webidl-conversions@4.0.2: resolution: {integrity: sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==} @@ -21748,11 +20650,6 @@ packages: resolution: {integrity: sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==} engines: {node: '>=10.4'} - /webidl-conversions@7.0.0: - resolution: {integrity: sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==} - engines: {node: '>=12'} - dev: false - /webpack-dev-middleware@5.3.3(webpack@5.87.0): resolution: {integrity: sha512-hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA==} engines: {node: '>= 12.13.0'} @@ -21834,6 +20731,7 @@ packages: dependencies: source-list-map: 2.0.1 source-map: 0.6.1 + dev: false /webpack-sources@2.3.1: resolution: {integrity: sha512-y9EI9AO42JjEcrTJFOYmVywVZdKVUfOvDUPsJea5GIr1JOEGFVqwlY2K098fFoIjOkDzHn2AjRvM8dsBZu+gCA==} @@ -21846,6 +20744,7 @@ packages: /webpack-sources@3.2.3: resolution: {integrity: sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==} engines: {node: '>=10.13.0'} + dev: false /webpack@5.87.0: resolution: {integrity: sha512-GOu1tNbQ7p1bDEoFRs2YPcfyGs8xq52yyPBZ3m2VGnXGtV9MxjrkABHm4V9Ia280OefsSLzvbVoXcfLxjKY/Iw==} @@ -21887,45 +20786,6 @@ packages: - uglify-js dev: false - /webpack@5.88.2: - resolution: {integrity: sha512-JmcgNZ1iKj+aiR0OvTYtWQqJwq37Pf683dY9bVORwVbUrDhLhdn/PlO2sHsFHPkj7sHNQF3JwaAkp49V+Sq1tQ==} - engines: {node: '>=10.13.0'} - hasBin: true - peerDependencies: - webpack-cli: '*' - peerDependenciesMeta: - webpack-cli: - optional: true - dependencies: - '@types/eslint-scope': 3.7.4 - '@types/estree': 1.0.1 - '@webassemblyjs/ast': 1.11.6 - '@webassemblyjs/wasm-edit': 1.11.6 - '@webassemblyjs/wasm-parser': 1.11.6 - acorn: 8.9.0 - acorn-import-assertions: 1.9.0(acorn@8.9.0) - browserslist: 4.21.9 - chrome-trace-event: 1.0.3 - enhanced-resolve: 5.15.0 - es-module-lexer: 1.3.0 - eslint-scope: 5.1.1 - events: 3.3.0 - glob-to-regexp: 0.4.1 - graceful-fs: 4.2.11 - json-parse-even-better-errors: 2.3.1 - loader-runner: 4.3.0 - mime-types: 2.1.35 - neo-async: 2.6.2 - schema-utils: 3.3.0 - tapable: 2.2.1 - terser-webpack-plugin: 5.3.9(webpack@5.88.2) - watchpack: 2.4.0 - webpack-sources: 3.2.3 - transitivePeerDependencies: - - '@swc/core' - - esbuild - - uglify-js - /websocket-driver@0.7.4: resolution: {integrity: sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==} engines: {node: '>=0.8.0'} @@ -21973,24 +20833,12 @@ packages: /whatwg-mimetype@2.3.0: resolution: {integrity: sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==} - /whatwg-mimetype@3.0.0: - resolution: {integrity: sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==} - engines: {node: '>=12'} - dev: false - - /whatwg-url@12.0.1: - resolution: {integrity: sha512-Ed/LrqB8EPlGxjS+TrsXcpUond1mhccS3pchLhzSgPCnTimUCKj3IZE75pAs5m6heB2U2TMerKFUXheyHY+VDQ==} - engines: {node: '>=14'} - dependencies: - tr46: 4.1.1 - webidl-conversions: 7.0.0 - dev: false - /whatwg-url@5.0.0: resolution: {integrity: sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==} dependencies: tr46: 0.0.3 webidl-conversions: 3.0.1 + dev: true /whatwg-url@7.1.0: resolution: {integrity: sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==} @@ -22463,6 +21311,7 @@ packages: /xtend@4.0.2: resolution: {integrity: sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==} engines: {node: '>=0.4'} + dev: true /y18n@4.0.3: resolution: {integrity: sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==} @@ -22591,7 +21440,6 @@ packages: /yn@3.1.1: resolution: {integrity: sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==} engines: {node: '>=6'} - dev: true /yocto-queue@0.1.0: resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==} From c85ed255f55232209717341de3a28bff9d5aa43e Mon Sep 17 00:00:00 2001 From: Akim <59872966+akim-bow@users.noreply.github.com> Date: Wed, 9 Aug 2023 20:04:22 +0700 Subject: [PATCH 07/48] chore: Fix test with node 18/20 error message (#323) * Fix test with node 18/20 error message * Run tests on node 18 and 20 * Enhance description * Fix type and obj property --------- Co-authored-by: Anatoly Laskaris --- .github/workflows/tests.yml | 2 +- .../js-peer/src/services/__test__/builtInHandler.spec.ts | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index e991e712e..942717340 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -38,7 +38,7 @@ jobs: matrix: node-version: - 18.x - # - 20.x + - 20.x steps: - name: Import secrets diff --git a/packages/core/js-peer/src/services/__test__/builtInHandler.spec.ts b/packages/core/js-peer/src/services/__test__/builtInHandler.spec.ts index 9516aaec5..993206707 100644 --- a/packages/core/js-peer/src/services/__test__/builtInHandler.spec.ts +++ b/packages/core/js-peer/src/services/__test__/builtInHandler.spec.ts @@ -129,6 +129,12 @@ describe('Tests for default handler', () => { // act const fn = builtInServices[req.serviceId][req.fnName]; const res = await fn(req); + + // Our test cases above depend on node error message. In node 20 error message for JSON.parse has changed. + // Simple and fast solution for this specific case is to unify both variations into node 18 version error format. + if (res.result === 'Unexpected token \'i\', "incorrect" is not valid JSON') { + res.result = 'Unexpected token i in JSON at position 0'; + } // assert expect(res).toMatchObject({ From 1ccf057448d27468ff9fc6125869be8e22b665af Mon Sep 17 00:00:00 2001 From: Akim Mamedov Date: Tue, 1 Aug 2023 15:19:50 +0700 Subject: [PATCH 08/48] * Separate marine worker as a package * Trying to fix tests --- packages/client/js-client.node/package.json | 20 +- packages/client/js-client.node/src/index.ts | 11 +- packages/client/js-client.node/vite.config.js | 31 +- .../js-client.web.standalone/package.json | 27 +- .../js-client.web.standalone/src/index.ts | 2 +- packages/core/marine-worker/package.json | 14 +- packages/core/marine-worker/src/index.ts | 9 +- packages/core/marine-worker/vite.config.js | 24 + pnpm-lock.yaml | 1607 +++++++++++++---- 9 files changed, 1375 insertions(+), 370 deletions(-) create mode 100644 packages/core/marine-worker/vite.config.js diff --git a/packages/client/js-client.node/package.json b/packages/client/js-client.node/package.json index e57ed1a21..06f5228fb 100644 --- a/packages/client/js-client.node/package.json +++ b/packages/client/js-client.node/package.json @@ -2,7 +2,7 @@ "name": "@fluencelabs/js-client.node", "version": "0.7.1", "description": "TypeScript implementation of Fluence Peer", - "main": "./dist/index.js", + "main": "./dist/js-client.node.js", "typings": "./dist/index.d.ts", "engines": { "node": ">=10", @@ -10,13 +10,13 @@ }, "exports": { ".": { - "import": "./dist/index.js", + "import": "./dist/js-client.node.js", "types": "./dist/index.d.ts" } }, "type": "module", "scripts": { - "build": "tsc" + "build": "vite build" }, "repository": "https://github.com/fluencelabs/fluence-js", "author": "Fluence Labs", @@ -26,9 +26,19 @@ "@fluencelabs/interfaces": "0.8.1", "@fluencelabs/avm": "0.43.1", "@fluencelabs/marine-js": "0.7.2", - "platform": "1.3.6" + "@fluencelabs/marine-worker": "workspace:*", + "cross-fetch": "4.0.0", + "platform": "1.3.6", + "threads": "1.7.0", + "vite-plugin-require-transform": "1.0.21" }, "devDependencies": { - "@types/platform": "1.3.4" + "@rollup/plugin-commonjs": "25.0.3", + "@rollup/plugin-dynamic-import-vars": "2.0.4", + "@types/platform": "1.3.4", + "rollup-plugin-cjs-es": "2.0.0", + "vite": "4.0.4", + "vite-plugin-commonjs": "0.8.2", + "vite-plugin-replace": "0.1.1" } } diff --git a/packages/client/js-client.node/src/index.ts b/packages/client/js-client.node/src/index.ts index 060bf0718..e00a29b95 100644 --- a/packages/client/js-client.node/src/index.ts +++ b/packages/client/js-client.node/src/index.ts @@ -23,13 +23,11 @@ import { MarineBasedAvmRunner } from '@fluencelabs/js-peer/dist/jsPeer/avm.js'; import { MarineBackgroundRunner } from '@fluencelabs/js-peer/dist/marine/worker/index.js'; import { WasmLoaderFromNpm } from '@fluencelabs/js-peer/dist/marine/deps-loader/node.js'; import { doRegisterNodeUtils } from '@fluencelabs/js-peer/dist/services/NodeUtils.js'; -import { encode, decode } from 'js-base64'; -import parseDataURL from "data-urls"; - import WorkerInlineUrl from '@fluencelabs/marine-worker/dist/marine-worker.umd.сjs?url'; // @ts-ignore -import { BlobWorker, Worker } from 'threads'; +import { BlobWorker } from 'threads'; +import fetch from 'cross-fetch'; throwIfNotSupported(); @@ -45,9 +43,8 @@ export const defaultNames = { }; const createClient = async (relay: RelayOptions, config: ClientConfig): Promise => { - const data = /data:application\/\w+?;base64,(.+)/.exec(WorkerInlineUrl)?.[1]!; - - const workerLoader = BlobWorker.fromText(decode(data)); + const workerBlob = await fetch(WorkerInlineUrl).then(res => res.blob()); + const workerLoader = new BlobWorker(workerBlob); const controlModuleLoader = new WasmLoaderFromNpm(defaultNames.marine.package, defaultNames.marine.file); const avmModuleLoader = new WasmLoaderFromNpm(defaultNames.avm.package, defaultNames.avm.file); diff --git a/packages/client/js-client.node/vite.config.js b/packages/client/js-client.node/vite.config.js index 7fbb75b6e..d52341835 100644 --- a/packages/client/js-client.node/vite.config.js +++ b/packages/client/js-client.node/vite.config.js @@ -2,7 +2,6 @@ import {defineConfig} from 'vite' import {resolve} from 'path'; import {builtinModules} from "module"; import { replaceCodePlugin } from "vite-plugin-replace"; -import inject from '@rollup/plugin-inject'; export default defineConfig({ build: { @@ -12,28 +11,16 @@ export default defineConfig({ name: 'JSClient', }, rollupOptions: { - external: [...builtinModules, ...builtinModules.map(bm => `node:${bm}`), 'ws', 'worker_threads'], - plugins: [ - inject({ - 'WebSocket': ['ws', 'WebSocket'], - self: 'global', - 'WorkerScope': ['worker_threads', '*'], - 'Worker': ['worker_threads', 'Worker'], - 'isMainThread': ['worker_threads', 'isMainThread'], - }) - ] + external: builtinModules }, + commonjsOptions: { + esmExternals: true, + dynamicRequireRoot: '/Users/a.mamedov/WebstormProjects/js-client/node_modules/.pnpm', + dynamicRequireTargets: ['./default-gateway@6.0.3/node_modules/default-gateway/*.js'], + ignoreDynamicRequires: true, + } }, plugins: [replaceCodePlugin({ - replacements: [ - {from: 'require(`./${file}.js`)', to: 'require(`./linux.js`)'}, - {from: 'const { name, version } = req(\'../../package.json\')', to: 'const { name, version } = { name: \'ssdp\', version: \'4.0.4\' }'}, - {from: 'eval("require")("worker_threads")', to: 'WorkerScope'}, - {from: 'eval("require")("worker_threads")', to: 'WorkerScope'}, - ] - })], - resolve: { - browserField: false, - conditions: ['node'] - } + replacements: [{from: 'require(`./${file}.js`)', to: ''}] + })] }) \ No newline at end of file diff --git a/packages/client/js-client.web.standalone/package.json b/packages/client/js-client.web.standalone/package.json index abcd02757..2eeaafc3a 100644 --- a/packages/client/js-client.web.standalone/package.json +++ b/packages/client/js-client.web.standalone/package.json @@ -10,28 +10,41 @@ }, "type": "module", "scripts": { - "build": "node --loader ts-node/esm ./build.ts" + "build": "node --loader ts-node/esm -C browser ./build.ts" }, "repository": "https://github.com/fluencelabs/fluence-js", "author": "Fluence Labs", "license": "Apache-2.0", "dependencies": { - "@fluencelabs/js-peer": "0.9.1", "@fluencelabs/interfaces": "0.8.1", + "@fluencelabs/js-peer": "0.9.1", + "@fluencelabs/marine-worker": "workspace:*", "buffer": "6.0.3", - "process": "0.11.10" + "cross-fetch": "4.0.0", + "process": "0.11.10", + "threads": "1.7.0", + "vite-plugin-node-polyfills": "0.9.0", + "webpack": "5.88.2" }, "devDependencies": { "@fluencelabs/avm": "0.43.1", "@fluencelabs/marine-js": "0.7.2", - "@types/node": "16.11.59", + "@rollup/plugin-inject": "5.0.3", "@types/jest": "28.1.0", + "@types/node": "16.11.59", + "crypto-browserify": "3.12.0", + "esbuild-loader": "3.0.1", "jest": "28.1.0", - "ts-jest": "28.0.2", "js-base64": "3.7.5", - "@rollup/plugin-inject": "5.0.3", - "vite-plugin-replace": "0.1.1", + "node-polyfill-webpack-plugin": "2.0.1", + "node-stdlib-browser": "1.2.0", + "rollup-plugin-node-polyfills": "0.2.1", + "ts-jest": "28.0.2", + "ts-loader": "9.4.4", "vite": "4.0.4", + "vite-plugin-external": "1.2.8", + "vite-plugin-externals": "0.6.2", + "vite-plugin-replace": "0.1.1", "vite-tsconfig-paths": "4.0.3" } } diff --git a/packages/client/js-client.web.standalone/src/index.ts b/packages/client/js-client.web.standalone/src/index.ts index 531f198f0..8b02f1693 100644 --- a/packages/client/js-client.web.standalone/src/index.ts +++ b/packages/client/js-client.web.standalone/src/index.ts @@ -23,7 +23,7 @@ import { InlinedWorkerLoader, InlinedWasmLoader } from '@fluencelabs/js-peer/dis import { BlobWorker } from 'threads'; import fetch from 'cross-fetch'; -import WorkerInlineUrl from '@fluencelabs/marine-worker/dist/marine-worker.js?url'; +import WorkerInlineUrl from '@fluencelabs/marine-worker/dist/marine-worker.umd.сjs?url'; const createClient = async (relay: RelayOptions, config: ClientConfig): Promise => { const workerBlob = await fetch(WorkerInlineUrl).then(res => res.blob()); diff --git a/packages/core/marine-worker/package.json b/packages/core/marine-worker/package.json index 03d439ae4..f404a6bdc 100644 --- a/packages/core/marine-worker/package.json +++ b/packages/core/marine-worker/package.json @@ -8,19 +8,21 @@ "main": "./dist/marine-worker.umd.cjs", "module": "/dist/marine-worker.js", "exports": { + ".": { + "import": "./dist/marine-worker.js", + "require": "./dist/marine-worker.umd.cjs" + }, "./dist/marine-worker.js": { - "node": "./dist/node/marine-worker.js", - "browser": "./dist/browser/marine-worker.js" + "import": "./dist/marine-worker.js" }, "./dist/marine-worker.umd.сjs": { - "node": "./dist/node/marine-worker.umd.cjs", - "browser": "./dist/browser/marine-worker.umd.cjs" + "import": "./dist/marine-worker.umd.cjs" } }, "type": "module", "scripts": { "test": "echo \"Error: no test specified\" && exit 1", - "build": "node --loader ts-node/esm build.ts" + "build": "vite build" }, "repository": "https://github.com/fluencelabs/fluence-js", "author": "Fluence Labs", @@ -29,11 +31,9 @@ "devDependencies": { "@rollup/plugin-inject": "5.0.3", "@types/node": "20.4.5", - "deepmerge": "4.3.1", "node-stdlib-browser": "1.2.0", "typescript": "5.1.6", "vite": "4.0.4", - "vite-plugin-replace": "0.1.1", "vitest": "0.29.7" }, "dependencies": { diff --git a/packages/core/marine-worker/src/index.ts b/packages/core/marine-worker/src/index.ts index 5ecfd1a34..5d7fe4355 100644 --- a/packages/core/marine-worker/src/index.ts +++ b/packages/core/marine-worker/src/index.ts @@ -20,7 +20,6 @@ import type { JSONArray, JSONObject, LogMessage } from '@fluencelabs/marine-js/d import { Observable, Subject } from 'observable-fns'; // @ts-ignore no types provided for package import { expose } from 'threads'; -import * as Buffer from 'buffer'; let marineServices = new Map(); let controlModule: WebAssembly.Module | undefined; @@ -28,12 +27,12 @@ let controlModule: WebAssembly.Module | undefined; const onLogMessage = new Subject(); const toExpose = { - init: async (controlModuleWasm: SharedArrayBuffer | Buffer): Promise => { - controlModule = await WebAssembly.compile(new Uint8Array(controlModuleWasm)); + init: async (controlModuleWasm: ArrayBuffer): Promise => { + controlModule = await WebAssembly.compile(controlModuleWasm); }, createService: async ( - wasm: SharedArrayBuffer | Buffer, + wasm: ArrayBuffer, serviceId: string, marineConfig?: MarineServiceConfig, envs?: Env, @@ -42,7 +41,7 @@ const toExpose = { throw new Error('MarineJS is not initialized. To initialize call `init` function'); } - const service = await WebAssembly.compile(new Uint8Array(wasm)); + const service = await WebAssembly.compile(wasm); const srv = new MarineService( controlModule, service, diff --git a/packages/core/marine-worker/vite.config.js b/packages/core/marine-worker/vite.config.js new file mode 100644 index 000000000..1fb966855 --- /dev/null +++ b/packages/core/marine-worker/vite.config.js @@ -0,0 +1,24 @@ +import {defineConfig} from 'vite' +import {resolve} from 'path'; +import {createRequire} from "module"; +import inject from "@rollup/plugin-inject"; + +const require = createRequire(import.meta.url); +const esbuildShim = require.resolve('node-stdlib-browser/helpers/esbuild/shim'); + +export default defineConfig({ + build: { + target: 'es6', + lib: { + entry: resolve(__dirname, 'src/index.ts'), + name: 'MarineWorker', + }, + }, + plugins: [{ + ...inject({ + global: [esbuildShim, 'global'], + process: [esbuildShim, 'process'], + Buffer: [esbuildShim, 'Buffer'] + }), enforce: 'post' + }] +}) \ No newline at end of file diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 3f6efdd11..59dd1fbc0 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -10,7 +10,7 @@ importers: devDependencies: '@fluencelabs/aqua': specifier: 0.9.1-374 - version: 0.9.1-374(jest@27.5.1)(node-fetch@3.3.1)(typescript@4.7.2) + version: 0.9.1-374(jest@27.5.1)(node-fetch@3.3.2)(typescript@4.7.2) '@fluencelabs/aqua-lib': specifier: 0.6.0 version: 0.6.0 @@ -44,7 +44,7 @@ importers: version: 0.6.0 '@fluencelabs/cli': specifier: 0.3.9 - version: 0.3.9(@ethersproject/abi@5.7.0)(@ethersproject/providers@5.7.2)(@nomicfoundation/hardhat-chai-matchers@1.0.6)(@nomicfoundation/hardhat-network-helpers@1.0.8)(@nomiclabs/hardhat-ethers@2.2.3)(@nomiclabs/hardhat-etherscan@3.1.7)(@typechain/ethers-v5@10.2.1)(@typechain/hardhat@6.1.6)(@types/chai@4.3.5)(@types/mocha@9.1.1)(@types/node@18.13.0)(chai@4.3.7)(hardhat-gas-reporter@1.0.9)(hardhat@2.15.0)(jest@27.5.1)(solidity-coverage@0.7.22)(ts-node@10.9.1)(typechain@8.2.0)(typescript@4.7.2) + version: 0.3.9(@ethersproject/abi@5.7.0)(@ethersproject/providers@5.7.2)(@nomicfoundation/hardhat-chai-matchers@1.0.6)(@nomicfoundation/hardhat-network-helpers@1.0.8)(@nomiclabs/hardhat-ethers@2.2.3)(@nomiclabs/hardhat-etherscan@3.1.7)(@typechain/ethers-v5@10.2.1)(@typechain/hardhat@6.1.6)(@types/chai@4.3.5)(@types/mocha@9.1.1)(@types/node@20.4.5)(chai@4.3.7)(hardhat-gas-reporter@1.0.9)(hardhat@2.15.0)(jest@27.5.1)(solidity-coverage@0.7.22)(ts-node@10.9.1)(typechain@8.2.0)(typescript@4.7.2) '@fluencelabs/registry': specifier: 0.8.2 version: 0.8.2 @@ -61,7 +61,7 @@ importers: specifier: workspace:^ version: link:../../../client/js-client.node '@test/aqua_for_test': - specifier: workspace:^ + specifier: workspace:../../aqua version: link:../../aqua packages/@tests/smoke/web: @@ -70,7 +70,7 @@ importers: specifier: workspace:^ version: link:../../../client/js-client.web.standalone '@test/test-utils': - specifier: workspace:^ + specifier: workspace:../../test-utils version: link:../../test-utils packages/@tests/smoke/web-cra-ts: @@ -110,7 +110,7 @@ importers: version: 18.2.0(react@18.2.0) react-scripts: specifier: 5.0.1 - version: 5.0.1(@babel/plugin-syntax-flow@7.22.5)(@babel/plugin-transform-react-jsx@7.22.5)(eslint@8.43.0)(react@18.2.0)(ts-node@10.9.1)(typescript@4.9.5) + version: 5.0.1(@babel/plugin-syntax-flow@7.22.5)(@babel/plugin-transform-react-jsx@7.22.5)(eslint@8.43.0)(react@18.2.0)(typescript@4.9.5) typescript: specifier: 4.9.5 version: 4.9.5 @@ -155,7 +155,7 @@ importers: version: 7.2.0 microbundle: specifier: 0.15.1 - version: 0.15.1(ts-node@10.9.1) + version: 0.15.1 packages/client/js-client.node: dependencies: @@ -171,13 +171,43 @@ importers: '@fluencelabs/marine-js': specifier: 0.7.2 version: 0.7.2 + '@fluencelabs/marine-worker': + specifier: workspace:* + version: link:../../core/marine-worker + cross-fetch: + specifier: 4.0.0 + version: 4.0.0 platform: specifier: 1.3.6 version: 1.3.6 + threads: + specifier: 1.7.0 + version: 1.7.0 + vite-plugin-require-transform: + specifier: 1.0.21 + version: 1.0.21 devDependencies: + '@rollup/plugin-commonjs': + specifier: 25.0.3 + version: 25.0.3(rollup@3.25.1) + '@rollup/plugin-dynamic-import-vars': + specifier: 2.0.4 + version: 2.0.4(rollup@3.25.1) '@types/platform': specifier: 1.3.4 version: 1.3.4 + rollup-plugin-cjs-es: + specifier: 2.0.0 + version: 2.0.0(rollup@3.25.1) + vite: + specifier: 4.0.4 + version: 4.0.4 + vite-plugin-commonjs: + specifier: 0.8.2 + version: 0.8.2 + vite-plugin-replace: + specifier: 0.1.1 + version: 0.1.1(vite@4.0.4) packages/client/js-client.web: dependencies: @@ -196,7 +226,7 @@ importers: version: 16.11.59 jest: specifier: 28.1.0 - version: 28.1.0(@types/node@16.11.59)(ts-node@10.9.1) + version: 28.1.0(@types/node@16.11.59) ts-jest: specifier: 28.0.2 version: 28.0.2(@babel/core@7.22.5)(@types/jest@28.1.0)(jest@28.1.0)(typescript@4.7.2) @@ -209,12 +239,27 @@ importers: '@fluencelabs/js-peer': specifier: 0.9.1 version: link:../../core/js-peer + '@fluencelabs/marine-worker': + specifier: workspace:* + version: link:../../core/marine-worker buffer: specifier: 6.0.3 version: 6.0.3 + cross-fetch: + specifier: 4.0.0 + version: 4.0.0 process: specifier: 0.11.10 version: 0.11.10 + threads: + specifier: 1.7.0 + version: 1.7.0 + vite-plugin-node-polyfills: + specifier: 0.9.0 + version: 0.9.0(vite@4.0.4) + webpack: + specifier: 5.88.2 + version: 5.88.2 devDependencies: '@fluencelabs/avm': specifier: 0.43.1 @@ -231,18 +276,42 @@ importers: '@types/node': specifier: 16.11.59 version: 16.11.59 + crypto-browserify: + specifier: 3.12.0 + version: 3.12.0 + esbuild-loader: + specifier: 3.0.1 + version: 3.0.1(webpack@5.88.2) jest: specifier: 28.1.0 - version: 28.1.0(@types/node@16.11.59)(ts-node@10.9.1) + version: 28.1.0(@types/node@16.11.59) js-base64: specifier: 3.7.5 version: 3.7.5 + node-polyfill-webpack-plugin: + specifier: 2.0.1 + version: 2.0.1(webpack@5.88.2) + node-stdlib-browser: + specifier: 1.2.0 + version: 1.2.0 + rollup-plugin-node-polyfills: + specifier: 0.2.1 + version: 0.2.1 ts-jest: specifier: 28.0.2 version: 28.0.2(@babel/core@7.22.5)(@types/jest@28.1.0)(jest@28.1.0)(typescript@4.7.2) + ts-loader: + specifier: 9.4.4 + version: 9.4.4(typescript@4.7.2)(webpack@5.88.2) vite: specifier: 4.0.4 version: 4.0.4(@types/node@16.11.59) + vite-plugin-external: + specifier: 1.2.8 + version: 1.2.8 + vite-plugin-externals: + specifier: 0.6.2 + version: 0.6.2(vite@4.0.4) vite-plugin-replace: specifier: 0.1.1 version: 0.1.1(vite@4.0.4) @@ -282,6 +351,9 @@ importers: '@fluencelabs/marine-js': specifier: 0.7.2 version: 0.7.2 + '@fluencelabs/marine-worker': + specifier: workspace:* + version: link:../marine-worker '@libp2p/crypto': specifier: 1.0.8 version: 1.0.8(uint8arraylist@2.4.3) @@ -323,7 +395,7 @@ importers: version: 6.0.3 debug: specifier: 4.3.4 - version: 4.3.4(supports-color@8.1.1) + version: 4.3.4 it-length-prefixed: specifier: 8.0.4 version: 8.0.4 @@ -380,6 +452,37 @@ importers: specifier: 0.29.7 version: 0.29.7 + packages/core/marine-worker: + dependencies: + '@fluencelabs/marine-js': + specifier: 0.3.45 + version: 0.3.45 + observable-fns: + specifier: 0.6.1 + version: 0.6.1 + threads: + specifier: 1.7.0 + version: 1.7.0 + devDependencies: + '@rollup/plugin-inject': + specifier: 5.0.3 + version: 5.0.3 + '@types/node': + specifier: 20.4.5 + version: 20.4.5 + node-stdlib-browser: + specifier: 1.2.0 + version: 1.2.0 + typescript: + specifier: 5.1.6 + version: 5.1.6 + vite: + specifier: 4.0.4 + version: 4.0.4(@types/node@20.4.5) + vitest: + specifier: 0.29.7 + version: 0.29.7 + packages: /@achingbrain/ip-address@8.1.0: @@ -474,7 +577,7 @@ packages: '@babel/traverse': 7.22.5 '@babel/types': 7.22.5 convert-source-map: 1.9.0 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 gensync: 1.0.0-beta.2 json5: 2.2.3 semver: 6.3.0 @@ -567,7 +670,7 @@ packages: '@babel/core': 7.22.5 '@babel/helper-compilation-targets': 7.22.5(@babel/core@7.22.5) '@babel/helper-plugin-utils': 7.22.5 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 lodash.debounce: 4.0.8 resolve: 1.22.2 semver: 6.3.0 @@ -1832,7 +1935,7 @@ packages: '@babel/helper-split-export-declaration': 7.22.5 '@babel/parser': 7.22.5 '@babel/types': 7.22.5 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 globals: 11.12.0 transitivePeerDependencies: - supports-color @@ -1889,7 +1992,7 @@ packages: '@stablelib/hkdf': 1.0.1 '@stablelib/sha256': 1.0.1 '@stablelib/x25519': 1.0.3 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 it-buffer: 0.1.3 it-length-prefixed: 5.0.3 it-pair: 1.0.0 @@ -1940,6 +2043,7 @@ packages: engines: {node: '>=12'} dependencies: '@jridgewell/trace-mapping': 0.3.9 + dev: true /@csstools/normalize.css@12.0.0: resolution: {integrity: sha512-M0qqxAcwCsIVfpFQSlGN5XjXWu8l5JDZN+fPt1LeW5SZexQTgnaEvgXAY+CeygRw0EeppWHi12JxESWiWrB0Sg==} @@ -2104,6 +2208,14 @@ packages: cpu: [arm64] os: [android] requiresBuild: true + optional: true + + /@esbuild/android-arm64@0.17.19: + resolution: {integrity: sha512-KBMWvEZooR7+kzY0BtbTQn0OAYY7CsiydT63pVEaPtVYF0hXbUaOyZog37DKxK7NF3XacBJOpYT4adIJh+avxA==} + engines: {node: '>=12'} + cpu: [arm64] + os: [android] + requiresBuild: true dev: true optional: true @@ -2113,6 +2225,14 @@ packages: cpu: [arm] os: [android] requiresBuild: true + optional: true + + /@esbuild/android-arm@0.17.19: + resolution: {integrity: sha512-rIKddzqhmav7MSmoFCmDIb6e2W57geRsM94gV2l38fzhXMwq7hZoClug9USI2pFRGL06f4IOPHHpFNOkWieR8A==} + engines: {node: '>=12'} + cpu: [arm] + os: [android] + requiresBuild: true dev: true optional: true @@ -2122,6 +2242,14 @@ packages: cpu: [x64] os: [android] requiresBuild: true + optional: true + + /@esbuild/android-x64@0.17.19: + resolution: {integrity: sha512-uUTTc4xGNDT7YSArp/zbtmbhO0uEEK9/ETW29Wk1thYUJBz3IVnvgEiEwEa9IeLyvnpKrWK64Utw2bgUmDveww==} + engines: {node: '>=12'} + cpu: [x64] + os: [android] + requiresBuild: true dev: true optional: true @@ -2131,6 +2259,14 @@ packages: cpu: [arm64] os: [darwin] requiresBuild: true + optional: true + + /@esbuild/darwin-arm64@0.17.19: + resolution: {integrity: sha512-80wEoCfF/hFKM6WE1FyBHc9SfUblloAWx6FJkFWTWiCoht9Mc0ARGEM47e67W9rI09YoUxJL68WHfDRYEAvOhg==} + engines: {node: '>=12'} + cpu: [arm64] + os: [darwin] + requiresBuild: true dev: true optional: true @@ -2140,6 +2276,14 @@ packages: cpu: [x64] os: [darwin] requiresBuild: true + optional: true + + /@esbuild/darwin-x64@0.17.19: + resolution: {integrity: sha512-IJM4JJsLhRYr9xdtLytPLSH9k/oxR3boaUIYiHkAawtwNOXKE8KoU8tMvryogdcT8AU+Bflmh81Xn6Q0vTZbQw==} + engines: {node: '>=12'} + cpu: [x64] + os: [darwin] + requiresBuild: true dev: true optional: true @@ -2149,6 +2293,14 @@ packages: cpu: [arm64] os: [freebsd] requiresBuild: true + optional: true + + /@esbuild/freebsd-arm64@0.17.19: + resolution: {integrity: sha512-pBwbc7DufluUeGdjSU5Si+P3SoMF5DQ/F/UmTSb8HXO80ZEAJmrykPyzo1IfNbAoaqw48YRpv8shwd1NoI0jcQ==} + engines: {node: '>=12'} + cpu: [arm64] + os: [freebsd] + requiresBuild: true dev: true optional: true @@ -2158,6 +2310,14 @@ packages: cpu: [x64] os: [freebsd] requiresBuild: true + optional: true + + /@esbuild/freebsd-x64@0.17.19: + resolution: {integrity: sha512-4lu+n8Wk0XlajEhbEffdy2xy53dpR06SlzvhGByyg36qJw6Kpfk7cp45DR/62aPH9mtJRmIyrXAS5UWBrJT6TQ==} + engines: {node: '>=12'} + cpu: [x64] + os: [freebsd] + requiresBuild: true dev: true optional: true @@ -2167,6 +2327,14 @@ packages: cpu: [arm64] os: [linux] requiresBuild: true + optional: true + + /@esbuild/linux-arm64@0.17.19: + resolution: {integrity: sha512-ct1Tg3WGwd3P+oZYqic+YZF4snNl2bsnMKRkb3ozHmnM0dGWuxcPTTntAF6bOP0Sp4x0PjSF+4uHQ1xvxfRKqg==} + engines: {node: '>=12'} + cpu: [arm64] + os: [linux] + requiresBuild: true dev: true optional: true @@ -2176,6 +2344,14 @@ packages: cpu: [arm] os: [linux] requiresBuild: true + optional: true + + /@esbuild/linux-arm@0.17.19: + resolution: {integrity: sha512-cdmT3KxjlOQ/gZ2cjfrQOtmhG4HJs6hhvm3mWSRDPtZ/lP5oe8FWceS10JaSJC13GBd4eH/haHnqf7hhGNLerA==} + engines: {node: '>=12'} + cpu: [arm] + os: [linux] + requiresBuild: true dev: true optional: true @@ -2185,6 +2361,14 @@ packages: cpu: [ia32] os: [linux] requiresBuild: true + optional: true + + /@esbuild/linux-ia32@0.17.19: + resolution: {integrity: sha512-w4IRhSy1VbsNxHRQpeGCHEmibqdTUx61Vc38APcsRbuVgK0OPEnQ0YD39Brymn96mOx48Y2laBQGqgZ0j9w6SQ==} + engines: {node: '>=12'} + cpu: [ia32] + os: [linux] + requiresBuild: true dev: true optional: true @@ -2194,6 +2378,14 @@ packages: cpu: [loong64] os: [linux] requiresBuild: true + optional: true + + /@esbuild/linux-loong64@0.17.19: + resolution: {integrity: sha512-2iAngUbBPMq439a+z//gE+9WBldoMp1s5GWsUSgqHLzLJ9WoZLZhpwWuym0u0u/4XmZ3gpHmzV84PonE+9IIdQ==} + engines: {node: '>=12'} + cpu: [loong64] + os: [linux] + requiresBuild: true dev: true optional: true @@ -2203,6 +2395,14 @@ packages: cpu: [mips64el] os: [linux] requiresBuild: true + optional: true + + /@esbuild/linux-mips64el@0.17.19: + resolution: {integrity: sha512-LKJltc4LVdMKHsrFe4MGNPp0hqDFA1Wpt3jE1gEyM3nKUvOiO//9PheZZHfYRfYl6AwdTH4aTcXSqBerX0ml4A==} + engines: {node: '>=12'} + cpu: [mips64el] + os: [linux] + requiresBuild: true dev: true optional: true @@ -2212,6 +2412,14 @@ packages: cpu: [ppc64] os: [linux] requiresBuild: true + optional: true + + /@esbuild/linux-ppc64@0.17.19: + resolution: {integrity: sha512-/c/DGybs95WXNS8y3Ti/ytqETiW7EU44MEKuCAcpPto3YjQbyK3IQVKfF6nbghD7EcLUGl0NbiL5Rt5DMhn5tg==} + engines: {node: '>=12'} + cpu: [ppc64] + os: [linux] + requiresBuild: true dev: true optional: true @@ -2221,6 +2429,14 @@ packages: cpu: [riscv64] os: [linux] requiresBuild: true + optional: true + + /@esbuild/linux-riscv64@0.17.19: + resolution: {integrity: sha512-FC3nUAWhvFoutlhAkgHf8f5HwFWUL6bYdvLc/TTuxKlvLi3+pPzdZiFKSWz/PF30TB1K19SuCxDTI5KcqASJqA==} + engines: {node: '>=12'} + cpu: [riscv64] + os: [linux] + requiresBuild: true dev: true optional: true @@ -2230,6 +2446,14 @@ packages: cpu: [s390x] os: [linux] requiresBuild: true + optional: true + + /@esbuild/linux-s390x@0.17.19: + resolution: {integrity: sha512-IbFsFbxMWLuKEbH+7sTkKzL6NJmG2vRyy6K7JJo55w+8xDk7RElYn6xvXtDW8HCfoKBFK69f3pgBJSUSQPr+4Q==} + engines: {node: '>=12'} + cpu: [s390x] + os: [linux] + requiresBuild: true dev: true optional: true @@ -2239,6 +2463,14 @@ packages: cpu: [x64] os: [linux] requiresBuild: true + optional: true + + /@esbuild/linux-x64@0.17.19: + resolution: {integrity: sha512-68ngA9lg2H6zkZcyp22tsVt38mlhWde8l3eJLWkyLrp4HwMUr3c1s/M2t7+kHIhvMjglIBrFpncX1SzMckomGw==} + engines: {node: '>=12'} + cpu: [x64] + os: [linux] + requiresBuild: true dev: true optional: true @@ -2248,6 +2480,14 @@ packages: cpu: [x64] os: [netbsd] requiresBuild: true + optional: true + + /@esbuild/netbsd-x64@0.17.19: + resolution: {integrity: sha512-CwFq42rXCR8TYIjIfpXCbRX0rp1jo6cPIUPSaWwzbVI4aOfX96OXY8M6KNmtPcg7QjYeDmN+DD0Wp3LaBOLf4Q==} + engines: {node: '>=12'} + cpu: [x64] + os: [netbsd] + requiresBuild: true dev: true optional: true @@ -2257,6 +2497,14 @@ packages: cpu: [x64] os: [openbsd] requiresBuild: true + optional: true + + /@esbuild/openbsd-x64@0.17.19: + resolution: {integrity: sha512-cnq5brJYrSZ2CF6c35eCmviIN3k3RczmHz8eYaVlNasVqsNY+JKohZU5MKmaOI+KkllCdzOKKdPs762VCPC20g==} + engines: {node: '>=12'} + cpu: [x64] + os: [openbsd] + requiresBuild: true dev: true optional: true @@ -2266,6 +2514,14 @@ packages: cpu: [x64] os: [sunos] requiresBuild: true + optional: true + + /@esbuild/sunos-x64@0.17.19: + resolution: {integrity: sha512-vCRT7yP3zX+bKWFeP/zdS6SqdWB8OIpaRq/mbXQxTGHnIxspRtigpkUcDMlSCOejlHowLqII7K2JKevwyRP2rg==} + engines: {node: '>=12'} + cpu: [x64] + os: [sunos] + requiresBuild: true dev: true optional: true @@ -2275,6 +2531,14 @@ packages: cpu: [arm64] os: [win32] requiresBuild: true + optional: true + + /@esbuild/win32-arm64@0.17.19: + resolution: {integrity: sha512-yYx+8jwowUstVdorcMdNlzklLYhPxjniHWFKgRqH7IFlUEa0Umu3KuYplf1HUZZ422e3NU9F4LGb+4O0Kdcaag==} + engines: {node: '>=12'} + cpu: [arm64] + os: [win32] + requiresBuild: true dev: true optional: true @@ -2284,6 +2548,14 @@ packages: cpu: [ia32] os: [win32] requiresBuild: true + optional: true + + /@esbuild/win32-ia32@0.17.19: + resolution: {integrity: sha512-eggDKanJszUtCdlVs0RB+h35wNlb5v4TWEkq4vZcmVt5u/HiDZrTXe2bWFQUez3RgNHwx/x4sk5++4NSSicKkw==} + engines: {node: '>=12'} + cpu: [ia32] + os: [win32] + requiresBuild: true dev: true optional: true @@ -2293,6 +2565,14 @@ packages: cpu: [x64] os: [win32] requiresBuild: true + optional: true + + /@esbuild/win32-x64@0.17.19: + resolution: {integrity: sha512-lAhycmKnVOuRYNtRtatQR1LPQf2oYCkRGkSFnseDAKPl8lu5SOsK/e1sXe5a0Pc5kHIHe6P2I/ilntNv2xf3cA==} + engines: {node: '>=12'} + cpu: [x64] + os: [win32] + requiresBuild: true dev: true optional: true @@ -2316,7 +2596,7 @@ packages: engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dependencies: ajv: 6.12.6 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 espree: 9.5.2 globals: 13.20.0 ignore: 5.2.4 @@ -2698,15 +2978,15 @@ packages: resolution: {integrity: sha512-ifjtCM93KO3LhzPkMxqmXhwLmrg/scjOiyTihEVg7ns5N+BVzaK1eWzdOdqGdl9ZVoah43pdlQUepEo7VdRmsw==} dev: true - /@fluencelabs/aqua@0.9.1-374(jest@27.5.1)(node-fetch@3.3.1)(typescript@4.7.2): + /@fluencelabs/aqua@0.9.1-374(jest@27.5.1)(node-fetch@3.3.2)(typescript@4.7.2): resolution: {integrity: sha512-jF6oVE4h7bP/dQArKEfsy4UxbQbzACfVIBY/TFUL5D3np4ssjxrh15Y3gl1PwSWjlaPcDeFvAuStmcqfYQmLqQ==} hasBin: true dependencies: '@fluencelabs/aqua-ipfs': 0.5.8 '@fluencelabs/aqua-lib': 0.6.0 - '@fluencelabs/fluence': 0.27.5(jest@27.5.1)(node-fetch@3.3.1)(typescript@4.7.2) + '@fluencelabs/fluence': 0.27.5(jest@27.5.1)(node-fetch@3.3.2)(typescript@4.7.2) '@fluencelabs/fluence-network-environment': 1.0.13 - ipfs-http-client: 50.1.2(node-fetch@3.3.1) + ipfs-http-client: 50.1.2(node-fetch@3.3.2) transitivePeerDependencies: - '@babel/core' - '@types/jest' @@ -2732,22 +3012,22 @@ packages: /@fluencelabs/avm@0.43.1: resolution: {integrity: sha512-6tGOMT/2S3ANrqvPLjPUUHgnZCibdIJQH25lsfPN9wBhAcS+0DsYuh1rQWiiJ7xVpps/tuwzFX7gecMmr7hsnQ==} - /@fluencelabs/cli@0.3.9(@ethersproject/abi@5.7.0)(@ethersproject/providers@5.7.2)(@nomicfoundation/hardhat-chai-matchers@1.0.6)(@nomicfoundation/hardhat-network-helpers@1.0.8)(@nomiclabs/hardhat-ethers@2.2.3)(@nomiclabs/hardhat-etherscan@3.1.7)(@typechain/ethers-v5@10.2.1)(@typechain/hardhat@6.1.6)(@types/chai@4.3.5)(@types/mocha@9.1.1)(@types/node@18.13.0)(chai@4.3.7)(hardhat-gas-reporter@1.0.9)(hardhat@2.15.0)(jest@27.5.1)(solidity-coverage@0.7.22)(ts-node@10.9.1)(typechain@8.2.0)(typescript@4.7.2): + /@fluencelabs/cli@0.3.9(@ethersproject/abi@5.7.0)(@ethersproject/providers@5.7.2)(@nomicfoundation/hardhat-chai-matchers@1.0.6)(@nomicfoundation/hardhat-network-helpers@1.0.8)(@nomiclabs/hardhat-ethers@2.2.3)(@nomiclabs/hardhat-etherscan@3.1.7)(@typechain/ethers-v5@10.2.1)(@typechain/hardhat@6.1.6)(@types/chai@4.3.5)(@types/mocha@9.1.1)(@types/node@20.4.5)(chai@4.3.7)(hardhat-gas-reporter@1.0.9)(hardhat@2.15.0)(jest@27.5.1)(solidity-coverage@0.7.22)(ts-node@10.9.1)(typechain@8.2.0)(typescript@4.7.2): resolution: {integrity: sha512-xJYi7+AHrWt6RgWnr7Efr8Jpv0dNLoWhiCMvgSbXoFpIZzQAyNDgk5hnCdwIQ/eiJcNg0GHY0gyC+Q/d5YKc1Q==} engines: {node: '=16'} hasBin: true dependencies: '@fluencelabs/aqua-api': 0.10.6 - '@fluencelabs/deal-aurora': 0.1.12(@ethersproject/abi@5.7.0)(@ethersproject/providers@5.7.2)(@nomicfoundation/hardhat-chai-matchers@1.0.6)(@nomicfoundation/hardhat-network-helpers@1.0.8)(@nomiclabs/hardhat-ethers@2.2.3)(@nomiclabs/hardhat-etherscan@3.1.7)(@typechain/ethers-v5@10.2.1)(@typechain/hardhat@6.1.6)(@types/chai@4.3.5)(@types/mocha@9.1.1)(@types/node@18.13.0)(chai@4.3.7)(ethers@5.7.2)(hardhat-gas-reporter@1.0.9)(hardhat@2.15.0)(solidity-coverage@0.7.22)(ts-node@10.9.1)(typechain@8.2.0)(typescript@4.7.2) + '@fluencelabs/deal-aurora': 0.1.12(@ethersproject/abi@5.7.0)(@ethersproject/providers@5.7.2)(@nomicfoundation/hardhat-chai-matchers@1.0.6)(@nomicfoundation/hardhat-network-helpers@1.0.8)(@nomiclabs/hardhat-ethers@2.2.3)(@nomiclabs/hardhat-etherscan@3.1.7)(@typechain/ethers-v5@10.2.1)(@typechain/hardhat@6.1.6)(@types/chai@4.3.5)(@types/mocha@9.1.1)(@types/node@20.4.5)(chai@4.3.7)(ethers@5.7.2)(hardhat-gas-reporter@1.0.9)(hardhat@2.15.0)(solidity-coverage@0.7.22)(ts-node@10.9.1)(typechain@8.2.0)(typescript@4.7.2) '@fluencelabs/fluence': 0.28.0(jest@27.5.1)(node-fetch@2.6.11)(typescript@4.7.2) '@fluencelabs/fluence-network-environment': 1.0.14 '@iarna/toml': 2.2.5 '@mswjs/interceptors': 0.19.5 '@oclif/color': 1.0.6 - '@oclif/core': 2.8.7(@types/node@18.13.0)(typescript@4.7.2) - '@oclif/plugin-autocomplete': 2.3.0(@types/node@18.13.0)(typescript@4.7.2) - '@oclif/plugin-help': 5.2.10(@types/node@18.13.0)(typescript@4.7.2) - '@oclif/plugin-not-found': 2.3.26(@types/node@18.13.0)(typescript@4.7.2) + '@oclif/core': 2.8.7(@types/node@20.4.5)(typescript@4.7.2) + '@oclif/plugin-autocomplete': 2.3.0(@types/node@20.4.5)(typescript@4.7.2) + '@oclif/plugin-help': 5.2.10(@types/node@20.4.5)(typescript@4.7.2) + '@oclif/plugin-not-found': 2.3.26(@types/node@20.4.5)(typescript@4.7.2) '@walletconnect/universal-provider': 2.8.1(lokijs@1.5.12) ajv: 8.12.0 camelcase: 7.0.1 @@ -2828,7 +3108,7 @@ packages: - utf-8-validate dev: true - /@fluencelabs/connection@0.2.0(node-fetch@3.3.1): + /@fluencelabs/connection@0.2.0(node-fetch@3.3.2): resolution: {integrity: sha512-0jTRI1h/j/fR2VaLIlcIm6VoP3j2jL2lI6/OaYaOnwGXmI6CbZWHNeq9eaKWycT9B1vpN9wHu0Vi7vH3pFplhg==} engines: {node: '>=10', pnpm: '>=3'} dependencies: @@ -2838,12 +3118,12 @@ packages: buffer: 6.0.3 it-length-prefixed: 5.0.3 it-pipe: 1.1.0 - libp2p: 0.36.2(node-fetch@3.3.1) - libp2p-interfaces: 4.0.6(node-fetch@3.3.1) + libp2p: 0.36.2(node-fetch@3.3.2) + libp2p-interfaces: 4.0.6(node-fetch@3.3.2) libp2p-mplex: 0.10.7 - libp2p-websockets: 0.16.2(node-fetch@3.3.1) + libp2p-websockets: 0.16.2(node-fetch@3.3.2) loglevel: 1.8.0 - multiaddr: 10.0.1(node-fetch@3.3.1) + multiaddr: 10.0.1(node-fetch@3.3.2) peer-id: 0.16.0 transitivePeerDependencies: - bufferutil @@ -2853,10 +3133,10 @@ packages: - utf-8-validate dev: true - /@fluencelabs/deal-aurora@0.1.12(@ethersproject/abi@5.7.0)(@ethersproject/providers@5.7.2)(@nomicfoundation/hardhat-chai-matchers@1.0.6)(@nomicfoundation/hardhat-network-helpers@1.0.8)(@nomiclabs/hardhat-ethers@2.2.3)(@nomiclabs/hardhat-etherscan@3.1.7)(@typechain/ethers-v5@10.2.1)(@typechain/hardhat@6.1.6)(@types/chai@4.3.5)(@types/mocha@9.1.1)(@types/node@18.13.0)(chai@4.3.7)(ethers@5.7.2)(hardhat-gas-reporter@1.0.9)(hardhat@2.15.0)(solidity-coverage@0.7.22)(ts-node@10.9.1)(typechain@8.2.0)(typescript@4.7.2): + /@fluencelabs/deal-aurora@0.1.12(@ethersproject/abi@5.7.0)(@ethersproject/providers@5.7.2)(@nomicfoundation/hardhat-chai-matchers@1.0.6)(@nomicfoundation/hardhat-network-helpers@1.0.8)(@nomiclabs/hardhat-ethers@2.2.3)(@nomiclabs/hardhat-etherscan@3.1.7)(@typechain/ethers-v5@10.2.1)(@typechain/hardhat@6.1.6)(@types/chai@4.3.5)(@types/mocha@9.1.1)(@types/node@20.4.5)(chai@4.3.7)(ethers@5.7.2)(hardhat-gas-reporter@1.0.9)(hardhat@2.15.0)(solidity-coverage@0.7.22)(ts-node@10.9.1)(typechain@8.2.0)(typescript@4.7.2): resolution: {integrity: sha512-CcmcDIC8DJI2aVzN+ZMB4vYRuML0IHF9VfaL/GMjhkpe4iADPJq4YS527I1nPH335Ik3hTlncz71F/2jD35A+A==} dependencies: - '@nomicfoundation/hardhat-toolbox': 1.0.2(@ethersproject/abi@5.7.0)(@ethersproject/providers@5.7.2)(@nomicfoundation/hardhat-chai-matchers@1.0.6)(@nomicfoundation/hardhat-network-helpers@1.0.8)(@nomiclabs/hardhat-ethers@2.2.3)(@nomiclabs/hardhat-etherscan@3.1.7)(@typechain/ethers-v5@10.2.1)(@typechain/hardhat@6.1.6)(@types/chai@4.3.5)(@types/mocha@9.1.1)(@types/node@18.13.0)(chai@4.3.7)(ethers@5.7.2)(hardhat-gas-reporter@1.0.9)(hardhat@2.15.0)(solidity-coverage@0.7.22)(ts-node@10.9.1)(typechain@8.2.0)(typescript@4.7.2) + '@nomicfoundation/hardhat-toolbox': 1.0.2(@ethersproject/abi@5.7.0)(@ethersproject/providers@5.7.2)(@nomicfoundation/hardhat-chai-matchers@1.0.6)(@nomicfoundation/hardhat-network-helpers@1.0.8)(@nomiclabs/hardhat-ethers@2.2.3)(@nomiclabs/hardhat-etherscan@3.1.7)(@typechain/ethers-v5@10.2.1)(@typechain/hardhat@6.1.6)(@types/chai@4.3.5)(@types/mocha@9.1.1)(@types/node@20.4.5)(chai@4.3.7)(ethers@5.7.2)(hardhat-gas-reporter@1.0.9)(hardhat@2.15.0)(solidity-coverage@0.7.22)(ts-node@10.9.1)(typechain@8.2.0)(typescript@4.7.2) '@openzeppelin/contracts': 4.9.2 '@openzeppelin/contracts-upgradeable': 4.9.2 dotenv: 16.3.1 @@ -2890,14 +3170,14 @@ packages: resolution: {integrity: sha512-lMiH+7obmJW2Q+PMUR/vNAuX6TcVqlKmsWAHvnBogH7s8IeMT+UGN8qrweILWmE57G7MfauB302dIFQowR9tug==} dev: true - /@fluencelabs/fluence@0.27.5(jest@27.5.1)(node-fetch@3.3.1)(typescript@4.7.2): + /@fluencelabs/fluence@0.27.5(jest@27.5.1)(node-fetch@3.3.2)(typescript@4.7.2): resolution: {integrity: sha512-nMCzd/oHHk5/yWdg/+rPB+sc8X+fQ5YgwPhGVDoxFs8/CmIr1G5Na8Y6l8rrigasgQd+LV5GtAyh50Oq7/IXkg==} engines: {node: '>=10', pnpm: '>=3'} deprecated: fluencelabs/fluence is deprecated in favor of a thinner CDN-distributed .js bundle, please see the following link for installation instructions https://github.com/fluencelabs/js-client#installation hasBin: true dependencies: '@fluencelabs/avm': 0.31.10 - '@fluencelabs/connection': 0.2.0(node-fetch@3.3.1) + '@fluencelabs/connection': 0.2.0(node-fetch@3.3.2) '@fluencelabs/interfaces': 0.1.0 '@fluencelabs/keypair': 0.2.0 '@fluencelabs/marine-js': 0.3.37(jest@27.5.1)(typescript@4.7.2) @@ -2999,6 +3279,14 @@ packages: - typescript dev: true + /@fluencelabs/marine-js@0.3.45: + resolution: {integrity: sha512-GmeTvaC9n6zM6FPPyoHXwe2I8F9mEeE9DKzJcqy4FkUmpI11Fu4HrTvKgJyTURJkZSu8cfrjA7ZVeYuDGHeimQ==} + dependencies: + '@wasmer/wasi': 0.12.0 + '@wasmer/wasmfs': 0.12.0 + default-import: 1.1.5 + dev: false + /@fluencelabs/marine-js@0.7.2: resolution: {integrity: sha512-etjbXDgzyZkK82UZvtuIU3bfy5f52siDUy1m+T5Y5r70k82xYdZZ8vgWVgB6ivi2f3aDyQjgNTfzWQjKFpAReQ==} dependencies: @@ -3030,7 +3318,7 @@ packages: engines: {node: '>=10.10.0'} dependencies: '@humanwhocodes/object-schema': 1.2.1 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 minimatch: 3.1.2 transitivePeerDependencies: - supports-color @@ -3102,12 +3390,57 @@ packages: engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} dependencies: '@jest/types': 28.1.3 - '@types/node': 18.13.0 + '@types/node': 20.4.5 chalk: 4.1.2 jest-message-util: 28.1.3 jest-util: 28.1.3 slash: 3.0.0 + /@jest/core@27.5.1: + resolution: {integrity: sha512-AK6/UTrvQD0Cd24NSqmIA6rKsu0tKIxfiCducZvqxYdmMisOYAsdItspT+fQDQYARPf8XgjAFZi0ogW2agH5nQ==} + engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} + peerDependencies: + node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0 + peerDependenciesMeta: + node-notifier: + optional: true + dependencies: + '@jest/console': 27.5.1 + '@jest/reporters': 27.5.1 + '@jest/test-result': 27.5.1 + '@jest/transform': 27.5.1 + '@jest/types': 27.5.1 + '@types/node': 20.4.5 + ansi-escapes: 4.3.2 + chalk: 4.1.2 + emittery: 0.8.1 + exit: 0.1.2 + graceful-fs: 4.2.11 + jest-changed-files: 27.5.1 + jest-config: 27.5.1 + jest-haste-map: 27.5.1 + jest-message-util: 27.5.1 + jest-regex-util: 27.5.1 + jest-resolve: 27.5.1 + jest-resolve-dependencies: 27.5.1 + jest-runner: 27.5.1 + jest-runtime: 27.5.1 + jest-snapshot: 27.5.1 + jest-util: 27.5.1 + jest-validate: 27.5.1 + jest-watcher: 27.5.1 + micromatch: 4.0.5 + rimraf: 3.0.2 + slash: 3.0.0 + strip-ansi: 6.0.1 + transitivePeerDependencies: + - bufferutil + - canvas + - supports-color + - ts-node + - utf-8-validate + dev: false + /@jest/core@27.5.1(ts-node@10.9.1): resolution: {integrity: sha512-AK6/UTrvQD0Cd24NSqmIA6rKsu0tKIxfiCducZvqxYdmMisOYAsdItspT+fQDQYARPf8XgjAFZi0ogW2agH5nQ==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} @@ -3122,7 +3455,7 @@ packages: '@jest/test-result': 27.5.1 '@jest/transform': 27.5.1 '@jest/types': 27.5.1 - '@types/node': 18.13.0 + '@types/node': 20.4.5 ansi-escapes: 4.3.2 chalk: 4.1.2 emittery: 0.8.1 @@ -3151,8 +3484,9 @@ packages: - supports-color - ts-node - utf-8-validate + dev: true - /@jest/core@28.1.3(ts-node@10.9.1): + /@jest/core@28.1.3: resolution: {integrity: sha512-CIKBrlaKOzA7YG19BEqCw3SLIsEwjZkeJzf5bdooVnW4bH5cktqe3JX+G2YV1aK5vP8N9na1IGWFzYaTp6k6NA==} engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} peerDependencies: @@ -3166,14 +3500,14 @@ packages: '@jest/test-result': 28.1.3 '@jest/transform': 28.1.3 '@jest/types': 28.1.3 - '@types/node': 18.13.0 + '@types/node': 20.4.5 ansi-escapes: 4.3.2 chalk: 4.1.2 ci-info: 3.8.0 exit: 0.1.2 graceful-fs: 4.2.11 jest-changed-files: 28.1.3 - jest-config: 28.1.3(@types/node@18.13.0)(ts-node@10.9.1) + jest-config: 28.1.3(@types/node@20.4.5) jest-haste-map: 28.1.3 jest-message-util: 28.1.3 jest-regex-util: 28.0.2 @@ -3210,7 +3544,7 @@ packages: dependencies: '@jest/fake-timers': 28.1.3 '@jest/types': 28.1.3 - '@types/node': 18.13.0 + '@types/node': 20.4.5 jest-mock: 28.1.3 dev: true @@ -3248,7 +3582,7 @@ packages: dependencies: '@jest/types': 28.1.3 '@sinonjs/fake-timers': 9.1.2 - '@types/node': 18.13.0 + '@types/node': 20.4.5 jest-message-util: 28.1.3 jest-mock: 28.1.3 jest-util: 28.1.3 @@ -3325,7 +3659,7 @@ packages: '@jest/transform': 28.1.3 '@jest/types': 28.1.3 '@jridgewell/trace-mapping': 0.3.18 - '@types/node': 18.13.0 + '@types/node': 20.4.5 chalk: 4.1.2 collect-v8-coverage: 1.0.1 exit: 0.1.2 @@ -3461,7 +3795,7 @@ packages: dependencies: '@types/istanbul-lib-coverage': 2.0.4 '@types/istanbul-reports': 3.0.1 - '@types/node': 18.13.0 + '@types/node': 20.4.5 '@types/yargs': 16.0.5 chalk: 4.1.2 @@ -3472,7 +3806,7 @@ packages: '@jest/schemas': 28.1.3 '@types/istanbul-lib-coverage': 2.0.4 '@types/istanbul-reports': 3.0.1 - '@types/node': 18.13.0 + '@types/node': 20.4.5 '@types/yargs': 17.0.24 chalk: 4.1.2 @@ -3491,6 +3825,7 @@ packages: /@jridgewell/resolve-uri@3.1.1: resolution: {integrity: sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==} engines: {node: '>=6.0.0'} + dev: true /@jridgewell/set-array@1.1.2: resolution: {integrity: sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==} @@ -3519,6 +3854,7 @@ packages: dependencies: '@jridgewell/resolve-uri': 3.1.1 '@jridgewell/sourcemap-codec': 1.4.15 + dev: true /@json-rpc-tools/provider@1.7.6: resolution: {integrity: sha512-z7D3xvJ33UfCGv77n40lbzOYjZKVM3k2+5cV7xS8G6SCvKTzMkhkUYuD/qzQUNT4cG/lv0e9mRToweEEVLVVmA==} @@ -3871,7 +4207,7 @@ packages: dependencies: '@libp2p/interface-peer-id': 2.0.2 '@multiformats/multiaddr': 12.1.3 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 interface-datastore: 8.2.3 multiformats: 11.0.2 transitivePeerDependencies: @@ -4066,7 +4402,7 @@ packages: '@open-draft/until': 1.0.3 '@remix-run/web-fetch': 4.3.4 '@types/debug': 4.1.7 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 headers-polyfill: 3.1.2 outvariant: 1.4.0 strict-event-emitter: 0.4.6 @@ -4185,7 +4521,7 @@ packages: '@nomicfoundation/ethereumjs-tx': 5.0.1 '@nomicfoundation/ethereumjs-util': 9.0.1 abstract-level: 1.0.3 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 ethereum-cryptography: 0.1.3 level: 8.0.0 lru-cache: 5.1.1 @@ -4226,7 +4562,7 @@ packages: '@nomicfoundation/ethereumjs-common': 4.0.1 '@nomicfoundation/ethereumjs-tx': 5.0.1 '@nomicfoundation/ethereumjs-util': 9.0.1 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 ethereum-cryptography: 0.1.3 mcl-wasm: 0.7.9 rustbn.js: 0.2.0 @@ -4247,7 +4583,7 @@ packages: dependencies: '@nomicfoundation/ethereumjs-common': 4.0.1 '@nomicfoundation/ethereumjs-rlp': 5.0.1 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 ethereum-cryptography: 0.1.3 ethers: 5.7.2 js-sdsl: 4.4.1 @@ -4305,7 +4641,7 @@ packages: '@nomicfoundation/ethereumjs-trie': 6.0.1 '@nomicfoundation/ethereumjs-tx': 5.0.1 '@nomicfoundation/ethereumjs-util': 9.0.1 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 ethereum-cryptography: 0.1.3 mcl-wasm: 0.7.9 rustbn.js: 0.2.0 @@ -4343,7 +4679,7 @@ packages: hardhat: 2.15.0(ts-node@10.9.1)(typescript@4.7.2) dev: true - /@nomicfoundation/hardhat-toolbox@1.0.2(@ethersproject/abi@5.7.0)(@ethersproject/providers@5.7.2)(@nomicfoundation/hardhat-chai-matchers@1.0.6)(@nomicfoundation/hardhat-network-helpers@1.0.8)(@nomiclabs/hardhat-ethers@2.2.3)(@nomiclabs/hardhat-etherscan@3.1.7)(@typechain/ethers-v5@10.2.1)(@typechain/hardhat@6.1.6)(@types/chai@4.3.5)(@types/mocha@9.1.1)(@types/node@18.13.0)(chai@4.3.7)(ethers@5.7.2)(hardhat-gas-reporter@1.0.9)(hardhat@2.15.0)(solidity-coverage@0.7.22)(ts-node@10.9.1)(typechain@8.2.0)(typescript@4.7.2): + /@nomicfoundation/hardhat-toolbox@1.0.2(@ethersproject/abi@5.7.0)(@ethersproject/providers@5.7.2)(@nomicfoundation/hardhat-chai-matchers@1.0.6)(@nomicfoundation/hardhat-network-helpers@1.0.8)(@nomiclabs/hardhat-ethers@2.2.3)(@nomiclabs/hardhat-etherscan@3.1.7)(@typechain/ethers-v5@10.2.1)(@typechain/hardhat@6.1.6)(@types/chai@4.3.5)(@types/mocha@9.1.1)(@types/node@20.4.5)(chai@4.3.7)(ethers@5.7.2)(hardhat-gas-reporter@1.0.9)(hardhat@2.15.0)(solidity-coverage@0.7.22)(ts-node@10.9.1)(typechain@8.2.0)(typescript@4.7.2): resolution: {integrity: sha512-8CEgWSKUK2aMit+76Sez8n7UB0Ze1lwT+LcWxj4EFP30lQWOwOws048t6MTPfThH0BlSWjC6hJRr0LncIkc1Sw==} peerDependencies: '@ethersproject/abi': ^5.4.7 @@ -4376,13 +4712,13 @@ packages: '@typechain/hardhat': 6.1.6(@ethersproject/abi@5.7.0)(@ethersproject/providers@5.7.2)(@typechain/ethers-v5@10.2.1)(ethers@5.7.2)(hardhat@2.15.0)(typechain@8.2.0) '@types/chai': 4.3.5 '@types/mocha': 9.1.1 - '@types/node': 18.13.0 + '@types/node': 20.4.5 chai: 4.3.7 ethers: 5.7.2 hardhat: 2.15.0(ts-node@10.9.1)(typescript@4.7.2) hardhat-gas-reporter: 1.0.9(hardhat@2.15.0) solidity-coverage: 0.7.22 - ts-node: 10.9.1(@types/node@18.13.0)(typescript@4.7.2) + ts-node: 10.9.1(@types/node@20.4.5)(typescript@4.7.2) typechain: 8.2.0(typescript@4.7.2) typescript: 4.7.2 dev: true @@ -4512,7 +4848,7 @@ packages: '@ethersproject/address': 5.7.0 cbor: 8.1.0 chalk: 2.4.2 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 fs-extra: 7.0.1 hardhat: 2.15.0(ts-node@10.9.1)(typescript@4.7.2) lodash: 4.17.21 @@ -4534,7 +4870,7 @@ packages: tslib: 2.5.3 dev: true - /@oclif/core@2.8.7(@types/node@18.13.0)(typescript@4.7.2): + /@oclif/core@2.8.7(@types/node@20.4.5)(typescript@4.7.2): resolution: {integrity: sha512-WTZUFgANYGyHQOmGc2YsczEdqdlG2/ZEfqksHnuYbz3egozpka/R9LrFwNfWPZETi9ydzcjDWwJKUGQmJG3ixA==} engines: {node: '>=14.0.0'} dependencies: @@ -4562,7 +4898,7 @@ packages: strip-ansi: 6.0.1 supports-color: 8.1.1 supports-hyperlinks: 2.3.0 - ts-node: 10.9.1(@types/node@18.13.0)(typescript@4.7.2) + ts-node: 10.9.1(@types/node@20.4.5)(typescript@4.7.2) tslib: 2.5.3 widest-line: 3.1.0 wordwrap: 1.0.0 @@ -4574,13 +4910,13 @@ packages: - typescript dev: true - /@oclif/plugin-autocomplete@2.3.0(@types/node@18.13.0)(typescript@4.7.2): + /@oclif/plugin-autocomplete@2.3.0(@types/node@20.4.5)(typescript@4.7.2): resolution: {integrity: sha512-32gdneCAQbtjAvpX7lYFYrxsMPAfOh2hyvP4QEMspTiZkygT8m/NwayBVA+Ua5EM3/rk7jxTKYFQ7Gm/ZgSFuA==} engines: {node: '>=12.0.0'} dependencies: - '@oclif/core': 2.8.7(@types/node@18.13.0)(typescript@4.7.2) + '@oclif/core': 2.8.7(@types/node@20.4.5)(typescript@4.7.2) chalk: 4.1.2 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 fs-extra: 9.1.0 transitivePeerDependencies: - '@swc/core' @@ -4590,11 +4926,11 @@ packages: - typescript dev: true - /@oclif/plugin-help@5.2.10(@types/node@18.13.0)(typescript@4.7.2): + /@oclif/plugin-help@5.2.10(@types/node@20.4.5)(typescript@4.7.2): resolution: {integrity: sha512-l3hnloPkXOLGGrepLLdj8NsBpVhhEpg4jclIeIBaZzIo6+c+/uqcL2LjvOogmSEf5g4zooRtxivwUpcFiBSaBg==} engines: {node: '>=12.0.0'} dependencies: - '@oclif/core': 2.8.7(@types/node@18.13.0)(typescript@4.7.2) + '@oclif/core': 2.8.7(@types/node@20.4.5)(typescript@4.7.2) transitivePeerDependencies: - '@swc/core' - '@swc/wasm' @@ -4602,12 +4938,12 @@ packages: - typescript dev: true - /@oclif/plugin-not-found@2.3.26(@types/node@18.13.0)(typescript@4.7.2): + /@oclif/plugin-not-found@2.3.26(@types/node@20.4.5)(typescript@4.7.2): resolution: {integrity: sha512-a8WfN8km1A9Q0lXWo1LZgFEjVFYIbOOp/QG++zyHt2Hnsp2b5Zr0p8EQLBK7v6na6C0Mrr+GlMI8zE40hYWMbw==} engines: {node: '>=12.0.0'} dependencies: '@oclif/color': 1.0.6 - '@oclif/core': 2.8.7(@types/node@18.13.0)(typescript@4.7.2) + '@oclif/core': 2.8.7(@types/node@20.4.5)(typescript@4.7.2) fast-levenshtein: 3.0.0 transitivePeerDependencies: - '@swc/core' @@ -4779,27 +5115,60 @@ packages: rollup: 2.79.1 dev: true - /@rollup/plugin-inject@5.0.3: - resolution: {integrity: sha512-411QlbL+z2yXpRWFXSmw/teQRMkXcAAC8aYTemc15gwJRpvEVDQwoe+N/HTFD8RFG8+88Bme9DK2V9CVm7hJdA==} + /@rollup/plugin-commonjs@25.0.3(rollup@3.25.1): + resolution: {integrity: sha512-uBdtWr/H3BVcgm97MUdq2oJmqBR23ny1hOrWe2PKo9FTbjsGqg32jfasJUKYAI5ouqacjRnj65mBB/S79F+GQA==} engines: {node: '>=14.0.0'} peerDependencies: - rollup: ^1.20.0||^2.0.0||^3.0.0 + rollup: ^2.68.0||^3.0.0 peerDependenciesMeta: rollup: optional: true dependencies: - '@rollup/pluginutils': 5.0.2 + '@rollup/pluginutils': 5.0.2(rollup@3.25.1) + commondir: 1.0.1 estree-walker: 2.0.2 + glob: 8.1.0 + is-reference: 1.2.1 magic-string: 0.27.0 + rollup: 3.25.1 dev: true - /@rollup/plugin-json@4.1.0(rollup@2.79.1): - resolution: {integrity: sha512-yfLbTdNS6amI/2OpmbiBoW12vngr5NW2jCJVZSBEz+H5KfUJZ2M7sDjk0U6GOOdCWFVScShte29o9NezJ53TPw==} + /@rollup/plugin-dynamic-import-vars@2.0.4(rollup@3.25.1): + resolution: {integrity: sha512-aAD4eJ657PfQFgsIP0tvpPF6d4viSAf64BgAJQEBsxL75KrOVVr/QBlfdCnB0w7fJrVDfo9guZwz0k+xEj2FJA==} + engines: {node: '>=14.0.0'} peerDependencies: - rollup: ^1.20.0 || ^2.0.0 - dependencies: - '@rollup/pluginutils': 3.1.0(rollup@2.79.1) - rollup: 2.79.1 + rollup: ^1.20.0||^2.0.0||^3.0.0 + peerDependenciesMeta: + rollup: + optional: true + dependencies: + '@rollup/pluginutils': 5.0.2(rollup@3.25.1) + estree-walker: 2.0.2 + fast-glob: 3.2.12 + magic-string: 0.27.0 + rollup: 3.25.1 + dev: true + + /@rollup/plugin-inject@5.0.3: + resolution: {integrity: sha512-411QlbL+z2yXpRWFXSmw/teQRMkXcAAC8aYTemc15gwJRpvEVDQwoe+N/HTFD8RFG8+88Bme9DK2V9CVm7hJdA==} + engines: {node: '>=14.0.0'} + peerDependencies: + rollup: ^1.20.0||^2.0.0||^3.0.0 + peerDependenciesMeta: + rollup: + optional: true + dependencies: + '@rollup/pluginutils': 5.0.2 + estree-walker: 2.0.2 + magic-string: 0.27.0 + + /@rollup/plugin-json@4.1.0(rollup@2.79.1): + resolution: {integrity: sha512-yfLbTdNS6amI/2OpmbiBoW12vngr5NW2jCJVZSBEz+H5KfUJZ2M7sDjk0U6GOOdCWFVScShte29o9NezJ53TPw==} + peerDependencies: + rollup: ^1.20.0 || ^2.0.0 + dependencies: + '@rollup/pluginutils': 3.1.0(rollup@2.79.1) + rollup: 2.79.1 dev: true /@rollup/plugin-node-resolve@11.2.1(rollup@2.79.1): @@ -4857,6 +5226,20 @@ packages: '@types/estree': 1.0.1 estree-walker: 2.0.2 picomatch: 2.3.1 + + /@rollup/pluginutils@5.0.2(rollup@3.25.1): + resolution: {integrity: sha512-pTd9rIsP92h+B6wWwFbW8RkZv4hiR/xKsqre4SIuAOaOEQRxi0lqLke9k2/7WegC85GgUs9pjmOjCUi3In4vwA==} + engines: {node: '>=14.0.0'} + peerDependencies: + rollup: ^1.20.0||^2.0.0||^3.0.0 + peerDependenciesMeta: + rollup: + optional: true + dependencies: + '@types/estree': 1.0.1 + estree-walker: 2.0.2 + picomatch: 2.3.1 + rollup: 3.25.1 dev: true /@rushstack/eslint-patch@1.3.2: @@ -5323,7 +5706,7 @@ packages: dependencies: '@truffle/error': 0.1.1 '@truffle/interface-adapter': 0.5.34 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 web3: 1.7.4 transitivePeerDependencies: - bufferutil @@ -5338,15 +5721,19 @@ packages: /@tsconfig/node10@1.0.9: resolution: {integrity: sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA==} + dev: true /@tsconfig/node12@1.0.11: resolution: {integrity: sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==} + dev: true /@tsconfig/node14@1.0.3: resolution: {integrity: sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==} + dev: true /@tsconfig/node16@1.0.4: resolution: {integrity: sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==} + dev: true /@typechain/ethers-v5@10.2.1(@ethersproject/abi@5.7.0)(@ethersproject/providers@5.7.2)(ethers@5.7.2)(typechain@8.2.0)(typescript@4.7.2): resolution: {integrity: sha512-n3tQmCZjRE6IU4h6lqUGiQ1j866n5MTCBJreNEHHVWXa2u9GJTaeYyU1/k+1qLutkyw+sS6VAN+AbeiTqsxd/A==} @@ -5417,26 +5804,26 @@ packages: /@types/bn.js@4.11.6: resolution: {integrity: sha512-pqr857jrp2kPuO9uRjZ3PwnJTjoQy+fcdxvBTvHm6dkmEL9q+hDD/2j/0ELOBPtPnS8LjCX0gI9nbl8lVkadpg==} dependencies: - '@types/node': 18.13.0 + '@types/node': 20.4.5 dev: true /@types/bn.js@5.1.1: resolution: {integrity: sha512-qNrYbZqMx0uJAfKnKclPh+dTwK33KfLHYqtyODwd5HnXOjnkhc4qgn3BrK6RWyGZm5+sIFE7Q7Vz6QQtJB7w7g==} dependencies: - '@types/node': 18.13.0 + '@types/node': 20.4.5 dev: true /@types/body-parser@1.19.2: resolution: {integrity: sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==} dependencies: '@types/connect': 3.4.35 - '@types/node': 18.13.0 + '@types/node': 20.4.5 dev: false /@types/bonjour@3.5.10: resolution: {integrity: sha512-p7ienRMiS41Nu2/igbJxxLDWrSZ0WxM8UQgCeO9KhoVF7cOVFkrKsiDr1EsJIla8vV3oEEjGcz11jc5yimhzZw==} dependencies: - '@types/node': 18.13.0 + '@types/node': 20.4.5 dev: false /@types/bs58@4.0.1: @@ -5450,7 +5837,7 @@ packages: dependencies: '@types/http-cache-semantics': 4.0.1 '@types/keyv': 3.1.4 - '@types/node': 18.13.0 + '@types/node': 20.4.5 '@types/responselike': 1.0.0 dev: true @@ -5473,26 +5860,26 @@ packages: /@types/cli-progress@3.11.0: resolution: {integrity: sha512-XhXhBv1R/q2ahF3BM7qT5HLzJNlIL0wbcGyZVjqOTqAybAnsLisd7gy1UCyIqpL+5Iv6XhlSyzjLCnI2sIdbCg==} dependencies: - '@types/node': 18.13.0 + '@types/node': 20.4.5 dev: true /@types/concat-stream@1.6.1: resolution: {integrity: sha512-eHE4cQPoj6ngxBZMvVf6Hw7Mh4jMW4U9lpGmS5GBPB9RYxlFg+CHaVN7ErNY4W9XfLIEn20b4VDYaIrbq0q4uA==} dependencies: - '@types/node': 18.13.0 + '@types/node': 20.4.5 dev: true /@types/connect-history-api-fallback@1.5.0: resolution: {integrity: sha512-4x5FkPpLipqwthjPsF7ZRbOv3uoLUFkTA9G9v583qi4pACvq0uTELrB8OLUzPWUI4IJIyvM85vzkV1nyiI2Lig==} dependencies: '@types/express-serve-static-core': 4.17.35 - '@types/node': 18.13.0 + '@types/node': 20.4.5 dev: false /@types/connect@3.4.35: resolution: {integrity: sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==} dependencies: - '@types/node': 18.13.0 + '@types/node': 20.4.5 dev: false /@types/debug@4.1.7: @@ -5506,14 +5893,12 @@ packages: dependencies: '@types/eslint': 8.40.2 '@types/estree': 1.0.1 - dev: false /@types/eslint@8.40.2: resolution: {integrity: sha512-PRVjQ4Eh9z9pmmtaq8nTjZjQwKFk7YIHIud3lRoKRBgUQjgjRmoGxxGEPXQkF+lH7QkHJRNr5F4aBgYCW0lqpQ==} dependencies: '@types/estree': 1.0.1 '@types/json-schema': 7.0.12 - dev: false /@types/estree@0.0.39: resolution: {integrity: sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==} @@ -5524,7 +5909,7 @@ packages: /@types/express-serve-static-core@4.17.35: resolution: {integrity: sha512-wALWQwrgiB2AWTT91CB62b6Yt0sNHpznUXeZEcnPU3DRdlDIz74x8Qg1UUYKSVFi+va5vKOLYRBI1bRKiLLKIg==} dependencies: - '@types/node': 18.13.0 + '@types/node': 20.4.5 '@types/qs': 6.9.7 '@types/range-parser': 1.2.4 '@types/send': 0.17.1 @@ -5542,14 +5927,14 @@ packages: /@types/form-data@0.0.33: resolution: {integrity: sha512-8BSvG1kGm83cyJITQMZSulnl6QV8jqAGreJsc5tPu1Jq0vTSOiY/k24Wx82JRpWwZSqrala6sd5rWi6aNXvqcw==} dependencies: - '@types/node': 18.13.0 + '@types/node': 20.4.5 dev: true /@types/glob@7.2.0: resolution: {integrity: sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==} dependencies: '@types/minimatch': 5.1.2 - '@types/node': 18.13.0 + '@types/node': 20.4.5 dev: true /@types/graceful-fs@4.1.6: @@ -5568,7 +5953,7 @@ packages: /@types/http-proxy@1.17.11: resolution: {integrity: sha512-HC8G7c1WmaF2ekqpnFq626xd3Zz0uvaqFmBJNRZCGEZCXkvSdJoNFn/8Ygbd9fKNQj8UzLdCETaI0UWPAjK7IA==} dependencies: - '@types/node': 18.13.0 + '@types/node': 20.4.5 dev: false /@types/istanbul-lib-coverage@2.0.4: @@ -5599,7 +5984,6 @@ packages: /@types/json-schema@7.0.12: resolution: {integrity: sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA==} - dev: false /@types/json5@0.0.29: resolution: {integrity: sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==} @@ -5608,7 +5992,7 @@ packages: /@types/keyv@3.1.4: resolution: {integrity: sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==} dependencies: - '@types/node': 18.13.0 + '@types/node': 20.4.5 dev: true /@types/long@4.0.2: @@ -5653,7 +6037,6 @@ packages: /@types/node@16.11.59: resolution: {integrity: sha512-6u+36Dj3aDzhfBVUf/mfmc92OEdzQ2kx2jcXGdigfl70E/neV21ZHE6UCz4MDzTRcVqGAM27fk+DLXvyDsn3Jw==} - dev: true /@types/node@16.18.12: resolution: {integrity: sha512-vzLe5NaNMjIE3mcddFVGlAXN1LEWueUsMsOJWaT6wWMJGyljHAWHznqfnKUQWGzu7TLPrGvWdNAsvQYW+C0xtw==} @@ -5662,6 +6045,9 @@ packages: /@types/node@18.13.0: resolution: {integrity: sha512-gC3TazRzGoOnoKAhUx+Q0t8S9Tzs74z7m0ipwGpSqQrleP14hKxP4/JUeEQcD3W1/aIpnWl8pHowI7WokuZpXg==} + /@types/node@20.4.5: + resolution: {integrity: sha512-rt40Nk13II9JwQBdeYqmbn2Q6IVTA5uPhvSO+JVqdXw/6/4glI6oR9ezty/A9Hg5u7JH4OmYmuQ+XvjKm0Datg==} + /@types/node@8.10.66: resolution: {integrity: sha512-tktOkFUA4kXx2hhhrB8bIFb5TbwzS4uOhKEmwiD+NoiL0qtP2OQ9mFldbgD4dV1djrlBYP6eBuQZiWjuHUpqFw==} dev: true @@ -5672,7 +6058,7 @@ packages: /@types/pbkdf2@3.1.0: resolution: {integrity: sha512-Cf63Rv7jCQ0LaL8tNXmEyqTHuIJxRdlS5vMh1mj5voN4+QFhVZnlZruezqpWYDiJ8UTzhP0VmeLXCmBk66YrMQ==} dependencies: - '@types/node': 18.13.0 + '@types/node': 20.4.5 dev: true /@types/platform@1.3.4: @@ -5714,19 +6100,19 @@ packages: /@types/readable-stream@2.3.15: resolution: {integrity: sha512-oM5JSKQCcICF1wvGgmecmHldZ48OZamtMxcGGVICOJA8o8cahXC1zEVAif8iwoc5j8etxFaRFnf095+CDsuoFQ==} dependencies: - '@types/node': 18.13.0 + '@types/node': 20.4.5 safe-buffer: 5.1.2 dev: true /@types/resolve@1.17.1: resolution: {integrity: sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==} dependencies: - '@types/node': 18.13.0 + '@types/node': 20.4.5 /@types/responselike@1.0.0: resolution: {integrity: sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==} dependencies: - '@types/node': 18.13.0 + '@types/node': 20.4.5 dev: true /@types/retry@0.12.0: @@ -5743,7 +6129,7 @@ packages: /@types/secp256k1@4.0.3: resolution: {integrity: sha512-Da66lEIFeIz9ltsdMZcpQvmrmmoqrfju8pm1BH8WbYjZSwUgCwXLb9C+9XYogwBITnbsSaMdVPb2ekf7TV+03w==} dependencies: - '@types/node': 18.13.0 + '@types/node': 20.4.5 dev: true /@types/semver@7.5.0: @@ -5754,7 +6140,7 @@ packages: resolution: {integrity: sha512-Cwo8LE/0rnvX7kIIa3QHCkcuF21c05Ayb0ZfxPiv0W8VRiZiNW/WuRupHKpqqGVGf7SUA44QSOUKaEd9lIrd/Q==} dependencies: '@types/mime': 1.3.2 - '@types/node': 18.13.0 + '@types/node': 20.4.5 dev: false /@types/serve-handler@6.1.1: @@ -5773,13 +6159,13 @@ packages: resolution: {integrity: sha512-NUo5XNiAdULrJENtJXZZ3fHtfMolzZwczzBbnAeBbqBwG+LaG6YaJtuwzwGSQZ2wsCrxjEhNNjAkKigy3n8teQ==} dependencies: '@types/mime': 3.0.1 - '@types/node': 18.13.0 + '@types/node': 20.4.5 dev: false /@types/sockjs@0.3.33: resolution: {integrity: sha512-f0KEEe05NvUnat+boPTZ0dgaLZ4SfSouXUgv5noUiefG2ajgKjmETo9ZJyuqsl7dfl2aHlLJUiki6B4ZYldiiw==} dependencies: - '@types/node': 18.13.0 + '@types/node': 20.4.5 dev: false /@types/stack-utils@2.0.1: @@ -5802,7 +6188,7 @@ packages: /@types/ws@8.5.5: resolution: {integrity: sha512-lwhs8hktwxSjf9UaZ9tG5M03PGogvFaH8gUgLNbN9HKIg0dvv6q+gkSuJ8HN4/VbyxkuLzCjlN7GquQ0gUJfIg==} dependencies: - '@types/node': 18.13.0 + '@types/node': 20.4.5 dev: false /@types/yargs-parser@21.0.0: @@ -5822,7 +6208,7 @@ packages: resolution: {integrity: sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==} requiresBuild: true dependencies: - '@types/node': 18.13.0 + '@types/node': 20.4.5 dev: true optional: true @@ -5842,7 +6228,7 @@ packages: '@typescript-eslint/scope-manager': 5.60.0 '@typescript-eslint/type-utils': 5.60.0(eslint@8.43.0)(typescript@4.9.5) '@typescript-eslint/utils': 5.60.0(eslint@8.43.0)(typescript@4.9.5) - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 eslint: 8.43.0 grapheme-splitter: 1.0.4 ignore: 5.2.4 @@ -5880,7 +6266,7 @@ packages: '@typescript-eslint/scope-manager': 5.60.0 '@typescript-eslint/types': 5.60.0 '@typescript-eslint/typescript-estree': 5.60.0(typescript@4.9.5) - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 eslint: 8.43.0 typescript: 4.9.5 transitivePeerDependencies: @@ -5907,7 +6293,7 @@ packages: dependencies: '@typescript-eslint/typescript-estree': 5.60.0(typescript@4.9.5) '@typescript-eslint/utils': 5.60.0(eslint@8.43.0)(typescript@4.9.5) - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 eslint: 8.43.0 tsutils: 3.21.0(typescript@4.9.5) typescript: 4.9.5 @@ -5931,7 +6317,7 @@ packages: dependencies: '@typescript-eslint/types': 5.60.0 '@typescript-eslint/visitor-keys': 5.60.0 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 globby: 11.1.0 is-glob: 4.0.3 semver: 7.5.2 @@ -6265,19 +6651,15 @@ packages: dependencies: '@webassemblyjs/helper-numbers': 1.11.6 '@webassemblyjs/helper-wasm-bytecode': 1.11.6 - dev: false /@webassemblyjs/floating-point-hex-parser@1.11.6: resolution: {integrity: sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==} - dev: false /@webassemblyjs/helper-api-error@1.11.6: resolution: {integrity: sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==} - dev: false /@webassemblyjs/helper-buffer@1.11.6: resolution: {integrity: sha512-z3nFzdcp1mb8nEOFFk8DrYLpHvhKC3grJD2ardfKOzmbmJvEf/tPIqCY+sNcwZIY8ZD7IkB2l7/pqhUhqm7hLA==} - dev: false /@webassemblyjs/helper-numbers@1.11.6: resolution: {integrity: sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==} @@ -6285,11 +6667,9 @@ packages: '@webassemblyjs/floating-point-hex-parser': 1.11.6 '@webassemblyjs/helper-api-error': 1.11.6 '@xtuc/long': 4.2.2 - dev: false /@webassemblyjs/helper-wasm-bytecode@1.11.6: resolution: {integrity: sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==} - dev: false /@webassemblyjs/helper-wasm-section@1.11.6: resolution: {integrity: sha512-LPpZbSOwTpEC2cgn4hTydySy1Ke+XEu+ETXuoyvuyezHO3Kjdu90KK95Sh9xTbmjrCsUwvWwCOQQNta37VrS9g==} @@ -6298,23 +6678,19 @@ packages: '@webassemblyjs/helper-buffer': 1.11.6 '@webassemblyjs/helper-wasm-bytecode': 1.11.6 '@webassemblyjs/wasm-gen': 1.11.6 - dev: false /@webassemblyjs/ieee754@1.11.6: resolution: {integrity: sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==} dependencies: '@xtuc/ieee754': 1.2.0 - dev: false /@webassemblyjs/leb128@1.11.6: resolution: {integrity: sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==} dependencies: '@xtuc/long': 4.2.2 - dev: false /@webassemblyjs/utf8@1.11.6: resolution: {integrity: sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==} - dev: false /@webassemblyjs/wasm-edit@1.11.6: resolution: {integrity: sha512-Ybn2I6fnfIGuCR+Faaz7YcvtBKxvoLV3Lebn1tM4o/IAJzmi9AWYIPWpyBfU8cC+JxAO57bk4+zdsTjJR+VTOw==} @@ -6327,7 +6703,6 @@ packages: '@webassemblyjs/wasm-opt': 1.11.6 '@webassemblyjs/wasm-parser': 1.11.6 '@webassemblyjs/wast-printer': 1.11.6 - dev: false /@webassemblyjs/wasm-gen@1.11.6: resolution: {integrity: sha512-3XOqkZP/y6B4F0PBAXvI1/bky7GryoogUtfwExeP/v7Nzwo1QLcq5oQmpKlftZLbT+ERUOAZVQjuNVak6UXjPA==} @@ -6337,7 +6712,6 @@ packages: '@webassemblyjs/ieee754': 1.11.6 '@webassemblyjs/leb128': 1.11.6 '@webassemblyjs/utf8': 1.11.6 - dev: false /@webassemblyjs/wasm-opt@1.11.6: resolution: {integrity: sha512-cOrKuLRE7PCe6AsOVl7WasYf3wbSo4CeOk6PkrjS7g57MFfVUF9u6ysQBBODX0LdgSvQqRiGz3CXvIDKcPNy4g==} @@ -6346,7 +6720,6 @@ packages: '@webassemblyjs/helper-buffer': 1.11.6 '@webassemblyjs/wasm-gen': 1.11.6 '@webassemblyjs/wasm-parser': 1.11.6 - dev: false /@webassemblyjs/wasm-parser@1.11.6: resolution: {integrity: sha512-6ZwPeGzMJM3Dqp3hCsLgESxBGtT/OeCvCZ4TA1JUPYgmhAx38tTPR9JaKy0S5H3evQpO/h2uWs2j6Yc/fjkpTQ==} @@ -6357,22 +6730,18 @@ packages: '@webassemblyjs/ieee754': 1.11.6 '@webassemblyjs/leb128': 1.11.6 '@webassemblyjs/utf8': 1.11.6 - dev: false /@webassemblyjs/wast-printer@1.11.6: resolution: {integrity: sha512-JM7AhRcE+yW2GWYaKeHL5vt4xqee5N2WcezptmgyhNS+ScggqcT1OtXykhAb13Sn5Yas0j2uv9tHgrjwvzAP4A==} dependencies: '@webassemblyjs/ast': 1.11.6 '@xtuc/long': 4.2.2 - dev: false /@xtuc/ieee754@1.2.0: resolution: {integrity: sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==} - dev: false /@xtuc/long@4.2.2: resolution: {integrity: sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==} - dev: false /@zxing/text-encoding@0.9.0: resolution: {integrity: sha512-U/4aVJ2mxI0aDNI8Uq0wEhMgY+u4CNtEb0om3+y3+niDAsoTCOB33UF0sxpzqzdqXLqmvc+vZyAt4O8pPdfkwA==} @@ -6451,7 +6820,6 @@ packages: acorn: ^8 dependencies: acorn: 8.9.0 - dev: false /acorn-jsx@5.3.2(acorn@8.9.0): resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==} @@ -6468,6 +6836,7 @@ packages: /acorn-walk@8.2.0: resolution: {integrity: sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==} engines: {node: '>=0.4.0'} + dev: true /acorn@7.4.1: resolution: {integrity: sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==} @@ -6504,7 +6873,7 @@ packages: resolution: {integrity: sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==} engines: {node: '>= 6.0.0'} dependencies: - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 transitivePeerDependencies: - supports-color @@ -6533,7 +6902,6 @@ packages: ajv: ^6.9.1 dependencies: ajv: 6.12.6 - dev: false /ajv-keywords@5.1.0(ajv@8.12.0): resolution: {integrity: sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==} @@ -6679,6 +7047,7 @@ packages: /arg@4.1.3: resolution: {integrity: sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==} + dev: true /arg@5.0.2: resolution: {integrity: sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==} @@ -6797,7 +7166,6 @@ packages: inherits: 2.0.4 minimalistic-assert: 1.0.1 safer-buffer: 2.1.2 - dev: true /asn1@0.2.6: resolution: {integrity: sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==} @@ -6810,6 +7178,14 @@ packages: engines: {node: '>=0.8'} dev: true + /assert@2.0.0: + resolution: {integrity: sha512-se5Cd+js9dXJnu6Ag2JFc00t+HmHOen+8Q+L7O9zI0PqQXr20uk2J0XQqMxZEeo5U50o8Nvmmx7dZrl+Ufr35A==} + dependencies: + es6-object-assign: 1.1.0 + is-nan: 1.3.2 + object-is: 1.1.5 + util: 0.12.5 + /assertion-error@1.1.0: resolution: {integrity: sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==} dev: true @@ -6891,7 +7267,7 @@ packages: /axios@0.21.4: resolution: {integrity: sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==} dependencies: - follow-redirects: 1.15.2(debug@4.3.4) + follow-redirects: 1.15.2 transitivePeerDependencies: - debug dev: true @@ -7169,7 +7545,6 @@ packages: /big.js@5.2.2: resolution: {integrity: sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==} - dev: false /bigint-crypto-utils@3.2.2: resolution: {integrity: sha512-U1RbE3aX9ayCUVcIPHuPDPKcK3SFOXf93J1UK/iHlJuQB7bhagPIX06/CLpLEsDThJ7KA4Dhrnzynl+d2weTiw==} @@ -7238,11 +7613,9 @@ packages: /bn.js@4.12.0: resolution: {integrity: sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==} - dev: true /bn.js@5.2.1: resolution: {integrity: sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==} - dev: true /body-parser@1.20.1: resolution: {integrity: sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==} @@ -7328,7 +7701,6 @@ packages: /brorand@1.1.0: resolution: {integrity: sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w==} - dev: true /brotli-size@4.0.0: resolution: {integrity: sha512-uA9fOtlTRC0iqKfzff1W34DXUA3GyVqbUaeo3Rw3d4gd1eavKVCETXrn3NzO74W+UVkG3UHu8WxUi+XvKI/huA==} @@ -7362,6 +7734,11 @@ packages: engines: {node: '>=16.0.0', npm: '>=7.0.0'} dev: true + /browser-resolve@2.0.0: + resolution: {integrity: sha512-7sWsQlYL2rGLy2IWm8WL8DCTJvYLc/qlOnsakDac87SOoCd16WLsaAMdCiAqsTNHIe+SXfaqyxyo6THoWqs8WQ==} + dependencies: + resolve: 1.22.2 + /browser-stdout@1.3.1: resolution: {integrity: sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==} dev: true @@ -7375,7 +7752,6 @@ packages: evp_bytestokey: 1.0.3 inherits: 2.0.4 safe-buffer: 5.2.1 - dev: true /browserify-cipher@1.0.1: resolution: {integrity: sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==} @@ -7383,7 +7759,6 @@ packages: browserify-aes: 1.2.0 browserify-des: 1.0.2 evp_bytestokey: 1.0.3 - dev: true /browserify-des@1.0.2: resolution: {integrity: sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==} @@ -7392,14 +7767,12 @@ packages: des.js: 1.1.0 inherits: 2.0.4 safe-buffer: 5.2.1 - dev: true /browserify-rsa@4.1.0: resolution: {integrity: sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==} dependencies: bn.js: 5.2.1 randombytes: 2.1.0 - dev: true /browserify-sign@4.2.1: resolution: {integrity: sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==} @@ -7413,7 +7786,11 @@ packages: parse-asn1: 5.1.6 readable-stream: 3.6.2 safe-buffer: 5.2.1 - dev: true + + /browserify-zlib@0.2.0: + resolution: {integrity: sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==} + dependencies: + pako: 1.0.11 /browserslist@4.21.9: resolution: {integrity: sha512-M0MFoZzbUrRU4KNfCrDLnvyE7gub+peetoTid3TBIqtunaDJyXlwhakT+/VkvSXcfIzFfK/nkCs4nmyTmxdNSg==} @@ -7487,7 +7864,6 @@ packages: /buffer-xor@1.0.3: resolution: {integrity: sha512-571s0T7nZWK6vB67HI5dyUF7wXiNcfaPPPTl6zYCNApANjIvYJTg7hlud/+cJpdAhS7dVzqMLmfhfHR3rAcOjQ==} - dev: true /buffer@5.7.1: resolution: {integrity: sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==} @@ -7513,6 +7889,9 @@ packages: resolution: {integrity: sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==} engines: {node: '>=6'} + /builtin-status-codes@3.0.0: + resolution: {integrity: sha512-HpGFw18DgFWlncDfjTa2rcQ4W88O1mC8e8yZ2AvQY5KDaktSTwo+KRf6nHK6FRI5FyRyb/5T6+TSxfP7QyGsmQ==} + /busboy@1.6.0: resolution: {integrity: sha512-8SFQbg/0hQ9xy3UNTB0YEnsNBbWfhf7RtnzpL7TkBiTBRfrQ9Fxcnz7VJsleJpyp6rVLvXiuORqjlHi5q+PYuA==} engines: {node: '>=10.16.0'} @@ -7783,7 +8162,6 @@ packages: /chrome-trace-event@1.0.3: resolution: {integrity: sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==} engines: {node: '>=6.0'} - dev: false /chromium-bidi@0.4.4(devtools-protocol@0.0.1094867): resolution: {integrity: sha512-4BX5cSaponuvVT1+SbLYTOAgDoVtX/Khoc9UsbFJ/AsPVUeFAM3RiIDFI6XFhLYMi9WmVJqh1ZH+dRpNKkKwiQ==} @@ -7830,6 +8208,14 @@ packages: dependencies: inherits: 2.0.4 safe-buffer: 5.2.1 + + /cjs-es@0.9.2: + resolution: {integrity: sha512-b3dU5kkUWO8slt5DHHgKFgV5ghWbyBCQVa6lJnDA3+zfgil6MnL8JtoqoM01xabrDcgoazizriwvObCm1sXFgg==} + dependencies: + '@rollup/pluginutils': 4.2.1 + estree-walker: 3.0.3 + is-reference: 3.0.1 + magic-string: 0.26.7 dev: true /cjs-module-lexer@1.2.3: @@ -8105,6 +8491,12 @@ packages: engines: {node: '>=0.8'} dev: false + /console-browserify@1.2.0: + resolution: {integrity: sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==} + + /constants-browserify@1.0.0: + resolution: {integrity: sha512-xFxOwqIzR/e1k1gLiWEophSCMqXcwVHIH7akf7b/vxcUeGunlj3hvZaaqxwHsTgn+IndtkQJgSztIDWeumWJDQ==} + /content-disposition@0.5.2: resolution: {integrity: sha512-kRGRZw3bLlFISDBgwTSA1TMBFN6J6GWDeubmDE3AF+3+yXL8hTWv8r5rkLbqYXY4RjPk/EzHnClI3zQf1cFmHA==} engines: {node: '>= 0.6'} @@ -8228,7 +8620,6 @@ packages: dependencies: bn.js: 4.12.0 elliptic: 6.5.4 - dev: true /create-hash@1.2.0: resolution: {integrity: sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==} @@ -8238,7 +8629,6 @@ packages: md5.js: 1.3.5 ripemd160: 2.0.2 sha.js: 2.4.11 - dev: true /create-hmac@1.1.7: resolution: {integrity: sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==} @@ -8249,7 +8639,6 @@ packages: ripemd160: 2.0.2 safe-buffer: 5.2.1 sha.js: 2.4.11 - dev: true /create-require@1.1.1: resolution: {integrity: sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==} @@ -8265,11 +8654,19 @@ packages: /cross-fetch@3.1.6: resolution: {integrity: sha512-riRvo06crlE8HiqOwIpQhxwdOk4fOeR7FVM/wXoxchFEqMNUjvbs3bfo4OTgMEMHzppd4DxFBDbyySj8Cv781g==} dependencies: - node-fetch: 2.6.11 + node-fetch: 2.6.12 transitivePeerDependencies: - encoding dev: true + /cross-fetch@4.0.0: + resolution: {integrity: sha512-e4a5N8lVvuLgAWgnCrLr2PP0YyDOTHa9H/Rj54dirp61qXnNq46m82bRhNqIA5VccJtWBvPTFRV3TtvHUKPB1g==} + dependencies: + node-fetch: 2.6.12 + transitivePeerDependencies: + - encoding + dev: false + /cross-spawn@6.0.5: resolution: {integrity: sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==} engines: {node: '>=4.8'} @@ -8307,7 +8704,6 @@ packages: public-encrypt: 4.0.3 randombytes: 2.1.0 randomfill: 1.0.4 - dev: true /crypto-random-string@2.0.0: resolution: {integrity: sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==} @@ -8583,7 +8979,7 @@ packages: resolution: {integrity: sha512-DmPsUux63daOfCszxLkcp6LjdJ0k/BQNhIMtoAi5mbraYQnEQkFtKORmTu6XmDX6ujbtaBkeuJAiCBNI7MZklw==} engines: {node: '>=16.0.0', npm: '>=7.0.0'} dependencies: - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 err-code: 3.0.1 interface-datastore: 6.1.1 it-drain: 1.0.5 @@ -8655,6 +9051,17 @@ packages: dependencies: ms: 2.1.3 + /debug@4.3.4: + resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==} + engines: {node: '>=6.0'} + peerDependencies: + supports-color: '*' + peerDependenciesMeta: + supports-color: + optional: true + dependencies: + ms: 2.1.2 + /debug@4.3.4(supports-color@8.1.1): resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==} engines: {node: '>=6.0'} @@ -8666,6 +9073,7 @@ packages: dependencies: ms: 2.1.2 supports-color: 8.1.1 + dev: true /decamelize@1.2.0: resolution: {integrity: sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==} @@ -8856,7 +9264,6 @@ packages: dependencies: inherits: 2.0.4 minimalistic-assert: 1.0.1 - dev: true /destroy@1.2.0: resolution: {integrity: sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==} @@ -8890,7 +9297,7 @@ packages: hasBin: true dependencies: address: 1.2.2 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 transitivePeerDependencies: - supports-color dev: true @@ -8920,6 +9327,7 @@ packages: /diff@4.0.2: resolution: {integrity: sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==} engines: {node: '>=0.3.1'} + dev: true /diff@5.0.0: resolution: {integrity: sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==} @@ -8937,7 +9345,6 @@ packages: bn.js: 4.12.0 miller-rabin: 4.0.1 randombytes: 2.1.0 - dev: true /dir-glob@3.0.1: resolution: {integrity: sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==} @@ -8956,7 +9363,7 @@ packages: /dns-over-http-resolver@1.2.3(node-fetch@2.6.11): resolution: {integrity: sha512-miDiVSI6KSNbi4SVifzO/reD8rMnxgrlnkrlkugOLQpWQTe2qMdHsZp5DmfKjxNE+/T3VAAYLQUZMv9SMr6+AA==} dependencies: - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 native-fetch: 3.0.0(node-fetch@2.6.11) receptacle: 1.3.2 transitivePeerDependencies: @@ -8964,11 +9371,11 @@ packages: - supports-color dev: true - /dns-over-http-resolver@1.2.3(node-fetch@3.3.1): + /dns-over-http-resolver@1.2.3(node-fetch@3.3.2): resolution: {integrity: sha512-miDiVSI6KSNbi4SVifzO/reD8rMnxgrlnkrlkugOLQpWQTe2qMdHsZp5DmfKjxNE+/T3VAAYLQUZMv9SMr6+AA==} dependencies: - debug: 4.3.4(supports-color@8.1.1) - native-fetch: 3.0.0(node-fetch@3.3.1) + debug: 4.3.4 + native-fetch: 3.0.0(node-fetch@3.3.2) receptacle: 1.3.2 transitivePeerDependencies: - node-fetch @@ -8979,7 +9386,7 @@ packages: resolution: {integrity: sha512-Lm/eXB7yAQLJ5WxlBGwYfBY7utduXPZykcSmcG6K7ozM0wrZFvxZavhT6PqI0kd/5CUTfev/RrEFQqyU4CGPew==} engines: {node: '>=16.0.0', npm: '>=7.0.0'} dependencies: - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 native-fetch: 4.0.2(undici@5.22.1) receptacle: 1.3.2 undici: 5.22.1 @@ -9035,6 +9442,10 @@ packages: resolution: {integrity: sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w==} dev: true + /domain-browser@4.22.0: + resolution: {integrity: sha512-IGBwjF7tNk3cwypFNH/7bfzBcgSCbaMOD3GsaY1AU/JRrnHnYgEM0+9kQt52iZxjNsjBtJYtao146V+f8jFZNw==} + engines: {node: '>=10'} + /domelementtype@1.3.1: resolution: {integrity: sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==} dev: false @@ -9169,7 +9580,6 @@ packages: inherits: 2.0.4 minimalistic-assert: 1.0.1 minimalistic-crypto-utils: 1.0.1 - dev: true /emittery@0.10.2: resolution: {integrity: sha512-aITqOwnLanpHLNXZJENbOgjUBeHocD+xsSJmNrjovKBW5HbSpW3d1pEls7GFQPUWXiwG9+0P4GtHfEqC/4M0Iw==} @@ -9192,7 +9602,6 @@ packages: /emojis-list@3.0.0: resolution: {integrity: sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==} engines: {node: '>= 4'} - dev: false /encodeurl@1.0.2: resolution: {integrity: sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==} @@ -9215,7 +9624,6 @@ packages: dependencies: graceful-fs: 4.2.11 tapable: 2.2.1 - dev: false /enquirer@2.3.6: resolution: {integrity: sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==} @@ -9302,9 +9710,20 @@ packages: stop-iteration-iterator: 1.0.0 dev: false + /es-info@0.4.0: + resolution: {integrity: sha512-fH+6WU7kIhEFM0tkQwMlpVn9N+Kk1oj8IxuwiNj55fEMiSrJG9e73C/WKYvk5Eeg+X3zsr+nfGd1588Th+DmtQ==} + dependencies: + '@rollup/pluginutils': 4.2.1 + estree-walker: 3.0.3 + is-reference: 3.0.1 + dev: true + + /es-module-lexer@0.4.1: + resolution: {integrity: sha512-ooYciCUtfw6/d2w56UVeqHPcoCFAiJdz5XOkYpv/Txl1HMUozpXjz/2RIQgqwKdXNDPSF1W7mJCFse3G+HDyAA==} + dev: true + /es-module-lexer@1.3.0: resolution: {integrity: sha512-vZK7T0N2CBmBOixhmjdqx2gWVbFZ4DXZ/NyRMZVlJXPa7CyFS+/a4QQsDGDQy9ZfEzxFuNEsMLeQJnKP2p5/JA==} - dev: false /es-set-tostringtag@2.0.1: resolution: {integrity: sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==} @@ -9346,6 +9765,9 @@ packages: es6-symbol: 3.1.3 dev: true + /es6-object-assign@1.1.0: + resolution: {integrity: sha512-MEl9uirslVwqQU369iHNWZXsI8yaZYGg/D65aOgZkeyFJwHYSxilf7rQzXKI7DdDuBPrBXbfk3sl9hJhmd5AUw==} + /es6-promise@4.2.8: resolution: {integrity: sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==} dev: true @@ -9362,6 +9784,18 @@ packages: ext: 1.7.0 dev: true + /esbuild-loader@3.0.1(webpack@5.88.2): + resolution: {integrity: sha512-aZfGybqTeuyCd4AsVvWOOfkhIuN+wfZFjMyh3gyQEU1Uvsl8L6vye9HqP93iRa0iTA+6Jclap514PJIC3cLnMA==} + peerDependencies: + webpack: ^4.40.0 || ^5.0.0 + dependencies: + esbuild: 0.17.19 + get-tsconfig: 4.6.2 + loader-utils: 2.0.4 + webpack: 5.88.2 + webpack-sources: 1.4.3 + dev: true + /esbuild@0.16.17: resolution: {integrity: sha512-G8LEkV0XzDMNwXKgM0Jwu3nY3lSTwSGY6XbxM9cr9+s0T/qSV1q1JVPBGzm3dcjhCic9+emZDmMffkwgPeOeLg==} engines: {node: '>=12'} @@ -9390,6 +9824,35 @@ packages: '@esbuild/win32-arm64': 0.16.17 '@esbuild/win32-ia32': 0.16.17 '@esbuild/win32-x64': 0.16.17 + + /esbuild@0.17.19: + resolution: {integrity: sha512-XQ0jAPFkK/u3LcVRcvVHQcTIqD6E2H1fvZMA5dQPSOWb3suUbWbfbRf94pjc0bNzRYLfIrDRQXr7X+LHIm5oHw==} + engines: {node: '>=12'} + hasBin: true + requiresBuild: true + optionalDependencies: + '@esbuild/android-arm': 0.17.19 + '@esbuild/android-arm64': 0.17.19 + '@esbuild/android-x64': 0.17.19 + '@esbuild/darwin-arm64': 0.17.19 + '@esbuild/darwin-x64': 0.17.19 + '@esbuild/freebsd-arm64': 0.17.19 + '@esbuild/freebsd-x64': 0.17.19 + '@esbuild/linux-arm': 0.17.19 + '@esbuild/linux-arm64': 0.17.19 + '@esbuild/linux-ia32': 0.17.19 + '@esbuild/linux-loong64': 0.17.19 + '@esbuild/linux-mips64el': 0.17.19 + '@esbuild/linux-ppc64': 0.17.19 + '@esbuild/linux-riscv64': 0.17.19 + '@esbuild/linux-s390x': 0.17.19 + '@esbuild/linux-x64': 0.17.19 + '@esbuild/netbsd-x64': 0.17.19 + '@esbuild/openbsd-x64': 0.17.19 + '@esbuild/sunos-x64': 0.17.19 + '@esbuild/win32-arm64': 0.17.19 + '@esbuild/win32-ia32': 0.17.19 + '@esbuild/win32-x64': 0.17.19 dev: true /escalade@3.1.1: @@ -9579,7 +10042,7 @@ packages: '@typescript-eslint/eslint-plugin': 5.60.0(@typescript-eslint/parser@5.60.0)(eslint@8.43.0)(typescript@4.9.5) '@typescript-eslint/experimental-utils': 5.60.0(eslint@8.43.0)(typescript@4.9.5) eslint: 8.43.0 - jest: 27.5.1(ts-node@10.9.1) + jest: 27.5.1 transitivePeerDependencies: - supports-color - typescript @@ -9662,7 +10125,6 @@ packages: dependencies: esrecurse: 4.3.0 estraverse: 4.3.0 - dev: false /eslint-scope@7.2.0: resolution: {integrity: sha512-DYj5deGlHBfMt15J7rdtyKNq/Nqlv5KfU4iodrQ019XESsRnwXH9KAE0y3cwtUHDo2ob7CypAnCqefh6vioWRw==} @@ -9713,7 +10175,7 @@ packages: ajv: 6.12.6 chalk: 4.1.2 cross-spawn: 7.0.3 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 doctrine: 3.0.0 escape-string-regexp: 4.0.0 eslint-scope: 7.2.0 @@ -9784,7 +10246,6 @@ packages: engines: {node: '>=4.0'} dependencies: estraverse: 5.3.0 - dev: false /estraverse@1.9.3: resolution: {integrity: sha512-25w1fMXQrGdoquWnScXZGckOv+Wes+JDnuN/+7ex3SauFRS72r2lFDec0EKPt2YD1wUJ/IrfEex+9yp4hfSOJA==} @@ -9794,7 +10255,6 @@ packages: /estraverse@4.3.0: resolution: {integrity: sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==} engines: {node: '>=4.0'} - dev: false /estraverse@5.3.0: resolution: {integrity: sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==} @@ -9809,6 +10269,11 @@ packages: /estree-walker@2.0.2: resolution: {integrity: sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==} + + /estree-walker@3.0.3: + resolution: {integrity: sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==} + dependencies: + '@types/estree': 1.0.1 dev: true /esutils@2.0.3: @@ -10031,7 +10496,6 @@ packages: dependencies: md5.js: 1.3.5 safe-buffer: 5.2.1 - dev: true /execa@5.1.1: resolution: {integrity: sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==} @@ -10133,7 +10597,7 @@ packages: engines: {node: '>= 10.17.0'} hasBin: true dependencies: - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 get-stream: 5.2.0 yauzl: 2.10.0 optionalDependencies: @@ -10322,6 +10786,11 @@ packages: engines: {node: '>=0.10.0'} dev: true + /filter-obj@2.0.2: + resolution: {integrity: sha512-lO3ttPjHZRfjMcxWKb1j1eDhTFsu4meeR3lnMcnBFhk6RuLhvEiuALu2TlfL310ph4lCYYwgF/ElIjdP739tdg==} + engines: {node: '>=8'} + dev: true + /finalhandler@1.2.0: resolution: {integrity: sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==} engines: {node: '>= 0.8'} @@ -10402,6 +10871,15 @@ packages: resolution: {integrity: sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==} dev: false + /follow-redirects@1.15.2: + resolution: {integrity: sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==} + engines: {node: '>=4.0'} + peerDependencies: + debug: '*' + peerDependenciesMeta: + debug: + optional: true + /follow-redirects@1.15.2(debug@4.3.4): resolution: {integrity: sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==} engines: {node: '>=4.0'} @@ -10411,7 +10889,8 @@ packages: debug: optional: true dependencies: - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 + dev: true /for-each@0.3.3: resolution: {integrity: sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==} @@ -10711,6 +11190,12 @@ packages: call-bind: 1.0.2 get-intrinsic: 1.2.1 + /get-tsconfig@4.6.2: + resolution: {integrity: sha512-E5XrT4CbbXcXWy+1jChlZmrmCwd5KGx502kDCXJJ7y898TtWW9FwoG5HfOLVRKmlmDGkWN2HM9Ho+/Y8F0sJDg==} + dependencies: + resolve-pkg-maps: 1.0.0 + dev: true + /getpass@0.1.7: resolution: {integrity: sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==} dependencies: @@ -10740,7 +11225,6 @@ packages: /glob-to-regexp@0.4.1: resolution: {integrity: sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==} - dev: false /glob@5.0.15: resolution: {integrity: sha512-c9IPMazfRITpmAAKi22dK1VKxGDX9ehhqfABDriL/lzO92xcUKEJPQHrVA/2YHSNFB4iFlykVmWvwo48nr3OxA==} @@ -10806,6 +11290,17 @@ packages: once: 1.4.0 path-is-absolute: 1.0.1 + /glob@8.1.0: + resolution: {integrity: sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==} + engines: {node: '>=12'} + dependencies: + fs.realpath: 1.0.0 + inflight: 1.0.6 + inherits: 2.0.4 + minimatch: 5.1.6 + once: 1.4.0 + dev: true + /global-modules@2.0.0: resolution: {integrity: sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==} engines: {node: '>=6'} @@ -11046,7 +11541,7 @@ packages: chalk: 2.4.2 chokidar: 3.5.3 ci-info: 2.0.0 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 enquirer: 2.3.6 env-paths: 2.2.1 ethereum-cryptography: 1.2.0 @@ -11069,7 +11564,7 @@ packages: solc: 0.7.3(debug@4.3.4) source-map-support: 0.5.21 stacktrace-parser: 0.1.10 - ts-node: 10.9.1(@types/node@18.13.0)(typescript@4.7.2) + ts-node: 10.9.1(@types/node@20.4.5)(typescript@4.7.2) tsort: 0.0.1 typescript: 4.7.2 undici: 5.22.1 @@ -11140,7 +11635,6 @@ packages: inherits: 2.0.4 readable-stream: 3.6.2 safe-buffer: 5.2.1 - dev: true /hash.js@1.1.3: resolution: {integrity: sha512-/UETyP0W22QILqS+6HowevwhEFJ3MBJnwTf75Qob9Wz9t0DPuisL8kW8YZMK62dHAKE1c1p+gY1TtOLY+USEHA==} @@ -11154,7 +11648,6 @@ packages: dependencies: inherits: 2.0.4 minimalistic-assert: 1.0.1 - dev: true /hashlru@2.3.0: resolution: {integrity: sha512-0cMsjjIC8I+D3M44pOQdsy0OHXGLVz6Z0beRuufhKa0KfaD2wGwAev6jILzXsd3/vpnNQJmWyZtIILqM1N+n5A==} @@ -11173,7 +11666,6 @@ packages: hash.js: 1.1.7 minimalistic-assert: 1.0.1 minimalistic-crypto-utils: 1.0.1 - dev: true /hoopy@0.1.4: resolution: {integrity: sha512-HRcs+2mr52W0K+x8RzcLzuPPmVIKMSv97RGHy0Ea9y/mpcaK+xTrjICA04KAHi4GRzxliNqNJEFYWHghy3rSfQ==} @@ -11298,7 +11790,7 @@ packages: dependencies: '@tootallnate/once': 1.1.2 agent-base: 6.0.2 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 transitivePeerDependencies: - supports-color @@ -11326,7 +11818,7 @@ packages: engines: {node: '>=8.0.0'} dependencies: eventemitter3: 4.0.7 - follow-redirects: 1.15.2(debug@4.3.4) + follow-redirects: 1.15.2 requires-port: 1.0.0 transitivePeerDependencies: - debug @@ -11385,12 +11877,15 @@ packages: resolve-alpn: 1.2.1 dev: true + /https-browserify@1.0.0: + resolution: {integrity: sha512-J+FkSdyD+0mA0N+81tMotaRMfSL9SGi+xpD3T6YApKsc3bGSXJlfXri3VyFOeYkfLRQisDk1W+jIFFKBeUBbBg==} + /https-proxy-agent@5.0.1: resolution: {integrity: sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==} engines: {node: '>= 6'} dependencies: agent-base: 6.0.2 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 transitivePeerDependencies: - supports-color @@ -11662,14 +12157,14 @@ packages: - supports-color dev: true - /ipfs-core-types@0.5.2(node-fetch@3.3.1): + /ipfs-core-types@0.5.2(node-fetch@3.3.2): resolution: {integrity: sha512-DOQeL+GFGYMTlnbdtMeBzvfVnyAalSgCfPr8XUCI+FVBZZWwzkt5jZZzGDmF87HVRrMR3FuVyBKZj772mcXKyQ==} deprecated: js-IPFS has been deprecated in favour of Helia - please see https://github.com/ipfs/js-ipfs/issues/4336 for details dependencies: cids: 1.1.9 interface-datastore: 4.0.2 ipld-block: 0.11.1 - multiaddr: 9.0.2(node-fetch@3.3.1) + multiaddr: 9.0.2(node-fetch@3.3.2) multibase: 4.0.6 transitivePeerDependencies: - node-fetch @@ -11706,7 +12201,7 @@ packages: - supports-color dev: true - /ipfs-core-utils@0.8.3(node-fetch@3.3.1): + /ipfs-core-utils@0.8.3(node-fetch@3.3.2): resolution: {integrity: sha512-PY7PkCgCtVYtNOe1C3ew1+5D9NqXqizb886R/lyGWe+KsmWtBQkQIk0ZIDwKyHGvG2KA2QQeIDzdOmzBQBJtHQ==} deprecated: js-IPFS has been deprecated in favour of Helia - please see https://github.com/ipfs/js-ipfs/issues/4336 for details dependencies: @@ -11715,14 +12210,14 @@ packages: browser-readablestream-to-it: 1.0.3 cids: 1.1.9 err-code: 3.0.1 - ipfs-core-types: 0.5.2(node-fetch@3.3.1) + ipfs-core-types: 0.5.2(node-fetch@3.3.2) ipfs-unixfs: 4.0.3 ipfs-utils: 8.1.6 it-all: 1.0.6 it-map: 1.0.6 it-peekable: 1.0.3 - multiaddr: 9.0.2(node-fetch@3.3.1) - multiaddr-to-uri: 7.0.0(node-fetch@3.3.1) + multiaddr: 9.0.2(node-fetch@3.3.2) + multiaddr-to-uri: 7.0.0(node-fetch@3.3.2) parse-duration: 1.1.0 timeout-abort-controller: 1.1.1 uint8arrays: 2.1.10 @@ -11731,7 +12226,7 @@ packages: - supports-color dev: true - /ipfs-http-client@50.1.2(node-fetch@3.3.1): + /ipfs-http-client@50.1.2(node-fetch@3.3.2): resolution: {integrity: sha512-ZbJlED4wqwFXQFVB9FQDs20ygdq7O/zSq4AvO9KRAmkqUj2TsCWCteUz2fBMnGWLh2tExxeSl/rQbHbJptb8JQ==} engines: {node: '>=14.0.0', npm: '>=3.0.0'} deprecated: js-IPFS has been deprecated in favour of Helia - please see https://github.com/ipfs/js-ipfs/issues/4336 for details @@ -11739,10 +12234,10 @@ packages: abort-controller: 3.0.0 any-signal: 2.1.2 cids: 1.1.9 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 form-data: 4.0.0 - ipfs-core-types: 0.5.2(node-fetch@3.3.1) - ipfs-core-utils: 0.8.3(node-fetch@3.3.1) + ipfs-core-types: 0.5.2(node-fetch@3.3.2) + ipfs-core-utils: 0.8.3(node-fetch@3.3.2) ipfs-unixfs: 4.0.3 ipfs-utils: 8.1.6 ipld-block: 0.11.1 @@ -11754,7 +12249,7 @@ packages: it-tar: 3.0.0 it-to-stream: 1.0.0 merge-options: 3.0.4 - multiaddr: 9.0.2(node-fetch@3.3.1) + multiaddr: 9.0.2(node-fetch@3.3.2) multibase: 4.0.6 multicodec: 3.2.1 multihashes: 4.0.3 @@ -11850,8 +12345,8 @@ packages: it-to-stream: 1.0.0 merge-options: 3.0.4 nanoid: 3.3.6 - native-fetch: 3.0.0(node-fetch@2.6.11) - node-fetch: 2.6.11 + native-fetch: 3.0.0(node-fetch@2.6.12) + node-fetch: 2.6.12 react-native-fetch-api: 3.0.0 stream-to-it: 0.2.4 transitivePeerDependencies: @@ -12001,7 +12496,6 @@ packages: engines: {node: '>= 0.4'} dependencies: has-tostringtag: 1.0.0 - dev: true /is-glob@4.0.3: resolution: {integrity: sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==} @@ -12041,6 +12535,13 @@ packages: /is-module@1.0.0: resolution: {integrity: sha512-51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g==} + /is-nan@1.3.2: + resolution: {integrity: sha512-E+zBKpQ2t6MEo1VsonYmluk9NxGrbzpeeLC2xIViuO2EjU2xsXsBPwTr3Ykv9l08UYEVEdWeRZNouaZqF6RN0w==} + engines: {node: '>= 0.4'} + dependencies: + call-bind: 1.0.2 + define-properties: 1.2.0 + /is-natural-number@4.0.1: resolution: {integrity: sha512-Y4LTamMe0DDQIIAlaer9eKebAlDSV6huy+TWhJVPlzZh2o4tRP5SQWFlLn5N0To4mDD22/qdOq+veo1cSISLgQ==} dev: true @@ -12091,6 +12592,12 @@ packages: '@types/estree': 1.0.1 dev: true + /is-reference@3.0.1: + resolution: {integrity: sha512-baJJdQLiYaJdvFbJqXrcGv3WU3QCzBlUcI5QhbesIm6/xPsvmO+2CDoi/GMOFBQEQm+PXkwOPrp9KK5ozZsp2w==} + dependencies: + '@types/estree': 1.0.1 + dev: true + /is-regex@1.1.4: resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==} engines: {node: '>= 0.4'} @@ -12210,6 +12717,10 @@ packages: resolution: {integrity: sha512-9JPDgCN4B7QPkLtYAAOrEuAWvP9rWvR5offAr0/SeF046wIkglqH3VXgYYP6NcsKslH80UIVgmPqNe3j7tG2ng==} engines: {node: '>=12'} + /isomorphic-timers-promises@1.0.1: + resolution: {integrity: sha512-u4sej9B1LPSxTGKB/HiuzvEQnXH0ECYkSVQU39koSwmFAxhlEAFl9RdTvLv4TOTQUgBS5O3O5fwUxk6byBZ+IQ==} + engines: {node: '>=10'} + /isstream@0.1.2: resolution: {integrity: sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==} dev: true @@ -12242,7 +12753,7 @@ packages: resolution: {integrity: sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==} engines: {node: '>=10'} dependencies: - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 istanbul-lib-coverage: 3.2.0 source-map: 0.6.1 transitivePeerDependencies: @@ -12651,7 +13162,7 @@ packages: '@jest/expect': 28.1.3 '@jest/test-result': 28.1.3 '@jest/types': 28.1.3 - '@types/node': 18.13.0 + '@types/node': 20.4.5 chalk: 4.1.2 co: 4.6.0 dedent: 0.7.0 @@ -12670,7 +13181,7 @@ packages: - supports-color dev: true - /jest-cli@27.5.1(ts-node@10.9.1): + /jest-cli@27.5.1: resolution: {integrity: sha512-Hc6HOOwYq4/74/c62dEE3r5elx8wjYqxY0r0G/nFrLDPMFRu6RA/u8qINOIkvhxG7mMQ5EJsOGfRpI8L6eFUVw==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} hasBin: true @@ -12680,14 +13191,14 @@ packages: node-notifier: optional: true dependencies: - '@jest/core': 27.5.1(ts-node@10.9.1) + '@jest/core': 27.5.1 '@jest/test-result': 27.5.1 '@jest/types': 27.5.1 chalk: 4.1.2 exit: 0.1.2 graceful-fs: 4.2.11 import-local: 3.1.0 - jest-config: 27.5.1(ts-node@10.9.1) + jest-config: 27.5.1 jest-util: 27.5.1 jest-validate: 27.5.1 prompts: 2.4.2 @@ -12698,10 +13209,11 @@ packages: - supports-color - ts-node - utf-8-validate + dev: false - /jest-cli@28.1.3(@types/node@16.11.59)(ts-node@10.9.1): - resolution: {integrity: sha512-roY3kvrv57Azn1yPgdTebPAXvdR2xfezaKKYzVxZ6It/5NCxzJym6tUI5P1zkdWhfUYkxEI9uZWcQdaFLo8mJQ==} - engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} + /jest-cli@27.5.1(ts-node@10.9.1): + resolution: {integrity: sha512-Hc6HOOwYq4/74/c62dEE3r5elx8wjYqxY0r0G/nFrLDPMFRu6RA/u8qINOIkvhxG7mMQ5EJsOGfRpI8L6eFUVw==} + engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} hasBin: true peerDependencies: node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0 @@ -12709,14 +13221,44 @@ packages: node-notifier: optional: true dependencies: - '@jest/core': 28.1.3(ts-node@10.9.1) + '@jest/core': 27.5.1(ts-node@10.9.1) + '@jest/test-result': 27.5.1 + '@jest/types': 27.5.1 + chalk: 4.1.2 + exit: 0.1.2 + graceful-fs: 4.2.11 + import-local: 3.1.0 + jest-config: 27.5.1(ts-node@10.9.1) + jest-util: 27.5.1 + jest-validate: 27.5.1 + prompts: 2.4.2 + yargs: 16.2.0 + transitivePeerDependencies: + - bufferutil + - canvas + - supports-color + - ts-node + - utf-8-validate + dev: true + + /jest-cli@28.1.3(@types/node@16.11.59): + resolution: {integrity: sha512-roY3kvrv57Azn1yPgdTebPAXvdR2xfezaKKYzVxZ6It/5NCxzJym6tUI5P1zkdWhfUYkxEI9uZWcQdaFLo8mJQ==} + engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} + hasBin: true + peerDependencies: + node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0 + peerDependenciesMeta: + node-notifier: + optional: true + dependencies: + '@jest/core': 28.1.3 '@jest/test-result': 28.1.3 '@jest/types': 28.1.3 chalk: 4.1.2 exit: 0.1.2 graceful-fs: 4.2.11 import-local: 3.1.0 - jest-config: 28.1.3(@types/node@16.11.59)(ts-node@10.9.1) + jest-config: 28.1.3(@types/node@16.11.59) jest-util: 28.1.3 jest-validate: 28.1.3 prompts: 2.4.2 @@ -12727,6 +13269,46 @@ packages: - ts-node dev: true + /jest-config@27.5.1: + resolution: {integrity: sha512-5sAsjm6tGdsVbW9ahcChPAFCk4IlkQUknH5AvKjuLTSlcO/wCZKyFdn7Rg0EkC+OGgWODEy2hDpWB1PgzH0JNA==} + engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} + peerDependencies: + ts-node: '>=9.0.0' + peerDependenciesMeta: + ts-node: + optional: true + dependencies: + '@babel/core': 7.22.5 + '@jest/test-sequencer': 27.5.1 + '@jest/types': 27.5.1 + babel-jest: 27.5.1(@babel/core@7.22.5) + chalk: 4.1.2 + ci-info: 3.8.0 + deepmerge: 4.3.1 + glob: 7.2.3 + graceful-fs: 4.2.11 + jest-circus: 27.5.1 + jest-environment-jsdom: 27.5.1 + jest-environment-node: 27.5.1 + jest-get-type: 27.5.1 + jest-jasmine2: 27.5.1 + jest-regex-util: 27.5.1 + jest-resolve: 27.5.1 + jest-runner: 27.5.1 + jest-util: 27.5.1 + jest-validate: 27.5.1 + micromatch: 4.0.5 + parse-json: 5.2.0 + pretty-format: 27.5.1 + slash: 3.0.0 + strip-json-comments: 3.1.1 + transitivePeerDependencies: + - bufferutil + - canvas + - supports-color + - utf-8-validate + dev: false + /jest-config@27.5.1(ts-node@10.9.1): resolution: {integrity: sha512-5sAsjm6tGdsVbW9ahcChPAFCk4IlkQUknH5AvKjuLTSlcO/wCZKyFdn7Rg0EkC+OGgWODEy2hDpWB1PgzH0JNA==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} @@ -12760,14 +13342,15 @@ packages: pretty-format: 27.5.1 slash: 3.0.0 strip-json-comments: 3.1.1 - ts-node: 10.9.1(@types/node@18.13.0)(typescript@4.7.2) + ts-node: 10.9.1(@types/node@20.4.5)(typescript@4.7.2) transitivePeerDependencies: - bufferutil - canvas - supports-color - utf-8-validate + dev: true - /jest-config@28.1.3(@types/node@16.11.59)(ts-node@10.9.1): + /jest-config@28.1.3(@types/node@16.11.59): resolution: {integrity: sha512-MG3INjByJ0J4AsNBm7T3hsuxKQqFIiRo/AUqb1q9LRKI5UU6Aar9JHbr9Ivn1TVwfUD9KirRoM/T6u8XlcQPHQ==} engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} peerDependencies: @@ -12802,12 +13385,11 @@ packages: pretty-format: 28.1.3 slash: 3.0.0 strip-json-comments: 3.1.1 - ts-node: 10.9.1(@types/node@18.13.0)(typescript@4.7.2) transitivePeerDependencies: - supports-color dev: true - /jest-config@28.1.3(@types/node@18.13.0)(ts-node@10.9.1): + /jest-config@28.1.3(@types/node@20.4.5): resolution: {integrity: sha512-MG3INjByJ0J4AsNBm7T3hsuxKQqFIiRo/AUqb1q9LRKI5UU6Aar9JHbr9Ivn1TVwfUD9KirRoM/T6u8XlcQPHQ==} engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} peerDependencies: @@ -12822,7 +13404,7 @@ packages: '@babel/core': 7.22.5 '@jest/test-sequencer': 28.1.3 '@jest/types': 28.1.3 - '@types/node': 18.13.0 + '@types/node': 20.4.5 babel-jest: 28.1.3(@babel/core@7.22.5) chalk: 4.1.2 ci-info: 3.8.0 @@ -12842,7 +13424,6 @@ packages: pretty-format: 28.1.3 slash: 3.0.0 strip-json-comments: 3.1.1 - ts-node: 10.9.1(@types/node@18.13.0)(typescript@4.7.2) transitivePeerDependencies: - supports-color dev: true @@ -12935,7 +13516,7 @@ packages: '@jest/environment': 28.1.3 '@jest/fake-timers': 28.1.3 '@jest/types': 28.1.3 - '@types/node': 18.13.0 + '@types/node': 20.4.5 jest-mock: 28.1.3 jest-util: 28.1.3 dev: true @@ -12974,7 +13555,7 @@ packages: dependencies: '@jest/types': 28.1.3 '@types/graceful-fs': 4.1.6 - '@types/node': 18.13.0 + '@types/node': 20.4.5 anymatch: 3.1.3 fb-watchman: 2.0.2 graceful-fs: 4.2.11 @@ -13085,7 +13666,7 @@ packages: engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} dependencies: '@jest/types': 28.1.3 - '@types/node': 18.13.0 + '@types/node': 20.4.5 dev: true /jest-pnp-resolver@1.2.3(jest-resolve@27.5.1): @@ -13209,7 +13790,7 @@ packages: '@jest/test-result': 28.1.3 '@jest/transform': 28.1.3 '@jest/types': 28.1.3 - '@types/node': 18.13.0 + '@types/node': 20.4.5 chalk: 4.1.2 emittery: 0.10.2 graceful-fs: 4.2.11 @@ -13360,7 +13941,7 @@ packages: engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: '@jest/types': 27.5.1 - '@types/node': 18.13.0 + '@types/node': 20.4.5 chalk: 4.1.2 ci-info: 3.8.0 graceful-fs: 4.2.11 @@ -13371,7 +13952,7 @@ packages: engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} dependencies: '@jest/types': 28.1.3 - '@types/node': 18.13.0 + '@types/node': 20.4.5 chalk: 4.1.2 ci-info: 3.8.0 graceful-fs: 4.2.11 @@ -13408,7 +13989,7 @@ packages: dependencies: ansi-escapes: 4.3.2 chalk: 4.1.2 - jest: 27.5.1(ts-node@10.9.1) + jest: 27.5.1 jest-regex-util: 28.0.2 jest-watcher: 28.1.3 slash: 4.0.0 @@ -13434,7 +14015,7 @@ packages: dependencies: '@jest/test-result': 28.1.3 '@jest/types': 28.1.3 - '@types/node': 18.13.0 + '@types/node': 20.4.5 ansi-escapes: 4.3.2 chalk: 4.1.2 emittery: 0.10.2 @@ -13445,7 +14026,7 @@ packages: resolution: {integrity: sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==} engines: {node: '>= 10.13.0'} dependencies: - '@types/node': 18.13.0 + '@types/node': 20.4.5 merge-stream: 2.0.0 supports-color: 7.2.0 @@ -13461,10 +14042,31 @@ packages: resolution: {integrity: sha512-CqRA220YV/6jCo8VWvAt1KKx6eek1VIHMPeLEbpcfSfkEeWyBNppynM/o6q+Wmw+sOhos2ml34wZbSX3G13//g==} engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} dependencies: - '@types/node': 18.13.0 + '@types/node': 20.4.5 merge-stream: 2.0.0 supports-color: 8.1.1 + /jest@27.5.1: + resolution: {integrity: sha512-Yn0mADZB89zTtjkPJEXwrac3LHudkQMR+Paqa8uxJHCBr9agxztUifWCyiYrjhMPBoUVBjyny0I7XH6ozDr7QQ==} + engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} + hasBin: true + peerDependencies: + node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0 + peerDependenciesMeta: + node-notifier: + optional: true + dependencies: + '@jest/core': 27.5.1 + import-local: 3.1.0 + jest-cli: 27.5.1 + transitivePeerDependencies: + - bufferutil + - canvas + - supports-color + - ts-node + - utf-8-validate + dev: false + /jest@27.5.1(ts-node@10.9.1): resolution: {integrity: sha512-Yn0mADZB89zTtjkPJEXwrac3LHudkQMR+Paqa8uxJHCBr9agxztUifWCyiYrjhMPBoUVBjyny0I7XH6ozDr7QQ==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} @@ -13484,8 +14086,9 @@ packages: - supports-color - ts-node - utf-8-validate + dev: true - /jest@28.1.0(@types/node@16.11.59)(ts-node@10.9.1): + /jest@28.1.0(@types/node@16.11.59): resolution: {integrity: sha512-TZR+tHxopPhzw3c3560IJXZWLNHgpcz1Zh0w5A65vynLGNcg/5pZ+VildAd7+XGOu6jd58XMY/HNn0IkZIXVXg==} engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} hasBin: true @@ -13495,9 +14098,9 @@ packages: node-notifier: optional: true dependencies: - '@jest/core': 28.1.3(ts-node@10.9.1) + '@jest/core': 28.1.3 import-local: 3.1.0 - jest-cli: 28.1.3(@types/node@16.11.59)(ts-node@10.9.1) + jest-cli: 28.1.3(@types/node@16.11.59) transitivePeerDependencies: - '@types/node' - supports-color @@ -13865,7 +14468,7 @@ packages: resolution: {integrity: sha512-3KjzNEIWhi+VoOamLvgKKUE/xqwxSw/JYqsBnfMhAWVRvRtosROtVT03wci2XbuuowCYw+/hEX1xKJIR1w5n0A==} dependencies: abortable-iterator: 3.0.2 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 err-code: 3.0.1 it-length-prefixed: 5.0.3 it-pipe: 1.1.0 @@ -13882,17 +14485,17 @@ packages: - supports-color dev: true - /libp2p-interfaces@4.0.6(node-fetch@3.3.1): + /libp2p-interfaces@4.0.6(node-fetch@3.3.2): resolution: {integrity: sha512-3KjzNEIWhi+VoOamLvgKKUE/xqwxSw/JYqsBnfMhAWVRvRtosROtVT03wci2XbuuowCYw+/hEX1xKJIR1w5n0A==} dependencies: abortable-iterator: 3.0.2 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 err-code: 3.0.1 it-length-prefixed: 5.0.3 it-pipe: 1.1.0 it-pushable: 1.4.2 libp2p-crypto: 0.21.2 - multiaddr: 10.0.1(node-fetch@3.3.1) + multiaddr: 10.0.1(node-fetch@3.3.2) multiformats: 9.9.0 p-queue: 6.6.2 peer-id: 0.16.0 @@ -13908,7 +14511,7 @@ packages: dependencies: abortable-iterator: 3.0.2 bl: 5.1.0 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 err-code: 3.0.1 it-pipe: 1.1.0 it-pushable: 1.4.2 @@ -13921,7 +14524,7 @@ packages: resolution: {integrity: sha512-kq/US2unamiyY+YwP47dO1uqpAdcbdYI2Fzi9JIEhjfPBaD1MR/uyQ/YP7ABthl3EaxAjIQYd1TVp85d6QKAtQ==} dependencies: abortable-iterator: 3.0.2 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 err-code: 3.0.1 ip-address: 8.1.0 is-loopback-addr: 1.0.1 @@ -13932,15 +14535,15 @@ packages: - supports-color dev: true - /libp2p-utils@0.4.1(node-fetch@3.3.1): + /libp2p-utils@0.4.1(node-fetch@3.3.2): resolution: {integrity: sha512-kq/US2unamiyY+YwP47dO1uqpAdcbdYI2Fzi9JIEhjfPBaD1MR/uyQ/YP7ABthl3EaxAjIQYd1TVp85d6QKAtQ==} dependencies: abortable-iterator: 3.0.2 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 err-code: 3.0.1 ip-address: 8.1.0 is-loopback-addr: 1.0.1 - multiaddr: 10.0.1(node-fetch@3.3.1) + multiaddr: 10.0.1(node-fetch@3.3.2) private-ip: 2.3.4 transitivePeerDependencies: - node-fetch @@ -13952,7 +14555,7 @@ packages: dependencies: abortable-iterator: 3.0.2 class-is: 1.1.0 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 err-code: 3.0.1 ipfs-utils: 9.0.14 it-ws: 4.0.0 @@ -13970,19 +14573,19 @@ packages: - utf-8-validate dev: true - /libp2p-websockets@0.16.2(node-fetch@3.3.1): + /libp2p-websockets@0.16.2(node-fetch@3.3.2): resolution: {integrity: sha512-QGfo8jX1Ks16yi8C67CCyMW7k9cfCYiQ0lzKVJBud0fV3ymbMO2L8gzU6iXUUZTHILo8ka26zKhwQ4lmUMI+nA==} dependencies: abortable-iterator: 3.0.2 class-is: 1.1.0 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 err-code: 3.0.1 ipfs-utils: 9.0.14 it-ws: 4.0.0 - libp2p-utils: 0.4.1(node-fetch@3.3.1) - mafmt: 10.0.0(node-fetch@3.3.1) - multiaddr: 10.0.1(node-fetch@3.3.1) - multiaddr-to-uri: 8.0.0(node-fetch@3.3.1) + libp2p-utils: 0.4.1(node-fetch@3.3.2) + mafmt: 10.0.0(node-fetch@3.3.2) + multiaddr: 10.0.1(node-fetch@3.3.2) + multiaddr-to-uri: 8.0.0(node-fetch@3.3.2) p-defer: 3.0.0 p-timeout: 4.1.0 transitivePeerDependencies: @@ -14004,7 +14607,7 @@ packages: bignumber.js: 9.1.1 class-is: 1.1.0 datastore-core: 7.0.3 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 err-code: 3.0.1 es6-promisify: 7.0.0 events: 3.3.0 @@ -14056,7 +14659,7 @@ packages: - supports-color dev: true - /libp2p@0.36.2(node-fetch@3.3.1): + /libp2p@0.36.2(node-fetch@3.3.2): resolution: {integrity: sha512-UpNYBMQVivMu56zoibdGitopv39uBBAybIBOEGWmFy/I2NnTVGUutLPrxo47AuN2kntYgo/TNJfW+PpswUgSaw==} engines: {node: '>=15.0.0'} dependencies: @@ -14067,7 +14670,7 @@ packages: bignumber.js: 9.1.1 class-is: 1.1.0 datastore-core: 7.0.3 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 err-code: 3.0.1 es6-promisify: 7.0.0 events: 3.3.0 @@ -14087,12 +14690,12 @@ packages: it-sort: 1.0.1 it-take: 1.0.2 libp2p-crypto: 0.21.2 - libp2p-interfaces: 4.0.6(node-fetch@3.3.1) - libp2p-utils: 0.4.1(node-fetch@3.3.1) - mafmt: 10.0.0(node-fetch@3.3.1) + libp2p-interfaces: 4.0.6(node-fetch@3.3.2) + libp2p-utils: 0.4.1(node-fetch@3.3.2) + mafmt: 10.0.0(node-fetch@3.3.2) merge-options: 3.0.4 mortice: 2.0.1 - multiaddr: 10.0.1(node-fetch@3.3.1) + multiaddr: 10.0.1(node-fetch@3.3.2) multiformats: 9.9.0 multistream-select: 3.0.2 mutable-proxy: 1.0.0 @@ -14205,7 +14808,6 @@ packages: /loader-runner@4.3.0: resolution: {integrity: sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==} engines: {node: '>=6.11.5'} - dev: false /loader-utils@2.0.4: resolution: {integrity: sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==} @@ -14214,7 +14816,6 @@ packages: big.js: 5.2.2 emojis-list: 3.0.0 json5: 2.2.3 - dev: false /loader-utils@3.2.1: resolution: {integrity: sha512-ZvFw1KWS3GVyYBYb7qkmRM/WwL2TQQBxgCK62rlvm4WpVQ23Nb4tYjApUlfjrEGvOs7KHEsmyUn75OHZrJMWPw==} @@ -14394,10 +14995,10 @@ packages: - supports-color dev: true - /mafmt@10.0.0(node-fetch@3.3.1): + /mafmt@10.0.0(node-fetch@3.3.2): resolution: {integrity: sha512-K1bziJOXcnepfztu+2Xy9FLKVLaFMDuspmiyJIYRxnO0WOxFSV7XKSdMxMrVZxcvg1+YjlTIvSGTImUHU2k4Aw==} dependencies: - multiaddr: 10.0.1(node-fetch@3.3.1) + multiaddr: 10.0.1(node-fetch@3.3.2) transitivePeerDependencies: - node-fetch - supports-color @@ -14408,11 +15009,24 @@ packages: dependencies: sourcemap-codec: 1.4.8 + /magic-string@0.26.7: + resolution: {integrity: sha512-hX9XH3ziStPoPhJxLq1syWuZMxbDvGNbVchfrdCtanC7D13888bMFow61x8axrx+GfHLtVeAx2kxL7tTGRl+Ow==} + engines: {node: '>=12'} + dependencies: + sourcemap-codec: 1.4.8 + dev: true + /magic-string@0.27.0: resolution: {integrity: sha512-8UnnX2PeRAPZuN12svgR9j7M1uWMovg/CEnIwIG0LFkXSJJe4PdfUGiTGl8V9bsBHFUtfVINcSyYxd7q+kx9fA==} engines: {node: '>=12'} dependencies: '@jridgewell/sourcemap-codec': 1.4.15 + + /magic-string@0.30.2: + resolution: {integrity: sha512-lNZdu7pewtq/ZvWUp9Wpf/x7WzMTsR26TWV03BRZrXFsv+BI6dy8RAiKgm1uM/kyR0rCfUcqvOlXKG66KhIGug==} + engines: {node: '>=12'} + dependencies: + '@jridgewell/sourcemap-codec': 1.4.15 dev: true /make-dir@1.3.0: @@ -14430,6 +15044,7 @@ packages: /make-error@1.3.6: resolution: {integrity: sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==} + dev: true /makeerror@1.0.12: resolution: {integrity: sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==} @@ -14461,7 +15076,6 @@ packages: hash-base: 3.1.0 inherits: 2.0.4 safe-buffer: 5.2.1 - dev: true /mdn-data@2.0.14: resolution: {integrity: sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==} @@ -14521,7 +15135,7 @@ packages: resolution: {integrity: sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==} engines: {node: '>= 0.6'} - /microbundle@0.15.1(ts-node@10.9.1): + /microbundle@0.15.1: resolution: {integrity: sha512-aAF+nwFbkSIJGfrJk+HyzmJOq3KFaimH6OIFBU6J2DPjQeg1jXIYlIyEv81Gyisb9moUkudn+wj7zLNYMOv75Q==} hasBin: true dependencies: @@ -14558,7 +15172,7 @@ packages: pretty-bytes: 5.6.0 rollup: 2.79.1 rollup-plugin-bundle-size: 1.0.3 - rollup-plugin-postcss: 4.0.2(postcss@8.4.24)(ts-node@10.9.1) + rollup-plugin-postcss: 4.0.2(postcss@8.4.24) rollup-plugin-terser: 7.0.2(rollup@2.79.1) rollup-plugin-typescript2: 0.32.1(rollup@2.79.1)(typescript@4.7.2) rollup-plugin-visualizer: 5.9.2(rollup@2.79.1) @@ -14586,7 +15200,6 @@ packages: dependencies: bn.js: 4.12.0 brorand: 1.1.0 - dev: true /mime-db@1.33.0: resolution: {integrity: sha512-BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ==} @@ -14655,7 +15268,6 @@ packages: /minimalistic-crypto-utils@1.0.1: resolution: {integrity: sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg==} - dev: true /minimatch@3.0.4: resolution: {integrity: sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==} @@ -14863,11 +15475,11 @@ packages: /ms@2.1.3: resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==} - /multiaddr-to-uri@7.0.0(node-fetch@3.3.1): + /multiaddr-to-uri@7.0.0(node-fetch@3.3.2): resolution: {integrity: sha512-VbscDpLcbV0m25tJqfnZSfbjVUuNlPa4BbD5l/7me1t0lc3SWI0XAoO5E/PNJF0e1qUlbdq7yjVFEQjUT+9r0g==} deprecated: This module is deprecated, please upgrade to @multiformats/multiaddr-to-uri dependencies: - multiaddr: 9.0.2(node-fetch@3.3.1) + multiaddr: 9.0.2(node-fetch@3.3.2) transitivePeerDependencies: - node-fetch - supports-color @@ -14883,11 +15495,11 @@ packages: - supports-color dev: true - /multiaddr-to-uri@8.0.0(node-fetch@3.3.1): + /multiaddr-to-uri@8.0.0(node-fetch@3.3.2): resolution: {integrity: sha512-dq4p/vsOOUdVEd1J1gl+R2GFrXJQH8yjLtz4hodqdVbieg39LvBOdMQRdQnfbg5LSM/q1BYNVf5CBbwZFFqBgA==} deprecated: This module is deprecated, please upgrade to @multiformats/multiaddr-to-uri dependencies: - multiaddr: 10.0.1(node-fetch@3.3.1) + multiaddr: 10.0.1(node-fetch@3.3.2) transitivePeerDependencies: - node-fetch - supports-color @@ -14908,11 +15520,11 @@ packages: - supports-color dev: true - /multiaddr@10.0.1(node-fetch@3.3.1): + /multiaddr@10.0.1(node-fetch@3.3.2): resolution: {integrity: sha512-G5upNcGzEGuTHkzxezPrrD6CaIHR9uo+7MwqhNVcXTs33IInon4y7nMiGxl2CY5hG7chvYQUQhz5V52/Qe3cbg==} deprecated: This module is deprecated, please upgrade to @multiformats/multiaddr dependencies: - dns-over-http-resolver: 1.2.3(node-fetch@3.3.1) + dns-over-http-resolver: 1.2.3(node-fetch@3.3.2) err-code: 3.0.1 is-ip: 3.1.0 multiformats: 9.9.0 @@ -14923,12 +15535,12 @@ packages: - supports-color dev: true - /multiaddr@9.0.2(node-fetch@3.3.1): + /multiaddr@9.0.2(node-fetch@3.3.2): resolution: {integrity: sha512-YFaEb9t4yXSbaGksSEdg+Kn2U02s7w4wXUgyEMQmPxFJj7CfVHY10WOsScAX/rK6Soa15S1zXYadqH9TtlVreQ==} deprecated: This module is deprecated, please upgrade to @multiformats/multiaddr dependencies: cids: 1.1.9 - dns-over-http-resolver: 1.2.3(node-fetch@3.3.1) + dns-over-http-resolver: 1.2.3(node-fetch@3.3.2) err-code: 3.0.1 is-ip: 3.1.0 multibase: 4.0.6 @@ -15050,7 +15662,7 @@ packages: dependencies: abortable-iterator: 3.0.2 bl: 5.1.0 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 err-code: 3.0.1 it-first: 1.0.7 it-handshake: 2.0.0 @@ -15119,7 +15731,7 @@ packages: engines: {node: '>=10.0.0'} dependencies: async: 3.2.4 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 default-gateway: 6.0.3 request: 2.88.2 unordered-array-remove: 1.0.2 @@ -15152,12 +15764,20 @@ packages: node-fetch: 2.6.11 dev: true - /native-fetch@3.0.0(node-fetch@3.3.1): + /native-fetch@3.0.0(node-fetch@2.6.12): resolution: {integrity: sha512-G3Z7vx0IFb/FQ4JxvtqGABsOTIqRWvgQz6e+erkB+JJD6LrszQtMozEHI4EkmgZQvnGHrpLVzUWk7t4sJCIkVw==} peerDependencies: node-fetch: '*' dependencies: - node-fetch: 3.3.1 + node-fetch: 2.6.12 + dev: true + + /native-fetch@3.0.0(node-fetch@3.3.2): + resolution: {integrity: sha512-G3Z7vx0IFb/FQ4JxvtqGABsOTIqRWvgQz6e+erkB+JJD6LrszQtMozEHI4EkmgZQvnGHrpLVzUWk7t4sJCIkVw==} + peerDependencies: + node-fetch: '*' + dependencies: + node-fetch: 3.3.2 dev: true /native-fetch@4.0.2(undici@5.22.1): @@ -15248,6 +15868,17 @@ packages: whatwg-url: 5.0.0 dev: true + /node-fetch@2.6.12: + resolution: {integrity: sha512-C/fGU2E8ToujUivIO0H+tpQ6HWo4eEmchoPIoXtxCrVghxdKq+QOHqEZW7tuP3KlV3bC8FRMO5nMCC7Zm1VP6g==} + engines: {node: 4.x || >=6.0.0} + peerDependencies: + encoding: ^0.1.0 + peerDependenciesMeta: + encoding: + optional: true + dependencies: + whatwg-url: 5.0.0 + /node-fetch@2.6.7: resolution: {integrity: sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==} engines: {node: 4.x || >=6.0.0} @@ -15260,8 +15891,8 @@ packages: whatwg-url: 5.0.0 dev: true - /node-fetch@3.3.1: - resolution: {integrity: sha512-cRVc/kyto/7E5shrWca1Wsea4y6tL9iYJE5FBCius3JQfb/4P4I295PfhgbJQBLTx6lATE4z+wK0rPM4VS2uow==} + /node-fetch@3.3.2: + resolution: {integrity: sha512-dRB78srN/l6gqWulah9SrxeYnxeddIG30+GOqK/9OlLVyLg3HPnr6SqOWTWOXKRwC2eGYCkZ59NNuSgvSrpgOA==} engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} dependencies: data-uri-to-buffer: 4.0.1 @@ -15286,9 +15917,75 @@ packages: /node-int64@0.4.0: resolution: {integrity: sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==} + /node-polyfill-webpack-plugin@2.0.1(webpack@5.88.2): + resolution: {integrity: sha512-ZUMiCnZkP1LF0Th2caY6J/eKKoA0TefpoVa68m/LQU1I/mE8rGt4fNYGgNuCcK+aG8P8P43nbeJ2RqJMOL/Y1A==} + engines: {node: '>=12'} + peerDependencies: + webpack: '>=5' + dependencies: + assert: 2.0.0 + browserify-zlib: 0.2.0 + buffer: 6.0.3 + console-browserify: 1.2.0 + constants-browserify: 1.0.0 + crypto-browserify: 3.12.0 + domain-browser: 4.22.0 + events: 3.3.0 + filter-obj: 2.0.2 + https-browserify: 1.0.0 + os-browserify: 0.3.0 + path-browserify: 1.0.1 + process: 0.11.10 + punycode: 2.3.0 + querystring-es3: 0.2.1 + readable-stream: 4.4.2 + stream-browserify: 3.0.0 + stream-http: 3.2.0 + string_decoder: 1.3.0 + timers-browserify: 2.0.12 + tty-browserify: 0.0.1 + type-fest: 2.19.0 + url: 0.11.1 + util: 0.12.5 + vm-browserify: 1.1.2 + webpack: 5.88.2 + dev: true + /node-releases@2.0.12: resolution: {integrity: sha512-QzsYKWhXTWx8h1kIvqfnC++o0pEmpRQA/aenALsL2F4pqNVr7YzcdMlDij5WBnwftRbJCNJL/O7zdKaxKPHqgQ==} + /node-stdlib-browser@1.2.0: + resolution: {integrity: sha512-VSjFxUhRhkyed8AtLwSCkMrJRfQ3e2lGtG3sP6FEgaLKBBbxM/dLfjRe1+iLhjvyLFW3tBQ8+c0pcOtXGbAZJg==} + engines: {node: '>=10'} + dependencies: + assert: 2.0.0 + browser-resolve: 2.0.0 + browserify-zlib: 0.2.0 + buffer: 5.7.1 + console-browserify: 1.2.0 + constants-browserify: 1.0.0 + create-require: 1.1.1 + crypto-browserify: 3.12.0 + domain-browser: 4.22.0 + events: 3.3.0 + https-browserify: 1.0.0 + isomorphic-timers-promises: 1.0.1 + os-browserify: 0.3.0 + path-browserify: 1.0.1 + pkg-dir: 5.0.0 + process: 0.11.10 + punycode: 1.4.1 + querystring-es3: 0.2.1 + readable-stream: 3.6.2 + stream-browserify: 3.0.0 + stream-http: 3.2.0 + string_decoder: 1.3.0 + timers-browserify: 2.0.12 + tty-browserify: 0.0.1 + url: 0.11.1 + util: 0.12.5 + vm-browserify: 1.1.2 + /nofilter@3.1.0: resolution: {integrity: sha512-l2NNj07e9afPnhAhvgVrCD/oy2Ai1yfLpuo3EpiO1jFTsB4sFz6oIfAfSZyQzVpkZQ9xS8ZS5g1jCBgq4Hwo0g==} engines: {node: '>=12.19'} @@ -15373,7 +16070,6 @@ packages: dependencies: call-bind: 1.0.2 define-properties: 1.2.0 - dev: false /object-keys@1.1.1: resolution: {integrity: sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==} @@ -15561,6 +16257,9 @@ packages: resolution: {integrity: sha512-cMddMgb2QElm8G7vdaa02jhUNbTSrhsgAGUz1OokD83uJTwSUn+nKoNoKVVaRa08yF6sgfO7Maou1+bgLd9rdQ==} dev: true + /os-browserify@0.3.0: + resolution: {integrity: sha512-gjcpUc3clBf9+210TRaDWbf+rZZZEshZ+DlXMRCeAjp0xhTrnQsKHypIy1J3d5hKdUzj69t708EHtU8P6bUn0A==} + /os-tmpdir@1.0.2: resolution: {integrity: sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==} engines: {node: '>=0.10.0'} @@ -15790,7 +16489,6 @@ packages: evp_bytestokey: 1.0.3 pbkdf2: 3.1.2 safe-buffer: 5.2.1 - dev: true /parse-cache-control@1.0.1: resolution: {integrity: sha512-60zvsJReQPX5/QP0Kzfd/VrpjScIQ7SHBW6bFCYfEP+fp0Eppr1SHhIO5nd1PjZtvclzSzES9D/p5nFJurwfWg==} @@ -15893,7 +16591,6 @@ packages: ripemd160: 2.0.2 safe-buffer: 5.2.1 sha.js: 2.4.11 - dev: true /peer-id@0.15.4: resolution: {integrity: sha512-MDoBIMZYwQIAHaZQUwsIcvoFgdbIl5GtZMwSkXpIYvc5v0TSDv+u8WsTKrKt2Vv28tHFFDJQdVzu3T4qTPzK+w==} @@ -16014,6 +16711,12 @@ packages: dependencies: find-up: 4.1.0 + /pkg-dir@5.0.0: + resolution: {integrity: sha512-NPE8TDbzl/3YQYY7CSS228s3g2ollTFnc+Qi3tqmqJp9Vg2ovUpixcJEo2HJScN2Ez+kEaal6y70c0ehqJBJeA==} + engines: {node: '>=10'} + dependencies: + find-up: 5.0.0 + /pkg-types@1.0.3: resolution: {integrity: sha512-nN7pYi0AQqJnoLPC9eHFQ8AcyaixBUOwvqc5TDnIKCMEE6I0y8P7OKA7fPexsXGCGxQDl/cmrLAp26LhcwxZ4A==} dependencies: @@ -16324,7 +17027,7 @@ packages: postcss-value-parser: 4.2.0 dev: false - /postcss-load-config@3.1.4(postcss@8.4.24)(ts-node@10.9.1): + /postcss-load-config@3.1.4(postcss@8.4.24): resolution: {integrity: sha512-6DiM4E7v4coTE4uzA8U//WhtPwyhiim3eyjEMFCnUpzbrkK9wJHgKDT2mR+HbtSrd/NubVaYTOpSpjUl8NQeRg==} engines: {node: '>= 10'} peerDependencies: @@ -16338,11 +17041,10 @@ packages: dependencies: lilconfig: 2.1.0 postcss: 8.4.24 - ts-node: 10.9.1(@types/node@18.13.0)(typescript@4.7.2) yaml: 1.10.2 dev: true - /postcss-load-config@4.0.1(postcss@8.4.24)(ts-node@10.9.1): + /postcss-load-config@4.0.1(postcss@8.4.24): resolution: {integrity: sha512-vEJIc8RdiBRu3oRAI0ymerOn+7rPuMvRXslTvZUKZonDHFIczxztIyJ1urxM1x9JXEikvpWWTUUqal5j/8QgvA==} engines: {node: '>= 14'} peerDependencies: @@ -16356,7 +17058,6 @@ packages: dependencies: lilconfig: 2.1.0 postcss: 8.4.24 - ts-node: 10.9.1(@types/node@18.13.0)(typescript@4.7.2) yaml: 2.3.1 dev: false @@ -16956,7 +17657,7 @@ packages: '@protobufjs/pool': 1.1.0 '@protobufjs/utf8': 1.1.0 '@types/long': 4.0.2 - '@types/node': 18.13.0 + '@types/node': 20.4.5 long: 4.0.0 dev: true @@ -16975,7 +17676,7 @@ packages: '@protobufjs/path': 1.1.2 '@protobufjs/pool': 1.1.0 '@protobufjs/utf8': 1.1.0 - '@types/node': 18.13.0 + '@types/node': 20.4.5 long: 5.2.3 /protons-runtime@4.0.2(uint8arraylist@2.4.3): @@ -17021,7 +17722,6 @@ packages: parse-asn1: 5.1.6 randombytes: 2.1.0 safe-buffer: 5.2.1 - dev: true /pump@3.0.0: resolution: {integrity: sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==} @@ -17032,7 +17732,6 @@ packages: /punycode@1.4.1: resolution: {integrity: sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==} - dev: false /punycode@2.1.0: resolution: {integrity: sha512-Yxz2kRwT90aPiWEMHVYnEf4+rhwF1tBmmZ4KepCP+Wkium9JxtWnUm1nqGwpiAHr/tnTSeHqr3wb++jgSkXjhA==} @@ -17054,7 +17753,7 @@ packages: dependencies: chromium-bidi: 0.4.4(devtools-protocol@0.0.1094867) cross-fetch: 3.1.5 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 devtools-protocol: 0.0.1094867 extract-zip: 2.0.1 https-proxy-agent: 5.0.1 @@ -17105,7 +17804,6 @@ packages: engines: {node: '>=0.6'} dependencies: side-channel: 1.0.4 - dev: true /qs@6.5.3: resolution: {integrity: sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==} @@ -17131,6 +17829,10 @@ packages: strict-uri-encode: 2.0.0 dev: true + /querystring-es3@0.2.1: + resolution: {integrity: sha512-773xhDQnZBMFobEiztv8LIl70ch5MSF/jUQVlhwFyBILqq96anmoctVIYz+ZRp0qbCKATTn6ev02M3r7Ga5vqA==} + engines: {node: '>=0.4.x'} + /querystringify@2.2.0: resolution: {integrity: sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==} @@ -17290,7 +17992,7 @@ packages: engines: {node: '>=0.10.0'} dev: false - /react-scripts@5.0.1(@babel/plugin-syntax-flow@7.22.5)(@babel/plugin-transform-react-jsx@7.22.5)(eslint@8.43.0)(react@18.2.0)(ts-node@10.9.1)(typescript@4.9.5): + /react-scripts@5.0.1(@babel/plugin-syntax-flow@7.22.5)(@babel/plugin-transform-react-jsx@7.22.5)(eslint@8.43.0)(react@18.2.0)(typescript@4.9.5): resolution: {integrity: sha512-8VAmEm/ZAwQzJ+GOMLbBsTdDKOpuZh7RPs0UymvBR2vRk4iZWCskjbFnxqjrzoIvlNNRZ3QJFx6/qDSi6zSnaQ==} engines: {node: '>=14.0.0'} hasBin: true @@ -17324,7 +18026,7 @@ packages: fs-extra: 10.1.0 html-webpack-plugin: 5.5.3(webpack@5.87.0) identity-obj-proxy: 3.0.0 - jest: 27.5.1(ts-node@10.9.1) + jest: 27.5.1 jest-resolve: 27.5.1 jest-watch-typeahead: 1.1.0(jest@27.5.1) mini-css-extract-plugin: 2.7.6(webpack@5.87.0) @@ -17344,7 +18046,7 @@ packages: semver: 7.5.2 source-map-loader: 3.0.2(webpack@5.87.0) style-loader: 3.3.3(webpack@5.87.0) - tailwindcss: 3.3.2(ts-node@10.9.1) + tailwindcss: 3.3.2 terser-webpack-plugin: 5.3.9(webpack@5.87.0) typescript: 4.9.5 webpack: 5.87.0 @@ -17419,6 +18121,17 @@ packages: string_decoder: 1.3.0 util-deprecate: 1.0.2 + /readable-stream@4.4.2: + resolution: {integrity: sha512-Lk/fICSyIhodxy1IDK2HazkeGjSmezAWX2egdtJnYhtzKEsBPJowlI6F6LPb5tqIQILrMbx22S5o3GuJavPusA==} + engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + dependencies: + abort-controller: 3.0.0 + buffer: 6.0.3 + events: 3.3.0 + process: 0.11.10 + string_decoder: 1.3.0 + dev: true + /readdirp@3.2.0: resolution: {integrity: sha512-crk4Qu3pmXwgxdSgGhgA/eXiJAPQiX4GMOZZMXnqKxHX7TaoL+3gQVo/WeuAiogr07DpnfjIMpXXa+PAIvwPGQ==} engines: {node: '>= 8'} @@ -17642,6 +18355,10 @@ packages: resolution: {integrity: sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==} engines: {node: '>=8'} + /resolve-pkg-maps@1.0.0: + resolution: {integrity: sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==} + dev: true + /resolve-url-loader@4.0.0: resolution: {integrity: sha512-05VEMczVREcbtT7Bz+C+96eUO5HDNvdthIiMB34t7FcF8ehcu4wC0sSgPUubs3XW2Q3CNLJk/BJrCU9wVRymiA==} engines: {node: '>=8.9'} @@ -17745,7 +18462,6 @@ packages: dependencies: hash-base: 3.1.0 inherits: 2.0.4 - dev: true /rlp@2.2.7: resolution: {integrity: sha512-d5gdPmgQ0Z+AklL2NVXr/IoSjNZFfTVvQWzL/AM2AOcSzYP2xjlb0AC8YyCLc41MSNf6P6QVtjgPdmVtzb+4lQ==} @@ -17761,7 +18477,34 @@ packages: maxmin: 2.1.0 dev: true - /rollup-plugin-postcss@4.0.2(postcss@8.4.24)(ts-node@10.9.1): + /rollup-plugin-cjs-es@2.0.0(rollup@3.25.1): + resolution: {integrity: sha512-ks9SqJEC5iBY5x1DpC7H1ckLMwQQFDauFXVirH8IhC+HfkQ7dhT7ukRGiUKFNBC9+lTB8Ge4ZnJD30wSue5+OQ==} + engines: {node: '>= 7.10'} + peerDependencies: + rollup: ^3.2.2 + dependencies: + '@rollup/pluginutils': 5.0.2(rollup@3.25.1) + cjs-es: 0.9.2 + es-info: 0.4.0 + rollup: 3.25.1 + dev: true + + /rollup-plugin-inject@3.0.2: + resolution: {integrity: sha512-ptg9PQwzs3orn4jkgXJ74bfs5vYz1NCZlSQMBUA0wKcGp5i5pA1AO3fOUEte8enhGUC+iapTCzEWw2jEFFUO/w==} + deprecated: This package has been deprecated and is no longer maintained. Please use @rollup/plugin-inject. + dependencies: + estree-walker: 0.6.1 + magic-string: 0.25.9 + rollup-pluginutils: 2.8.2 + dev: true + + /rollup-plugin-node-polyfills@0.2.1: + resolution: {integrity: sha512-4kCrKPTJ6sK4/gLL/U5QzVT8cxJcofO0OU74tnB19F40cmuAKSzH5/siithxlofFEjwvw1YAhPmbvGNA6jEroA==} + dependencies: + rollup-plugin-inject: 3.0.2 + dev: true + + /rollup-plugin-postcss@4.0.2(postcss@8.4.24): resolution: {integrity: sha512-05EaY6zvZdmvPUDi3uCcAQoESDcYnv8ogJJQRp6V5kZ6J6P7uAVJlrTZcaaA20wTH527YTnKfkAoPxWI/jPp4w==} engines: {node: '>=10'} peerDependencies: @@ -17774,7 +18517,7 @@ packages: p-queue: 6.6.2 pify: 5.0.0 postcss: 8.4.24 - postcss-load-config: 3.1.4(postcss@8.4.24)(ts-node@10.9.1) + postcss-load-config: 3.1.4(postcss@8.4.24) postcss-modules: 4.3.1(postcss@8.4.24) promise.series: 0.2.0 resolve: 1.22.2 @@ -17848,7 +18591,6 @@ packages: hasBin: true optionalDependencies: fsevents: 2.3.2 - dev: true /run-async@3.0.0: resolution: {integrity: sha512-540WwVDOMxA6dN6We19EcT9sc3hkXPw5mzRNGM3FkdN/vtE9NFvj5lFAPNwUDmJjXidm3v7TC1cTE7t17Ulm1Q==} @@ -18019,7 +18761,6 @@ packages: '@types/json-schema': 7.0.12 ajv: 6.12.6 ajv-keywords: 3.5.2(ajv@6.12.6) - dev: false /schema-utils@4.2.0: resolution: {integrity: sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==} @@ -18122,7 +18863,6 @@ packages: resolution: {integrity: sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==} dependencies: randombytes: 2.1.0 - dev: false /serve-handler@6.1.5: resolution: {integrity: sha512-ijPFle6Hwe8zfmBxJdE+5fta53fdIY0lHISJvuikXB3VYFafRjMRpOffSPvCYsbKyBA7pvy9oYr/BT1O3EArlg==} @@ -18189,7 +18929,6 @@ packages: /setimmediate@1.0.5: resolution: {integrity: sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==} - dev: true /setprototypeof@1.1.0: resolution: {integrity: sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==} @@ -18204,7 +18943,6 @@ packages: dependencies: inherits: 2.0.4 safe-buffer: 5.2.1 - dev: true /sha1@1.1.1: resolution: {integrity: sha512-dZBS6OrMjtgVkopB1Gmo4RQCDKiZsqcpAQpkV/aaj+FCrCg8r4I4qMkDPQjBgLIxlmu9k4nUbWq6ohXahOneYA==} @@ -18367,7 +19105,6 @@ packages: /source-list-map@2.0.1: resolution: {integrity: sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==} - dev: false /source-map-js@1.0.2: resolution: {integrity: sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==} @@ -18429,7 +19166,7 @@ packages: /spdy-transport@3.0.0: resolution: {integrity: sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==} dependencies: - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 detect-node: 2.1.0 hpack.js: 2.1.6 obuf: 1.1.2 @@ -18443,7 +19180,7 @@ packages: resolution: {integrity: sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==} engines: {node: '>=6.0.0'} dependencies: - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 handle-thing: 2.0.1 http-deceiver: 1.2.7 select-hose: 2.0.0 @@ -18534,6 +19271,20 @@ packages: internal-slot: 1.0.5 dev: false + /stream-browserify@3.0.0: + resolution: {integrity: sha512-H73RAHsVBapbim0tU2JwwOiXUj+fikfiaoYAKHF3VJfA0pe2BCzkhAHBlLG6REzE+2WNZcxOXjK7lkso+9euLA==} + dependencies: + inherits: 2.0.4 + readable-stream: 3.6.2 + + /stream-http@3.2.0: + resolution: {integrity: sha512-Oq1bLqisTyK3TSCXpPbT4sdeYNdmyZJv1LxpEm2vu1ZhK89kSE5YXwZc3cWk0MagGaKriBh9mCFbVGtO+vY29A==} + dependencies: + builtin-status-codes: 3.0.0 + inherits: 2.0.4 + readable-stream: 3.6.2 + xtend: 4.0.2 + /stream-shift@1.0.1: resolution: {integrity: sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==} dev: true @@ -18954,7 +19705,7 @@ packages: strip-ansi: 6.0.1 dev: true - /tailwindcss@3.3.2(ts-node@10.9.1): + /tailwindcss@3.3.2: resolution: {integrity: sha512-9jPkMiIBXvPc2KywkraqsUfbfj+dHDb+JPWtSJa9MLFdrPyazI7q6WX2sUrm7R9eVR7qqv3Pas7EvQFzxKnI6w==} engines: {node: '>=14.0.0'} hasBin: true @@ -18976,7 +19727,7 @@ packages: postcss: 8.4.24 postcss-import: 15.1.0(postcss@8.4.24) postcss-js: 4.0.1(postcss@8.4.24) - postcss-load-config: 4.0.1(postcss@8.4.24)(ts-node@10.9.1) + postcss-load-config: 4.0.1(postcss@8.4.24) postcss-nested: 6.0.1(postcss@8.4.24) postcss-selector-parser: 6.0.13 postcss-value-parser: 4.2.0 @@ -18994,7 +19745,6 @@ packages: /tapable@2.2.1: resolution: {integrity: sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==} engines: {node: '>=6'} - dev: false /tar-fs@2.1.1: resolution: {integrity: sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==} @@ -19087,6 +19837,29 @@ packages: webpack: 5.87.0 dev: false + /terser-webpack-plugin@5.3.9(webpack@5.88.2): + resolution: {integrity: sha512-ZuXsqE07EcggTWQjXUj+Aot/OMcD0bMKGgF63f7UxYcu5/AJF53aIpK1YoP5xR9l6s/Hy2b+t1AM0bLNPRuhwA==} + engines: {node: '>= 10.13.0'} + peerDependencies: + '@swc/core': '*' + esbuild: '*' + uglify-js: '*' + webpack: ^5.1.0 + peerDependenciesMeta: + '@swc/core': + optional: true + esbuild: + optional: true + uglify-js: + optional: true + dependencies: + '@jridgewell/trace-mapping': 0.3.18 + jest-worker: 27.5.1 + schema-utils: 3.3.0 + serialize-javascript: 6.0.1 + terser: 5.18.1 + webpack: 5.88.2 + /terser@5.18.1: resolution: {integrity: sha512-j1n0Ao919h/Ai5r43VAnfV/7azUYW43GPxK7qSATzrsERfW7+y2QW9Cp9ufnRF5CQUWbnLSo7UJokSWCqg4tsQ==} engines: {node: '>=10'} @@ -19149,7 +19922,7 @@ packages: resolution: {integrity: sha512-Mx5NBSHX3sQYR6iI9VYbgHKBLisyB+xROCBGjjWm1O9wb9vfLxdaGtmT/KCjUqMsSNW6nERzCW3T6H43LqjDZQ==} dependencies: callsites: 3.1.0 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 is-observable: 2.1.0 observable-fns: 0.6.1 optionalDependencies: @@ -19185,6 +19958,12 @@ packages: dependencies: retimer: 3.0.0 + /timers-browserify@2.0.12: + resolution: {integrity: sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==} + engines: {node: '>=0.6.0'} + dependencies: + setimmediate: 1.0.5 + /tiny-glob@0.2.9: resolution: {integrity: sha512-g/55ssRPUjShh+xkfx9UPDXqhckHEsHr4Vd9zX55oSdGZc/MD0m3sferOkwWtp98bv+kcVfEHtRJgBVJzelrzg==} dependencies: @@ -19265,7 +20044,6 @@ packages: /tr46@0.0.3: resolution: {integrity: sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==} - dev: true /tr46@1.0.1: resolution: {integrity: sha512-dTpowEjclQ7Kgx5SdBkqRzVhERQXov8/l9Ft9dVM9fmg0W0KQSVaXX9T4i6twCPNtYiZM53lpSSUAwJbFPOHxA==} @@ -19375,7 +20153,7 @@ packages: '@types/jest': 28.1.0 bs-logger: 0.2.6 fast-json-stable-stringify: 2.1.0 - jest: 28.1.0(@types/node@16.11.59)(ts-node@10.9.1) + jest: 28.1.0(@types/node@16.11.59) jest-util: 28.1.3 json5: 2.2.3 lodash.memoize: 4.1.2 @@ -19385,6 +20163,21 @@ packages: yargs-parser: 20.2.9 dev: true + /ts-loader@9.4.4(typescript@4.7.2)(webpack@5.88.2): + resolution: {integrity: sha512-MLukxDHBl8OJ5Dk3y69IsKVFRA/6MwzEqBgh+OXMPB/OD01KQuWPFd1WAQP8a5PeSCAxfnkhiuWqfmFJzJQt9w==} + engines: {node: '>=12.0.0'} + peerDependencies: + typescript: '*' + webpack: ^5.0.0 + dependencies: + chalk: 4.1.2 + enhanced-resolve: 5.15.0 + micromatch: 4.0.5 + semver: 7.5.2 + typescript: 4.7.2 + webpack: 5.88.2 + dev: true + /ts-node@10.9.1(@types/node@18.13.0)(typescript@4.7.2): resolution: {integrity: sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==} hasBin: true @@ -19414,6 +20207,38 @@ packages: typescript: 4.7.2 v8-compile-cache-lib: 3.0.1 yn: 3.1.1 + dev: true + + /ts-node@10.9.1(@types/node@20.4.5)(typescript@4.7.2): + resolution: {integrity: sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==} + hasBin: true + peerDependencies: + '@swc/core': '>=1.2.50' + '@swc/wasm': '>=1.2.50' + '@types/node': '*' + typescript: '>=2.7' + peerDependenciesMeta: + '@swc/core': + optional: true + '@swc/wasm': + optional: true + dependencies: + '@cspotcode/source-map-support': 0.8.1 + '@tsconfig/node10': 1.0.9 + '@tsconfig/node12': 1.0.11 + '@tsconfig/node14': 1.0.3 + '@tsconfig/node16': 1.0.4 + '@types/node': 20.4.5 + acorn: 8.9.0 + acorn-walk: 8.2.0 + arg: 4.1.3 + create-require: 1.1.1 + diff: 4.0.2 + make-error: 1.3.6 + typescript: 4.7.2 + v8-compile-cache-lib: 3.0.1 + yn: 3.1.1 + dev: true /ts-pattern@3.3.3: resolution: {integrity: sha512-Z5EFi6g6wyX3uDFHqxF5W5c5h663oZg9O6aOiAT7fqNu0HPSfCxtHzrQ7SblTy738Mrg2Ezorky8H5aUOm8Pvg==} @@ -19460,6 +20285,9 @@ packages: typescript: 4.9.5 dev: false + /tty-browserify@0.0.1: + resolution: {integrity: sha512-C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw==} + /tunnel-agent@0.6.0: resolution: {integrity: sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==} dependencies: @@ -19514,6 +20342,11 @@ packages: engines: {node: '>=8'} dev: true + /type-fest@2.19.0: + resolution: {integrity: sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==} + engines: {node: '>=12.20'} + dev: true + /type-is@1.6.18: resolution: {integrity: sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==} engines: {node: '>= 0.6'} @@ -19536,7 +20369,7 @@ packages: typescript: '>=4.3.0' dependencies: '@types/prettier': 2.7.3 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 fs-extra: 7.0.1 glob: 7.1.7 js-sha3: 0.8.0 @@ -19570,6 +20403,7 @@ packages: resolution: {integrity: sha512-Mamb1iX2FDUpcTRzltPxgWMKy3fhg0TN378ylbktPGPK/99KbDtMQ4W1hwgsbPAsG3a0xKa1vmw4VKZQbkvz5A==} engines: {node: '>=4.2.0'} hasBin: true + dev: true /typescript@4.9.5: resolution: {integrity: sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==} @@ -19577,6 +20411,12 @@ packages: hasBin: true dev: false + /typescript@5.1.6: + resolution: {integrity: sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA==} + engines: {node: '>=14.17'} + hasBin: true + dev: true + /typical@4.0.0: resolution: {integrity: sha512-VAH4IvQ7BDFYglMd7BPRDfLgxZZX4O4TFcRDA6EN5X7erNJJq+McIEp8np9aVtxrCJ6qx4GTYVfOWNjcqwZgRw==} engines: {node: '>=8'} @@ -19631,7 +20471,7 @@ packages: resolution: {integrity: sha512-b+aKlI2oTnxnfeSQWV1sMacqSNxqhtXySaH6bflvONGxF8V/fT3ZlYH7z2qgGfydsvpVo4JUgM/Ylyfl2YouCg==} engines: {node: '>=16.0.0', npm: '>=7.0.0'} dependencies: - multiformats: 11.0.1 + multiformats: 11.0.2 /ultron@1.1.1: resolution: {integrity: sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==} @@ -19757,6 +20597,12 @@ packages: resolution: {integrity: sha512-3AChu4NiXquPfeckE5R5cGdiHCMWJx1dwCWOmWIL4KHAziJNOFIYJlpGFeKDvwLPHovZRCxK3cYlwzqI9Vp+Gg==} dev: true + /url@0.11.1: + resolution: {integrity: sha512-rWS3H04/+mzzJkv0eZ7vEDGiQbgquI1fGfOad6zKvgYQi1SzMmhl7c/DdRGxhaWrVH6z0qWITo8rpnxK/RfEhA==} + dependencies: + punycode: 1.4.1 + qs: 6.11.2 + /ursa-optional@0.10.2: resolution: {integrity: sha512-TKdwuLboBn7M34RcvVTuQyhvrA8gYKapuVdm0nBP0mnBc7oECOfUQZrY91cefL3/nm64ZyrejSRrhTVdX7NG/A==} engines: {node: '>=4'} @@ -19801,7 +20647,6 @@ packages: is-generator-function: 1.0.10 is-typed-array: 1.1.10 which-typed-array: 1.1.9 - dev: true /utila@0.4.0: resolution: {integrity: sha512-Z0DbgELS9/L/75wZbro8xAnT50pBVFQZ+hUEueGDU5FN51YSCYM+jdxsfCiHjwNP/4LCDD0i/graKpeBnOXKRA==} @@ -19839,6 +20684,7 @@ packages: /v8-compile-cache-lib@3.0.1: resolution: {integrity: sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==} + dev: true /v8-to-istanbul@8.1.1: resolution: {integrity: sha512-FGtKtv3xIpR6BYhvgH8MI/y78oT7d8Au3ww4QIxymrCtZEh5b8gCw2siywE+puhEmuWKDtmfrvF5UlB298ut3w==} @@ -19877,17 +20723,17 @@ packages: extsprintf: 1.3.0 dev: true - /vite-node@0.29.7(@types/node@18.13.0): + /vite-node@0.29.7(@types/node@20.4.5): resolution: {integrity: sha512-PakCZLvz37yFfUPWBnLa1OYHPCGm5v4pmRrTcFN4V/N/T3I6tyP3z07S//9w+DdeL7vVd0VSeyMZuAh+449ZWw==} engines: {node: '>=v14.16.0'} hasBin: true dependencies: cac: 6.7.14 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 mlly: 1.3.0 pathe: 1.1.1 picocolors: 1.0.0 - vite: 4.0.4(@types/node@18.13.0) + vite: 4.0.4(@types/node@20.4.5) transitivePeerDependencies: - '@types/node' - less @@ -19898,20 +20744,80 @@ packages: - terser dev: true + /vite-plugin-commonjs@0.8.2: + resolution: {integrity: sha512-UJlvuioutS7Tno3p3Dqxkr0G4xXt8ILYsJzOiyvFlEsyAxFRofsBGHN/Sl15q0Y4vtvvC7+QZCc6GuUxOM6Cmg==} + dependencies: + acorn: 8.9.0 + fast-glob: 3.2.12 + magic-string: 0.30.2 + vite-plugin-dynamic-import: 1.5.0 + dev: true + + /vite-plugin-dynamic-import@1.5.0: + resolution: {integrity: sha512-Qp85c+AVJmLa8MLni74U4BDiWpUeFNx7NJqbGZyR2XJOU7mgW0cb7nwlAMucFyM4arEd92Nfxp4j44xPi6Fu7g==} + dependencies: + acorn: 8.9.0 + es-module-lexer: 1.3.0 + fast-glob: 3.2.12 + magic-string: 0.30.2 + dev: true + + /vite-plugin-external@1.2.8: + resolution: {integrity: sha512-w5xDuYoXPd7rPC6OVuee63Y4HSYeOuIFlEYyP6PWTE+o5MKF4qFH79RiLmpdopPxNmTGjQvlUes+UY1MVU+BMA==} + dependencies: + fs-extra: 10.1.0 + dev: true + + /vite-plugin-externals@0.6.2(vite@4.0.4): + resolution: {integrity: sha512-R5oVY8xDJjLXLTs2XDYzvYbc/RTZuIwOx2xcFbYf+/VXB6eJuatDgt8jzQ7kZ+IrgwQhe6tU8U2fTyy72C25CQ==} + engines: {node: ^14.18.0 || >=16.0.0} + peerDependencies: + vite: '>=2.0.0' + dependencies: + acorn: 8.9.0 + es-module-lexer: 0.4.1 + fs-extra: 10.1.0 + magic-string: 0.25.9 + vite: 4.0.4(@types/node@16.11.59) + dev: true + + /vite-plugin-node-polyfills@0.9.0(vite@4.0.4): + resolution: {integrity: sha512-+i+WPUuIBhJy+ODfxx6S6FTl28URCxUszbl/IL4GwrZvbqqY/8VDIp+zpjMS8Us/a7GwN4Iaqr/fVIBtkNQojQ==} + peerDependencies: + vite: ^2.0.0 || ^3.0.0 || ^4.0.0 + dependencies: + '@rollup/plugin-inject': 5.0.3 + node-stdlib-browser: 1.2.0 + vite: 4.0.4(@types/node@16.11.59) + transitivePeerDependencies: + - rollup + dev: false + /vite-plugin-replace@0.1.1(vite@4.0.4): resolution: {integrity: sha512-v+okl3JNt2pf1jDYijw+WPVt6h9FWa/atTi+qnSFBqmKThLTDhlesx0r3bh+oFPmxRJmis5tNx9HtN6lGFoqWg==} peerDependencies: vite: ^2 dependencies: - vite: 4.0.4(@types/node@16.11.59) + vite: 4.0.4 dev: true + /vite-plugin-require-transform@1.0.21: + resolution: {integrity: sha512-A3SrHhVg9tCW35O7E8kcuB71YTEdVd3EaM1zh6gbH4zxy4WzXSfcNf0UiWmaHHhr6wdFhiiAGdpR6S0SUxXkGQ==} + dependencies: + '@babel/generator': 7.22.5 + '@babel/parser': 7.22.5 + '@babel/traverse': 7.22.5 + '@babel/types': 7.22.5 + transitivePeerDependencies: + - supports-color + dev: false + /vite-tsconfig-paths@4.0.3(typescript@4.7.2)(vite@4.0.4): resolution: {integrity: sha512-gRO2Q/tOkV+9kMht5tz90+IaEKvW2zCnvwJV3tp2ruPNZOTM5rF+yXorJT4ggmAMYEaJ3nyXjx5P5jY5FwiZ+A==} peerDependencies: vite: '>2.0.0-0' dependencies: - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 globrex: 0.1.2 tsconfck: 2.1.1(typescript@4.7.2) vite: 4.0.4(@types/node@16.11.59) @@ -19920,6 +20826,39 @@ packages: - typescript dev: true + /vite@4.0.4: + resolution: {integrity: sha512-xevPU7M8FU0i/80DMR+YhgrzR5KS2ORy1B4xcX/cXLsvnUWvfHuqMmVU6N0YiJ4JWGRJJsLCgjEzKjG9/GKoSw==} + engines: {node: ^14.18.0 || >=16.0.0} + hasBin: true + peerDependencies: + '@types/node': '>= 14' + less: '*' + sass: '*' + stylus: '*' + sugarss: '*' + terser: ^5.4.0 + peerDependenciesMeta: + '@types/node': + optional: true + less: + optional: true + sass: + optional: true + stylus: + optional: true + sugarss: + optional: true + terser: + optional: true + dependencies: + esbuild: 0.16.17 + postcss: 8.4.24 + resolve: 1.22.2 + rollup: 3.25.1 + optionalDependencies: + fsevents: 2.3.2 + dev: true + /vite@4.0.4(@types/node@16.11.59): resolution: {integrity: sha512-xevPU7M8FU0i/80DMR+YhgrzR5KS2ORy1B4xcX/cXLsvnUWvfHuqMmVU6N0YiJ4JWGRJJsLCgjEzKjG9/GKoSw==} engines: {node: ^14.18.0 || >=16.0.0} @@ -19952,9 +20891,8 @@ packages: rollup: 3.25.1 optionalDependencies: fsevents: 2.3.2 - dev: true - /vite@4.0.4(@types/node@18.13.0): + /vite@4.0.4(@types/node@20.4.5): resolution: {integrity: sha512-xevPU7M8FU0i/80DMR+YhgrzR5KS2ORy1B4xcX/cXLsvnUWvfHuqMmVU6N0YiJ4JWGRJJsLCgjEzKjG9/GKoSw==} engines: {node: ^14.18.0 || >=16.0.0} hasBin: true @@ -19979,7 +20917,7 @@ packages: terser: optional: true dependencies: - '@types/node': 18.13.0 + '@types/node': 20.4.5 esbuild: 0.16.17 postcss: 8.4.24 resolve: 1.22.2 @@ -20018,7 +20956,7 @@ packages: dependencies: '@types/chai': 4.3.5 '@types/chai-subset': 1.3.3 - '@types/node': 18.13.0 + '@types/node': 20.4.5 '@vitest/expect': 0.29.7 '@vitest/runner': 0.29.7 '@vitest/spy': 0.29.7 @@ -20027,7 +20965,7 @@ packages: acorn-walk: 8.2.0 cac: 6.7.14 chai: 4.3.7 - debug: 4.3.4(supports-color@8.1.1) + debug: 4.3.4 local-pkg: 0.4.3 pathe: 1.1.1 picocolors: 1.0.0 @@ -20037,8 +20975,8 @@ packages: tinybench: 2.5.0 tinypool: 0.4.0 tinyspy: 1.1.1 - vite: 4.0.4(@types/node@18.13.0) - vite-node: 0.29.7(@types/node@18.13.0) + vite: 4.0.4(@types/node@20.4.5) + vite-node: 0.29.7(@types/node@20.4.5) why-is-node-running: 2.2.2 transitivePeerDependencies: - less @@ -20049,6 +20987,9 @@ packages: - terser dev: true + /vm-browserify@1.1.2: + resolution: {integrity: sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==} + /w3c-hr-time@1.0.2: resolution: {integrity: sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==} deprecated: Use your platform's native performance.now() and performance.timeOrigin. @@ -20072,7 +21013,6 @@ packages: dependencies: glob-to-regexp: 0.4.1 graceful-fs: 4.2.11 - dev: false /wbuf@1.7.3: resolution: {integrity: sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==} @@ -20636,7 +21576,6 @@ packages: /webidl-conversions@3.0.1: resolution: {integrity: sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==} - dev: true /webidl-conversions@4.0.2: resolution: {integrity: sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==} @@ -20731,7 +21670,6 @@ packages: dependencies: source-list-map: 2.0.1 source-map: 0.6.1 - dev: false /webpack-sources@2.3.1: resolution: {integrity: sha512-y9EI9AO42JjEcrTJFOYmVywVZdKVUfOvDUPsJea5GIr1JOEGFVqwlY2K098fFoIjOkDzHn2AjRvM8dsBZu+gCA==} @@ -20744,7 +21682,6 @@ packages: /webpack-sources@3.2.3: resolution: {integrity: sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==} engines: {node: '>=10.13.0'} - dev: false /webpack@5.87.0: resolution: {integrity: sha512-GOu1tNbQ7p1bDEoFRs2YPcfyGs8xq52yyPBZ3m2VGnXGtV9MxjrkABHm4V9Ia280OefsSLzvbVoXcfLxjKY/Iw==} @@ -20786,6 +21723,45 @@ packages: - uglify-js dev: false + /webpack@5.88.2: + resolution: {integrity: sha512-JmcgNZ1iKj+aiR0OvTYtWQqJwq37Pf683dY9bVORwVbUrDhLhdn/PlO2sHsFHPkj7sHNQF3JwaAkp49V+Sq1tQ==} + engines: {node: '>=10.13.0'} + hasBin: true + peerDependencies: + webpack-cli: '*' + peerDependenciesMeta: + webpack-cli: + optional: true + dependencies: + '@types/eslint-scope': 3.7.4 + '@types/estree': 1.0.1 + '@webassemblyjs/ast': 1.11.6 + '@webassemblyjs/wasm-edit': 1.11.6 + '@webassemblyjs/wasm-parser': 1.11.6 + acorn: 8.9.0 + acorn-import-assertions: 1.9.0(acorn@8.9.0) + browserslist: 4.21.9 + chrome-trace-event: 1.0.3 + enhanced-resolve: 5.15.0 + es-module-lexer: 1.3.0 + eslint-scope: 5.1.1 + events: 3.3.0 + glob-to-regexp: 0.4.1 + graceful-fs: 4.2.11 + json-parse-even-better-errors: 2.3.1 + loader-runner: 4.3.0 + mime-types: 2.1.35 + neo-async: 2.6.2 + schema-utils: 3.3.0 + tapable: 2.2.1 + terser-webpack-plugin: 5.3.9(webpack@5.88.2) + watchpack: 2.4.0 + webpack-sources: 3.2.3 + transitivePeerDependencies: + - '@swc/core' + - esbuild + - uglify-js + /websocket-driver@0.7.4: resolution: {integrity: sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==} engines: {node: '>=0.8.0'} @@ -20838,7 +21814,6 @@ packages: dependencies: tr46: 0.0.3 webidl-conversions: 3.0.1 - dev: true /whatwg-url@7.1.0: resolution: {integrity: sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==} @@ -21311,7 +22286,6 @@ packages: /xtend@4.0.2: resolution: {integrity: sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==} engines: {node: '>=0.4'} - dev: true /y18n@4.0.3: resolution: {integrity: sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==} @@ -21440,6 +22414,7 @@ packages: /yn@3.1.1: resolution: {integrity: sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==} engines: {node: '>=6'} + dev: true /yocto-queue@0.1.0: resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==} From 34820cc1714657b2c3aeba2b9e184ff19cd9e193 Mon Sep 17 00:00:00 2001 From: Akim Mamedov Date: Wed, 2 Aug 2023 00:19:55 +0700 Subject: [PATCH 09/48] Finalizing test fixes --- packages/client/js-client.node/package.json | 8 +- packages/client/js-client.node/src/index.ts | 11 +- packages/client/js-client.node/vite.config.js | 31 ++-- .../js-client.web.standalone/src/index.ts | 2 +- packages/core/marine-worker/package.json | 14 +- packages/core/marine-worker/src/index.ts | 9 +- packages/core/marine-worker/vite.config.js | 24 ---- pnpm-lock.yaml | 134 +++++++++++++++++- 8 files changed, 182 insertions(+), 51 deletions(-) delete mode 100644 packages/core/marine-worker/vite.config.js diff --git a/packages/client/js-client.node/package.json b/packages/client/js-client.node/package.json index 06f5228fb..c3e4f6ed1 100644 --- a/packages/client/js-client.node/package.json +++ b/packages/client/js-client.node/package.json @@ -28,13 +28,19 @@ "@fluencelabs/marine-js": "0.7.2", "@fluencelabs/marine-worker": "workspace:*", "cross-fetch": "4.0.0", + "data-urls": "4.0.0", + "js-base64": "3.7.5", "platform": "1.3.6", "threads": "1.7.0", - "vite-plugin-require-transform": "1.0.21" + "vite-plugin-require-transform": "1.0.21", + "ws": "8.13.0" }, "devDependencies": { "@rollup/plugin-commonjs": "25.0.3", "@rollup/plugin-dynamic-import-vars": "2.0.4", + "@rollup/plugin-inject": "5.0.3", + "@rollup/plugin-node-resolve": "15.1.0", + "@types/data-urls": "3.0.1", "@types/platform": "1.3.4", "rollup-plugin-cjs-es": "2.0.0", "vite": "4.0.4", diff --git a/packages/client/js-client.node/src/index.ts b/packages/client/js-client.node/src/index.ts index e00a29b95..060bf0718 100644 --- a/packages/client/js-client.node/src/index.ts +++ b/packages/client/js-client.node/src/index.ts @@ -23,11 +23,13 @@ import { MarineBasedAvmRunner } from '@fluencelabs/js-peer/dist/jsPeer/avm.js'; import { MarineBackgroundRunner } from '@fluencelabs/js-peer/dist/marine/worker/index.js'; import { WasmLoaderFromNpm } from '@fluencelabs/js-peer/dist/marine/deps-loader/node.js'; import { doRegisterNodeUtils } from '@fluencelabs/js-peer/dist/services/NodeUtils.js'; +import { encode, decode } from 'js-base64'; +import parseDataURL from "data-urls"; + import WorkerInlineUrl from '@fluencelabs/marine-worker/dist/marine-worker.umd.сjs?url'; // @ts-ignore -import { BlobWorker } from 'threads'; -import fetch from 'cross-fetch'; +import { BlobWorker, Worker } from 'threads'; throwIfNotSupported(); @@ -43,8 +45,9 @@ export const defaultNames = { }; const createClient = async (relay: RelayOptions, config: ClientConfig): Promise => { - const workerBlob = await fetch(WorkerInlineUrl).then(res => res.blob()); - const workerLoader = new BlobWorker(workerBlob); + const data = /data:application\/\w+?;base64,(.+)/.exec(WorkerInlineUrl)?.[1]!; + + const workerLoader = BlobWorker.fromText(decode(data)); const controlModuleLoader = new WasmLoaderFromNpm(defaultNames.marine.package, defaultNames.marine.file); const avmModuleLoader = new WasmLoaderFromNpm(defaultNames.avm.package, defaultNames.avm.file); diff --git a/packages/client/js-client.node/vite.config.js b/packages/client/js-client.node/vite.config.js index d52341835..7fbb75b6e 100644 --- a/packages/client/js-client.node/vite.config.js +++ b/packages/client/js-client.node/vite.config.js @@ -2,6 +2,7 @@ import {defineConfig} from 'vite' import {resolve} from 'path'; import {builtinModules} from "module"; import { replaceCodePlugin } from "vite-plugin-replace"; +import inject from '@rollup/plugin-inject'; export default defineConfig({ build: { @@ -11,16 +12,28 @@ export default defineConfig({ name: 'JSClient', }, rollupOptions: { - external: builtinModules + external: [...builtinModules, ...builtinModules.map(bm => `node:${bm}`), 'ws', 'worker_threads'], + plugins: [ + inject({ + 'WebSocket': ['ws', 'WebSocket'], + self: 'global', + 'WorkerScope': ['worker_threads', '*'], + 'Worker': ['worker_threads', 'Worker'], + 'isMainThread': ['worker_threads', 'isMainThread'], + }) + ] }, - commonjsOptions: { - esmExternals: true, - dynamicRequireRoot: '/Users/a.mamedov/WebstormProjects/js-client/node_modules/.pnpm', - dynamicRequireTargets: ['./default-gateway@6.0.3/node_modules/default-gateway/*.js'], - ignoreDynamicRequires: true, - } }, plugins: [replaceCodePlugin({ - replacements: [{from: 'require(`./${file}.js`)', to: ''}] - })] + replacements: [ + {from: 'require(`./${file}.js`)', to: 'require(`./linux.js`)'}, + {from: 'const { name, version } = req(\'../../package.json\')', to: 'const { name, version } = { name: \'ssdp\', version: \'4.0.4\' }'}, + {from: 'eval("require")("worker_threads")', to: 'WorkerScope'}, + {from: 'eval("require")("worker_threads")', to: 'WorkerScope'}, + ] + })], + resolve: { + browserField: false, + conditions: ['node'] + } }) \ No newline at end of file diff --git a/packages/client/js-client.web.standalone/src/index.ts b/packages/client/js-client.web.standalone/src/index.ts index 8b02f1693..531f198f0 100644 --- a/packages/client/js-client.web.standalone/src/index.ts +++ b/packages/client/js-client.web.standalone/src/index.ts @@ -23,7 +23,7 @@ import { InlinedWorkerLoader, InlinedWasmLoader } from '@fluencelabs/js-peer/dis import { BlobWorker } from 'threads'; import fetch from 'cross-fetch'; -import WorkerInlineUrl from '@fluencelabs/marine-worker/dist/marine-worker.umd.сjs?url'; +import WorkerInlineUrl from '@fluencelabs/marine-worker/dist/marine-worker.js?url'; const createClient = async (relay: RelayOptions, config: ClientConfig): Promise => { const workerBlob = await fetch(WorkerInlineUrl).then(res => res.blob()); diff --git a/packages/core/marine-worker/package.json b/packages/core/marine-worker/package.json index f404a6bdc..03d439ae4 100644 --- a/packages/core/marine-worker/package.json +++ b/packages/core/marine-worker/package.json @@ -8,21 +8,19 @@ "main": "./dist/marine-worker.umd.cjs", "module": "/dist/marine-worker.js", "exports": { - ".": { - "import": "./dist/marine-worker.js", - "require": "./dist/marine-worker.umd.cjs" - }, "./dist/marine-worker.js": { - "import": "./dist/marine-worker.js" + "node": "./dist/node/marine-worker.js", + "browser": "./dist/browser/marine-worker.js" }, "./dist/marine-worker.umd.сjs": { - "import": "./dist/marine-worker.umd.cjs" + "node": "./dist/node/marine-worker.umd.cjs", + "browser": "./dist/browser/marine-worker.umd.cjs" } }, "type": "module", "scripts": { "test": "echo \"Error: no test specified\" && exit 1", - "build": "vite build" + "build": "node --loader ts-node/esm build.ts" }, "repository": "https://github.com/fluencelabs/fluence-js", "author": "Fluence Labs", @@ -31,9 +29,11 @@ "devDependencies": { "@rollup/plugin-inject": "5.0.3", "@types/node": "20.4.5", + "deepmerge": "4.3.1", "node-stdlib-browser": "1.2.0", "typescript": "5.1.6", "vite": "4.0.4", + "vite-plugin-replace": "0.1.1", "vitest": "0.29.7" }, "dependencies": { diff --git a/packages/core/marine-worker/src/index.ts b/packages/core/marine-worker/src/index.ts index 5d7fe4355..5ecfd1a34 100644 --- a/packages/core/marine-worker/src/index.ts +++ b/packages/core/marine-worker/src/index.ts @@ -20,6 +20,7 @@ import type { JSONArray, JSONObject, LogMessage } from '@fluencelabs/marine-js/d import { Observable, Subject } from 'observable-fns'; // @ts-ignore no types provided for package import { expose } from 'threads'; +import * as Buffer from 'buffer'; let marineServices = new Map(); let controlModule: WebAssembly.Module | undefined; @@ -27,12 +28,12 @@ let controlModule: WebAssembly.Module | undefined; const onLogMessage = new Subject(); const toExpose = { - init: async (controlModuleWasm: ArrayBuffer): Promise => { - controlModule = await WebAssembly.compile(controlModuleWasm); + init: async (controlModuleWasm: SharedArrayBuffer | Buffer): Promise => { + controlModule = await WebAssembly.compile(new Uint8Array(controlModuleWasm)); }, createService: async ( - wasm: ArrayBuffer, + wasm: SharedArrayBuffer | Buffer, serviceId: string, marineConfig?: MarineServiceConfig, envs?: Env, @@ -41,7 +42,7 @@ const toExpose = { throw new Error('MarineJS is not initialized. To initialize call `init` function'); } - const service = await WebAssembly.compile(wasm); + const service = await WebAssembly.compile(new Uint8Array(wasm)); const srv = new MarineService( controlModule, service, diff --git a/packages/core/marine-worker/vite.config.js b/packages/core/marine-worker/vite.config.js deleted file mode 100644 index 1fb966855..000000000 --- a/packages/core/marine-worker/vite.config.js +++ /dev/null @@ -1,24 +0,0 @@ -import {defineConfig} from 'vite' -import {resolve} from 'path'; -import {createRequire} from "module"; -import inject from "@rollup/plugin-inject"; - -const require = createRequire(import.meta.url); -const esbuildShim = require.resolve('node-stdlib-browser/helpers/esbuild/shim'); - -export default defineConfig({ - build: { - target: 'es6', - lib: { - entry: resolve(__dirname, 'src/index.ts'), - name: 'MarineWorker', - }, - }, - plugins: [{ - ...inject({ - global: [esbuildShim, 'global'], - process: [esbuildShim, 'process'], - Buffer: [esbuildShim, 'Buffer'] - }), enforce: 'post' - }] -}) \ No newline at end of file diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 59dd1fbc0..50fddb0df 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -177,6 +177,12 @@ importers: cross-fetch: specifier: 4.0.0 version: 4.0.0 + data-urls: + specifier: 4.0.0 + version: 4.0.0 + js-base64: + specifier: 3.7.5 + version: 3.7.5 platform: specifier: 1.3.6 version: 1.3.6 @@ -186,6 +192,9 @@ importers: vite-plugin-require-transform: specifier: 1.0.21 version: 1.0.21 + ws: + specifier: 8.13.0 + version: 8.13.0 devDependencies: '@rollup/plugin-commonjs': specifier: 25.0.3 @@ -193,6 +202,15 @@ importers: '@rollup/plugin-dynamic-import-vars': specifier: 2.0.4 version: 2.0.4(rollup@3.25.1) + '@rollup/plugin-inject': + specifier: 5.0.3 + version: 5.0.3(rollup@3.25.1) + '@rollup/plugin-node-resolve': + specifier: 15.1.0 + version: 15.1.0(rollup@3.25.1) + '@types/data-urls': + specifier: 3.0.1 + version: 3.0.1 '@types/platform': specifier: 1.3.4 version: 1.3.4 @@ -470,6 +488,9 @@ importers: '@types/node': specifier: 20.4.5 version: 20.4.5 + deepmerge: + specifier: 4.3.1 + version: 4.3.1 node-stdlib-browser: specifier: 1.2.0 version: 1.2.0 @@ -479,6 +500,9 @@ importers: vite: specifier: 4.0.4 version: 4.0.4(@types/node@20.4.5) + vite-plugin-replace: + specifier: 0.1.1 + version: 0.1.1(vite@4.0.4) vitest: specifier: 0.29.7 version: 0.29.7 @@ -5162,6 +5186,21 @@ packages: estree-walker: 2.0.2 magic-string: 0.27.0 + /@rollup/plugin-inject@5.0.3(rollup@3.25.1): + resolution: {integrity: sha512-411QlbL+z2yXpRWFXSmw/teQRMkXcAAC8aYTemc15gwJRpvEVDQwoe+N/HTFD8RFG8+88Bme9DK2V9CVm7hJdA==} + engines: {node: '>=14.0.0'} + peerDependencies: + rollup: ^1.20.0||^2.0.0||^3.0.0 + peerDependenciesMeta: + rollup: + optional: true + dependencies: + '@rollup/pluginutils': 5.0.2(rollup@3.25.1) + estree-walker: 2.0.2 + magic-string: 0.27.0 + rollup: 3.25.1 + dev: true + /@rollup/plugin-json@4.1.0(rollup@2.79.1): resolution: {integrity: sha512-yfLbTdNS6amI/2OpmbiBoW12vngr5NW2jCJVZSBEz+H5KfUJZ2M7sDjk0U6GOOdCWFVScShte29o9NezJ53TPw==} peerDependencies: @@ -5185,6 +5224,24 @@ packages: resolve: 1.22.2 rollup: 2.79.1 + /@rollup/plugin-node-resolve@15.1.0(rollup@3.25.1): + resolution: {integrity: sha512-xeZHCgsiZ9pzYVgAo9580eCGqwh/XCEUM9q6iQfGNocjgkufHAqC3exA+45URvhiYV8sBF9RlBai650eNs7AsA==} + engines: {node: '>=14.0.0'} + peerDependencies: + rollup: ^2.78.0||^3.0.0 + peerDependenciesMeta: + rollup: + optional: true + dependencies: + '@rollup/pluginutils': 5.0.2(rollup@3.25.1) + '@types/resolve': 1.20.2 + deepmerge: 4.3.1 + is-builtin-module: 3.2.1 + is-module: 1.0.0 + resolve: 1.22.2 + rollup: 3.25.1 + dev: true + /@rollup/plugin-replace@2.4.2(rollup@2.79.1): resolution: {integrity: sha512-IGcu+cydlUMZ5En85jxHH4qj2hta/11BHq95iHEyb2sbgiN0eCdzvUcHw5gt9pBL5lTi4JDYJ1acCoMGpTvEZg==} peerDependencies: @@ -5882,6 +5939,13 @@ packages: '@types/node': 20.4.5 dev: false + /@types/data-urls@3.0.1: + resolution: {integrity: sha512-ZWfL03uxzUh0SkotNrcAAa9NCYxp05/UUmrDNgvJrQYFoYczQVOmFJAIN7yXII6xcxyrmAJMpF5yiJyBuGvF9w==} + dependencies: + '@types/whatwg-mimetype': 3.0.0 + '@types/whatwg-url': 11.0.0 + dev: true + /@types/debug@4.1.7: resolution: {integrity: sha512-9AonUzyTjXXhEOa0DnqpzZi6VHlqKMswga9EXjpXnnqxwLtdvPPtlO8evrI5D9S6asFRCQ6v+wpiUKbw+vKqyg==} dependencies: @@ -6109,6 +6173,10 @@ packages: dependencies: '@types/node': 20.4.5 + /@types/resolve@1.20.2: + resolution: {integrity: sha512-60BCwRFOZCQhDncwQdxxeOEEkbc5dIMccYLwbxsS4TUNeVECQ/pBJ0j09mrHOl/JJvpRPGwO9SvE4nR2Nb/a4Q==} + dev: true + /@types/responselike@1.0.0: resolution: {integrity: sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==} dependencies: @@ -6185,6 +6253,20 @@ packages: resolution: {integrity: sha512-u40ViizKDmdl5FhOXn9WQbulpigYCaiD5hD4KqR3xyQww6l3+0ND+A9TeFla8tFpqvR+UAkJdYb/8jdaQG4/nw==} dev: true + /@types/webidl-conversions@7.0.0: + resolution: {integrity: sha512-xTE1E+YF4aWPJJeUzaZI5DRntlkY3+BCVJi0axFptnjGmAoWxkyREIh/XMrfxVLejwQxMCfDXdICo0VLxThrog==} + dev: true + + /@types/whatwg-mimetype@3.0.0: + resolution: {integrity: sha512-xHFOhd41VpUR6Y0k8ZinlyFv5cyhC/r2zghJgWWN8oNxqNo45Nf0qCBInJsFeifLeoHcIF4voEfap4A2GYHWkw==} + dev: true + + /@types/whatwg-url@11.0.0: + resolution: {integrity: sha512-4F6szvZP3FM5HvJAmcInXBfrAhvM4tLIc8MO1nXwabG5TZVOLxVmAXRpICqXYd3lBlomSRGmLCopYV+yTocgpQ==} + dependencies: + '@types/webidl-conversions': 7.0.0 + dev: true + /@types/ws@8.5.5: resolution: {integrity: sha512-lwhs8hktwxSjf9UaZ9tG5M03PGogvFaH8gUgLNbN9HKIg0dvv6q+gkSuJ8HN4/VbyxkuLzCjlN7GquQ0gUJfIg==} dependencies: @@ -8975,6 +9057,15 @@ packages: whatwg-mimetype: 2.3.0 whatwg-url: 8.7.0 + /data-urls@4.0.0: + resolution: {integrity: sha512-/mMTei/JXPqvFqQtfyTowxmJVwr2PVAeCcDxyFf6LhoOu/09TX2OX3kb2wzi4DMXcfj4OItwDOnhl5oziPnT6g==} + engines: {node: '>=14'} + dependencies: + abab: 2.0.6 + whatwg-mimetype: 3.0.0 + whatwg-url: 12.0.1 + dev: false + /datastore-core@7.0.3: resolution: {integrity: sha512-DmPsUux63daOfCszxLkcp6LjdJ0k/BQNhIMtoAi5mbraYQnEQkFtKORmTu6XmDX6ujbtaBkeuJAiCBNI7MZklw==} engines: {node: '>=16.0.0', npm: '>=7.0.0'} @@ -12438,6 +12529,13 @@ packages: engines: {node: '>=4'} dev: true + /is-builtin-module@3.2.1: + resolution: {integrity: sha512-BSLE3HnV2syZ0FK0iMA/yUGplUeMmNz4AW5fnTunbCIqZi4vG3WjJT9FHMy5D69xmAYBHXQhJdALdpwVxV501A==} + engines: {node: '>=6'} + dependencies: + builtin-modules: 3.3.0 + dev: true + /is-callable@1.2.7: resolution: {integrity: sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==} engines: {node: '>= 0.4'} @@ -15359,6 +15457,15 @@ packages: ufo: 1.1.2 dev: true + /mlly@1.4.0: + resolution: {integrity: sha512-ua8PAThnTwpprIaU47EPeZ/bPUVp2QYBbWMphUQpVdBI3Lgqzm5KZQ45Agm3YJedHXaIHl6pBGabaLSUPPSptg==} + dependencies: + acorn: 8.9.0 + pathe: 1.1.1 + pkg-types: 1.0.3 + ufo: 1.1.2 + dev: true + /mnemonist@0.38.5: resolution: {integrity: sha512-bZTFT5rrPKtPJxj8KSV0WkPyNxl72vQepqqVUAW2ARUpUSF2qXMB6jZj7hW5/k7C1rtpzqbD/IIbJwLXUjCHeg==} dependencies: @@ -16721,7 +16828,7 @@ packages: resolution: {integrity: sha512-nN7pYi0AQqJnoLPC9eHFQ8AcyaixBUOwvqc5TDnIKCMEE6I0y8P7OKA7fPexsXGCGxQDl/cmrLAp26LhcwxZ4A==} dependencies: jsonc-parser: 3.2.0 - mlly: 1.3.0 + mlly: 1.4.0 pathe: 1.1.1 dev: true @@ -20057,6 +20164,13 @@ packages: dependencies: punycode: 2.3.0 + /tr46@4.1.1: + resolution: {integrity: sha512-2lv/66T7e5yNyhAAC4NaKe5nVavzuGJQVVtRYLyQ2OI8tsJ61PMLlelehb0wi2Hx6+hT/OJUWZcw8MjlSRnxvw==} + engines: {node: '>=14'} + dependencies: + punycode: 2.3.0 + dev: false + /trim-repeated@2.0.0: resolution: {integrity: sha512-QUHBFTJGdOwmp0tbOG505xAgOp/YliZP/6UgafFXYZ26WT1bvQmSMJUvkeVSASuJJHbqsFbynTvkd5W8RBTipg==} engines: {node: '>=12'} @@ -21589,6 +21703,11 @@ packages: resolution: {integrity: sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==} engines: {node: '>=10.4'} + /webidl-conversions@7.0.0: + resolution: {integrity: sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==} + engines: {node: '>=12'} + dev: false + /webpack-dev-middleware@5.3.3(webpack@5.87.0): resolution: {integrity: sha512-hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA==} engines: {node: '>= 12.13.0'} @@ -21809,6 +21928,19 @@ packages: /whatwg-mimetype@2.3.0: resolution: {integrity: sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==} + /whatwg-mimetype@3.0.0: + resolution: {integrity: sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==} + engines: {node: '>=12'} + dev: false + + /whatwg-url@12.0.1: + resolution: {integrity: sha512-Ed/LrqB8EPlGxjS+TrsXcpUond1mhccS3pchLhzSgPCnTimUCKj3IZE75pAs5m6heB2U2TMerKFUXheyHY+VDQ==} + engines: {node: '>=14'} + dependencies: + tr46: 4.1.1 + webidl-conversions: 7.0.0 + dev: false + /whatwg-url@5.0.0: resolution: {integrity: sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==} dependencies: From a8f206efef8029e52408f62658be443ef39ea30b Mon Sep 17 00:00:00 2001 From: Akim Mamedov Date: Tue, 8 Aug 2023 19:46:15 +0700 Subject: [PATCH 10/48] * Refactoring packages. * Using CDN to load .wasm deps. * Setting up tests for new architecture --- packages/@tests/smoke/web/public/index.html | 4 +- packages/@tests/smoke/web/src/index.ts | 14 +- packages/@tests/test-utils/src/index.ts | 6 +- packages/client/js-client.node/package.json | 2 +- packages/client/js-client.node/src/index.ts | 74 ++- packages/client/js-client.node/tsconfig.json | 3 +- packages/client/js-client.node/vite.config.js | 8 + .../client/js-client.web.standalone/build.ts | 43 +- .../js-client.web.standalone/package.json | 5 + .../js-client.web.standalone/src/index.ts | 64 ++- .../js-client.web.standalone/tsconfig.json | 3 +- packages/core/js-peer/package.json | 45 +- packages/core/js-peer/src/ephemeral/client.ts | 1 + .../core/js-peer/src/ephemeral/network.ts | 1 + packages/core/js-peer/src/jsPeer/avm.ts | 2 +- .../core/js-peer/src/marine/interfaces.ts | 4 +- .../core/js-peer/src/marine/worker/index.ts | 6 +- packages/core/js-peer/src/util/testUtils.ts | 12 +- packages/core/marine-worker/build.ts | 5 +- packages/core/marine-worker/package.json | 9 +- packages/core/marine-worker/src/index.ts | 10 +- pnpm-lock.yaml | 472 +++++++++++++++++- 22 files changed, 670 insertions(+), 123 deletions(-) diff --git a/packages/@tests/smoke/web/public/index.html b/packages/@tests/smoke/web/public/index.html index 8086a0f54..bced11691 100644 --- a/packages/@tests/smoke/web/public/index.html +++ b/packages/@tests/smoke/web/public/index.html @@ -16,8 +16,8 @@

Open console f12

- - + + diff --git a/packages/@tests/smoke/web/src/index.ts b/packages/@tests/smoke/web/src/index.ts index b4345c962..a369a3c93 100644 --- a/packages/@tests/smoke/web/src/index.ts +++ b/packages/@tests/smoke/web/src/index.ts @@ -2,7 +2,8 @@ import puppeteer from 'puppeteer'; import { dirname, join } from 'path'; import { fileURLToPath } from 'url'; -import { startCdn, startContentServer, stopServer } from '@test/test-utils'; +import { CDN_PUBLIC_PATH, startCdn, startContentServer, stopServer } from '@test/test-utils'; +import { symlink, access } from 'fs/promises'; const port = 3000; const uri = `http://localhost:${port}/`; @@ -10,12 +11,16 @@ const __dirname = dirname(fileURLToPath(import.meta.url)); const publicPath = join(__dirname, '../public/'); const test = async () => { - const cdn = await startCdn(8765); const localServer = await startContentServer(port, publicPath); + try { + await access(join(publicPath, 'source')) + } catch { + await symlink(CDN_PUBLIC_PATH, join(publicPath, 'source')); + } console.log('starting puppeteer...'); const browser = await puppeteer.launch({ headless: false }); - const page = await browser.newPage(); + const page = (await browser.pages())[0]; // uncomment to debug what's happening inside the browser // page.on('console', (msg) => console.log('// from console: ', msg.text())); @@ -24,6 +29,7 @@ const test = async () => { await page.goto(uri); console.log('clicking button...'); + // await page.waitForTimeout(10000000); await page.click('#btn'); console.log('waiting for result to appear...'); @@ -34,7 +40,7 @@ const test = async () => { console.log('raw result: ', content); await browser.close(); - await stopServer(cdn); + // await stopServer(cdn); await stopServer(localServer); if (!content) { diff --git a/packages/@tests/test-utils/src/index.ts b/packages/@tests/test-utils/src/index.ts index 89f2cfd6c..596071457 100644 --- a/packages/@tests/test-utils/src/index.ts +++ b/packages/@tests/test-utils/src/index.ts @@ -7,7 +7,7 @@ import { fileURLToPath } from 'url'; const __dirname = dirname(fileURLToPath(import.meta.url)); -const CDN_PUBLIC_PATH = join(__dirname, '../../../client/js-client.web.standalone/dist/'); +export const CDN_PUBLIC_PATH = join(__dirname, '../../../client/js-client.web.standalone/dist/'); export const startCdn = (port: number) => startContentServer(port, CDN_PUBLIC_PATH); @@ -15,6 +15,10 @@ export const startContentServer = (port: number, publicDir: string): Promise { return handler(request, response, { public: publicDir, + rewrites: [{ + source: '/js-client.min.js', + destination: '/source/js-client.min.js' + }] }); }); diff --git a/packages/client/js-client.node/package.json b/packages/client/js-client.node/package.json index c3e4f6ed1..4e207ba1b 100644 --- a/packages/client/js-client.node/package.json +++ b/packages/client/js-client.node/package.json @@ -29,13 +29,13 @@ "@fluencelabs/marine-worker": "workspace:*", "cross-fetch": "4.0.0", "data-urls": "4.0.0", - "js-base64": "3.7.5", "platform": "1.3.6", "threads": "1.7.0", "vite-plugin-require-transform": "1.0.21", "ws": "8.13.0" }, "devDependencies": { + "@laynezh/vite-plugin-lib-assets": "0.4.1", "@rollup/plugin-commonjs": "25.0.3", "@rollup/plugin-dynamic-import-vars": "2.0.4", "@rollup/plugin-inject": "5.0.3", diff --git a/packages/client/js-client.node/src/index.ts b/packages/client/js-client.node/src/index.ts index 060bf0718..60ccb4315 100644 --- a/packages/client/js-client.node/src/index.ts +++ b/packages/client/js-client.node/src/index.ts @@ -21,38 +21,68 @@ import { callAquaFunction } from '@fluencelabs/js-peer/dist/compilerSupport/call import { registerService } from '@fluencelabs/js-peer/dist/compilerSupport/registerService.js'; import { MarineBasedAvmRunner } from '@fluencelabs/js-peer/dist/jsPeer/avm.js'; import { MarineBackgroundRunner } from '@fluencelabs/js-peer/dist/marine/worker/index.js'; -import { WasmLoaderFromNpm } from '@fluencelabs/js-peer/dist/marine/deps-loader/node.js'; import { doRegisterNodeUtils } from '@fluencelabs/js-peer/dist/services/NodeUtils.js'; -import { encode, decode } from 'js-base64'; -import parseDataURL from "data-urls"; - -import WorkerInlineUrl from '@fluencelabs/marine-worker/dist/marine-worker.umd.сjs?url'; // @ts-ignore import { BlobWorker, Worker } from 'threads'; +import fetch from 'cross-fetch'; +import fs from 'fs'; throwIfNotSupported(); -export const defaultNames = { - avm: { - file: 'avm.wasm', - package: '@fluencelabs/avm', - }, - marine: { - file: 'marine-js.wasm', - package: '@fluencelabs/marine-js', - }, -}; +const WORKER_VERSION = '__WORKER_VERSION__'; +const MARINE_VERSION = '__MARINE_VERSION__'; +const AVM_VERSION = '__AVM_VERSION__'; +const CDN_ROOT = '__CDN_ROOT__'; +const CLIENT_ENV = '__CLIENT_ENV__' as 'browser' | 'node'; + +async function fetchWorker(packageName: string, assetPath: string, version: string) { + if (CLIENT_ENV === 'browser') { + return fetch(new globalThis.URL(`${packageName}@${version}${assetPath}`, CDN_ROOT)).then(res => res.text()); + } else { + const file = await new Promise((resolve, reject) => { + // Cannot use 'fs/promises' with current vite config. This module is not polyfilled by default. + fs.readFile(new globalThis.URL(`../node_modules/${packageName}${assetPath}`, import.meta.url), (err, data) => { + if (err) { + reject(err); + return; + } + resolve(data); + }); + }); + return file.toString(); + } +} + +async function fetchWasm(packageName: string, assetPath: string, version: string) { + if (CLIENT_ENV === 'browser') { + return fetch(new globalThis.URL(`${packageName}@${version}${assetPath}`, CDN_ROOT)).then(WebAssembly.compileStreaming); + } else { + const file = await new Promise((resolve, reject) => { + // Cannot use 'fs/promises' with current vite config. This module is not polyfilled by default. + fs.readFile(new globalThis.URL(`../node_modules/${packageName}${assetPath}`, import.meta.url), (err, data) => { + if (err) { + reject(err); + return; + } + resolve(data); + }); + }); + return WebAssembly.compile(file); + } +} + +const workerFile = CLIENT_ENV === 'browser' ? '/dist/browser/marine-worker.js' : '/dist/node/marine-worker.umd.cjs'; +const fetchWorkerCode = () => fetchWorker('@fluencelabs/marine-worker', workerFile, WORKER_VERSION); +const fetchMarineJsWasm = () => fetchWasm('@fluencelabs/marine-js', '/dist/marine-js.wasm', MARINE_VERSION); +const fetchAvmWasm = () => fetchWasm('@fluencelabs/avm', '/dist/avm.wasm', AVM_VERSION); const createClient = async (relay: RelayOptions, config: ClientConfig): Promise => { - const data = /data:application\/\w+?;base64,(.+)/.exec(WorkerInlineUrl)?.[1]!; - - const workerLoader = BlobWorker.fromText(decode(data)); - const controlModuleLoader = new WasmLoaderFromNpm(defaultNames.marine.package, defaultNames.marine.file); - const avmModuleLoader = new WasmLoaderFromNpm(defaultNames.avm.package, defaultNames.avm.file); + const workerCode = await fetchWorkerCode(); + const workerLoader = BlobWorker.fromText(workerCode); - const marine = new MarineBackgroundRunner(workerLoader, controlModuleLoader); - const avm = new MarineBasedAvmRunner(marine, avmModuleLoader); + const marine = new MarineBackgroundRunner(workerLoader, { getValue: fetchMarineJsWasm, start: () => Promise.resolve(), stop: () => Promise.resolve() }); + const avm = new MarineBasedAvmRunner(marine, { getValue: fetchAvmWasm, start: () => Promise.resolve(), stop: () => Promise.resolve() }); const { keyPair, peerConfig, relayConfig } = await makeClientPeerConfig(relay, config); const client: IFluenceClient = new ClientPeer(peerConfig, relayConfig, keyPair, marine, avm); registerNodeOnlyServices(client); diff --git a/packages/client/js-client.node/tsconfig.json b/packages/client/js-client.node/tsconfig.json index 8c892f213..d7880a081 100644 --- a/packages/client/js-client.node/tsconfig.json +++ b/packages/client/js-client.node/tsconfig.json @@ -1,7 +1,8 @@ { "extends": "../../../tsconfig.json", "compilerOptions": { - "outDir": "./dist" + "outDir": "./dist", + "resolveJsonModule": true }, "exclude": ["node_modules", "dist"] } diff --git a/packages/client/js-client.node/vite.config.js b/packages/client/js-client.node/vite.config.js index 7fbb75b6e..efc7a5e19 100644 --- a/packages/client/js-client.node/vite.config.js +++ b/packages/client/js-client.node/vite.config.js @@ -3,6 +3,8 @@ import {resolve} from 'path'; import {builtinModules} from "module"; import { replaceCodePlugin } from "vite-plugin-replace"; import inject from '@rollup/plugin-inject'; +import pkg from './package.json' assert { type: 'json' }; +import libAssetsPlugin from "@laynezh/vite-plugin-lib-assets"; export default defineConfig({ build: { @@ -31,9 +33,15 @@ export default defineConfig({ {from: 'eval("require")("worker_threads")', to: 'WorkerScope'}, {from: 'eval("require")("worker_threads")', to: 'WorkerScope'}, ] + }), libAssetsPlugin({ + include: ['**/marine-worker.umd.cjs'], + publicUrl: '/' })], resolve: { browserField: false, conditions: ['node'] + }, + define: { + __CLIENT_ENV__: 'node' } }) \ No newline at end of file diff --git a/packages/client/js-client.web.standalone/build.ts b/packages/client/js-client.web.standalone/build.ts index 67969da80..2dc58c0b4 100644 --- a/packages/client/js-client.web.standalone/build.ts +++ b/packages/client/js-client.web.standalone/build.ts @@ -1,4 +1,4 @@ -import * as fs from 'fs'; +import fs from 'fs'; import path, { dirname, join, resolve } from 'path'; import { fromUint8Array } from 'js-base64'; import type { InlineConfig, PluginOption } from 'vite'; @@ -9,6 +9,10 @@ import inject from '@rollup/plugin-inject'; import { replaceCodePlugin } from 'vite-plugin-replace'; import stdLibBrowser from 'node-stdlib-browser'; import { fileURLToPath } from 'url'; +import wasm from 'vite-plugin-wasm'; +import topLevelAwait from 'vite-plugin-top-level-await'; +import libAssetsPlugin from '@laynezh/vite-plugin-lib-assets' +import pkg from './package.json' assert { type: 'json' }; const require = createRequire(import.meta.url); @@ -45,7 +49,10 @@ const commonConfig = (opts: { global: [esbuildShim, 'global'], process: [esbuildShim, 'process'], Buffer: [esbuildShim, 'Buffer'] - }), enforce: 'post'}] as PluginOption[], + }), enforce: 'post'}, libAssetsPlugin({ + include: ['**/*.wasm', '**/marine-worker.js'], + publicUrl: '/' + })] as PluginOption[], optimizeDeps: { esbuildOptions: { define: { @@ -60,6 +67,13 @@ const commonConfig = (opts: { dgram: path.resolve(dirname(fileURLToPath(import.meta.url)), 'mocks/dgram'), module: path.resolve(dirname(fileURLToPath(import.meta.url)), 'mocks/module'), } + }, + define: { + __CLIENT_ENV__: 'browser', + __MARINE_VERSION__: pkg.devDependencies['@fluencelabs/marine-js'], + __AVM_VERSION__: pkg.devDependencies['@fluencelabs/avm'], + __WORKER_VERSION__: pkg.version, + __CDN_ROOT__: 'https://unpkg.com/' } }; }; @@ -86,7 +100,7 @@ const buildClient = async () => { name: 'worker-script', }); - await build(workerConfig); + // await build(workerConfig); // build js-client const jsClientConfig = commonConfig({ @@ -95,29 +109,6 @@ const buildClient = async () => { name: 'js-client', }); - const workerScriptB64 = await readAsBase64('./tmp/worker-script.umd.cjs'); - const avmBase64 = await readWasmFromNpmAsBase64('@fluencelabs/avm', 'avm.wasm'); - const marineBase64 = await readWasmFromNpmAsBase64('@fluencelabs/marine-js', 'marine-js.wasm'); - - jsClientConfig.plugins!.push( - replaceCodePlugin({ - replacements: [ - { - from: '___worker___', - to: workerScriptB64, - }, - { - from: '___avm___', - to: avmBase64, - }, - { - from: '___marine___', - to: marineBase64, - }, - ], - }), - ); - await build(jsClientConfig); // We should exclude the script with type=module because diff --git a/packages/client/js-client.web.standalone/package.json b/packages/client/js-client.web.standalone/package.json index 2eeaafc3a..b0098580e 100644 --- a/packages/client/js-client.web.standalone/package.json +++ b/packages/client/js-client.web.standalone/package.json @@ -21,6 +21,7 @@ "@fluencelabs/marine-worker": "workspace:*", "buffer": "6.0.3", "cross-fetch": "4.0.0", + "data-urls": "4.0.0", "process": "0.11.10", "threads": "1.7.0", "vite-plugin-node-polyfills": "0.9.0", @@ -29,7 +30,9 @@ "devDependencies": { "@fluencelabs/avm": "0.43.1", "@fluencelabs/marine-js": "0.7.2", + "@laynezh/vite-plugin-lib-assets": "0.4.1", "@rollup/plugin-inject": "5.0.3", + "@types/data-urls": "3.0.1", "@types/jest": "28.1.0", "@types/node": "16.11.59", "crypto-browserify": "3.12.0", @@ -45,6 +48,8 @@ "vite-plugin-external": "1.2.8", "vite-plugin-externals": "0.6.2", "vite-plugin-replace": "0.1.1", + "vite-plugin-top-level-await": "1.3.1", + "vite-plugin-wasm": "3.2.2", "vite-tsconfig-paths": "4.0.3" } } diff --git a/packages/client/js-client.web.standalone/src/index.ts b/packages/client/js-client.web.standalone/src/index.ts index 531f198f0..df8691a91 100644 --- a/packages/client/js-client.web.standalone/src/index.ts +++ b/packages/client/js-client.web.standalone/src/index.ts @@ -13,26 +13,70 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import type { RelayOptions, ClientConfig, IFluenceClient } from '@fluencelabs/interfaces'; +import type { ClientConfig, IFluenceClient, RelayOptions } from '@fluencelabs/interfaces'; import { ClientPeer, makeClientPeerConfig } from '@fluencelabs/js-peer/dist/clientPeer/ClientPeer.js'; import { callAquaFunction } from '@fluencelabs/js-peer/dist/compilerSupport/callFunction.js'; import { registerService } from '@fluencelabs/js-peer/dist/compilerSupport/registerService.js'; import { MarineBasedAvmRunner } from '@fluencelabs/js-peer/dist/jsPeer/avm.js'; import { MarineBackgroundRunner } from '@fluencelabs/js-peer/dist/marine/worker/index.js'; -import { InlinedWorkerLoader, InlinedWasmLoader } from '@fluencelabs/js-peer/dist/marine/deps-loader/common.js'; import { BlobWorker } from 'threads'; import fetch from 'cross-fetch'; +import * as fs from 'fs'; -import WorkerInlineUrl from '@fluencelabs/marine-worker/dist/marine-worker.js?url'; +const WORKER_VERSION = '__WORKER_VERSION__'; +const MARINE_VERSION = '__MARINE_VERSION__'; +const AVM_VERSION = '__AVM_VERSION__'; +// Override if necessary +const CDN_ROOT = 'https://unpkg.com/'; +const CLIENT_ENV = '__CLIENT_ENV__' as 'browser' | 'node'; -const createClient = async (relay: RelayOptions, config: ClientConfig): Promise => { - const workerBlob = await fetch(WorkerInlineUrl).then(res => res.blob()); - const workerLoader = new BlobWorker(workerBlob); - const controlModuleLoader = new InlinedWasmLoader('___marine___'); - const avmModuleLoader = new InlinedWasmLoader('___avm___'); +async function fetchWorker(packageName: string, assetPath: string, version: string) { + if (CLIENT_ENV === 'browser') { + return fetch(new globalThis.URL(`${packageName}@${version}${assetPath}`, CDN_ROOT)).then(res => res.text()); + } else { + const file = await new Promise((resolve, reject) => { + // Cannot use 'fs/promises' with current vite config. This module is not polyfilled by default. + fs.readFile(new globalThis.URL(`../node_modules/${packageName}${assetPath}`, import.meta.url), (err, data) => { + if (err) { + reject(err); + return; + } + resolve(data); + }); + }); + return file.toString(); + } +} + +async function fetchWasm(packageName: string, assetPath: string, version: string) { + if (CLIENT_ENV === 'browser') { + return fetch(new globalThis.URL(`${packageName}@${version}${assetPath}`, CDN_ROOT)).then(WebAssembly.compileStreaming); + } else { + const file = await new Promise((resolve, reject) => { + // Cannot use 'fs/promises' with current vite config. This module is not polyfilled by default. + fs.readFile(new globalThis.URL(`../node_modules/${packageName}${assetPath}`, import.meta.url), (err, data) => { + if (err) { + reject(err); + return; + } + resolve(data); + }); + }); + return WebAssembly.compile(file); + } +} - const marine = new MarineBackgroundRunner(workerLoader, controlModuleLoader); - const avm = new MarineBasedAvmRunner(marine, avmModuleLoader); +const workerFile = CLIENT_ENV === 'browser' ? '/dist/browser/marine-worker.js' : '/dist/node/marine-worker.umd.cjs'; +const fetchWorkerCode = () => fetchWorker('@fluencelabs/marine-worker', workerFile, WORKER_VERSION); +const fetchMarineJsWasm = () => fetchWasm('@fluencelabs/marine-js', '/dist/marine-js.wasm', MARINE_VERSION); +const fetchAvmWasm = () => fetchWasm('@fluencelabs/avm', '/dist/avm.wasm', AVM_VERSION); + +const createClient = async (relay: RelayOptions, config: ClientConfig): Promise => { + const workerCode = await fetchWorkerCode(); + const workerLoader = BlobWorker.fromText(workerCode); + + const marine = new MarineBackgroundRunner(workerLoader, { getValue: fetchMarineJsWasm, start: () => Promise.resolve(), stop: () => Promise.resolve() }); + const avm = new MarineBasedAvmRunner(marine, { getValue: fetchAvmWasm, start: () => Promise.resolve(), stop: () => Promise.resolve() }); const { keyPair, peerConfig, relayConfig } = await makeClientPeerConfig(relay, config); const client: IFluenceClient = new ClientPeer(peerConfig, relayConfig, keyPair, marine, avm); await client.connect(); diff --git a/packages/client/js-client.web.standalone/tsconfig.json b/packages/client/js-client.web.standalone/tsconfig.json index 0d2678596..f53fd9c3e 100644 --- a/packages/client/js-client.web.standalone/tsconfig.json +++ b/packages/client/js-client.web.standalone/tsconfig.json @@ -2,7 +2,8 @@ "extends": "../../../tsconfig.json", "compilerOptions": { "outDir": "./dist", - "moduleResolution": "node" + "moduleResolution": "node", + "resolveJsonModule": true }, "exclude": ["node_modules", "dist"] } diff --git a/packages/core/js-peer/package.json b/packages/core/js-peer/package.json index 2ba78b98a..c099ce6e6 100644 --- a/packages/core/js-peer/package.json +++ b/packages/core/js-peer/package.json @@ -17,44 +17,45 @@ "author": "Fluence Labs", "license": "Apache-2.0", "dependencies": { + "@chainsafe/libp2p-noise": "11.0.0", "@fluencelabs/interfaces": "0.8.1", "@fluencelabs/avm": "0.43.1", "@fluencelabs/marine-js": "0.7.2", - "multiformats": "11.0.1", - "debug": "4.3.4", - "async": "3.2.4", - "bs58": "5.0.0", - "buffer": "6.0.3", - "@libp2p/peer-id": "2.0.1", - "rxjs": "7.5.5", - "ts-pattern": "3.3.3", - "uuid": "8.3.2", - "threads": "1.7.0", + "@fluencelabs/marine-worker": "workspace:*", "@libp2p/crypto": "1.0.8", - "@libp2p/peer-id-factory": "2.0.1", - "@libp2p/interface-peer-id": "2.0.1", + "@libp2p/interface-connection": "3.0.8", "@libp2p/interface-keys": "1.0.7", - "js-base64": "3.7.5", - "it-length-prefixed": "8.0.4", - "it-pipe": "2.0.5", - "it-map": "2.0.0", - "uint8arrays": "4.0.3", - "@chainsafe/libp2p-noise": "11.0.0", - "libp2p": "0.42.2", + "@libp2p/interface-peer-id": "2.0.1", "@libp2p/interfaces": "3.3.1", - "@libp2p/interface-connection": "3.0.8", "@libp2p/mplex": "7.1.1", + "@libp2p/peer-id": "2.0.1", + "@libp2p/peer-id-factory": "2.0.1", "@libp2p/websockets": "5.0.3", "@multiformats/multiaddr": "11.3.0", - "@fluencelabs/marine-worker": "workspace:*" + "async": "3.2.4", + "bs58": "5.0.0", + "buffer": "6.0.3", + "cross-fetch": "4.0.0", + "debug": "4.3.4", + "it-length-prefixed": "8.0.4", + "it-map": "2.0.0", + "it-pipe": "2.0.5", + "js-base64": "3.7.5", + "libp2p": "0.42.2", + "multiformats": "11.0.1", + "rxjs": "7.5.5", + "threads": "1.7.0", + "ts-pattern": "3.3.3", + "uint8arrays": "4.0.3", + "uuid": "8.3.2" }, "devDependencies": { "@fluencelabs/aqua-api": "0.9.3", "@fluencelabs/aqua-lib": "0.6.0", "@fluencelabs/fluence-network-environment": "1.0.13", "@types/bs58": "4.0.1", - "@types/uuid": "8.3.2", "@types/debug": "4.1.7", + "@types/uuid": "8.3.2", "vitest": "0.29.7" } } diff --git a/packages/core/js-peer/src/ephemeral/client.ts b/packages/core/js-peer/src/ephemeral/client.ts index f30e12c5b..1d5e1051e 100644 --- a/packages/core/js-peer/src/ephemeral/client.ts +++ b/packages/core/js-peer/src/ephemeral/client.ts @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +// @ts-nocheck import { PeerIdB58 } from '@fluencelabs/interfaces'; import { MarineBasedAvmRunner } from '../jsPeer/avm.js'; import { FluencePeer, PeerConfig } from '../jsPeer/FluencePeer.js'; diff --git a/packages/core/js-peer/src/ephemeral/network.ts b/packages/core/js-peer/src/ephemeral/network.ts index 79c86604c..c993d49c9 100644 --- a/packages/core/js-peer/src/ephemeral/network.ts +++ b/packages/core/js-peer/src/ephemeral/network.ts @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +// @ts-nocheck import { PeerIdB58 } from '@fluencelabs/interfaces'; import { fromBase64Sk, KeyPair } from '../keypair/index.js'; import { MarineBackgroundRunner } from '../marine/worker/index.js'; diff --git a/packages/core/js-peer/src/jsPeer/avm.ts b/packages/core/js-peer/src/jsPeer/avm.ts index d351b0848..2e7fdc98d 100644 --- a/packages/core/js-peer/src/jsPeer/avm.ts +++ b/packages/core/js-peer/src/jsPeer/avm.ts @@ -44,7 +44,7 @@ export class MarineBasedAvmRunner implements IAvmRunner { async start(): Promise { await this.marine.start(); await this.avmWasmLoader.start(); - await this.marine.createService(this.avmWasmLoader.getValue(), 'avm'); + await this.marine.createService(await this.avmWasmLoader.getValue(), 'avm'); } async stop(): Promise {} diff --git a/packages/core/js-peer/src/marine/interfaces.ts b/packages/core/js-peer/src/marine/interfaces.ts index a9b0828ef..ec8f8aa04 100644 --- a/packages/core/js-peer/src/marine/interfaces.ts +++ b/packages/core/js-peer/src/marine/interfaces.ts @@ -26,7 +26,7 @@ export interface IMarineHost extends IStartable { /** * Creates marine service from the given module and service id */ - createService(serviceModule: SharedArrayBuffer | Buffer, serviceId: string): Promise; + createService(serviceModule: WebAssembly.Module, serviceId: string): Promise; /** * Removes marine service with the given service id @@ -75,7 +75,7 @@ export interface IValueLoader { /** * Interface for something which can load wasm files */ -export interface IWasmLoader extends IValueLoader, IStartable {} +export interface IWasmLoader extends IValueLoader>, IStartable {} /** * Interface for something which can thread.js based worker diff --git a/packages/core/js-peer/src/marine/worker/index.ts b/packages/core/js-peer/src/marine/worker/index.ts index 058a60952..a91232c9b 100644 --- a/packages/core/js-peer/src/marine/worker/index.ts +++ b/packages/core/js-peer/src/marine/worker/index.ts @@ -16,7 +16,7 @@ import type { JSONArray, JSONObject, CallParameters } from '@fluencelabs/marine-js/dist/types'; import { LogFunction, logLevelToEnv } from '@fluencelabs/marine-js/dist/types'; -import type { MarineBackgroundInterface } from '../worker-script/index.js'; +import type { MarineBackgroundInterface } from '@fluencelabs/marine-worker'; // @ts-ignore import { spawn, Thread } from 'threads'; // @ts-ignore @@ -51,7 +51,7 @@ export class MarineBackgroundRunner implements IMarineHost { this.marineServices = new Set(); await this.controlModuleLoader.start(); - const wasm = this.controlModuleLoader.getValue(); + const wasm = await this.controlModuleLoader.getValue(); this.workerThread = await spawn(this.worker, { timeout: 99999999 }); const logfn: LogFunction = (message) => { const serviceLogger = this.loggers.get(message.service); @@ -64,7 +64,7 @@ export class MarineBackgroundRunner implements IMarineHost { await this.workerThread.init(wasm); } - async createService(serviceModule: SharedArrayBuffer | Buffer, serviceId: string): Promise { + async createService(serviceModule: WebAssembly.Module, serviceId: string): Promise { if (!this.workerThread) { throw 'Worker is not initialized'; } diff --git a/packages/core/js-peer/src/util/testUtils.ts b/packages/core/js-peer/src/util/testUtils.ts index 0c49083ba..92308a85e 100644 --- a/packages/core/js-peer/src/util/testUtils.ts +++ b/packages/core/js-peer/src/util/testUtils.ts @@ -32,6 +32,7 @@ import { JsServiceHost } from '../jsServiceHost/JsServiceHost.js'; import { ClientPeer, makeClientPeerConfig } from '../clientPeer/ClientPeer.js'; import { WasmLoaderFromNpm } from '../marine/deps-loader/node.js'; import { IConnection } from '../connection/interfaces.js'; +import fetch from 'cross-fetch'; export const registerHandlersHelper = ( peer: FluencePeer, @@ -94,14 +95,17 @@ class NoopConnection implements IConnection { } } +const fetchMarineJsWasm = () => fetch('__marine_js_wasm__').then(res => WebAssembly.compileStreaming(res)); +const fetchAvmWasm = () => fetch('__avm_wasm__').then(res => WebAssembly.compileStreaming(res)); + export class TestPeer extends FluencePeer { constructor(keyPair: KeyPair, connection: IConnection) { const workerLoader = new WorkerLoader(); const controlModuleLoader = new WasmLoaderFromNpm('@fluencelabs/marine-js', 'marine-js.wasm'); const avmModuleLoader = new WasmLoaderFromNpm('@fluencelabs/avm', 'avm.wasm'); - const marine = new MarineBackgroundRunner(workerLoader, controlModuleLoader); + const marine = new MarineBackgroundRunner(workerLoader, { getValue: fetchMarineJsWasm, start: () => Promise.resolve(), stop: () => Promise.resolve() }); const jsHost = new JsServiceHost(); - const avm = new MarineBasedAvmRunner(marine, avmModuleLoader); + const avm = new MarineBasedAvmRunner(marine, { getValue: fetchAvmWasm, start: () => Promise.resolve(), stop: () => Promise.resolve() }); super(DEFAULT_CONFIG, keyPair, marine, jsHost, avm, connection); } } @@ -130,8 +134,8 @@ export const withClient = async ( const workerLoader = new WorkerLoader(); const controlModuleLoader = new WasmLoaderFromNpm('@fluencelabs/marine-js', 'marine-js.wasm'); const avmModuleLoader = new WasmLoaderFromNpm('@fluencelabs/avm', 'avm.wasm'); - const marine = new MarineBackgroundRunner(workerLoader, controlModuleLoader); - const avm = new MarineBasedAvmRunner(marine, avmModuleLoader); + const marine = new MarineBackgroundRunner(workerLoader, { getValue: fetchMarineJsWasm, start: () => Promise.resolve(), stop: () => Promise.resolve() }); + const avm = new MarineBasedAvmRunner(marine, { getValue: fetchAvmWasm, start: () => Promise.resolve(), stop: () => Promise.resolve() }); const { keyPair, peerConfig, relayConfig } = await makeClientPeerConfig(relay, config); const client = new ClientPeer(peerConfig, relayConfig, keyPair, marine, avm); try { diff --git a/packages/core/marine-worker/build.ts b/packages/core/marine-worker/build.ts index 083494c1c..b37da67b7 100644 --- a/packages/core/marine-worker/build.ts +++ b/packages/core/marine-worker/build.ts @@ -6,6 +6,7 @@ import inject from '@rollup/plugin-inject'; import merge from 'deepmerge'; import { fileURLToPath } from 'url'; import { replaceCodePlugin } from 'vite-plugin-replace'; +import dtsPlugin from 'vite-plugin-dts'; const require = createRequire(import.meta.url); const esbuildShim = require.resolve('node-stdlib-browser/helpers/esbuild/shim'); @@ -16,14 +17,14 @@ const commonConfig = defineConfig({ entry: resolve(dirname(fileURLToPath(import.meta.url)), 'src/index.ts'), name: 'MarineWorker' }, - }, + } }) as UserConfig; const browserConfig: InlineConfig = await merge(commonConfig, defineConfig({ build: { outDir: 'dist/browser', }, - plugins: [{ + plugins: [dtsPlugin({outDir: 'dist'}), { // @ts-ignore ...inject({ global: [esbuildShim, 'global'], diff --git a/packages/core/marine-worker/package.json b/packages/core/marine-worker/package.json index 03d439ae4..b381dd14a 100644 --- a/packages/core/marine-worker/package.json +++ b/packages/core/marine-worker/package.json @@ -1,13 +1,17 @@ { "name": "@fluencelabs/marine-worker", - "version": "1.0.0", + "version": "0.1.0", "description": "Marine worker", "files": [ "dist" ], "main": "./dist/marine-worker.umd.cjs", - "module": "/dist/marine-worker.js", + "module": "./dist/marine-worker.js", + "types": "./dist/index.d.ts", "exports": { + ".": { + "types": "./dist/index.d.ts" + }, "./dist/marine-worker.js": { "node": "./dist/node/marine-worker.js", "browser": "./dist/browser/marine-worker.js" @@ -33,6 +37,7 @@ "node-stdlib-browser": "1.2.0", "typescript": "5.1.6", "vite": "4.0.4", + "vite-plugin-dts": "3.4.0", "vite-plugin-replace": "0.1.1", "vitest": "0.29.7" }, diff --git a/packages/core/marine-worker/src/index.ts b/packages/core/marine-worker/src/index.ts index 5ecfd1a34..d6aa4196d 100644 --- a/packages/core/marine-worker/src/index.ts +++ b/packages/core/marine-worker/src/index.ts @@ -20,7 +20,6 @@ import type { JSONArray, JSONObject, LogMessage } from '@fluencelabs/marine-js/d import { Observable, Subject } from 'observable-fns'; // @ts-ignore no types provided for package import { expose } from 'threads'; -import * as Buffer from 'buffer'; let marineServices = new Map(); let controlModule: WebAssembly.Module | undefined; @@ -28,12 +27,12 @@ let controlModule: WebAssembly.Module | undefined; const onLogMessage = new Subject(); const toExpose = { - init: async (controlModuleWasm: SharedArrayBuffer | Buffer): Promise => { - controlModule = await WebAssembly.compile(new Uint8Array(controlModuleWasm)); + init: async (_controlModule: WebAssembly.Module): Promise => { + controlModule = _controlModule; }, createService: async ( - wasm: SharedArrayBuffer | Buffer, + service: WebAssembly.Module, serviceId: string, marineConfig?: MarineServiceConfig, envs?: Env, @@ -41,8 +40,7 @@ const toExpose = { if (!controlModule) { throw new Error('MarineJS is not initialized. To initialize call `init` function'); } - - const service = await WebAssembly.compile(new Uint8Array(wasm)); + const srv = new MarineService( controlModule, service, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 50fddb0df..d96dfa739 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -180,9 +180,6 @@ importers: data-urls: specifier: 4.0.0 version: 4.0.0 - js-base64: - specifier: 3.7.5 - version: 3.7.5 platform: specifier: 1.3.6 version: 1.3.6 @@ -196,6 +193,9 @@ importers: specifier: 8.13.0 version: 8.13.0 devDependencies: + '@laynezh/vite-plugin-lib-assets': + specifier: 0.4.1 + version: 0.4.1 '@rollup/plugin-commonjs': specifier: 25.0.3 version: 25.0.3(rollup@3.25.1) @@ -266,6 +266,9 @@ importers: cross-fetch: specifier: 4.0.0 version: 4.0.0 + data-urls: + specifier: 4.0.0 + version: 4.0.0 process: specifier: 0.11.10 version: 0.11.10 @@ -285,9 +288,15 @@ importers: '@fluencelabs/marine-js': specifier: 0.7.2 version: 0.7.2 + '@laynezh/vite-plugin-lib-assets': + specifier: 0.4.1 + version: 0.4.1 '@rollup/plugin-inject': specifier: 5.0.3 version: 5.0.3 + '@types/data-urls': + specifier: 3.0.1 + version: 3.0.1 '@types/jest': specifier: 28.1.0 version: 28.1.0 @@ -333,6 +342,12 @@ importers: vite-plugin-replace: specifier: 0.1.1 version: 0.1.1(vite@4.0.4) + vite-plugin-top-level-await: + specifier: 1.3.1 + version: 1.3.1(vite@4.0.4) + vite-plugin-wasm: + specifier: 3.2.2 + version: 3.2.2(vite@4.0.4) vite-tsconfig-paths: specifier: 4.0.3 version: 4.0.3(typescript@4.7.2)(vite@4.0.4) @@ -411,6 +426,9 @@ importers: buffer: specifier: 6.0.3 version: 6.0.3 + cross-fetch: + specifier: 4.0.0 + version: 4.0.0 debug: specifier: 4.3.4 version: 4.3.4 @@ -500,6 +518,9 @@ importers: vite: specifier: 4.0.4 version: 4.0.4(@types/node@20.4.5) + vite-plugin-dts: + specifier: 3.4.0 + version: 3.4.0(@types/node@20.4.5)(typescript@5.1.6)(vite@4.0.4) vite-plugin-replace: specifier: 0.1.1 version: 0.1.1(vite@4.0.4) @@ -3909,6 +3930,13 @@ packages: '@pedrouid/environment': 1.0.1 dev: true + /@laynezh/vite-plugin-lib-assets@0.4.1: + resolution: {integrity: sha512-ZhQ03IcjOLNsFgFaMXJiRSqjVuNg8KY+NJUhApFR2NbmWB5pFpRdUC0z98zDizceeFiQymqkjI6vCrFIPhiMYw==} + dependencies: + loader-utils: 3.2.1 + mrmime: 1.0.1 + dev: true + /@leichtgewicht/ip-codec@2.0.4: resolution: {integrity: sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A==} dev: false @@ -4419,6 +4447,49 @@ packages: tweetnacl-util: 0.15.1 dev: true + /@microsoft/api-extractor-model@7.27.6(@types/node@20.4.5): + resolution: {integrity: sha512-eiCnlayyum1f7fS2nA9pfIod5VCNR1G+Tq84V/ijDrKrOFVa598BLw145nCsGDMoFenV6ajNi2PR5WCwpAxW6Q==} + dependencies: + '@microsoft/tsdoc': 0.14.2 + '@microsoft/tsdoc-config': 0.16.2 + '@rushstack/node-core-library': 3.59.7(@types/node@20.4.5) + transitivePeerDependencies: + - '@types/node' + dev: true + + /@microsoft/api-extractor@7.36.4(@types/node@20.4.5): + resolution: {integrity: sha512-21UECq8C/8CpHT23yiqTBQ10egKUacIpxkPyYR7hdswo/M5yTWdBvbq+77YC9uPKQJOUfOD1FImBQ1DzpsdeQQ==} + hasBin: true + dependencies: + '@microsoft/api-extractor-model': 7.27.6(@types/node@20.4.5) + '@microsoft/tsdoc': 0.14.2 + '@microsoft/tsdoc-config': 0.16.2 + '@rushstack/node-core-library': 3.59.7(@types/node@20.4.5) + '@rushstack/rig-package': 0.4.1 + '@rushstack/ts-command-line': 4.15.2 + colors: 1.2.5 + lodash: 4.17.21 + resolve: 1.22.2 + semver: 7.5.4 + source-map: 0.6.1 + typescript: 5.0.4 + transitivePeerDependencies: + - '@types/node' + dev: true + + /@microsoft/tsdoc-config@0.16.2: + resolution: {integrity: sha512-OGiIzzoBLgWWR0UdRJX98oYO+XKGf7tiK4Zk6tQ/E4IJqGCe7dvkTvgDZV5cFJUzLGDOjeAXrnZoA6QkVySuxw==} + dependencies: + '@microsoft/tsdoc': 0.14.2 + ajv: 6.12.6 + jju: 1.4.0 + resolve: 1.19.0 + dev: true + + /@microsoft/tsdoc@0.14.2: + resolution: {integrity: sha512-9b8mPpKrfeGRuhFH5iO1iwCLeIIsV6+H1sRfxbkoGXIyQE2BTsPd9zqSqQJ+pv5sJ/hT5M1zvOFL02MnEezFug==} + dev: true + /@mswjs/interceptors@0.19.5: resolution: {integrity: sha512-kFlcrlgd8on6fe+ZRNcHcBjQgkNvjna5uJC0ufWLVcbQTTo1MhQHkDNgmId1kPmGVZVQ1gAUY3AC+QFbRwAiGw==} engines: {node: '>=14'} @@ -5252,6 +5323,16 @@ packages: rollup: 2.79.1 dev: false + /@rollup/plugin-virtual@3.0.1: + resolution: {integrity: sha512-fK8O0IL5+q+GrsMLuACVNk2x21g3yaw+sG2qn16SnUd3IlBsQyvWxLMGHmCmXRMecPjGRSZ/1LmZB4rjQm68og==} + engines: {node: '>=14.0.0'} + peerDependencies: + rollup: ^1.20.0||^2.0.0||^3.0.0 + peerDependenciesMeta: + rollup: + optional: true + dev: true + /@rollup/pluginutils@3.1.0(rollup@2.79.1): resolution: {integrity: sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==} engines: {node: '>= 8.0.0'} @@ -5303,6 +5384,40 @@ packages: resolution: {integrity: sha512-V+MvGwaHH03hYhY+k6Ef/xKd6RYlc4q8WBx+2ANmipHJcKuktNcI/NgEsJgdSUF6Lw32njT6OnrRsKYCdgHjYw==} dev: false + /@rushstack/node-core-library@3.59.7(@types/node@20.4.5): + resolution: {integrity: sha512-ln1Drq0h+Hwa1JVA65x5mlSgUrBa1uHL+V89FqVWQgXd1vVIMhrtqtWGQrhTnFHxru5ppX+FY39VWELF/FjQCw==} + peerDependencies: + '@types/node': '*' + peerDependenciesMeta: + '@types/node': + optional: true + dependencies: + '@types/node': 20.4.5 + colors: 1.2.5 + fs-extra: 7.0.1 + import-lazy: 4.0.0 + jju: 1.4.0 + resolve: 1.22.2 + semver: 7.5.4 + z-schema: 5.0.5 + dev: true + + /@rushstack/rig-package@0.4.1: + resolution: {integrity: sha512-AGRwpqlXNSp9LhUSz4HKI9xCluqQDt/obsQFdv/NYIekF3pTTPzc+HbQsIsjVjYnJ3DcmxOREVMhvrMEjpiq6g==} + dependencies: + resolve: 1.22.2 + strip-json-comments: 3.1.1 + dev: true + + /@rushstack/ts-command-line@4.15.2: + resolution: {integrity: sha512-5+C2uoJY8b+odcZD6coEe2XNC4ZjGB4vCMESbqW/8DHRWC/qIHfANdmN9F1wz/lAgxz72i7xRoVtPY2j7e4gpQ==} + dependencies: + '@types/argparse': 1.0.38 + argparse: 1.0.10 + colors: 1.2.5 + string-argv: 0.3.2 + dev: true + /@scure/base@1.1.1: resolution: {integrity: sha512-ZxOhsSyxYwLJj3pLZCefNitxsj093tb2vq90mp2txoYeBqbcjDjqFhyM8eUjq/uFm6zJ+mUuqxlS2FkuSY1MTA==} dev: true @@ -5649,6 +5764,118 @@ packages: - supports-color dev: false + /@swc/core-darwin-arm64@1.3.75: + resolution: {integrity: sha512-anDnx9L465lGbjB2mvcV54NGHW6illr0IDvVV7JmkabYUVneaRdQvTr0tbHv3xjHnjrK1wuwVOHKV0LcQF2tnQ==} + engines: {node: '>=10'} + cpu: [arm64] + os: [darwin] + requiresBuild: true + dev: true + optional: true + + /@swc/core-darwin-x64@1.3.75: + resolution: {integrity: sha512-dIHDfrLmeZfr2xwi1whO7AmzdI3HdamgvxthaL+S8L1x8TeczAZEvsmZTjy3s8p3Va4rbGXcb3+uBhmfkqCbfw==} + engines: {node: '>=10'} + cpu: [x64] + os: [darwin] + requiresBuild: true + dev: true + optional: true + + /@swc/core-linux-arm-gnueabihf@1.3.75: + resolution: {integrity: sha512-qeJmvMGrjC6xt+G0R4kVqqxvlhxJx7tTzhcEoWgLJnfvGZiF6SJdsef4OSM7HuReXrlBoEtJbfGPrLJtbV+C0w==} + engines: {node: '>=10'} + cpu: [arm] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@swc/core-linux-arm64-gnu@1.3.75: + resolution: {integrity: sha512-sqA9JqHEJBF4AdNuwo5zRqq0HC3l31SPsG9zpRa4nRzG5daBBJ80H7fi6PZQud1rfNNq+Q08gjYrdrxwHstvjw==} + engines: {node: '>=10'} + cpu: [arm64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@swc/core-linux-arm64-musl@1.3.75: + resolution: {integrity: sha512-95rQT5xTAL3eKhMJbJbLsZHHP9EUlh1rcrFoLf0gUApoVF8g94QjZ9hYZiI72mMP5WPjgTEXQVnVB9O2GxeaLw==} + engines: {node: '>=10'} + cpu: [arm64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@swc/core-linux-x64-gnu@1.3.75: + resolution: {integrity: sha512-If7UpAhnPduMmtC+TSgPpZ1UXZfp2hIpjUFxpeCmHHYLS6Fn/2GZC5hpEiu+wvFJF0hzPh93eNAHa9gUxGUG+w==} + engines: {node: '>=10'} + cpu: [x64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@swc/core-linux-x64-musl@1.3.75: + resolution: {integrity: sha512-HOhxX0YNHTElCZqIviquka3CGYTN8rSQ6BdFfSk/K0O+ZEHx3qGte0qr+gGLPF/237GxreUkp3OMaWKuURtuCg==} + engines: {node: '>=10'} + cpu: [x64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@swc/core-win32-arm64-msvc@1.3.75: + resolution: {integrity: sha512-7QPI+mvBXAerVfWahrgBNe+g7fK8PuetxFnZSEmXUcDXvWcdJXAndD7GjAJzbDyjQpLKHbsDKMiHYvfNxZoN/A==} + engines: {node: '>=10'} + cpu: [arm64] + os: [win32] + requiresBuild: true + dev: true + optional: true + + /@swc/core-win32-ia32-msvc@1.3.75: + resolution: {integrity: sha512-EfABCy4Wlq7O5ShWsm32FgDkSjyeyj/SQ4wnUIvWpkXhgfT1iNXky7KRU1HtX+SmnVk/k/NnabVZpIklYbjtZA==} + engines: {node: '>=10'} + cpu: [ia32] + os: [win32] + requiresBuild: true + dev: true + optional: true + + /@swc/core-win32-x64-msvc@1.3.75: + resolution: {integrity: sha512-cTvP0pOD9C3pSp1cwtt85ZsrUkQz8RZfSPhM+jCGxKxmoowDCnInoOQ4Ica/ehyuUnQ4/IstSdYtYpO5yzPDJg==} + engines: {node: '>=10'} + cpu: [x64] + os: [win32] + requiresBuild: true + dev: true + optional: true + + /@swc/core@1.3.75: + resolution: {integrity: sha512-YLqd5oZVnaOq/OzkjRSsJUQqAfKYiD0fzUyVUPVlNNCoQEfVfSMcXH80hLmYe9aDH0T/a7qEMjWyIr/0kWqy1A==} + engines: {node: '>=10'} + requiresBuild: true + peerDependencies: + '@swc/helpers': ^0.5.0 + peerDependenciesMeta: + '@swc/helpers': + optional: true + optionalDependencies: + '@swc/core-darwin-arm64': 1.3.75 + '@swc/core-darwin-x64': 1.3.75 + '@swc/core-linux-arm-gnueabihf': 1.3.75 + '@swc/core-linux-arm64-gnu': 1.3.75 + '@swc/core-linux-arm64-musl': 1.3.75 + '@swc/core-linux-x64-gnu': 1.3.75 + '@swc/core-linux-x64-musl': 1.3.75 + '@swc/core-win32-arm64-msvc': 1.3.75 + '@swc/core-win32-ia32-msvc': 1.3.75 + '@swc/core-win32-x64-msvc': 1.3.75 + dev: true + /@szmarczak/http-timer@1.1.2: resolution: {integrity: sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==} engines: {node: '>=6'} @@ -5829,6 +6056,10 @@ packages: typechain: 8.2.0(typescript@4.7.2) dev: true + /@types/argparse@1.0.38: + resolution: {integrity: sha512-ebDJ9b0e702Yr7pWgB0jzm+CX4Srzz8RcXtLJDJB+BSccqMa36uyH/zUsSYao5+BD1ytv3k3rPYCq4mAE1hsXA==} + dev: true + /@types/aria-query@5.0.1: resolution: {integrity: sha512-XTIieEY+gvJ39ChLcB4If5zHtPxt3Syj5rgZR+e1ctpmK8NjPf0zFqsz4JpLJT0xla9GFDKjy8Cpu331nrmE1Q==} dev: false @@ -6472,6 +6703,78 @@ packages: pretty-format: 27.5.1 dev: true + /@volar/language-core@1.10.0: + resolution: {integrity: sha512-ddyWwSYqcbEZNFHm+Z3NZd6M7Ihjcwl/9B5cZd8kECdimVXUFdFi60XHWD27nrWtUQIsUYIG7Ca1WBwV2u2LSQ==} + dependencies: + '@volar/source-map': 1.10.0 + dev: true + + /@volar/source-map@1.10.0: + resolution: {integrity: sha512-/ibWdcOzDGiq/GM1JU2eX8fH1bvAhl66hfe8yEgLEzg9txgr6qb5sQ/DEz5PcDL75tF5H5sCRRwn8Eu8ezi9mw==} + dependencies: + muggle-string: 0.3.1 + dev: true + + /@volar/typescript@1.10.0: + resolution: {integrity: sha512-OtqGtFbUKYC0pLNIk3mHQp5xWnvL1CJIUc9VE39VdZ/oqpoBh5jKfb9uJ45Y4/oP/WYTrif/Uxl1k8VTPz66Gg==} + dependencies: + '@volar/language-core': 1.10.0 + dev: true + + /@vue/compiler-core@3.3.4: + resolution: {integrity: sha512-cquyDNvZ6jTbf/+x+AgM2Arrp6G4Dzbb0R64jiG804HRMfRiFXWI6kqUVqZ6ZR0bQhIoQjB4+2bhNtVwndW15g==} + dependencies: + '@babel/parser': 7.22.5 + '@vue/shared': 3.3.4 + estree-walker: 2.0.2 + source-map-js: 1.0.2 + dev: true + + /@vue/compiler-dom@3.3.4: + resolution: {integrity: sha512-wyM+OjOVpuUukIq6p5+nwHYtj9cFroz9cwkfmP9O1nzH68BenTTv0u7/ndggT8cIQlnBeOo6sUT/gvHcIkLA5w==} + dependencies: + '@vue/compiler-core': 3.3.4 + '@vue/shared': 3.3.4 + dev: true + + /@vue/language-core@1.8.8(typescript@5.1.6): + resolution: {integrity: sha512-i4KMTuPazf48yMdYoebTkgSOJdFraE4pQf0B+FTOFkbB+6hAfjrSou/UmYWRsWyZV6r4Rc6DDZdI39CJwL0rWw==} + peerDependencies: + typescript: '*' + peerDependenciesMeta: + typescript: + optional: true + dependencies: + '@volar/language-core': 1.10.0 + '@volar/source-map': 1.10.0 + '@vue/compiler-dom': 3.3.4 + '@vue/reactivity': 3.3.4 + '@vue/shared': 3.3.4 + minimatch: 9.0.3 + muggle-string: 0.3.1 + typescript: 5.1.6 + vue-template-compiler: 2.7.14 + dev: true + + /@vue/reactivity@3.3.4: + resolution: {integrity: sha512-kLTDLwd0B1jG08NBF3R5rqULtv/f8x3rOFByTDz4J53ttIQEDmALqKqXY0J+XQeN0aV2FBxY8nJDf88yvOPAqQ==} + dependencies: + '@vue/shared': 3.3.4 + dev: true + + /@vue/shared@3.3.4: + resolution: {integrity: sha512-7OjdcV8vQ74eiz1TZLzZP4JwqM5fA94K6yntPS5Z25r9HDuGNzaGdgvwKYq6S+MxwF0TFRwe50fIR/MYnakdkQ==} + dev: true + + /@vue/typescript@1.8.8(typescript@5.1.6): + resolution: {integrity: sha512-jUnmMB6egu5wl342eaUH236v8tdcEPXXkPgj+eI/F6JwW/lb+yAU6U07ZbQ3MVabZRlupIlPESB7ajgAGixhow==} + dependencies: + '@volar/typescript': 1.10.0 + '@vue/language-core': 1.8.8(typescript@5.1.6) + transitivePeerDependencies: + - typescript + dev: true + /@walletconnect/core@2.8.1(lokijs@1.5.12): resolution: {integrity: sha512-mN9Zkdl/NeThntK8cydDoQOW6jUEpOeFgYR1RCKPLH51VQwlbdSgvvQIeanSQXEY4U7AM3x8cs1sxqMomIfRQg==} dependencies: @@ -8455,6 +8758,11 @@ packages: resolution: {integrity: sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==} dev: false + /colors@1.2.5: + resolution: {integrity: sha512-erNRLao/Y3Fv54qUa0LBB+//Uf3YwMUmdJinN20yMXm9zdKKqH9wt7R9IIVZ+K7ShzfpLV/Zg8+VyrBJYB4lpg==} + engines: {node: '>=0.1.90'} + dev: true + /colors@1.4.0: resolution: {integrity: sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==} engines: {node: '>=0.1.90'} @@ -8511,6 +8819,13 @@ packages: engines: {node: '>= 12'} dev: false + /commander@9.5.0: + resolution: {integrity: sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ==} + engines: {node: ^12.20.0 || >=14} + requiresBuild: true + dev: true + optional: true + /common-path-prefix@3.0.0: resolution: {integrity: sha512-QE33hToZseCH3jS0qN96O/bSh3kaw/h+Tq7ngyY9eWDUnTlTNUyqfqvCXioLe5Na5jFsL78ra/wuBU4iuEgd4w==} dev: false @@ -9105,6 +9420,10 @@ packages: - supports-color dev: false + /de-indent@1.0.2: + resolution: {integrity: sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg==} + dev: true + /death@1.1.0: resolution: {integrity: sha512-vsV6S4KVHvTGxbEcij7hkWRv0It+sGGWVOM67dQde/o5Xjnr+KmLjxWJii2uEObIrt1CcM9w0Yaovx+iOlIL+w==} dev: true @@ -12067,6 +12386,11 @@ packages: resolve-from: 5.0.0 dev: true + /import-lazy@4.0.0: + resolution: {integrity: sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==} + engines: {node: '>=8'} + dev: true + /import-local@3.1.0: resolution: {integrity: sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==} engines: {node: '>=8'} @@ -14210,6 +14534,10 @@ packages: hasBin: true dev: false + /jju@1.4.0: + resolution: {integrity: sha512-8wb9Yw966OSxApiCt0K3yNJL8pnNeIv+OEq2YMidz4FKP6nonSRoOXc80iXY4JaN2FC11B9qsNmDsm+ZOfMROA==} + dev: true + /js-base64@3.7.5: resolution: {integrity: sha512-3MEt5DTINKqfScXKfJFrRbxkrnk2AxPWGBL/ycjz4dK8iqiSJ06UxD8jh8xuh6p10TX4t2+7FsBYVxxQbMg+qA==} @@ -14457,6 +14785,10 @@ packages: engines: {node: '>= 8'} dev: false + /kolorist@1.8.0: + resolution: {integrity: sha512-Y+60/zizpJ3HRH8DCss+q95yr6145JXZo46OTpFvDZWLfRCE4qChOyk1b26nMaNpfHHgxagk9dXT5OP0Tfe+dQ==} + dev: true + /language-subtag-registry@0.3.22: resolution: {integrity: sha512-tN0MCzyWnoz/4nHS6uxdlFWoUZT7ABptwKPQ52Ea7URk6vll88bWBVhodtnlfEuCcKWNGoc+uGbw1cwa9IKh/w==} dev: false @@ -14962,6 +15294,10 @@ packages: /lodash.debounce@4.0.8: resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==} + /lodash.get@4.4.2: + resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==} + dev: true + /lodash.isequal@4.5.0: resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==} dev: true @@ -15391,6 +15727,13 @@ packages: dependencies: brace-expansion: 2.0.1 + /minimatch@9.0.3: + resolution: {integrity: sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==} + engines: {node: '>=16 || 14 >=14.17'} + dependencies: + brace-expansion: 2.0.1 + dev: true + /minimist@1.2.8: resolution: {integrity: sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==} @@ -15457,15 +15800,6 @@ packages: ufo: 1.1.2 dev: true - /mlly@1.4.0: - resolution: {integrity: sha512-ua8PAThnTwpprIaU47EPeZ/bPUVp2QYBbWMphUQpVdBI3Lgqzm5KZQ45Agm3YJedHXaIHl6pBGabaLSUPPSptg==} - dependencies: - acorn: 8.9.0 - pathe: 1.1.1 - pkg-types: 1.0.3 - ufo: 1.1.2 - dev: true - /mnemonist@0.38.5: resolution: {integrity: sha512-bZTFT5rrPKtPJxj8KSV0WkPyNxl72vQepqqVUAW2ARUpUSF2qXMB6jZj7hW5/k7C1rtpzqbD/IIbJwLXUjCHeg==} dependencies: @@ -15582,6 +15916,10 @@ packages: /ms@2.1.3: resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==} + /muggle-string@0.3.1: + resolution: {integrity: sha512-ckmWDJjphvd/FvZawgygcUeQCxzvohjFO5RxTjj4eq8kw359gFF3E1brjfI+viLMxss5JrHTDRHZvu2/tuy0Qg==} + dev: true + /multiaddr-to-uri@7.0.0(node-fetch@3.3.2): resolution: {integrity: sha512-VbscDpLcbV0m25tJqfnZSfbjVUuNlPa4BbD5l/7me1t0lc3SWI0XAoO5E/PNJF0e1qUlbdq7yjVFEQjUT+9r0g==} deprecated: This module is deprecated, please upgrade to @multiformats/multiaddr-to-uri @@ -16828,7 +17166,7 @@ packages: resolution: {integrity: sha512-nN7pYi0AQqJnoLPC9eHFQ8AcyaixBUOwvqc5TDnIKCMEE6I0y8P7OKA7fPexsXGCGxQDl/cmrLAp26LhcwxZ4A==} dependencies: jsonc-parser: 3.2.0 - mlly: 1.4.0 + mlly: 1.3.0 pathe: 1.1.1 dev: true @@ -18499,6 +18837,13 @@ packages: path-parse: 1.0.7 dev: true + /resolve@1.19.0: + resolution: {integrity: sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==} + dependencies: + is-core-module: 2.12.1 + path-parse: 1.0.7 + dev: true + /resolve@1.22.2: resolution: {integrity: sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==} hasBin: true @@ -18935,6 +19280,14 @@ packages: dependencies: lru-cache: 6.0.0 + /semver@7.5.4: + resolution: {integrity: sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==} + engines: {node: '>=10'} + hasBin: true + dependencies: + lru-cache: 6.0.0 + dev: true + /send@0.18.0: resolution: {integrity: sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==} engines: {node: '>= 0.8.0'} @@ -19425,6 +19778,11 @@ packages: engines: {node: '>=4'} dev: true + /string-argv@0.3.2: + resolution: {integrity: sha512-aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q==} + engines: {node: '>=0.6.19'} + dev: true + /string-format@2.0.0: resolution: {integrity: sha512-bbEs3scLeYNXLecRRuk6uJxdXUSj6le/8rNPHChIJTn2V79aXVTR1EH2OH5zLKKoz0V02fOUKZZcw01pLUShZA==} dev: true @@ -20525,6 +20883,12 @@ packages: hasBin: true dev: false + /typescript@5.0.4: + resolution: {integrity: sha512-cW9T5W9xY37cc+jfEnaUvX91foxtHkza3Nw3wkoF4sSlKn0MONdkdEndig/qPBWXNkmplh3NzayQzCiHM4/hqw==} + engines: {node: '>=12.20'} + hasBin: true + dev: true + /typescript@5.1.6: resolution: {integrity: sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA==} engines: {node: '>=14.17'} @@ -20817,6 +21181,11 @@ packages: convert-source-map: 1.9.0 dev: true + /validator@13.11.0: + resolution: {integrity: sha512-Ii+sehpSfZy+At5nPdnyMhx78fEoPDkR2XW/zimHEL3MyGJQOCQ7WeP20jPYRz7ZCpcKLB21NxuXHF3bxjStBQ==} + engines: {node: '>= 0.10'} + dev: true + /varint@5.0.2: resolution: {integrity: sha512-lKxKYG6H03yCZUpAGOPOsMcGxd1RHCu1iKvEHYDPmTyq2HueGhD73ssNBqqQWfvYs04G9iUFRvmAVLW20Jw6ow==} dev: true @@ -20867,6 +21236,30 @@ packages: vite-plugin-dynamic-import: 1.5.0 dev: true + /vite-plugin-dts@3.4.0(@types/node@20.4.5)(typescript@5.1.6)(vite@4.0.4): + resolution: {integrity: sha512-B5UbhiF83hPlJpdri3k2FlseO2qIQfY95XJib7z1s8NTQKgPK+KgeuOQf8FR1hnE/pSU+RA3ra2T18HvymPDyA==} + engines: {node: ^14.18.0 || >=16.0.0} + peerDependencies: + typescript: '*' + vite: '*' + peerDependenciesMeta: + vite: + optional: true + dependencies: + '@microsoft/api-extractor': 7.36.4(@types/node@20.4.5) + '@rollup/pluginutils': 5.0.2 + '@vue/language-core': 1.8.8(typescript@5.1.6) + debug: 4.3.4 + kolorist: 1.8.0 + typescript: 5.1.6 + vite: 4.0.4(@types/node@20.4.5) + vue-tsc: 1.8.8(typescript@5.1.6) + transitivePeerDependencies: + - '@types/node' + - rollup + - supports-color + dev: true + /vite-plugin-dynamic-import@1.5.0: resolution: {integrity: sha512-Qp85c+AVJmLa8MLni74U4BDiWpUeFNx7NJqbGZyR2XJOU7mgW0cb7nwlAMucFyM4arEd92Nfxp4j44xPi6Fu7g==} dependencies: @@ -20926,6 +21319,28 @@ packages: - supports-color dev: false + /vite-plugin-top-level-await@1.3.1(vite@4.0.4): + resolution: {integrity: sha512-55M1h4NAwkrpxPNOJIBzKZFihqLUzIgnElLSmPNPMR2Fn9+JHKaNg3sVX1Fq+VgvuBksQYxiD3OnwQAUu7kaPQ==} + peerDependencies: + vite: '>=2.8' + dependencies: + '@rollup/plugin-virtual': 3.0.1 + '@swc/core': 1.3.75 + uuid: 9.0.0 + vite: 4.0.4(@types/node@16.11.59) + transitivePeerDependencies: + - '@swc/helpers' + - rollup + dev: true + + /vite-plugin-wasm@3.2.2(vite@4.0.4): + resolution: {integrity: sha512-cdbBUNR850AEoMd5nvLmnyeq63CSfoP1ctD/L2vLk/5+wsgAPlAVAzUK5nGKWO/jtehNlrSSHLteN+gFQw7VOA==} + peerDependencies: + vite: ^2 || ^3 || ^4 + dependencies: + vite: 4.0.4(@types/node@16.11.59) + dev: true + /vite-tsconfig-paths@4.0.3(typescript@4.7.2)(vite@4.0.4): resolution: {integrity: sha512-gRO2Q/tOkV+9kMht5tz90+IaEKvW2zCnvwJV3tp2ruPNZOTM5rF+yXorJT4ggmAMYEaJ3nyXjx5P5jY5FwiZ+A==} peerDependencies: @@ -21104,6 +21519,25 @@ packages: /vm-browserify@1.1.2: resolution: {integrity: sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==} + /vue-template-compiler@2.7.14: + resolution: {integrity: sha512-zyA5Y3ArvVG0NacJDkkzJuPQDF8RFeRlzV2vLeSnhSpieO6LK2OVbdLPi5MPPs09Ii+gMO8nY4S3iKQxBxDmWQ==} + dependencies: + de-indent: 1.0.2 + he: 1.2.0 + dev: true + + /vue-tsc@1.8.8(typescript@5.1.6): + resolution: {integrity: sha512-bSydNFQsF7AMvwWsRXD7cBIXaNs/KSjvzWLymq/UtKE36697sboX4EccSHFVxvgdBlI1frYPc/VMKJNB7DFeDQ==} + hasBin: true + peerDependencies: + typescript: '*' + dependencies: + '@vue/language-core': 1.8.8(typescript@5.1.6) + '@vue/typescript': 1.8.8(typescript@5.1.6) + semver: 7.5.2 + typescript: 5.1.6 + dev: true + /w3c-hr-time@1.0.2: resolution: {integrity: sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==} deprecated: Use your platform's native performance.now() and performance.timeOrigin. @@ -22555,3 +22989,15 @@ packages: /yocto-queue@1.0.0: resolution: {integrity: sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==} engines: {node: '>=12.20'} + + /z-schema@5.0.5: + resolution: {integrity: sha512-D7eujBWkLa3p2sIpJA0d1pr7es+a7m0vFAnZLlCEKq/Ij2k0MLi9Br2UPxoxdYystm5K1yeBGzub0FlYUEWj2Q==} + engines: {node: '>=8.0.0'} + hasBin: true + dependencies: + lodash.get: 4.4.2 + lodash.isequal: 4.5.0 + validator: 13.11.0 + optionalDependencies: + commander: 9.5.0 + dev: true From e6b62ac93982991853ba4d2c78886128e5ea7a57 Mon Sep 17 00:00:00 2001 From: Akim Mamedov Date: Thu, 10 Aug 2023 15:23:14 +0700 Subject: [PATCH 11/48] Fix almost all tests --- packages/client/js-client.node/src/index.ts | 85 ++- packages/client/js-client.node/src/test.ts | 23 + packages/client/js-client.node/vite.config.js | 3 - .../client/js-client.web.standalone/build.ts | 7 +- .../js-client.web.standalone/package.json | 3 +- .../js-client.web.standalone/src/index.ts | 90 ++- .../js-peer/copy-worker-script-workaround.mjs | 3 - packages/core/js-peer/package.json | 45 +- packages/core/js-peer/src/ephemeral/client.ts | 1 - .../core/js-peer/src/ephemeral/network.ts | 1 - packages/core/js-peer/src/index.ts | 132 ---- packages/core/js-peer/src/jsPeer/avm.ts | 2 +- .../core/js-peer/src/marine/interfaces.ts | 4 +- .../js-peer/src/marine/worker-script/index.ts | 106 --- .../src/marine/worker-script/workerLoader.ts | 2 +- .../core/js-peer/src/marine/worker/index.ts | 12 +- .../core/js-peer/src/services/NodeUtils.ts | 15 +- packages/core/js-peer/src/util/testUtils.ts | 14 +- packages/core/js-peer/tsconfig.json | 3 +- packages/core/marine-worker/package.json | 5 +- packages/core/marine-worker/src/index.ts | 40 +- pnpm-lock.yaml | 712 ++++++++++++++++-- 22 files changed, 863 insertions(+), 445 deletions(-) create mode 100644 packages/client/js-client.node/src/test.ts delete mode 100644 packages/core/js-peer/copy-worker-script-workaround.mjs delete mode 100644 packages/core/js-peer/src/index.ts delete mode 100644 packages/core/js-peer/src/marine/worker-script/index.ts diff --git a/packages/client/js-client.node/src/index.ts b/packages/client/js-client.node/src/index.ts index 60ccb4315..e500d3e32 100644 --- a/packages/client/js-client.node/src/index.ts +++ b/packages/client/js-client.node/src/index.ts @@ -27,6 +27,9 @@ import { doRegisterNodeUtils } from '@fluencelabs/js-peer/dist/services/NodeUtil import { BlobWorker, Worker } from 'threads'; import fetch from 'cross-fetch'; import fs from 'fs'; +import { WasmLoaderFromNpm } from '@fluencelabs/js-peer/dist/marine/deps-loader/node.js'; +import { Buffer } from 'buffer'; +import process from 'process'; throwIfNotSupported(); @@ -34,30 +37,11 @@ const WORKER_VERSION = '__WORKER_VERSION__'; const MARINE_VERSION = '__MARINE_VERSION__'; const AVM_VERSION = '__AVM_VERSION__'; const CDN_ROOT = '__CDN_ROOT__'; -const CLIENT_ENV = '__CLIENT_ENV__' as 'browser' | 'node'; -async function fetchWorker(packageName: string, assetPath: string, version: string) { - if (CLIENT_ENV === 'browser') { - return fetch(new globalThis.URL(`${packageName}@${version}${assetPath}`, CDN_ROOT)).then(res => res.text()); - } else { - const file = await new Promise((resolve, reject) => { - // Cannot use 'fs/promises' with current vite config. This module is not polyfilled by default. - fs.readFile(new globalThis.URL(`../node_modules/${packageName}${assetPath}`, import.meta.url), (err, data) => { - if (err) { - reject(err); - return; - } - resolve(data); - }); - }); - return file.toString(); - } -} +const isNode = typeof process !== 'undefined' && process?.release?.name === 'node'; -async function fetchWasm(packageName: string, assetPath: string, version: string) { - if (CLIENT_ENV === 'browser') { - return fetch(new globalThis.URL(`${packageName}@${version}${assetPath}`, CDN_ROOT)).then(WebAssembly.compileStreaming); - } else { +async function fetchResource(packageName: string, assetPath: string, version: string) { + if (isNode) { const file = await new Promise((resolve, reject) => { // Cannot use 'fs/promises' with current vite config. This module is not polyfilled by default. fs.readFile(new globalThis.URL(`../node_modules/${packageName}${assetPath}`, import.meta.url), (err, data) => { @@ -68,24 +52,65 @@ async function fetchWasm(packageName: string, assetPath: string, version: string resolve(data); }); }); - return WebAssembly.compile(file); + return new Response(file, { + headers: { + 'Content-type': + assetPath.endsWith('.wasm') + ? 'application/wasm' + : assetPath.endsWith('.js') + ? 'application/javascript' + : 'application/text' + } + }); + } else { + // Will work everywhere fetch is supported. + return fetch(new globalThis.URL(`${packageName}@${version}${assetPath}`, CDN_ROOT)); } } -const workerFile = CLIENT_ENV === 'browser' ? '/dist/browser/marine-worker.js' : '/dist/node/marine-worker.umd.cjs'; -const fetchWorkerCode = () => fetchWorker('@fluencelabs/marine-worker', workerFile, WORKER_VERSION); -const fetchMarineJsWasm = () => fetchWasm('@fluencelabs/marine-js', '/dist/marine-js.wasm', MARINE_VERSION); -const fetchAvmWasm = () => fetchWasm('@fluencelabs/avm', '/dist/avm.wasm', AVM_VERSION); +const workerFile = isNode ? '/dist/node/marine-worker.umd.cjs' : '/dist/browser/marine-worker.js'; +const fetchWorkerCode = () => fetchResource('@fluencelabs/marine-worker', workerFile, WORKER_VERSION).then(res => res.text()); +const fetchMarineJsWasm = () => fetchResource('@fluencelabs/marine-js', '/dist/marine-js.wasm', MARINE_VERSION).then(res => res.arrayBuffer()); +const fetchAvmWasm = () => fetchResource('@fluencelabs/avm', '/dist/avm.wasm', AVM_VERSION).then(res => res.arrayBuffer()); const createClient = async (relay: RelayOptions, config: ClientConfig): Promise => { const workerCode = await fetchWorkerCode(); const workerLoader = BlobWorker.fromText(workerCode); - const marine = new MarineBackgroundRunner(workerLoader, { getValue: fetchMarineJsWasm, start: () => Promise.resolve(), stop: () => Promise.resolve() }); - const avm = new MarineBasedAvmRunner(marine, { getValue: fetchAvmWasm, start: () => Promise.resolve(), stop: () => Promise.resolve() }); + const marineJsWasm = Buffer.from(await fetchMarineJsWasm()); + const avmWasm = Buffer.from(await fetchAvmWasm()); + + const marine = new MarineBackgroundRunner({ + getValue() { + return workerLoader; + }, start(): Promise { + return Promise.resolve(undefined); + }, stop(): Promise { + return Promise.resolve(undefined); + } + }, { + getValue() { + return marineJsWasm; + }, start(): Promise { + return Promise.resolve(undefined); + }, stop(): Promise { + return Promise.resolve(undefined); + } + }); + const avm = new MarineBasedAvmRunner(marine, { + getValue() { + return avmWasm; + }, start(): Promise { + return Promise.resolve(undefined); + }, stop(): Promise { + return Promise.resolve(undefined); + } + }); const { keyPair, peerConfig, relayConfig } = await makeClientPeerConfig(relay, config); const client: IFluenceClient = new ClientPeer(peerConfig, relayConfig, keyPair, marine, avm); - registerNodeOnlyServices(client); + if (isNode) { + registerNodeOnlyServices(client); + } await client.connect(); return client; }; diff --git a/packages/client/js-client.node/src/test.ts b/packages/client/js-client.node/src/test.ts new file mode 100644 index 000000000..5dfb86d2d --- /dev/null +++ b/packages/client/js-client.node/src/test.ts @@ -0,0 +1,23 @@ +/* + * Copyright 2023 Fluence Labs Limited + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import { readFile } from 'fs/promises'; + +const file = await readFile('./node_modules/@fluencelabs/marine-js/dist/marine-js.wasm'); +const wasm = await WebAssembly.compileStreaming(new Response(file, { + headers: {'Content-Type': 'application/wasm'} +})) +console.log(wasm); \ No newline at end of file diff --git a/packages/client/js-client.node/vite.config.js b/packages/client/js-client.node/vite.config.js index efc7a5e19..2234de446 100644 --- a/packages/client/js-client.node/vite.config.js +++ b/packages/client/js-client.node/vite.config.js @@ -40,8 +40,5 @@ export default defineConfig({ resolve: { browserField: false, conditions: ['node'] - }, - define: { - __CLIENT_ENV__: 'node' } }) \ No newline at end of file diff --git a/packages/client/js-client.web.standalone/build.ts b/packages/client/js-client.web.standalone/build.ts index 2dc58c0b4..449da878e 100644 --- a/packages/client/js-client.web.standalone/build.ts +++ b/packages/client/js-client.web.standalone/build.ts @@ -6,13 +6,10 @@ import { build } from 'vite'; import { createRequire } from 'module'; import tsconfigPaths from 'vite-tsconfig-paths'; import inject from '@rollup/plugin-inject'; -import { replaceCodePlugin } from 'vite-plugin-replace'; import stdLibBrowser from 'node-stdlib-browser'; import { fileURLToPath } from 'url'; -import wasm from 'vite-plugin-wasm'; -import topLevelAwait from 'vite-plugin-top-level-await'; import libAssetsPlugin from '@laynezh/vite-plugin-lib-assets' -import pkg from './package.json' assert { type: 'json' }; +import pkg from './package.json' assert { type: 'json' }; const require = createRequire(import.meta.url); @@ -72,7 +69,7 @@ const commonConfig = (opts: { __CLIENT_ENV__: 'browser', __MARINE_VERSION__: pkg.devDependencies['@fluencelabs/marine-js'], __AVM_VERSION__: pkg.devDependencies['@fluencelabs/avm'], - __WORKER_VERSION__: pkg.version, + __WORKER_VERSION__: pkg.devDependencies['@fluencelabs/marine-worker'].split(':')[1], __CDN_ROOT__: 'https://unpkg.com/' } }; diff --git a/packages/client/js-client.web.standalone/package.json b/packages/client/js-client.web.standalone/package.json index b0098580e..3eb09872a 100644 --- a/packages/client/js-client.web.standalone/package.json +++ b/packages/client/js-client.web.standalone/package.json @@ -18,7 +18,6 @@ "dependencies": { "@fluencelabs/interfaces": "0.8.1", "@fluencelabs/js-peer": "0.9.1", - "@fluencelabs/marine-worker": "workspace:*", "buffer": "6.0.3", "cross-fetch": "4.0.0", "data-urls": "4.0.0", @@ -30,6 +29,7 @@ "devDependencies": { "@fluencelabs/avm": "0.43.1", "@fluencelabs/marine-js": "0.7.2", + "@fluencelabs/marine-worker": "workspace:*", "@laynezh/vite-plugin-lib-assets": "0.4.1", "@rollup/plugin-inject": "5.0.3", "@types/data-urls": "3.0.1", @@ -44,6 +44,7 @@ "rollup-plugin-node-polyfills": "0.2.1", "ts-jest": "28.0.2", "ts-loader": "9.4.4", + "ts-node": "10.9.1", "vite": "4.0.4", "vite-plugin-external": "1.2.8", "vite-plugin-externals": "0.6.2", diff --git a/packages/client/js-client.web.standalone/src/index.ts b/packages/client/js-client.web.standalone/src/index.ts index df8691a91..7610194b4 100644 --- a/packages/client/js-client.web.standalone/src/index.ts +++ b/packages/client/js-client.web.standalone/src/index.ts @@ -22,36 +22,20 @@ import { MarineBackgroundRunner } from '@fluencelabs/js-peer/dist/marine/worker/ import { BlobWorker } from 'threads'; import fetch from 'cross-fetch'; import * as fs from 'fs'; +import process from 'process'; +import { Buffer } from 'buffer'; +import { doRegisterNodeUtils } from '@fluencelabs/js-peer/dist/services/NodeUtils'; const WORKER_VERSION = '__WORKER_VERSION__'; const MARINE_VERSION = '__MARINE_VERSION__'; const AVM_VERSION = '__AVM_VERSION__'; // Override if necessary const CDN_ROOT = 'https://unpkg.com/'; -const CLIENT_ENV = '__CLIENT_ENV__' as 'browser' | 'node'; -async function fetchWorker(packageName: string, assetPath: string, version: string) { - if (CLIENT_ENV === 'browser') { - return fetch(new globalThis.URL(`${packageName}@${version}${assetPath}`, CDN_ROOT)).then(res => res.text()); - } else { - const file = await new Promise((resolve, reject) => { - // Cannot use 'fs/promises' with current vite config. This module is not polyfilled by default. - fs.readFile(new globalThis.URL(`../node_modules/${packageName}${assetPath}`, import.meta.url), (err, data) => { - if (err) { - reject(err); - return; - } - resolve(data); - }); - }); - return file.toString(); - } -} +const isNode = typeof process !== 'undefined' && process?.release?.name === 'node'; -async function fetchWasm(packageName: string, assetPath: string, version: string) { - if (CLIENT_ENV === 'browser') { - return fetch(new globalThis.URL(`${packageName}@${version}${assetPath}`, CDN_ROOT)).then(WebAssembly.compileStreaming); - } else { +async function fetchResource(packageName: string, assetPath: string, version: string) { + if (isNode) { const file = await new Promise((resolve, reject) => { // Cannot use 'fs/promises' with current vite config. This module is not polyfilled by default. fs.readFile(new globalThis.URL(`../node_modules/${packageName}${assetPath}`, import.meta.url), (err, data) => { @@ -62,27 +46,73 @@ async function fetchWasm(packageName: string, assetPath: string, version: string resolve(data); }); }); - return WebAssembly.compile(file); + return new Response(file, { + headers: { + 'Content-type': + assetPath.endsWith('.wasm') + ? 'application/wasm' + : assetPath.endsWith('.js') + ? 'application/javascript' + : 'application/text' + } + }); + } else { + // Will work everywhere fetch is supported. + return fetch(new globalThis.URL(`${packageName}@${version}${assetPath}`, CDN_ROOT)); } } -const workerFile = CLIENT_ENV === 'browser' ? '/dist/browser/marine-worker.js' : '/dist/node/marine-worker.umd.cjs'; -const fetchWorkerCode = () => fetchWorker('@fluencelabs/marine-worker', workerFile, WORKER_VERSION); -const fetchMarineJsWasm = () => fetchWasm('@fluencelabs/marine-js', '/dist/marine-js.wasm', MARINE_VERSION); -const fetchAvmWasm = () => fetchWasm('@fluencelabs/avm', '/dist/avm.wasm', AVM_VERSION); +const workerFile = isNode ? '/dist/node/marine-worker.umd.cjs' : '/dist/browser/marine-worker.js'; +const fetchWorkerCode = () => fetchResource('@fluencelabs/marine-worker', workerFile, WORKER_VERSION).then(res => res.text()); +const fetchMarineJsWasm = () => fetchResource('@fluencelabs/marine-js', '/dist/marine-js.wasm', MARINE_VERSION).then(res => res.arrayBuffer()); +const fetchAvmWasm = () => fetchResource('@fluencelabs/avm', '/dist/avm.wasm', AVM_VERSION).then(res => res.arrayBuffer()); const createClient = async (relay: RelayOptions, config: ClientConfig): Promise => { const workerCode = await fetchWorkerCode(); const workerLoader = BlobWorker.fromText(workerCode); - - const marine = new MarineBackgroundRunner(workerLoader, { getValue: fetchMarineJsWasm, start: () => Promise.resolve(), stop: () => Promise.resolve() }); - const avm = new MarineBasedAvmRunner(marine, { getValue: fetchAvmWasm, start: () => Promise.resolve(), stop: () => Promise.resolve() }); + + const marineJsWasm = Buffer.from(await fetchMarineJsWasm()); + const avmWasm = Buffer.from(await fetchAvmWasm()); + + const marine = new MarineBackgroundRunner({ + getValue() { + return workerLoader; + }, start(): Promise { + return Promise.resolve(undefined); + }, stop(): Promise { + return Promise.resolve(undefined); + } + }, { + getValue() { + return marineJsWasm; + }, start(): Promise { + return Promise.resolve(undefined); + }, stop(): Promise { + return Promise.resolve(undefined); + } + }); + const avm = new MarineBasedAvmRunner(marine, { + getValue() { + return avmWasm; + }, start(): Promise { + return Promise.resolve(undefined); + }, stop(): Promise { + return Promise.resolve(undefined); + } + }); const { keyPair, peerConfig, relayConfig } = await makeClientPeerConfig(relay, config); const client: IFluenceClient = new ClientPeer(peerConfig, relayConfig, keyPair, marine, avm); + if (isNode) { + registerNodeOnlyServices(client); + } await client.connect(); return client; }; +function registerNodeOnlyServices(client: IFluenceClient) { + doRegisterNodeUtils(client); +} + const publicFluenceInterface = { clientFactory: createClient, callAquaFunction, diff --git a/packages/core/js-peer/copy-worker-script-workaround.mjs b/packages/core/js-peer/copy-worker-script-workaround.mjs deleted file mode 100644 index b33b6d1d2..000000000 --- a/packages/core/js-peer/copy-worker-script-workaround.mjs +++ /dev/null @@ -1,3 +0,0 @@ -import { copyFileSync } from 'fs'; - -copyFileSync('./dist/marine/worker-script/index.js', './src/marine/worker-script/index.js'); diff --git a/packages/core/js-peer/package.json b/packages/core/js-peer/package.json index c099ce6e6..2a0791a9f 100644 --- a/packages/core/js-peer/package.json +++ b/packages/core/js-peer/package.json @@ -11,51 +11,50 @@ "type": "module", "scripts": { "build": "tsc", - "test": "node ./copy-worker-script-workaround.mjs && vitest --threads false run" + "test": "vitest --threads false run" }, "repository": "https://github.com/fluencelabs/fluence-js", "author": "Fluence Labs", "license": "Apache-2.0", "dependencies": { - "@chainsafe/libp2p-noise": "11.0.0", "@fluencelabs/interfaces": "0.8.1", "@fluencelabs/avm": "0.43.1", "@fluencelabs/marine-js": "0.7.2", "@fluencelabs/marine-worker": "workspace:*", - "@libp2p/crypto": "1.0.8", - "@libp2p/interface-connection": "3.0.8", - "@libp2p/interface-keys": "1.0.7", - "@libp2p/interface-peer-id": "2.0.1", - "@libp2p/interfaces": "3.3.1", - "@libp2p/mplex": "7.1.1", - "@libp2p/peer-id": "2.0.1", - "@libp2p/peer-id-factory": "2.0.1", - "@libp2p/websockets": "5.0.3", - "@multiformats/multiaddr": "11.3.0", + "multiformats": "11.0.1", + "debug": "4.3.4", "async": "3.2.4", "bs58": "5.0.0", "buffer": "6.0.3", - "cross-fetch": "4.0.0", - "debug": "4.3.4", - "it-length-prefixed": "8.0.4", - "it-map": "2.0.0", - "it-pipe": "2.0.5", - "js-base64": "3.7.5", - "libp2p": "0.42.2", - "multiformats": "11.0.1", + "@libp2p/peer-id": "2.0.1", "rxjs": "7.5.5", - "threads": "1.7.0", "ts-pattern": "3.3.3", + "uuid": "8.3.2", + "threads": "1.7.0", + "@libp2p/crypto": "1.0.8", + "@libp2p/peer-id-factory": "2.0.1", + "@libp2p/interface-peer-id": "2.0.1", + "@libp2p/interface-keys": "1.0.7", + "js-base64": "3.7.5", + "it-length-prefixed": "8.0.4", + "it-pipe": "2.0.5", + "it-map": "2.0.0", "uint8arrays": "4.0.3", - "uuid": "8.3.2" + "@chainsafe/libp2p-noise": "11.0.0", + "libp2p": "0.42.2", + "@libp2p/interfaces": "3.3.1", + "@libp2p/interface-connection": "3.0.8", + "@libp2p/mplex": "7.1.1", + "@libp2p/websockets": "5.0.3", + "@multiformats/multiaddr": "11.3.0" }, "devDependencies": { "@fluencelabs/aqua-api": "0.9.3", "@fluencelabs/aqua-lib": "0.6.0", "@fluencelabs/fluence-network-environment": "1.0.13", "@types/bs58": "4.0.1", - "@types/debug": "4.1.7", "@types/uuid": "8.3.2", + "@types/debug": "4.1.7", "vitest": "0.29.7" } } diff --git a/packages/core/js-peer/src/ephemeral/client.ts b/packages/core/js-peer/src/ephemeral/client.ts index 1d5e1051e..f30e12c5b 100644 --- a/packages/core/js-peer/src/ephemeral/client.ts +++ b/packages/core/js-peer/src/ephemeral/client.ts @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -// @ts-nocheck import { PeerIdB58 } from '@fluencelabs/interfaces'; import { MarineBasedAvmRunner } from '../jsPeer/avm.js'; import { FluencePeer, PeerConfig } from '../jsPeer/FluencePeer.js'; diff --git a/packages/core/js-peer/src/ephemeral/network.ts b/packages/core/js-peer/src/ephemeral/network.ts index c993d49c9..79c86604c 100644 --- a/packages/core/js-peer/src/ephemeral/network.ts +++ b/packages/core/js-peer/src/ephemeral/network.ts @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -// @ts-nocheck import { PeerIdB58 } from '@fluencelabs/interfaces'; import { fromBase64Sk, KeyPair } from '../keypair/index.js'; import { MarineBackgroundRunner } from '../marine/worker/index.js'; diff --git a/packages/core/js-peer/src/index.ts b/packages/core/js-peer/src/index.ts deleted file mode 100644 index 51166ace0..000000000 --- a/packages/core/js-peer/src/index.ts +++ /dev/null @@ -1,132 +0,0 @@ -/* - * Copyright 2023 Fluence Labs Limited - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -// @ts-nocheck - -import { getFluenceInterface, getFluenceInterfaceFromGlobalThis } from './util.js'; -import { - IFluenceClient, - ClientConfig, - RelayOptions, - ConnectionState, - CallAquaFunctionType, - RegisterServiceType, -} from '@fluencelabs/interfaces'; -import { WorkerLoader } from './marine/worker-script/workerLoader.js'; -export type { IFluenceClient, ClientConfig, CallParams } from '@fluencelabs/interfaces'; - -export { - ArrayType, - ArrowType, - ArrowWithCallbacks, - ArrowWithoutCallbacks, - BottomType, - FunctionCallConstants, - FunctionCallDef, - LabeledProductType, - NilType, - NonArrowType, - OptionType, - ProductType, - ScalarNames, - ScalarType, - ServiceDef, - StructType, - TopType, - UnlabeledProductType, - CallAquaFunctionType, - CallAquaFunctionArgs, - PassedArgs, - FnConfig, - RegisterServiceType, - RegisterServiceArgs, -} from '@fluencelabs/interfaces'; - -export { v5_callFunction, v5_registerService } from './compilerSupport/implementation.js'; - -/** - * Public interface to Fluence Network - */ -export const Fluence = { - /** - * Connect to the Fluence network - * @param relay - relay node to connect to - * @param config - client configuration - */ - connect: async (relay: RelayOptions, config?: ClientConfig): Promise => { - const fluence = await getFluenceInterface(); - const client = await fluence.clientFactory(relay, config); - fluence.defaultClient = client; - }, - - /** - * Disconnect from the Fluence network - */ - disconnect: async (): Promise => { - const fluence = await getFluenceInterface(); - await fluence.defaultClient?.disconnect(); - fluence.defaultClient = undefined; - }, - - /** - * Handle connection state changes. Immediately returns the current connection state - */ - onConnectionStateChange(handler: (state: ConnectionState) => void): ConnectionState { - const optimisticResult = getFluenceInterfaceFromGlobalThis(); - if (optimisticResult && optimisticResult.defaultClient) { - return optimisticResult.defaultClient.onConnectionStateChange(handler); - } - - getFluenceInterface().then((fluence) => { - fluence.defaultClient?.onConnectionStateChange(handler); - }); - - return 'disconnected'; - }, - - /** - * Low level API. Get the underlying client instance which holds the connection to the network - * @returns IFluenceClient instance - */ - getClient: async (): Promise => { - const fluence = await getFluenceInterface(); - if (!fluence.defaultClient) { - throw new Error('Fluence client is not initialized. Call Fluence.connect() first'); - } - return fluence.defaultClient; - }, -}; - -/** - * Low level API. Generally you need Fluence.connect() instead. - * @returns IFluenceClient instance - */ -export const createClient = async (relay: RelayOptions, config?: ClientConfig): Promise => { - const fluence = await getFluenceInterface(); - return await fluence.clientFactory(relay, config); -}; - -const publicFluenceInterface = { - clientFactory: createClient, - callAquaFunction, - registerService, -}; - -export function createClient() { - const workerLoader = new WorkerLoader(); -} - -export { callAquaFunction } from './compilerSupport/callFunction.js'; -export { registerService } from './compilerSupport/registerService.js'; diff --git a/packages/core/js-peer/src/jsPeer/avm.ts b/packages/core/js-peer/src/jsPeer/avm.ts index 2e7fdc98d..d351b0848 100644 --- a/packages/core/js-peer/src/jsPeer/avm.ts +++ b/packages/core/js-peer/src/jsPeer/avm.ts @@ -44,7 +44,7 @@ export class MarineBasedAvmRunner implements IAvmRunner { async start(): Promise { await this.marine.start(); await this.avmWasmLoader.start(); - await this.marine.createService(await this.avmWasmLoader.getValue(), 'avm'); + await this.marine.createService(this.avmWasmLoader.getValue(), 'avm'); } async stop(): Promise {} diff --git a/packages/core/js-peer/src/marine/interfaces.ts b/packages/core/js-peer/src/marine/interfaces.ts index ec8f8aa04..a9b0828ef 100644 --- a/packages/core/js-peer/src/marine/interfaces.ts +++ b/packages/core/js-peer/src/marine/interfaces.ts @@ -26,7 +26,7 @@ export interface IMarineHost extends IStartable { /** * Creates marine service from the given module and service id */ - createService(serviceModule: WebAssembly.Module, serviceId: string): Promise; + createService(serviceModule: SharedArrayBuffer | Buffer, serviceId: string): Promise; /** * Removes marine service with the given service id @@ -75,7 +75,7 @@ export interface IValueLoader { /** * Interface for something which can load wasm files */ -export interface IWasmLoader extends IValueLoader>, IStartable {} +export interface IWasmLoader extends IValueLoader, IStartable {} /** * Interface for something which can thread.js based worker diff --git a/packages/core/js-peer/src/marine/worker-script/index.ts b/packages/core/js-peer/src/marine/worker-script/index.ts deleted file mode 100644 index b01ea0e0d..000000000 --- a/packages/core/js-peer/src/marine/worker-script/index.ts +++ /dev/null @@ -1,106 +0,0 @@ -/* - * Copyright 2022 Fluence Labs Limited - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import { MarineService } from '@fluencelabs/marine-js/dist/MarineService'; -import type { Env, MarineModuleConfig, MarineServiceConfig, ModuleDescriptor } from '@fluencelabs/marine-js/dist/config' -import type { JSONArray, JSONObject, LogMessage, CallParameters } from '@fluencelabs/marine-js/dist/types'; -import { Buffer } from 'buffer'; -// @ts-ignore -import { Observable, Subject } from 'threads/observable'; -// @ts-ignore -import { expose } from 'threads/worker'; - -let marineServices = new Map(); -let controlModule: WebAssembly.Module | undefined; - -const createSimpleModuleDescriptor = (name: string, envs?: Env): ModuleDescriptor => { - return { - import_name: name, - config: { - logger_enabled: true, - logging_mask: 0, - wasi: { - envs: {...envs}, - preopened_files: new Set(), - mapped_dirs: new Map, - } - } - } -} -const createSimpleMarineService = (name: string, env? : Env): MarineServiceConfig => { - return { - modules_config: [createSimpleModuleDescriptor(name, env)], - } -} - -const onLogMessage = new Subject(); - -const asArray = (buf: SharedArrayBuffer | Buffer) => { - return new Uint8Array(buf); -}; - -const toExpose = { - init: async (controlModuleWasm: SharedArrayBuffer | Buffer): Promise => { - controlModule = await WebAssembly.compile(asArray(controlModuleWasm)); - }, - - createService: async ( - wasm: SharedArrayBuffer | Buffer, - serviceId: string, - envs?: Env, - ): Promise => { - if (!controlModule) { - throw new Error('MarineJS is not initialized. To initialize call `init` function'); - } - - const marineConfig = createSimpleMarineService(serviceId, envs); - const modules = {[serviceId]: new Uint8Array(wasm)} - const srv = new MarineService( - controlModule, - serviceId, - onLogMessage.next.bind(onLogMessage), - marineConfig, - modules, - envs, - ); - await srv.init(); - marineServices.set(serviceId, srv); - }, - - terminate: () => { - marineServices.forEach((val, key) => { - val.terminate(); - }); - onLogMessage.complete(); - }, - - callService: (serviceId: string, functionName: string, args: JSONArray | JSONObject, callParams: CallParameters): unknown => { - const srv = marineServices.get(serviceId); - if (!srv) { - throw new Error(`service with id=${serviceId} not found`); - } - - return srv.call(functionName, args, callParams); - }, - - onLogMessage(): Observable { - return Observable.from(onLogMessage); - }, -}; - -export type MarineBackgroundInterface = typeof toExpose; - -expose(toExpose); diff --git a/packages/core/js-peer/src/marine/worker-script/workerLoader.ts b/packages/core/js-peer/src/marine/worker-script/workerLoader.ts index 3ae67d134..3f22a3489 100644 --- a/packages/core/js-peer/src/marine/worker-script/workerLoader.ts +++ b/packages/core/js-peer/src/marine/worker-script/workerLoader.ts @@ -21,6 +21,6 @@ import { LazyLoader } from '../interfaces.js'; export class WorkerLoader extends LazyLoader { constructor() { - super(() => new Worker('./')); + super(() => new Worker('../../../node_modules/@fluencelabs/marine-worker/dist/node/marine-worker.umd.cjs')); } } diff --git a/packages/core/js-peer/src/marine/worker/index.ts b/packages/core/js-peer/src/marine/worker/index.ts index a91232c9b..f2da0ec0d 100644 --- a/packages/core/js-peer/src/marine/worker/index.ts +++ b/packages/core/js-peer/src/marine/worker/index.ts @@ -25,8 +25,6 @@ import { Buffer } from 'buffer'; import { MarineLogger, marineLogger } from '../../util/logger.js'; import { IMarineHost, IWasmLoader, IWorkerLoader } from '../interfaces.js'; -// @ts-ignore -import type { WorkerImplementation } from 'threads/dist/types/master'; export class MarineBackgroundRunner implements IMarineHost { private marineServices = new Set(); @@ -34,7 +32,7 @@ export class MarineBackgroundRunner implements IMarineHost { private loggers: Map = new Map(); - constructor(private worker: WorkerImplementation, private controlModuleLoader: IWasmLoader) {} + constructor(private workerLoader: IWorkerLoader, private controlModuleLoader: IWasmLoader) {} hasService(serviceId: string): boolean { return this.marineServices.has(serviceId); @@ -50,9 +48,11 @@ export class MarineBackgroundRunner implements IMarineHost { } this.marineServices = new Set(); + await this.workerLoader.start(); await this.controlModuleLoader.start(); - const wasm = await this.controlModuleLoader.getValue(); - this.workerThread = await spawn(this.worker, { timeout: 99999999 }); + const worker = this.workerLoader.getValue(); + const wasm = this.controlModuleLoader.getValue(); + this.workerThread = await spawn(worker, { timeout: 99999999 }); const logfn: LogFunction = (message) => { const serviceLogger = this.loggers.get(message.service); if (!serviceLogger) { @@ -64,7 +64,7 @@ export class MarineBackgroundRunner implements IMarineHost { await this.workerThread.init(wasm); } - async createService(serviceModule: WebAssembly.Module, serviceId: string): Promise { + async createService(serviceModule: SharedArrayBuffer | Buffer, serviceId: string): Promise { if (!this.workerThread) { throw 'Worker is not initialized'; } diff --git a/packages/core/js-peer/src/services/NodeUtils.ts b/packages/core/js-peer/src/services/NodeUtils.ts index 98abed751..8aef75372 100644 --- a/packages/core/js-peer/src/services/NodeUtils.ts +++ b/packages/core/js-peer/src/services/NodeUtils.ts @@ -18,8 +18,9 @@ import { CallParams, IFluenceInternalApi } from '@fluencelabs/interfaces'; import { defaultGuard } from './SingleModuleSrv.js'; import { NodeUtilsDef, registerNodeUtils } from './_aqua/node-utils.js'; import { SecurityGuard } from './securityGuard.js'; -import { readFile } from 'fs/promises'; +import * as fs from 'fs'; import { FluencePeer } from '../jsPeer/FluencePeer.js'; +import { Buffer } from 'buffer'; export class NodeUtils implements NodeUtilsDef { constructor(private peer: FluencePeer) { @@ -39,10 +40,18 @@ export class NodeUtils implements NodeUtilsDef { try { // Strange enough, but Buffer type works here, while reading with encoding 'utf-8' doesn't - const data: any = await readFile(path); + const data = await new Promise((resolve, reject) => { + fs.readFile(path, (err, data) => { + if (err) { + reject(err); + return; + } + resolve(data); + }) + }); return { success: true, - content: data, + content: data.toString(), error: null, }; } catch (err: any) { diff --git a/packages/core/js-peer/src/util/testUtils.ts b/packages/core/js-peer/src/util/testUtils.ts index 92308a85e..6881c0aa2 100644 --- a/packages/core/js-peer/src/util/testUtils.ts +++ b/packages/core/js-peer/src/util/testUtils.ts @@ -30,9 +30,8 @@ import { Subject, Subscribable } from 'rxjs'; import { WrapFnIntoServiceCall } from '../jsServiceHost/serviceUtils.js'; import { JsServiceHost } from '../jsServiceHost/JsServiceHost.js'; import { ClientPeer, makeClientPeerConfig } from '../clientPeer/ClientPeer.js'; -import { WasmLoaderFromNpm } from '../marine/deps-loader/node.js'; +import { WasmLoaderFromNpm, WorkerLoaderFromNpm } from '../marine/deps-loader/node.js'; import { IConnection } from '../connection/interfaces.js'; -import fetch from 'cross-fetch'; export const registerHandlersHelper = ( peer: FluencePeer, @@ -95,17 +94,14 @@ class NoopConnection implements IConnection { } } -const fetchMarineJsWasm = () => fetch('__marine_js_wasm__').then(res => WebAssembly.compileStreaming(res)); -const fetchAvmWasm = () => fetch('__avm_wasm__').then(res => WebAssembly.compileStreaming(res)); - export class TestPeer extends FluencePeer { constructor(keyPair: KeyPair, connection: IConnection) { const workerLoader = new WorkerLoader(); const controlModuleLoader = new WasmLoaderFromNpm('@fluencelabs/marine-js', 'marine-js.wasm'); const avmModuleLoader = new WasmLoaderFromNpm('@fluencelabs/avm', 'avm.wasm'); - const marine = new MarineBackgroundRunner(workerLoader, { getValue: fetchMarineJsWasm, start: () => Promise.resolve(), stop: () => Promise.resolve() }); + const marine = new MarineBackgroundRunner(workerLoader, controlModuleLoader); const jsHost = new JsServiceHost(); - const avm = new MarineBasedAvmRunner(marine, { getValue: fetchAvmWasm, start: () => Promise.resolve(), stop: () => Promise.resolve() }); + const avm = new MarineBasedAvmRunner(marine, avmModuleLoader); super(DEFAULT_CONFIG, keyPair, marine, jsHost, avm, connection); } } @@ -134,8 +130,8 @@ export const withClient = async ( const workerLoader = new WorkerLoader(); const controlModuleLoader = new WasmLoaderFromNpm('@fluencelabs/marine-js', 'marine-js.wasm'); const avmModuleLoader = new WasmLoaderFromNpm('@fluencelabs/avm', 'avm.wasm'); - const marine = new MarineBackgroundRunner(workerLoader, { getValue: fetchMarineJsWasm, start: () => Promise.resolve(), stop: () => Promise.resolve() }); - const avm = new MarineBasedAvmRunner(marine, { getValue: fetchAvmWasm, start: () => Promise.resolve(), stop: () => Promise.resolve() }); + const marine = new MarineBackgroundRunner(workerLoader, controlModuleLoader); + const avm = new MarineBasedAvmRunner(marine, avmModuleLoader); const { keyPair, peerConfig, relayConfig } = await makeClientPeerConfig(relay, config); const client = new ClientPeer(peerConfig, relayConfig, keyPair, marine, avm); try { diff --git a/packages/core/js-peer/tsconfig.json b/packages/core/js-peer/tsconfig.json index aa5bb8304..d9ea46454 100644 --- a/packages/core/js-peer/tsconfig.json +++ b/packages/core/js-peer/tsconfig.json @@ -4,5 +4,6 @@ "outDir": "./dist" }, "include": ["src/**/*"], - "exclude": ["node_modules", "dist"] + "exclude": ["node_modules", "dist"], + "esModuleInterop": true } diff --git a/packages/core/marine-worker/package.json b/packages/core/marine-worker/package.json index b381dd14a..fd88649ec 100644 --- a/packages/core/marine-worker/package.json +++ b/packages/core/marine-worker/package.json @@ -1,6 +1,6 @@ { "name": "@fluencelabs/marine-worker", - "version": "0.1.0", + "version": "0.2.0", "description": "Marine worker", "files": [ "dist" @@ -42,7 +42,8 @@ "vitest": "0.29.7" }, "dependencies": { - "@fluencelabs/marine-js": "0.3.45", + "@fluencelabs/avm": "0.43.1", + "@fluencelabs/marine-js": "0.7.2", "observable-fns": "0.6.1", "threads": "1.7.0" } diff --git a/packages/core/marine-worker/src/index.ts b/packages/core/marine-worker/src/index.ts index d6aa4196d..a1aff4519 100644 --- a/packages/core/marine-worker/src/index.ts +++ b/packages/core/marine-worker/src/index.ts @@ -15,38 +15,60 @@ */ import { MarineService } from '@fluencelabs/marine-js/dist/MarineService'; -import type { Env, MarineServiceConfig } from '@fluencelabs/marine-js/dist/config'; -import type { JSONArray, JSONObject, LogMessage } from '@fluencelabs/marine-js/dist/types'; +import type { Env, MarineModuleConfig, MarineServiceConfig, ModuleDescriptor } from '@fluencelabs/marine-js/dist/config'; +import type { JSONArray, JSONObject, LogMessage, CallParameters } from '@fluencelabs/marine-js/dist/types'; import { Observable, Subject } from 'observable-fns'; // @ts-ignore no types provided for package import { expose } from 'threads'; +import * as Buffer from 'buffer'; let marineServices = new Map(); let controlModule: WebAssembly.Module | undefined; +const createSimpleModuleDescriptor = (name: string, envs?: Env): ModuleDescriptor => { + return { + import_name: name, + config: { + logger_enabled: true, + logging_mask: 0, + wasi: { + envs: {...envs}, + preopened_files: new Set(), + mapped_dirs: new Map, + } + } + } +} +const createSimpleMarineService = (name: string, env? : Env): MarineServiceConfig => { + return { + modules_config: [createSimpleModuleDescriptor(name, env)], + } +} + const onLogMessage = new Subject(); const toExpose = { - init: async (_controlModule: WebAssembly.Module): Promise => { - controlModule = _controlModule; + init: async (controlModuleWasm: SharedArrayBuffer | Buffer): Promise => { + controlModule = await WebAssembly.compile(new Uint8Array(controlModuleWasm)); }, createService: async ( - service: WebAssembly.Module, + wasm: SharedArrayBuffer | Buffer, serviceId: string, - marineConfig?: MarineServiceConfig, envs?: Env, ): Promise => { if (!controlModule) { throw new Error('MarineJS is not initialized. To initialize call `init` function'); } - + + const marineConfig = createSimpleMarineService(serviceId, envs); + const modules = {[serviceId]: new Uint8Array(wasm)} const srv = new MarineService( controlModule, - service, serviceId, onLogMessage.next.bind(onLogMessage), marineConfig, + modules, envs, ); await srv.init(); @@ -60,7 +82,7 @@ const toExpose = { onLogMessage.complete(); }, - callService: (serviceId: string, functionName: string, args: JSONArray | JSONObject, callParams: any): unknown => { + callService: (serviceId: string, functionName: string, args: JSONArray | JSONObject, callParams: CallParameters): unknown => { const srv = marineServices.get(serviceId); if (!srv) { throw new Error(`service with id=${serviceId} not found`); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d96dfa739..eb3f84920 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -247,7 +247,7 @@ importers: version: 28.1.0(@types/node@16.11.59) ts-jest: specifier: 28.0.2 - version: 28.0.2(@babel/core@7.22.5)(@types/jest@28.1.0)(jest@28.1.0)(typescript@4.7.2) + version: 28.0.2(@babel/core@7.22.10)(@types/jest@28.1.0)(jest@28.1.0)(typescript@4.7.2) packages/client/js-client.web.standalone: dependencies: @@ -257,9 +257,6 @@ importers: '@fluencelabs/js-peer': specifier: 0.9.1 version: link:../../core/js-peer - '@fluencelabs/marine-worker': - specifier: workspace:* - version: link:../../core/marine-worker buffer: specifier: 6.0.3 version: 6.0.3 @@ -288,6 +285,9 @@ importers: '@fluencelabs/marine-js': specifier: 0.7.2 version: 0.7.2 + '@fluencelabs/marine-worker': + specifier: workspace:0.1.0 + version: link:../../core/marine-worker '@laynezh/vite-plugin-lib-assets': specifier: 0.4.1 version: 0.4.1 @@ -311,7 +311,7 @@ importers: version: 3.0.1(webpack@5.88.2) jest: specifier: 28.1.0 - version: 28.1.0(@types/node@16.11.59) + version: 28.1.0(@types/node@16.11.59)(ts-node@10.9.1) js-base64: specifier: 3.7.5 version: 3.7.5 @@ -326,10 +326,13 @@ importers: version: 0.2.1 ts-jest: specifier: 28.0.2 - version: 28.0.2(@babel/core@7.22.5)(@types/jest@28.1.0)(jest@28.1.0)(typescript@4.7.2) + version: 28.0.2(@babel/core@7.22.10)(@types/jest@28.1.0)(jest@28.1.0)(typescript@4.7.2) ts-loader: specifier: 9.4.4 version: 9.4.4(typescript@4.7.2)(webpack@5.88.2) + ts-node: + specifier: 10.9.1 + version: 10.9.1(@types/node@16.11.59)(typescript@4.7.2) vite: specifier: 4.0.4 version: 4.0.4(@types/node@16.11.59) @@ -426,9 +429,6 @@ importers: buffer: specifier: 6.0.3 version: 6.0.3 - cross-fetch: - specifier: 4.0.0 - version: 4.0.0 debug: specifier: 4.3.4 version: 4.3.4 @@ -490,9 +490,12 @@ importers: packages/core/marine-worker: dependencies: + '@fluencelabs/avm': + specifier: 0.43.1 + version: 0.43.1 '@fluencelabs/marine-js': - specifier: 0.3.45 - version: 0.3.45 + specifier: 0.7.2 + version: 0.7.2 observable-fns: specifier: 0.6.1 version: 0.6.1 @@ -583,7 +586,7 @@ packages: engines: {node: '>=6.0.0'} dependencies: '@jridgewell/gen-mapping': 0.3.3 - '@jridgewell/trace-mapping': 0.3.18 + '@jridgewell/trace-mapping': 0.3.19 /@apideck/better-ajv-errors@0.3.6(ajv@8.12.0): resolution: {integrity: sha512-P+ZygBLZtkp0qqOAJJVX4oX/sFo5JR3eBWwwuqHHhK0GIgQOKWrAfiAaWX0aArHkRWHMuggFEgAZNxVPwPZYaA==} @@ -597,6 +600,13 @@ packages: leven: 3.1.0 dev: false + /@babel/code-frame@7.22.10: + resolution: {integrity: sha512-/KKIMG4UEL35WmI9OlvMhurwtytjvXoFcGNrOvyG9zIzA8YmPjVtIZUf7b05+TPO7G7/GEmLHDaoCgACHl9hhA==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/highlight': 7.22.10 + chalk: 2.4.2 + /@babel/code-frame@7.22.5: resolution: {integrity: sha512-Xmwn266vad+6DAqEB2A6V/CcZVp62BbwVmcOJc2RPuwih1kw02TjQvWVWlcKGbBPd+8/0V5DEkOcizRGYsspYQ==} engines: {node: '>=6.9.0'} @@ -607,6 +617,32 @@ packages: resolution: {integrity: sha512-4Jc/YuIaYqKnDDz892kPIledykKg12Aw1PYX5i/TY28anJtacvM1Rrr8wbieB9GfEJwlzqT0hUEao0CxEebiDA==} engines: {node: '>=6.9.0'} + /@babel/compat-data@7.22.9: + resolution: {integrity: sha512-5UamI7xkUcJ3i9qVDS+KFDEK8/7oJ55/sJMB1Ge7IEapr7KfdfV/HErR+koZwOfd+SgtFKOKRhRakdg++DcJpQ==} + engines: {node: '>=6.9.0'} + + /@babel/core@7.22.10: + resolution: {integrity: sha512-fTmqbbUBAwCcre6zPzNngvsI0aNrPZe77AeqvDxWM9Nm+04RrJ3CAmGHA9f7lJQY6ZMhRztNemy4uslDxTX4Qw==} + engines: {node: '>=6.9.0'} + dependencies: + '@ampproject/remapping': 2.2.1 + '@babel/code-frame': 7.22.10 + '@babel/generator': 7.22.10 + '@babel/helper-compilation-targets': 7.22.10 + '@babel/helper-module-transforms': 7.22.9(@babel/core@7.22.10) + '@babel/helpers': 7.22.10 + '@babel/parser': 7.22.10 + '@babel/template': 7.22.5 + '@babel/traverse': 7.22.10 + '@babel/types': 7.22.10 + convert-source-map: 1.9.0 + debug: 4.3.4 + gensync: 1.0.0-beta.2 + json5: 2.2.3 + semver: 6.3.1 + transitivePeerDependencies: + - supports-color + /@babel/core@7.22.5: resolution: {integrity: sha512-SBuTAjg91A3eKOvD+bPEz3LlhHZRNu1nFOVts9lzDJTXshHTjII0BAtDS3Y2DAkdZdDKWVZGVwkDfc4Clxn1dg==} engines: {node: '>=6.9.0'} @@ -643,6 +679,15 @@ packages: semver: 6.3.0 dev: false + /@babel/generator@7.22.10: + resolution: {integrity: sha512-79KIf7YiWjjdZ81JnLujDRApWtl7BxTqWD88+FFdQEIOG8LJ0etDOM7CXuIgGJa55sGOwZVwuEsaLEm0PJ5/+A==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/types': 7.22.10 + '@jridgewell/gen-mapping': 0.3.3 + '@jridgewell/trace-mapping': 0.3.19 + jsesc: 2.5.2 + /@babel/generator@7.22.5: resolution: {integrity: sha512-+lcUbnTRhd0jOewtFSedLyiPsD5tswKkbgcezOqqWFUVNEwoUTlpPOBmvhG7OXWLR4jMdv0czPGH5XbflnD1EA==} engines: {node: '>=6.9.0'} @@ -664,6 +709,16 @@ packages: dependencies: '@babel/types': 7.22.5 + /@babel/helper-compilation-targets@7.22.10: + resolution: {integrity: sha512-JMSwHD4J7SLod0idLq5PKgI+6g/hLD/iuWBq08ZX49xE14VpVEojJ5rHWptpirV2j020MvypRLAXAO50igCJ5Q==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/compat-data': 7.22.9 + '@babel/helper-validator-option': 7.22.5 + browserslist: 4.21.10 + lru-cache: 5.1.1 + semver: 6.3.1 + /@babel/helper-compilation-targets@7.22.5(@babel/core@7.22.5): resolution: {integrity: sha512-Ji+ywpHeuqxB8WDxraCiqR0xfhYjiDE/e6k7FuIaANnoOFxAHskHChz4vA1mJC9Lbm01s1PVAGhQY4FUKSkGZw==} engines: {node: '>=6.9.0'} @@ -731,13 +786,13 @@ packages: engines: {node: '>=6.9.0'} dependencies: '@babel/template': 7.22.5 - '@babel/types': 7.22.5 + '@babel/types': 7.22.10 /@babel/helper-hoist-variables@7.22.5: resolution: {integrity: sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.22.5 + '@babel/types': 7.22.10 /@babel/helper-member-expression-to-functions@7.22.5: resolution: {integrity: sha512-aBiH1NKMG0H2cGZqspNvsaBe6wNGjbJjuLy29aU+eDZjSbbN53BaxlpB02xm9v34pLTZ1nIQPFYn2qMZoa5BQQ==} @@ -749,7 +804,7 @@ packages: resolution: {integrity: sha512-8Dl6+HD/cKifutF5qGd/8ZJi84QeAKh+CEe1sBzz8UayBBGg1dAIJrdHOcOM5b2MpzWL2yuotJTtGjETq0qjXg==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.22.5 + '@babel/types': 7.22.10 /@babel/helper-module-transforms@7.22.5: resolution: {integrity: sha512-+hGKDt/Ze8GFExiVHno/2dvG5IdstpzCq0y4Qc9OJ25D4q3pKfiIP/4Vp3/JvhDkLKsDK2api3q3fpIgiIF5bw==} @@ -766,6 +821,19 @@ packages: transitivePeerDependencies: - supports-color + /@babel/helper-module-transforms@7.22.9(@babel/core@7.22.10): + resolution: {integrity: sha512-t+WA2Xn5K+rTeGtC8jCsdAH52bjggG5TKRuRrAGNM/mjIbO4GxvlLMFOEz9wXY5I2XQ60PMFsAG2WIcG82dQMQ==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0 + dependencies: + '@babel/core': 7.22.10 + '@babel/helper-environment-visitor': 7.22.5 + '@babel/helper-module-imports': 7.22.5 + '@babel/helper-simple-access': 7.22.5 + '@babel/helper-split-export-declaration': 7.22.6 + '@babel/helper-validator-identifier': 7.22.5 + /@babel/helper-optimise-call-expression@7.22.5: resolution: {integrity: sha512-HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw==} engines: {node: '>=6.9.0'} @@ -807,7 +875,7 @@ packages: resolution: {integrity: sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.22.5 + '@babel/types': 7.22.10 /@babel/helper-skip-transparent-expression-wrappers@7.22.5: resolution: {integrity: sha512-tK14r66JZKiC43p8Ki33yLBVJKlQDFoA8GYN67lWCDCqoL6EMMSuM9b+Iff2jHaM/RRFYl7K+iiru7hbRqNx8Q==} @@ -821,6 +889,12 @@ packages: dependencies: '@babel/types': 7.22.5 + /@babel/helper-split-export-declaration@7.22.6: + resolution: {integrity: sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/types': 7.22.10 + /@babel/helper-string-parser@7.22.5: resolution: {integrity: sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==} engines: {node: '>=6.9.0'} @@ -844,6 +918,16 @@ packages: transitivePeerDependencies: - supports-color + /@babel/helpers@7.22.10: + resolution: {integrity: sha512-a41J4NW8HyZa1I1vAndrraTlPZ/eZoga2ZgS7fEr0tZJGVU4xqdE80CEm0CcNjha5EZ8fTBYLKHF0kqDUuAwQw==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/template': 7.22.5 + '@babel/traverse': 7.22.10 + '@babel/types': 7.22.10 + transitivePeerDependencies: + - supports-color + /@babel/helpers@7.22.5: resolution: {integrity: sha512-pSXRmfE1vzcUIDFQcSGA5Mr+GxBV9oiRKDuDxXvWQQBCh8HoIjs/2DlDB7H8smac1IVrB9/xdXj2N3Wol9Cr+Q==} engines: {node: '>=6.9.0'} @@ -854,6 +938,14 @@ packages: transitivePeerDependencies: - supports-color + /@babel/highlight@7.22.10: + resolution: {integrity: sha512-78aUtVcT7MUscr0K5mIEnkwxPE0MaxkR5RxRwuHaQ+JuU5AmTPhY+do2mdzVTnIJJpyBglql2pehuBIWHug+WQ==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/helper-validator-identifier': 7.22.5 + chalk: 2.4.2 + js-tokens: 4.0.0 + /@babel/highlight@7.22.5: resolution: {integrity: sha512-BSKlD1hgnedS5XRnGOljZawtag7H1yPfQp0tdNJCHoH6AZ+Pcm9VvkrK59/Yy593Ypg0zMxH2BxD1VPYUQ7UIw==} engines: {node: '>=6.9.0'} @@ -862,6 +954,13 @@ packages: chalk: 2.4.2 js-tokens: 4.0.0 + /@babel/parser@7.22.10: + resolution: {integrity: sha512-lNbdGsQb9ekfsnjFGhEiF4hfFqGgfOP3H3d27re3n+CGhNuTSUEQdfWk556sTLNTloczcdM5TYF2LhzmDQKyvQ==} + engines: {node: '>=6.0.0'} + hasBin: true + dependencies: + '@babel/types': 7.22.10 + /@babel/parser@7.22.5: resolution: {integrity: sha512-DFZMC9LJUG9PLOclRC32G63UXwzqS2koQC8dkx+PLdmt1xSePYpbT/NbsrJy8Q/muXz7o/h/d4A7Fuyixm559Q==} engines: {node: '>=6.0.0'} @@ -1010,6 +1109,14 @@ packages: '@babel/helper-create-regexp-features-plugin': 7.22.5(@babel/core@7.22.5) '@babel/helper-plugin-utils': 7.22.5 + /@babel/plugin-syntax-async-generators@7.8.4(@babel/core@7.22.10): + resolution: {integrity: sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.22.10 + '@babel/helper-plugin-utils': 7.22.5 + /@babel/plugin-syntax-async-generators@7.8.4(@babel/core@7.22.5): resolution: {integrity: sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==} peerDependencies: @@ -1018,6 +1125,14 @@ packages: '@babel/core': 7.22.5 '@babel/helper-plugin-utils': 7.22.5 + /@babel/plugin-syntax-bigint@7.8.3(@babel/core@7.22.10): + resolution: {integrity: sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.22.10 + '@babel/helper-plugin-utils': 7.22.5 + /@babel/plugin-syntax-bigint@7.8.3(@babel/core@7.22.5): resolution: {integrity: sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==} peerDependencies: @@ -1026,6 +1141,14 @@ packages: '@babel/core': 7.22.5 '@babel/helper-plugin-utils': 7.22.5 + /@babel/plugin-syntax-class-properties@7.12.13(@babel/core@7.22.10): + resolution: {integrity: sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.22.10 + '@babel/helper-plugin-utils': 7.22.5 + /@babel/plugin-syntax-class-properties@7.12.13(@babel/core@7.22.5): resolution: {integrity: sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==} peerDependencies: @@ -1069,6 +1192,16 @@ packages: '@babel/core': 7.22.5 '@babel/helper-plugin-utils': 7.22.5 + /@babel/plugin-syntax-flow@7.22.5(@babel/core@7.22.10): + resolution: {integrity: sha512-9RdCl0i+q0QExayk2nOS7853w08yLucnnPML6EN9S8fgMPVtdLDCdx/cOQ/i44Lb9UeQX9A35yaqBBOMMZxPxQ==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.22.10 + '@babel/helper-plugin-utils': 7.22.5 + dev: false + /@babel/plugin-syntax-flow@7.22.5(@babel/core@7.22.5): resolution: {integrity: sha512-9RdCl0i+q0QExayk2nOS7853w08yLucnnPML6EN9S8fgMPVtdLDCdx/cOQ/i44Lb9UeQX9A35yaqBBOMMZxPxQ==} engines: {node: '>=6.9.0'} @@ -1096,6 +1229,14 @@ packages: '@babel/core': 7.22.5 '@babel/helper-plugin-utils': 7.22.5 + /@babel/plugin-syntax-import-meta@7.10.4(@babel/core@7.22.10): + resolution: {integrity: sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.22.10 + '@babel/helper-plugin-utils': 7.22.5 + /@babel/plugin-syntax-import-meta@7.10.4(@babel/core@7.22.5): resolution: {integrity: sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==} peerDependencies: @@ -1104,6 +1245,14 @@ packages: '@babel/core': 7.22.5 '@babel/helper-plugin-utils': 7.22.5 + /@babel/plugin-syntax-json-strings@7.8.3(@babel/core@7.22.10): + resolution: {integrity: sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.22.10 + '@babel/helper-plugin-utils': 7.22.5 + /@babel/plugin-syntax-json-strings@7.8.3(@babel/core@7.22.5): resolution: {integrity: sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==} peerDependencies: @@ -1112,6 +1261,16 @@ packages: '@babel/core': 7.22.5 '@babel/helper-plugin-utils': 7.22.5 + /@babel/plugin-syntax-jsx@7.22.5(@babel/core@7.22.10): + resolution: {integrity: sha512-gvyP4hZrgrs/wWMaocvxZ44Hw0b3W8Pe+cMxc8V1ULQ07oh8VNbIRaoD1LRZVTvD+0nieDKjfgKg89sD7rrKrg==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.22.10 + '@babel/helper-plugin-utils': 7.22.5 + dev: false + /@babel/plugin-syntax-jsx@7.22.5(@babel/core@7.22.5): resolution: {integrity: sha512-gvyP4hZrgrs/wWMaocvxZ44Hw0b3W8Pe+cMxc8V1ULQ07oh8VNbIRaoD1LRZVTvD+0nieDKjfgKg89sD7rrKrg==} engines: {node: '>=6.9.0'} @@ -1121,6 +1280,14 @@ packages: '@babel/core': 7.22.5 '@babel/helper-plugin-utils': 7.22.5 + /@babel/plugin-syntax-logical-assignment-operators@7.10.4(@babel/core@7.22.10): + resolution: {integrity: sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.22.10 + '@babel/helper-plugin-utils': 7.22.5 + /@babel/plugin-syntax-logical-assignment-operators@7.10.4(@babel/core@7.22.5): resolution: {integrity: sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==} peerDependencies: @@ -1129,6 +1296,14 @@ packages: '@babel/core': 7.22.5 '@babel/helper-plugin-utils': 7.22.5 + /@babel/plugin-syntax-nullish-coalescing-operator@7.8.3(@babel/core@7.22.10): + resolution: {integrity: sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.22.10 + '@babel/helper-plugin-utils': 7.22.5 + /@babel/plugin-syntax-nullish-coalescing-operator@7.8.3(@babel/core@7.22.5): resolution: {integrity: sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==} peerDependencies: @@ -1137,6 +1312,14 @@ packages: '@babel/core': 7.22.5 '@babel/helper-plugin-utils': 7.22.5 + /@babel/plugin-syntax-numeric-separator@7.10.4(@babel/core@7.22.10): + resolution: {integrity: sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.22.10 + '@babel/helper-plugin-utils': 7.22.5 + /@babel/plugin-syntax-numeric-separator@7.10.4(@babel/core@7.22.5): resolution: {integrity: sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==} peerDependencies: @@ -1145,6 +1328,14 @@ packages: '@babel/core': 7.22.5 '@babel/helper-plugin-utils': 7.22.5 + /@babel/plugin-syntax-object-rest-spread@7.8.3(@babel/core@7.22.10): + resolution: {integrity: sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.22.10 + '@babel/helper-plugin-utils': 7.22.5 + /@babel/plugin-syntax-object-rest-spread@7.8.3(@babel/core@7.22.5): resolution: {integrity: sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==} peerDependencies: @@ -1153,6 +1344,14 @@ packages: '@babel/core': 7.22.5 '@babel/helper-plugin-utils': 7.22.5 + /@babel/plugin-syntax-optional-catch-binding@7.8.3(@babel/core@7.22.10): + resolution: {integrity: sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.22.10 + '@babel/helper-plugin-utils': 7.22.5 + /@babel/plugin-syntax-optional-catch-binding@7.8.3(@babel/core@7.22.5): resolution: {integrity: sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==} peerDependencies: @@ -1161,6 +1360,14 @@ packages: '@babel/core': 7.22.5 '@babel/helper-plugin-utils': 7.22.5 + /@babel/plugin-syntax-optional-chaining@7.8.3(@babel/core@7.22.10): + resolution: {integrity: sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.22.10 + '@babel/helper-plugin-utils': 7.22.5 + /@babel/plugin-syntax-optional-chaining@7.8.3(@babel/core@7.22.5): resolution: {integrity: sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==} peerDependencies: @@ -1178,6 +1385,15 @@ packages: '@babel/core': 7.22.5 '@babel/helper-plugin-utils': 7.22.5 + /@babel/plugin-syntax-top-level-await@7.14.5(@babel/core@7.22.10): + resolution: {integrity: sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.22.10 + '@babel/helper-plugin-utils': 7.22.5 + /@babel/plugin-syntax-top-level-await@7.14.5(@babel/core@7.22.5): resolution: {integrity: sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==} engines: {node: '>=6.9.0'} @@ -1187,6 +1403,15 @@ packages: '@babel/core': 7.22.5 '@babel/helper-plugin-utils': 7.22.5 + /@babel/plugin-syntax-typescript@7.22.5(@babel/core@7.22.10): + resolution: {integrity: sha512-1mS2o03i7t1c6VzH6fdQ3OA8tcEIxwG18zIPRp+UY1Ihv6W+XZzBCVxExF9upussPXJ0xE9XRHwMoNs1ep/nRQ==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.22.10 + '@babel/helper-plugin-utils': 7.22.5 + /@babel/plugin-syntax-typescript@7.22.5(@babel/core@7.22.5): resolution: {integrity: sha512-1mS2o03i7t1c6VzH6fdQ3OA8tcEIxwG18zIPRp+UY1Ihv6W+XZzBCVxExF9upussPXJ0xE9XRHwMoNs1ep/nRQ==} engines: {node: '>=6.9.0'} @@ -1648,6 +1873,20 @@ packages: '@babel/core': 7.22.5 '@babel/plugin-transform-react-jsx': 7.22.5(@babel/core@7.22.5) + /@babel/plugin-transform-react-jsx@7.22.5(@babel/core@7.22.10): + resolution: {integrity: sha512-rog5gZaVbUip5iWDMTYbVM15XQq+RkUKhET/IHR6oizR+JEoN6CAfTTuHcK4vwUyzca30qqHqEpzBOnaRMWYMA==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + dependencies: + '@babel/core': 7.22.10 + '@babel/helper-annotate-as-pure': 7.22.5 + '@babel/helper-module-imports': 7.22.5 + '@babel/helper-plugin-utils': 7.22.5 + '@babel/plugin-syntax-jsx': 7.22.5(@babel/core@7.22.10) + '@babel/types': 7.22.5 + dev: false + /@babel/plugin-transform-react-jsx@7.22.5(@babel/core@7.22.5): resolution: {integrity: sha512-rog5gZaVbUip5iWDMTYbVM15XQq+RkUKhET/IHR6oizR+JEoN6CAfTTuHcK4vwUyzca30qqHqEpzBOnaRMWYMA==} engines: {node: '>=6.9.0'} @@ -1964,9 +2203,26 @@ packages: resolution: {integrity: sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw==} engines: {node: '>=6.9.0'} dependencies: - '@babel/code-frame': 7.22.5 - '@babel/parser': 7.22.5 - '@babel/types': 7.22.5 + '@babel/code-frame': 7.22.10 + '@babel/parser': 7.22.10 + '@babel/types': 7.22.10 + + /@babel/traverse@7.22.10: + resolution: {integrity: sha512-Q/urqV4pRByiNNpb/f5OSv28ZlGJiFiiTh+GAHktbIrkPhPbl90+uW6SmpoLyZqutrg9AEaEf3Q/ZBRHBXgxig==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/code-frame': 7.22.10 + '@babel/generator': 7.22.10 + '@babel/helper-environment-visitor': 7.22.5 + '@babel/helper-function-name': 7.22.5 + '@babel/helper-hoist-variables': 7.22.5 + '@babel/helper-split-export-declaration': 7.22.6 + '@babel/parser': 7.22.10 + '@babel/types': 7.22.10 + debug: 4.3.4 + globals: 11.12.0 + transitivePeerDependencies: + - supports-color /@babel/traverse@7.22.5: resolution: {integrity: sha512-7DuIjPgERaNo6r+PZwItpjCZEa5vyw4eJGufeLxrPdBXBoLcCJCIasvK6pK/9DVNrLZTLFhUGqaC6X/PA007TQ==} @@ -1985,6 +2241,14 @@ packages: transitivePeerDependencies: - supports-color + /@babel/types@7.22.10: + resolution: {integrity: sha512-obaoigiLrlDZ7TUQln/8m4mSqIW2QFeOrCQc9r+xsaHGNoplVNYlRVpsfE8Vj35GEm2ZH4ZhrNYogs/3fj85kg==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/helper-string-parser': 7.22.5 + '@babel/helper-validator-identifier': 7.22.5 + to-fast-properties: 2.0.0 + /@babel/types@7.22.5: resolution: {integrity: sha512-zo3MIHGOkPOfoRXitsgHLjEXmlDaD/5KU1Uzuc9GNiZPhSqVxVRtxuPaSBZDsYZ9qV88AjtMtWW7ww98loJ9KA==} engines: {node: '>=6.9.0'} @@ -3324,14 +3588,6 @@ packages: - typescript dev: true - /@fluencelabs/marine-js@0.3.45: - resolution: {integrity: sha512-GmeTvaC9n6zM6FPPyoHXwe2I8F9mEeE9DKzJcqy4FkUmpI11Fu4HrTvKgJyTURJkZSu8cfrjA7ZVeYuDGHeimQ==} - dependencies: - '@wasmer/wasi': 0.12.0 - '@wasmer/wasmfs': 0.12.0 - default-import: 1.1.5 - dev: false - /@fluencelabs/marine-js@0.7.2: resolution: {integrity: sha512-etjbXDgzyZkK82UZvtuIU3bfy5f52siDUy1m+T5Y5r70k82xYdZZ8vgWVgB6ivi2f3aDyQjgNTfzWQjKFpAReQ==} dependencies: @@ -3574,6 +3830,49 @@ packages: - ts-node dev: true + /@jest/core@28.1.3(ts-node@10.9.1): + resolution: {integrity: sha512-CIKBrlaKOzA7YG19BEqCw3SLIsEwjZkeJzf5bdooVnW4bH5cktqe3JX+G2YV1aK5vP8N9na1IGWFzYaTp6k6NA==} + engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} + peerDependencies: + node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0 + peerDependenciesMeta: + node-notifier: + optional: true + dependencies: + '@jest/console': 28.1.3 + '@jest/reporters': 28.1.3 + '@jest/test-result': 28.1.3 + '@jest/transform': 28.1.3 + '@jest/types': 28.1.3 + '@types/node': 20.4.5 + ansi-escapes: 4.3.2 + chalk: 4.1.2 + ci-info: 3.8.0 + exit: 0.1.2 + graceful-fs: 4.2.11 + jest-changed-files: 28.1.3 + jest-config: 28.1.3(@types/node@20.4.5)(ts-node@10.9.1) + jest-haste-map: 28.1.3 + jest-message-util: 28.1.3 + jest-regex-util: 28.0.2 + jest-resolve: 28.1.3 + jest-resolve-dependencies: 28.1.3 + jest-runner: 28.1.3 + jest-runtime: 28.1.3 + jest-snapshot: 28.1.3 + jest-util: 28.1.3 + jest-validate: 28.1.3 + jest-watcher: 28.1.3 + micromatch: 4.0.5 + pretty-format: 28.1.3 + rimraf: 3.0.2 + slash: 3.0.0 + strip-ansi: 6.0.1 + transitivePeerDependencies: + - supports-color + - ts-node + dev: true + /@jest/environment@27.5.1: resolution: {integrity: sha512-/WQjhPJe3/ghaol/4Bq480JKXV/Rfw8nQdN7f41fM8VDHLcxKXou6QyXAh3EFr9/bVG3x74z1NWDkP87EiY8gA==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} @@ -3668,15 +3967,15 @@ packages: '@jest/types': 27.5.1 '@types/node': 18.13.0 chalk: 4.1.2 - collect-v8-coverage: 1.0.1 + collect-v8-coverage: 1.0.2 exit: 0.1.2 glob: 7.2.3 graceful-fs: 4.2.11 istanbul-lib-coverage: 3.2.0 istanbul-lib-instrument: 5.2.1 - istanbul-lib-report: 3.0.0 + istanbul-lib-report: 3.0.1 istanbul-lib-source-maps: 4.0.1 - istanbul-reports: 3.1.5 + istanbul-reports: 3.1.6 jest-haste-map: 27.5.1 jest-resolve: 27.5.1 jest-util: 27.5.1 @@ -3757,7 +4056,7 @@ packages: '@jest/console': 27.5.1 '@jest/types': 27.5.1 '@types/istanbul-lib-coverage': 2.0.4 - collect-v8-coverage: 1.0.1 + collect-v8-coverage: 1.0.2 /@jest/test-result@28.1.3: resolution: {integrity: sha512-kZAkxnSE+FqE8YjW8gNuoVkkC9I7S1qmenl8sGcDOLropASP+BkcGKwhXoyqQuGOGeYY0y/ixjrd/iERpEXHNg==} @@ -3793,7 +4092,7 @@ packages: resolution: {integrity: sha512-ipON6WtYgl/1329g5AIJVbUuEh0wZVbdpGwC99Jw4LwuoBNS95MVphU6zOeD9pDkon+LLbFL7lOQRapbB8SCHw==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: - '@babel/core': 7.22.5 + '@babel/core': 7.22.10 '@jest/types': 27.5.1 babel-plugin-istanbul: 6.1.1 chalk: 4.1.2 @@ -3861,7 +4160,7 @@ packages: dependencies: '@jridgewell/set-array': 1.1.2 '@jridgewell/sourcemap-codec': 1.4.15 - '@jridgewell/trace-mapping': 0.3.18 + '@jridgewell/trace-mapping': 0.3.19 /@jridgewell/resolve-uri@3.1.0: resolution: {integrity: sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==} @@ -3870,7 +4169,6 @@ packages: /@jridgewell/resolve-uri@3.1.1: resolution: {integrity: sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==} engines: {node: '>=6.0.0'} - dev: true /@jridgewell/set-array@1.1.2: resolution: {integrity: sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==} @@ -3894,6 +4192,12 @@ packages: '@jridgewell/resolve-uri': 3.1.0 '@jridgewell/sourcemap-codec': 1.4.14 + /@jridgewell/trace-mapping@0.3.19: + resolution: {integrity: sha512-kf37QtfW+Hwx/buWGMPcR60iF9ziHa6r/CZJIHbmcm4+0qrXiVdxegAH0F6yddEVQ7zdkjcGCgCzUu+BcbhQxw==} + dependencies: + '@jridgewell/resolve-uri': 3.1.1 + '@jridgewell/sourcemap-codec': 1.4.15 + /@jridgewell/trace-mapping@0.3.9: resolution: {integrity: sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==} dependencies: @@ -4947,7 +5251,7 @@ packages: fs-extra: 7.0.1 hardhat: 2.15.0(ts-node@10.9.1)(typescript@4.7.2) lodash: 4.17.21 - semver: 6.3.0 + semver: 6.3.1 table: 6.8.1 undici: 5.22.1 transitivePeerDependencies: @@ -5915,7 +6219,7 @@ packages: resolution: {integrity: sha512-0DGPd9AR3+iDTjGoMpxIkAsUihHZ3Ai6CneU6bRRrffXMgzCdlNk43jTrD2/5LT6CBb3MWTP8v510JzYtahD2w==} engines: {node: '>=14'} dependencies: - '@babel/code-frame': 7.22.5 + '@babel/code-frame': 7.22.10 '@babel/runtime': 7.22.5 '@types/aria-query': 5.0.1 aria-query: 5.1.3 @@ -6067,8 +6371,8 @@ packages: /@types/babel__core@7.20.1: resolution: {integrity: sha512-aACu/U/omhdk15O4Nfb+fHgH/z3QsfQzpnvRZhYhThms83ZnAOZz7zZAWO7mn2yyNQaA4xTO8GLK3uqFU4bYYw==} dependencies: - '@babel/parser': 7.22.5 - '@babel/types': 7.22.5 + '@babel/parser': 7.22.10 + '@babel/types': 7.22.10 '@types/babel__generator': 7.6.4 '@types/babel__template': 7.4.1 '@types/babel__traverse': 7.20.1 @@ -6076,18 +6380,18 @@ packages: /@types/babel__generator@7.6.4: resolution: {integrity: sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==} dependencies: - '@babel/types': 7.22.5 + '@babel/types': 7.22.10 /@types/babel__template@7.4.1: resolution: {integrity: sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==} dependencies: - '@babel/parser': 7.22.5 - '@babel/types': 7.22.5 + '@babel/parser': 7.22.10 + '@babel/types': 7.22.10 /@types/babel__traverse@7.20.1: resolution: {integrity: sha512-MitHFXnhtgwsGZWtT68URpOvLN4EREih1u3QtQiN4VdAxWKRVvGCSvw/Qth0M0Qq3pJpnGOu5JaM/ydK7OGbqg==} dependencies: - '@babel/types': 7.22.5 + '@babel/types': 7.22.10 /@types/bn.js@4.11.6: resolution: {integrity: sha512-pqr857jrp2kPuO9uRjZ3PwnJTjoQy+fcdxvBTvHm6dkmEL9q+hDD/2j/0ELOBPtPnS8LjCX0gI9nbl8lVkadpg==} @@ -7206,12 +7510,12 @@ packages: dependencies: acorn: 8.9.0 - /acorn-jsx@5.3.2(acorn@8.9.0): + /acorn-jsx@5.3.2(acorn@8.10.0): resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==} peerDependencies: acorn: ^6.0.0 || ^7.0.0 || ^8.0.0 dependencies: - acorn: 8.9.0 + acorn: 8.10.0 dev: false /acorn-walk@7.2.0: @@ -7228,6 +7532,11 @@ packages: engines: {node: '>=0.4.0'} hasBin: true + /acorn@8.10.0: + resolution: {integrity: sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==} + engines: {node: '>=0.4.0'} + hasBin: true + /acorn@8.9.0: resolution: {integrity: sha512-jaVNAFBHNLXspO543WnNNPZFRtavh3skAkITqD0/2aeMkKZTN+254PyhwxFYrk3vQ1xfY+2wbesJMs/JC8/PwQ==} engines: {node: '>=0.4.0'} @@ -7731,7 +8040,7 @@ packages: engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: '@babel/template': 7.22.5 - '@babel/types': 7.22.5 + '@babel/types': 7.22.10 '@types/babel__core': 7.20.1 '@types/babel__traverse': 7.20.1 @@ -7811,6 +8120,25 @@ packages: '@babel/parser': 7.22.5 dev: true + /babel-preset-current-node-syntax@1.0.1(@babel/core@7.22.10): + resolution: {integrity: sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==} + peerDependencies: + '@babel/core': ^7.0.0 + dependencies: + '@babel/core': 7.22.10 + '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.22.10) + '@babel/plugin-syntax-bigint': 7.8.3(@babel/core@7.22.10) + '@babel/plugin-syntax-class-properties': 7.12.13(@babel/core@7.22.10) + '@babel/plugin-syntax-import-meta': 7.10.4(@babel/core@7.22.10) + '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.22.10) + '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.22.10) + '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.22.10) + '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.22.10) + '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.22.10) + '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.22.10) + '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.22.10) + '@babel/plugin-syntax-top-level-await': 7.14.5(@babel/core@7.22.10) + /babel-preset-current-node-syntax@1.0.1(@babel/core@7.22.5): resolution: {integrity: sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==} peerDependencies: @@ -8177,6 +8505,16 @@ packages: dependencies: pako: 1.0.11 + /browserslist@4.21.10: + resolution: {integrity: sha512-bipEBdZfVH5/pwrvqc+Ub0kUPVfGUhlKxbvfD+z1BDnPEO/X98ruXGA1WP5ASpAFKan7Qr6j736IacbZQuAlKQ==} + engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} + hasBin: true + dependencies: + caniuse-lite: 1.0.30001519 + electron-to-chromium: 1.4.490 + node-releases: 2.0.13 + update-browserslist-db: 1.0.11(browserslist@4.21.10) + /browserslist@4.21.9: resolution: {integrity: sha512-M0MFoZzbUrRU4KNfCrDLnvyE7gub+peetoTid3TBIqtunaDJyXlwhakT+/VkvSXcfIzFfK/nkCs4nmyTmxdNSg==} engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} @@ -8386,6 +8724,9 @@ packages: /caniuse-lite@1.0.30001505: resolution: {integrity: sha512-jaAOR5zVtxHfL0NjZyflVTtXm3D3J9P15zSJ7HmQF8dSKGA6tqzQq+0ZI3xkjyQj46I4/M0K2GbMpcAFOcbr3A==} + /caniuse-lite@1.0.30001519: + resolution: {integrity: sha512-0QHgqR+Jv4bxHMp8kZ1Kn8CH55OikjKJ6JmKkZYP1F3D7w+lnFXF70nG5eNfsZS89jadi5Ywy5UCSKLAglIRkg==} + /cardinal@2.1.1: resolution: {integrity: sha512-JSr5eOgoEymtYHBjNWyjrMqet9Am2miJhlfKNdqLp6zoeAh0KN5dRAcxlecj5mAJrmQomgiOBj35xHLrFjqBpw==} hasBin: true @@ -8734,6 +9075,9 @@ packages: /collect-v8-coverage@1.0.1: resolution: {integrity: sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg==} + /collect-v8-coverage@1.0.2: + resolution: {integrity: sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q==} + /color-convert@1.9.3: resolution: {integrity: sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==} dependencies: @@ -9980,6 +10324,9 @@ packages: /electron-to-chromium@1.4.434: resolution: {integrity: sha512-5Gvm09UZTQRaWrimRtWRO5rvaX6Kpk5WHAPKDa7A4Gj6NIPuJ8w8WNpnxCXdd+CJJt6RBU6tUw0KyULoW6XuHw==} + /electron-to-chromium@1.4.490: + resolution: {integrity: sha512-6s7NVJz+sATdYnIwhdshx/N/9O6rvMxmhVoDSDFdj6iA45gHR8EQje70+RYsF4GeB+k0IeNSBnP7yG9ZXJFr7A==} + /elliptic@6.5.4: resolution: {integrity: sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==} dependencies: @@ -10302,15 +10649,14 @@ packages: source-map: 0.2.0 dev: true - /escodegen@2.0.0: - resolution: {integrity: sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==} + /escodegen@2.1.0: + resolution: {integrity: sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==} engines: {node: '>=6.0'} hasBin: true dependencies: esprima: 4.0.1 estraverse: 5.3.0 esutils: 2.0.3 - optionator: 0.8.3 optionalDependencies: source-map: 0.6.1 @@ -10396,8 +10742,8 @@ packages: '@babel/plugin-transform-react-jsx': ^7.14.9 eslint: ^8.1.0 dependencies: - '@babel/plugin-syntax-flow': 7.22.5(@babel/core@7.22.5) - '@babel/plugin-transform-react-jsx': 7.22.5(@babel/core@7.22.5) + '@babel/plugin-syntax-flow': 7.22.5(@babel/core@7.22.10) + '@babel/plugin-transform-react-jsx': 7.22.5(@babel/core@7.22.10) eslint: 8.43.0 lodash: 4.17.21 string-natural-compare: 3.0.1 @@ -10628,8 +10974,8 @@ packages: resolution: {integrity: sha512-7OASN1Wma5fum5SrNhFMAMJxOUAbhyfQ8dQ//PJaJbNw0URTPWqIghHWt1MmAANKhHZIYOHruW4Kw4ruUWOdGw==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dependencies: - acorn: 8.9.0 - acorn-jsx: 5.3.2(acorn@8.9.0) + acorn: 8.10.0 + acorn-jsx: 5.3.2(acorn@8.10.0) eslint-visitor-keys: 3.4.1 dev: false @@ -11970,7 +12316,7 @@ packages: qs: 6.11.2 raw-body: 2.5.2 resolve: 1.17.0 - semver: 6.3.0 + semver: 6.3.1 solc: 0.7.3(debug@4.3.4) source-map-support: 0.5.21 stacktrace-parser: 0.1.10 @@ -12873,6 +13219,11 @@ packages: dependencies: has: 1.0.3 + /is-core-module@2.13.0: + resolution: {integrity: sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ==} + dependencies: + has: 1.0.3 + /is-date-object@1.0.5: resolution: {integrity: sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==} engines: {node: '>= 0.4'} @@ -13155,11 +13506,11 @@ packages: resolution: {integrity: sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==} engines: {node: '>=8'} dependencies: - '@babel/core': 7.22.5 - '@babel/parser': 7.22.5 + '@babel/core': 7.22.10 + '@babel/parser': 7.22.10 '@istanbuljs/schema': 0.1.3 istanbul-lib-coverage: 3.2.0 - semver: 6.3.0 + semver: 6.3.1 transitivePeerDependencies: - supports-color @@ -13170,6 +13521,15 @@ packages: istanbul-lib-coverage: 3.2.0 make-dir: 3.1.0 supports-color: 7.2.0 + dev: true + + /istanbul-lib-report@3.0.1: + resolution: {integrity: sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==} + engines: {node: '>=10'} + dependencies: + istanbul-lib-coverage: 3.2.0 + make-dir: 4.0.0 + supports-color: 7.2.0 /istanbul-lib-source-maps@4.0.1: resolution: {integrity: sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==} @@ -13187,6 +13547,14 @@ packages: dependencies: html-escaper: 2.0.2 istanbul-lib-report: 3.0.0 + dev: true + + /istanbul-reports@3.1.6: + resolution: {integrity: sha512-TLgnMkKg3iTDsQ9PbPTdpfAK2DzjF9mqUG7RMgcQl8oFjad8ob4laGxv5XV5U9MAfx8D6tSJiUyuAwzLicaxlg==} + engines: {node: '>=8'} + dependencies: + html-escaper: 2.0.2 + istanbul-lib-report: 3.0.1 /it-all@1.0.6: resolution: {integrity: sha512-3cmCc6Heqe3uWi3CVM/k51fa/XbMFpQVzFoDsV0IZNHSQDyAXl3c4MjHkFX5kF3922OGj7Myv1nSEUgRtcuM1A==} @@ -13691,6 +14059,34 @@ packages: - ts-node dev: true + /jest-cli@28.1.3(@types/node@16.11.59)(ts-node@10.9.1): + resolution: {integrity: sha512-roY3kvrv57Azn1yPgdTebPAXvdR2xfezaKKYzVxZ6It/5NCxzJym6tUI5P1zkdWhfUYkxEI9uZWcQdaFLo8mJQ==} + engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} + hasBin: true + peerDependencies: + node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0 + peerDependenciesMeta: + node-notifier: + optional: true + dependencies: + '@jest/core': 28.1.3(ts-node@10.9.1) + '@jest/test-result': 28.1.3 + '@jest/types': 28.1.3 + chalk: 4.1.2 + exit: 0.1.2 + graceful-fs: 4.2.11 + import-local: 3.1.0 + jest-config: 28.1.3(@types/node@16.11.59)(ts-node@10.9.1) + jest-util: 28.1.3 + jest-validate: 28.1.3 + prompts: 2.4.2 + yargs: 17.7.2 + transitivePeerDependencies: + - '@types/node' + - supports-color + - ts-node + dev: true + /jest-config@27.5.1: resolution: {integrity: sha512-5sAsjm6tGdsVbW9ahcChPAFCk4IlkQUknH5AvKjuLTSlcO/wCZKyFdn7Rg0EkC+OGgWODEy2hDpWB1PgzH0JNA==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} @@ -13811,6 +14207,46 @@ packages: - supports-color dev: true + /jest-config@28.1.3(@types/node@16.11.59)(ts-node@10.9.1): + resolution: {integrity: sha512-MG3INjByJ0J4AsNBm7T3hsuxKQqFIiRo/AUqb1q9LRKI5UU6Aar9JHbr9Ivn1TVwfUD9KirRoM/T6u8XlcQPHQ==} + engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} + peerDependencies: + '@types/node': '*' + ts-node: '>=9.0.0' + peerDependenciesMeta: + '@types/node': + optional: true + ts-node: + optional: true + dependencies: + '@babel/core': 7.22.5 + '@jest/test-sequencer': 28.1.3 + '@jest/types': 28.1.3 + '@types/node': 16.11.59 + babel-jest: 28.1.3(@babel/core@7.22.5) + chalk: 4.1.2 + ci-info: 3.8.0 + deepmerge: 4.3.1 + glob: 7.2.3 + graceful-fs: 4.2.11 + jest-circus: 28.1.3 + jest-environment-node: 28.1.3 + jest-get-type: 28.0.2 + jest-regex-util: 28.0.2 + jest-resolve: 28.1.3 + jest-runner: 28.1.3 + jest-util: 28.1.3 + jest-validate: 28.1.3 + micromatch: 4.0.5 + parse-json: 5.2.0 + pretty-format: 28.1.3 + slash: 3.0.0 + strip-json-comments: 3.1.1 + ts-node: 10.9.1(@types/node@16.11.59)(typescript@4.7.2) + transitivePeerDependencies: + - supports-color + dev: true + /jest-config@28.1.3(@types/node@20.4.5): resolution: {integrity: sha512-MG3INjByJ0J4AsNBm7T3hsuxKQqFIiRo/AUqb1q9LRKI5UU6Aar9JHbr9Ivn1TVwfUD9KirRoM/T6u8XlcQPHQ==} engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} @@ -13850,6 +14286,46 @@ packages: - supports-color dev: true + /jest-config@28.1.3(@types/node@20.4.5)(ts-node@10.9.1): + resolution: {integrity: sha512-MG3INjByJ0J4AsNBm7T3hsuxKQqFIiRo/AUqb1q9LRKI5UU6Aar9JHbr9Ivn1TVwfUD9KirRoM/T6u8XlcQPHQ==} + engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} + peerDependencies: + '@types/node': '*' + ts-node: '>=9.0.0' + peerDependenciesMeta: + '@types/node': + optional: true + ts-node: + optional: true + dependencies: + '@babel/core': 7.22.5 + '@jest/test-sequencer': 28.1.3 + '@jest/types': 28.1.3 + '@types/node': 20.4.5 + babel-jest: 28.1.3(@babel/core@7.22.5) + chalk: 4.1.2 + ci-info: 3.8.0 + deepmerge: 4.3.1 + glob: 7.2.3 + graceful-fs: 4.2.11 + jest-circus: 28.1.3 + jest-environment-node: 28.1.3 + jest-get-type: 28.0.2 + jest-regex-util: 28.0.2 + jest-resolve: 28.1.3 + jest-runner: 28.1.3 + jest-util: 28.1.3 + jest-validate: 28.1.3 + micromatch: 4.0.5 + parse-json: 5.2.0 + pretty-format: 28.1.3 + slash: 3.0.0 + strip-json-comments: 3.1.1 + ts-node: 10.9.1(@types/node@16.11.59)(typescript@4.7.2) + transitivePeerDependencies: + - supports-color + dev: true + /jest-diff@27.5.1: resolution: {integrity: sha512-m0NvkX55LDt9T4mctTEgnZk3fmEg3NRYutvMPWM/0iPnkFj2wIeF45O1718cMSOFO1vINkqmxqD8vE37uTEbqw==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} @@ -14052,7 +14528,7 @@ packages: resolution: {integrity: sha512-rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: - '@babel/code-frame': 7.22.5 + '@babel/code-frame': 7.22.10 '@jest/types': 27.5.1 '@types/stack-utils': 2.0.1 chalk: 4.1.2 @@ -14153,7 +14629,7 @@ packages: jest-pnp-resolver: 1.2.3(jest-resolve@27.5.1) jest-util: 27.5.1 jest-validate: 27.5.1 - resolve: 1.22.2 + resolve: 1.22.4 resolve.exports: 1.1.1 slash: 3.0.0 @@ -14245,7 +14721,7 @@ packages: '@jest/types': 27.5.1 chalk: 4.1.2 cjs-module-lexer: 1.2.3 - collect-v8-coverage: 1.0.1 + collect-v8-coverage: 1.0.2 execa: 5.1.1 glob: 7.2.3 graceful-fs: 4.2.11 @@ -14302,16 +14778,16 @@ packages: resolution: {integrity: sha512-yYykXI5a0I31xX67mgeLw1DZ0bJB+gpq5IpSuCAoyDi0+BhgU/RIrL+RTzDmkNTchvDFWKP8lp+w/42Z3us5sA==} engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0} dependencies: - '@babel/core': 7.22.5 - '@babel/generator': 7.22.5 - '@babel/plugin-syntax-typescript': 7.22.5(@babel/core@7.22.5) - '@babel/traverse': 7.22.5 - '@babel/types': 7.22.5 + '@babel/core': 7.22.10 + '@babel/generator': 7.22.10 + '@babel/plugin-syntax-typescript': 7.22.5(@babel/core@7.22.10) + '@babel/traverse': 7.22.10 + '@babel/types': 7.22.10 '@jest/transform': 27.5.1 '@jest/types': 27.5.1 '@types/babel__traverse': 7.20.1 '@types/prettier': 2.7.3 - babel-preset-current-node-syntax: 1.0.1(@babel/core@7.22.5) + babel-preset-current-node-syntax: 1.0.1(@babel/core@7.22.10) chalk: 4.1.2 expect: 27.5.1 graceful-fs: 4.2.11 @@ -14323,7 +14799,7 @@ packages: jest-util: 27.5.1 natural-compare: 1.4.0 pretty-format: 27.5.1 - semver: 7.5.2 + semver: 7.5.4 transitivePeerDependencies: - supports-color @@ -14529,6 +15005,25 @@ packages: - ts-node dev: true + /jest@28.1.0(@types/node@16.11.59)(ts-node@10.9.1): + resolution: {integrity: sha512-TZR+tHxopPhzw3c3560IJXZWLNHgpcz1Zh0w5A65vynLGNcg/5pZ+VildAd7+XGOu6jd58XMY/HNn0IkZIXVXg==} + engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} + hasBin: true + peerDependencies: + node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0 + peerDependenciesMeta: + node-notifier: + optional: true + dependencies: + '@jest/core': 28.1.3(ts-node@10.9.1) + import-local: 3.1.0 + jest-cli: 28.1.3(@types/node@16.11.59)(ts-node@10.9.1) + transitivePeerDependencies: + - '@types/node' + - supports-color + - ts-node + dev: true + /jiti@1.18.2: resolution: {integrity: sha512-QAdOptna2NYiSSpv0O/BwoHBSmz4YhpzJHyi+fnMRTXFjp7B8i/YG5Z8IfusxB1ufjcD2Sre1F3R+nX3fvy7gg==} hasBin: true @@ -14594,20 +15089,20 @@ packages: optional: true dependencies: abab: 2.0.6 - acorn: 8.9.0 + acorn: 8.10.0 acorn-globals: 6.0.0 cssom: 0.4.4 cssstyle: 2.3.0 data-urls: 2.0.0 decimal.js: 10.4.3 domexception: 2.0.1 - escodegen: 2.0.0 + escodegen: 2.1.0 form-data: 3.0.1 html-encoding-sniffer: 2.0.1 http-proxy-agent: 4.0.1 https-proxy-agent: 5.0.1 is-potential-custom-element-name: 1.0.1 - nwsapi: 2.2.5 + nwsapi: 2.2.7 parse5: 6.0.1 saxes: 5.0.1 symbol-tree: 3.2.4 @@ -14837,6 +15332,7 @@ packages: dependencies: prelude-ls: 1.1.2 type-check: 0.3.2 + dev: true /levn@0.4.1: resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==} @@ -15476,6 +15972,12 @@ packages: dependencies: semver: 6.3.0 + /make-dir@4.0.0: + resolution: {integrity: sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==} + engines: {node: '>=10'} + dependencies: + semver: 7.5.4 + /make-error@1.3.6: resolution: {integrity: sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==} dev: true @@ -16399,6 +16901,9 @@ packages: /node-releases@2.0.12: resolution: {integrity: sha512-QzsYKWhXTWx8h1kIvqfnC++o0pEmpRQA/aenALsL2F4pqNVr7YzcdMlDij5WBnwftRbJCNJL/O7zdKaxKPHqgQ==} + /node-releases@2.0.13: + resolution: {integrity: sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==} + /node-stdlib-browser@1.2.0: resolution: {integrity: sha512-VSjFxUhRhkyed8AtLwSCkMrJRfQ3e2lGtG3sP6FEgaLKBBbxM/dLfjRe1+iLhjvyLFW3tBQ8+c0pcOtXGbAZJg==} engines: {node: '>=10'} @@ -16490,8 +16995,8 @@ packages: strip-hex-prefix: 1.0.0 dev: true - /nwsapi@2.2.5: - resolution: {integrity: sha512-6xpotnECFy/og7tKSBVmUNft7J3jyXAka4XvG6AUhFWRz+Q/Ljus7znJAA3bxColfQLdS+XsjoodtJfCgeTEFQ==} + /nwsapi@2.2.7: + resolution: {integrity: sha512-ub5E4+FBPKwAZx0UwIQOjYWGHTEq5sPqHQNRN8Z9e4A7u3Tj1weLJsL59yH9vmvqEtBHaOmT6cYQKIZOxp35FQ==} /oauth-sign@0.9.0: resolution: {integrity: sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==} @@ -16670,6 +17175,7 @@ packages: prelude-ls: 1.1.2 type-check: 0.3.2 word-wrap: 1.2.3 + dev: true /optionator@0.9.1: resolution: {integrity: sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==} @@ -17970,6 +18476,7 @@ packages: /prelude-ls@1.1.2: resolution: {integrity: sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==} engines: {node: '>= 0.8.0'} + dev: true /prelude-ls@1.2.1: resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==} @@ -18604,7 +19111,7 @@ packages: resolution: {integrity: sha512-HFM8rkZ+i3zrV+4LQjwQ0W+ez98pApMGM3HUrN04j3CqzPOzl9nmP15Y8YXNm8QHGv/eacOVEjqhmWpkRV0NAw==} engines: {node: '>= 0.10'} dependencies: - resolve: 1.22.2 + resolve: 1.22.4 dev: true /recursive-readdir@2.2.3: @@ -18852,6 +19359,14 @@ packages: path-parse: 1.0.7 supports-preserve-symlinks-flag: 1.0.0 + /resolve@1.22.4: + resolution: {integrity: sha512-PXNdCiPqDqeUou+w1C2eTQbNfxKSuMxqTCuvlmmMsk1NWHL5fRrhY6Pl0qEYYc6+QqGClco1Qj8XnjPego4wfg==} + hasBin: true + dependencies: + is-core-module: 2.13.0 + path-parse: 1.0.7 + supports-preserve-symlinks-flag: 1.0.0 + /resolve@2.0.0-next.4: resolution: {integrity: sha512-iMDbmAWtfU+MHpxt/I5iWI7cY6YVEZUQ3MBgPQ++XD1PELuJHIl82xBmObyP2KyQmkNB2dsqF7seoQQiAn5yDQ==} hasBin: true @@ -19273,6 +19788,10 @@ packages: resolution: {integrity: sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==} hasBin: true + /semver@6.3.1: + resolution: {integrity: sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==} + hasBin: true + /semver@7.5.2: resolution: {integrity: sha512-SoftuTROv/cRjCze/scjGyiDtcUyxw1rgYQSZY7XTmtR5hX+dm76iDbTH8TkLPHCQmlbQVSSbNZCPM2hb0knnQ==} engines: {node: '>=10'} @@ -19286,7 +19805,6 @@ packages: hasBin: true dependencies: lru-cache: 6.0.0 - dev: true /send@0.18.0: resolution: {integrity: sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==} @@ -19547,7 +20065,7 @@ packages: pify: 4.0.1 recursive-readdir: 2.2.3 sc-istanbul: 0.4.6 - semver: 7.5.2 + semver: 7.5.4 shelljs: 0.8.5 web3-utils: 1.10.0 transitivePeerDependencies: @@ -20600,7 +21118,7 @@ packages: yargs-parser: 20.2.9 dev: true - /ts-jest@28.0.2(@babel/core@7.22.5)(@types/jest@28.1.0)(jest@28.1.0)(typescript@4.7.2): + /ts-jest@28.0.2(@babel/core@7.22.10)(@types/jest@28.1.0)(jest@28.1.0)(typescript@4.7.2): resolution: {integrity: sha512-IOZMb3D0gx6IHO9ywPgiQxJ3Zl4ECylEFwoVpENB55aTn5sdO0Ptyx/7noNBxAaUff708RqQL4XBNxxOVjY0vQ==} engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0} hasBin: true @@ -20621,7 +21139,7 @@ packages: esbuild: optional: true dependencies: - '@babel/core': 7.22.5 + '@babel/core': 7.22.10 '@types/jest': 28.1.0 bs-logger: 0.2.6 fast-json-stable-stringify: 2.1.0 @@ -20650,6 +21168,37 @@ packages: webpack: 5.88.2 dev: true + /ts-node@10.9.1(@types/node@16.11.59)(typescript@4.7.2): + resolution: {integrity: sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==} + hasBin: true + peerDependencies: + '@swc/core': '>=1.2.50' + '@swc/wasm': '>=1.2.50' + '@types/node': '*' + typescript: '>=2.7' + peerDependenciesMeta: + '@swc/core': + optional: true + '@swc/wasm': + optional: true + dependencies: + '@cspotcode/source-map-support': 0.8.1 + '@tsconfig/node10': 1.0.9 + '@tsconfig/node12': 1.0.11 + '@tsconfig/node14': 1.0.3 + '@tsconfig/node16': 1.0.4 + '@types/node': 16.11.59 + acorn: 8.9.0 + acorn-walk: 8.2.0 + arg: 4.1.3 + create-require: 1.1.1 + diff: 4.0.2 + make-error: 1.3.6 + typescript: 4.7.2 + v8-compile-cache-lib: 3.0.1 + yn: 3.1.1 + dev: true + /ts-node@10.9.1(@types/node@18.13.0)(typescript@4.7.2): resolution: {integrity: sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==} hasBin: true @@ -20783,6 +21332,7 @@ packages: engines: {node: '>= 0.8.0'} dependencies: prelude-ls: 1.1.2 + dev: true /type-check@0.4.0: resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==} @@ -21039,6 +21589,16 @@ packages: engines: {node: '>=4'} dev: false + /update-browserslist-db@1.0.11(browserslist@4.21.10): + resolution: {integrity: sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==} + hasBin: true + peerDependencies: + browserslist: '>= 4.21.0' + dependencies: + browserslist: 4.21.10 + escalade: 3.1.1 + picocolors: 1.0.0 + /update-browserslist-db@1.0.11(browserslist@4.21.9): resolution: {integrity: sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==} hasBin: true From a30ab5922e87dbeb9fac5e62fad41e932c375ceb Mon Sep 17 00:00:00 2001 From: Akim Mamedov Date: Thu, 10 Aug 2023 15:24:54 +0700 Subject: [PATCH 12/48] Fix last strange test --- packages/core/js-peer/src/services/NodeUtils.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/core/js-peer/src/services/NodeUtils.ts b/packages/core/js-peer/src/services/NodeUtils.ts index 8aef75372..d6b89be88 100644 --- a/packages/core/js-peer/src/services/NodeUtils.ts +++ b/packages/core/js-peer/src/services/NodeUtils.ts @@ -51,7 +51,7 @@ export class NodeUtils implements NodeUtilsDef { }); return { success: true, - content: data.toString(), + content: data as unknown as string, error: null, }; } catch (err: any) { From c8946e32c8974d61f56875e272aec18dd3adfaa5 Mon Sep 17 00:00:00 2001 From: Akim Mamedov Date: Fri, 11 Aug 2023 22:20:37 +0700 Subject: [PATCH 13/48] Remove package specific packages --- packages/@tests/aqua/package.json | 1 + packages/@tests/aqua/src/index.ts | 4 +- packages/@tests/smoke/node/package.json | 3 +- packages/@tests/smoke/node/src/index.ts | 2 +- .../@tests/smoke/web-cra-ts/public/index.html | 2 +- .../@tests/smoke/web-cra-ts/test/index.ts | 13 +- packages/@tests/smoke/web/package.json | 2 +- packages/@tests/test-utils/package.json | 2 - packages/@tests/test-utils/src/index.ts | 11 +- packages/client/api/package.json | 3 +- packages/client/js-client.node/.gitignore | 21 - packages/client/js-client.node/.npmignore | 0 packages/client/js-client.node/CHANGELOG.md | 169 -- packages/client/js-client.node/README.md | 11 - packages/client/js-client.node/package.json | 50 - packages/client/js-client.node/src/index.ts | 143 - packages/client/js-client.node/tsconfig.json | 8 - packages/client/js-client.node/vite.config.js | 44 - .../js-client.web.standalone/.gitignore | 1 - .../js-client.web.standalone/.prettierignore | 1 - .../js-client.web.standalone/CHANGELOG.md | 170 -- .../client/js-client.web.standalone/README.md | 11 - .../client/js-client.web.standalone/build.ts | 122 - .../js-client.web.standalone/package.json | 56 - .../js-client.web.standalone/src/index.ts | 123 - .../js-client.web.standalone/tsconfig.json | 9 - packages/client/js-client.web/.gitignore | 21 - packages/client/js-client.web/CHANGELOG.md | 69 - packages/client/js-client.web/README.md | 11 - packages/client/js-client.web/package.json | 28 - packages/client/js-client.web/src/index.ts | 50 - packages/client/js-client.web/tsconfig.json | 7 - packages/core/js-peer/build.ts | 104 + .../js-peer}/mocks/crypto.js | 0 .../js-peer}/mocks/dgram.js | 0 .../js-peer}/mocks/module.js | 0 .../js-peer}/mocks/net.js | 0 packages/core/js-peer/package.json | 63 +- packages/core/js-peer/src/api.ts | 189 ++ .../core/js-peer/src/clientPeer/ClientPeer.ts | 2 + packages/core/js-peer/src/index.ts | 223 ++ .../core/js-peer/src/jsPeer/FluencePeer.ts | 3 + .../core/js-peer/src/marine/worker/index.ts | 10 +- .../js-peer}/src/test.ts | 10 +- packages/core/js-peer/tsconfig.json | 4 +- packages/core/marine-worker/package.json | 11 +- pnpm-lock.yaml | 2317 +++-------------- 47 files changed, 914 insertions(+), 3190 deletions(-) delete mode 100644 packages/client/js-client.node/.gitignore delete mode 100644 packages/client/js-client.node/.npmignore delete mode 100644 packages/client/js-client.node/CHANGELOG.md delete mode 100644 packages/client/js-client.node/README.md delete mode 100644 packages/client/js-client.node/package.json delete mode 100644 packages/client/js-client.node/src/index.ts delete mode 100644 packages/client/js-client.node/tsconfig.json delete mode 100644 packages/client/js-client.node/vite.config.js delete mode 100644 packages/client/js-client.web.standalone/.gitignore delete mode 100644 packages/client/js-client.web.standalone/.prettierignore delete mode 100644 packages/client/js-client.web.standalone/CHANGELOG.md delete mode 100644 packages/client/js-client.web.standalone/README.md delete mode 100644 packages/client/js-client.web.standalone/build.ts delete mode 100644 packages/client/js-client.web.standalone/package.json delete mode 100644 packages/client/js-client.web.standalone/src/index.ts delete mode 100644 packages/client/js-client.web.standalone/tsconfig.json delete mode 100644 packages/client/js-client.web/.gitignore delete mode 100644 packages/client/js-client.web/CHANGELOG.md delete mode 100644 packages/client/js-client.web/README.md delete mode 100644 packages/client/js-client.web/package.json delete mode 100644 packages/client/js-client.web/src/index.ts delete mode 100644 packages/client/js-client.web/tsconfig.json create mode 100644 packages/core/js-peer/build.ts rename packages/{client/js-client.web.standalone => core/js-peer}/mocks/crypto.js (100%) rename packages/{client/js-client.web.standalone => core/js-peer}/mocks/dgram.js (100%) rename packages/{client/js-client.web.standalone => core/js-peer}/mocks/module.js (100%) rename packages/{client/js-client.web.standalone => core/js-peer}/mocks/net.js (100%) create mode 100644 packages/core/js-peer/src/api.ts create mode 100644 packages/core/js-peer/src/index.ts rename packages/{client/js-client.node => core/js-peer}/src/test.ts (69%) diff --git a/packages/@tests/aqua/package.json b/packages/@tests/aqua/package.json index d212af8f4..d1ffd7ce3 100644 --- a/packages/@tests/aqua/package.json +++ b/packages/@tests/aqua/package.json @@ -18,6 +18,7 @@ "license": "Apache-2.0", "dependencies": { "@fluencelabs/js-client.api": "workspace:^", + "@fluencelabs/js-peer": "workspace:^", "base64-js": "1.5.1" }, "devDependencies": { diff --git a/packages/@tests/aqua/src/index.ts b/packages/@tests/aqua/src/index.ts index 92588e953..7579874ba 100644 --- a/packages/@tests/aqua/src/index.ts +++ b/packages/@tests/aqua/src/index.ts @@ -1,6 +1,6 @@ import { fromByteArray } from 'base64-js'; -import { Fluence } from '@fluencelabs/js-client.api'; -import type { ClientConfig } from '@fluencelabs/js-client.api'; +import { Fluence } from '@fluencelabs/js-peer'; +import type { ClientConfig } from '@fluencelabs/js-peer'; import { registerHelloWorld, helloTest, marineTest, resourceTest } from './_aqua/smoke_test.js'; import { wasm } from './wasmb64.js'; diff --git a/packages/@tests/smoke/node/package.json b/packages/@tests/smoke/node/package.json index 2479f31d7..85733ab2a 100644 --- a/packages/@tests/smoke/node/package.json +++ b/packages/@tests/smoke/node/package.json @@ -17,8 +17,7 @@ "author": "Fluence Labs", "license": "Apache-2.0", "dependencies": { - "@fluencelabs/js-client.api": "workspace:^", - "@fluencelabs/js-client.node": "workspace:^", + "@fluencelabs/js-peer": "workspace:*", "@test/aqua_for_test": "workspace:../../aqua" } } diff --git a/packages/@tests/smoke/node/src/index.ts b/packages/@tests/smoke/node/src/index.ts index 7cd822d84..eee1c205c 100644 --- a/packages/@tests/smoke/node/src/index.ts +++ b/packages/@tests/smoke/node/src/index.ts @@ -1,4 +1,4 @@ -import '@fluencelabs/js-client.node'; +import '@fluencelabs/js-peer'; import { runTest } from '@test/aqua_for_test'; runTest().then(() => console.log('Smoke tests succeed!')); diff --git a/packages/@tests/smoke/web-cra-ts/public/index.html b/packages/@tests/smoke/web-cra-ts/public/index.html index 5e5194445..1fb6b1dc9 100644 --- a/packages/@tests/smoke/web-cra-ts/public/index.html +++ b/packages/@tests/smoke/web-cra-ts/public/index.html @@ -7,7 +7,7 @@ - + + - +