From 4e977c8491700ba495d38855d18b94c8166be453 Mon Sep 17 00:00:00 2001 From: Nicolas Ochem Date: Thu, 30 Jun 2022 21:49:56 -0700 Subject: [PATCH] Endpoint: support CLI parameters --- .../templates/deployment.yaml | 13 +- charts/flashbake-endpoint/values.yaml | 9 + flashbake-endpoint-values-0.yaml | 3 + flashbake-endpoint-values-1.yaml | 3 + flashbake/app.ts | 26 +- flashbake/package-lock.json | 622 +++++++++++++----- flashbake/package.json | 4 +- 7 files changed, 495 insertions(+), 185 deletions(-) diff --git a/charts/flashbake-endpoint/templates/deployment.yaml b/charts/flashbake-endpoint/templates/deployment.yaml index 806c9d5..5bd2afc 100644 --- a/charts/flashbake-endpoint/templates/deployment.yaml +++ b/charts/flashbake-endpoint/templates/deployment.yaml @@ -39,9 +39,16 @@ spec: protocol: TCP resources: {{- toYaml .Values.resources | nindent 12 }} - env: - - name: TEZOS_RPC_URL - value: {{ .Values.tezos_rpc_url }} + command: + - node + - app.js + - start + - --relay_listener_port + - "{{ .Values.relay_listener_port }}" + - --tezos_rpc_url + - {{ .Values.tezos_rpc_url }} + - --baker_listener_port + - "{{ .Values.baker_listener_port }}" {{- with .Values.nodeSelector }} nodeSelector: {{- toYaml . | nindent 8 }} diff --git a/charts/flashbake-endpoint/values.yaml b/charts/flashbake-endpoint/values.yaml index de4f718..26cdbd4 100644 --- a/charts/flashbake-endpoint/values.yaml +++ b/charts/flashbake-endpoint/values.yaml @@ -1,6 +1,15 @@ # URL to talk to Tezos RPC API tezos_rpc_url: http://localhost:8732 +# port where endpoint listens to relay connections +relay_listener_port: 11732 + +# port where endpoint listens to connections from the +# baker. --operations-pool argument of the baker should +# target this endpoint. +baker_listener_port: 12732 + + replicaCount: 1 image: diff --git a/flashbake-endpoint-values-0.yaml b/flashbake-endpoint-values-0.yaml index dff2d48..d0a7be3 100644 --- a/flashbake-endpoint-values-0.yaml +++ b/flashbake-endpoint-values-0.yaml @@ -1,4 +1,7 @@ tezos_rpc_url: http://flashbake-baker-0:8732/ +relay_listener_port: 11732 +baker_listener_port: 12732 + image: repository: localhost/flashbake pullPolicy: IfNotPresent diff --git a/flashbake-endpoint-values-1.yaml b/flashbake-endpoint-values-1.yaml index 4677b31..433865f 100644 --- a/flashbake-endpoint-values-1.yaml +++ b/flashbake-endpoint-values-1.yaml @@ -1,4 +1,7 @@ tezos_rpc_url: http://flashbake-baker-1:8732/ +relay_listener_port: 11732 +baker_listener_port: 12732 + image: repository: localhost/flashbake pullPolicy: IfNotPresent diff --git a/flashbake/app.ts b/flashbake/app.ts index 6504132..7e7da8a 100644 --- a/flashbake/app.ts +++ b/flashbake/app.ts @@ -1,7 +1,7 @@ import express from 'express'; import { Mempool, InMemoryMempool } from "@flashbake/relay"; import { HttpBakerEndpoint } from '@flashbake/baker-endpoint'; - +import yargs, { Argv } from "yargs"; function startBakerEndpoint(relayListenerPort: number, bakerListenerPort: number, rpcApiUrl: string): HttpBakerEndpoint { const relayFacingApp = express(); @@ -19,13 +19,25 @@ function startBakerEndpoint(relayListenerPort: number, bakerListenerPort: number return baker; } -function main() { - const relayListenerPort = 11732; - const bakerListenerPort = 12732; - const rpcApiUrl = process.env["TEZOS_RPC_URL"] || ''; +async function main() { + let argv = await yargs + .command('start', "Start flashbake-endpoint.", (yargs: Argv) => { + return yargs.option('relay_listener_port', { + describe: "Relay listener port", + type: "number", + demandOption: true, + }).option('tezos_rpc_url', { + describe: "Tezos node RPC API URL", + type: "string", + demandOption: true, + }).option('baker_listener_port', { + describe: "Baker listener port", + type: "number", + demandOption: true, + }) + }).argv; - console.debug(`Using RPC API URL ${rpcApiUrl}`); - startBakerEndpoint(relayListenerPort, bakerListenerPort, rpcApiUrl); + startBakerEndpoint(argv.relay_listener_port, argv.baker_listener_port, argv.tezos_rpc_url); } main(); diff --git a/flashbake/package-lock.json b/flashbake/package-lock.json index a74a237..d0536d5 100644 --- a/flashbake/package-lock.json +++ b/flashbake/package-lock.json @@ -11,11 +11,13 @@ "dependencies": { "@flashbake/baker-endpoint": "file:endpoints-monorepo/baker-endpoint", "@flashbake/relay": "file:endpoints-monorepo/relay", - "express": "^4.17.2" + "express": "^4.17.2", + "yargs": "^17.5.1" }, "devDependencies": { "@types/express": "^4.17.13", "@types/node": "^16.11.7", + "@types/yargs": "^17.0.10", "ts-node": "^10.4.0", "typescript": "^4.4.4" } @@ -62,6 +64,9 @@ "version": "0.0.3", "license": "MIT", "dependencies": { + "@taquito/local-forging": "^12.0.3", + "@taquito/rpc": "^12.0.3", + "bs58check-ts": "^0.0.7", "lodash": "^4.17.21" }, "devDependencies": { @@ -76,9 +81,11 @@ "license": "MIT", "dependencies": { "@flashbake/core": "file:../core", - "@taquito/taquito": "^11.0.1", + "@taquito/rpc": "^12.1.1", + "@taquito/taquito": "^12.1.1", "@taquito/utils": "^12.1.1", "axios": "^0.24.0", + "body-parser": "^1.20.0", "express": "^4.17.2", "http-proxy-middleware": "^2.0.1", "lodash": "^4.17.21" @@ -90,42 +97,6 @@ "typescript": "^4.5.4" } }, - "endpoints-monorepo/relay/node_modules/@taquito/taquito": { - "version": "11.2.0", - "resolved": "https://registry.npmjs.org/@taquito/taquito/-/taquito-11.2.0.tgz", - "integrity": "sha512-OJJYPqQiF7IoxWsBavdKDuxi2oeWHHvRph2nqeCyqVx6H+7uQLpZCf0OP5iQ4F6AxoYPyD7DzEsSFH5tOdgqNQ==", - "hasInstallScript": true, - "dependencies": { - "@taquito/http-utils": "^11.2.0", - "@taquito/michel-codec": "^11.2.0", - "@taquito/michelson-encoder": "^11.2.0", - "@taquito/rpc": "^11.2.0", - "@taquito/utils": "^11.2.0", - "bignumber.js": "^9.0.2", - "rxjs": "^6.6.3" - }, - "engines": { - "node": ">=6.0.0" - } - }, - "endpoints-monorepo/relay/node_modules/@taquito/utils": { - "version": "11.2.0", - "resolved": "https://registry.npmjs.org/@taquito/utils/-/utils-11.2.0.tgz", - "integrity": "sha512-I5LoD5fG9S2Yo4CNpW4u3vF9lUJG1PxkGLi6ntvvH49SBXwo9HJ/n/v04aoE9V7ncA0a7LUm6ucnROagIc2QQQ==", - "dependencies": { - "@stablelib/blake2b": "^1.0.1", - "@stablelib/ed25519": "^1.0.2", - "@types/bs58check": "^2.1.0", - "blakejs": "^1.1.1", - "bs58check": "^2.1.2", - "buffer": "^6.0.3", - "elliptic": "^6.5.4", - "typedarray-to-buffer": "^4.0.0" - }, - "engines": { - "node": ">=6.0.0" - } - }, "endpoints-monorepo/relay/node_modules/@types/node": { "version": "17.0.23", "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.23.tgz", @@ -228,31 +199,51 @@ "integrity": "sha512-WfqfX/eXGiAd3RJe4VU2snh/ZPwtSjLG4ynQ/vYzvghTh7dHFcI1wl+nrkWG6lGhukOxOsUHfv8dUXr58D0ayg==" }, "node_modules/@taquito/http-utils": { - "version": "11.2.0", - "resolved": "https://registry.npmjs.org/@taquito/http-utils/-/http-utils-11.2.0.tgz", - "integrity": "sha512-9s9l4z70ah8/pjmc5ARxdwy6GCnsqwYxMITqCqKBT4DKVgI8m8kXkdxaVg+Ob5ZGvRQoVDSgTeSeNg8TUMtc+w==", + "version": "12.1.1", + "resolved": "https://registry.npmjs.org/@taquito/http-utils/-/http-utils-12.1.1.tgz", + "integrity": "sha512-Zlp/eTRVjFs0XEIiAhgxkh6s9npF4dO+e/Sm2XWsDmNPoGI2jdXNH0L+NiKJIOkYcu0CXlcgriTeEaYnbeTvcA==", "dependencies": { - "xhr2-cookies": "^1.1.0" + "axios": "^0.26.0" + }, + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@taquito/http-utils/node_modules/axios": { + "version": "0.26.1", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.26.1.tgz", + "integrity": "sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA==", + "dependencies": { + "follow-redirects": "^1.14.8" + } + }, + "node_modules/@taquito/local-forging": { + "version": "12.1.1", + "resolved": "https://registry.npmjs.org/@taquito/local-forging/-/local-forging-12.1.1.tgz", + "integrity": "sha512-SUA1YYRIpEGsTy5OfUIgIem0k/QsAzGjDCvf/wl5XV/fVBkP/+GN7uvYoqgJblCmsgtsMBhJFtXgs+D6bjGexg==", + "dependencies": { + "@taquito/utils": "^12.1.1", + "bignumber.js": "^9.0.2" }, "engines": { "node": ">=6.0.0" } }, "node_modules/@taquito/michel-codec": { - "version": "11.2.0", - "resolved": "https://registry.npmjs.org/@taquito/michel-codec/-/michel-codec-11.2.0.tgz", - "integrity": "sha512-ZWu1eyRl9RqOpyHP5h3JKfSPylUMN/91GTWjlJ26GhaMP9YA6mVjJ7pWDrZHFn1QXiS8JgQ7xwsmU+dBqZznSw==", + "version": "12.1.1", + "resolved": "https://registry.npmjs.org/@taquito/michel-codec/-/michel-codec-12.1.1.tgz", + "integrity": "sha512-BAig8YyLyRW5kxV/r0S191W+SvYuiTRJpgSp5IsgCDLAOh+d4/xq6IgU3PuGJgokQDstZdTbjpkrgRCnufR8lw==", "engines": { "node": ">=6.0.0" } }, "node_modules/@taquito/michelson-encoder": { - "version": "11.2.0", - "resolved": "https://registry.npmjs.org/@taquito/michelson-encoder/-/michelson-encoder-11.2.0.tgz", - "integrity": "sha512-ifU3PSrJiQDovY7MT3RjrBTVToW82vGBwXeTIKIMnnoAjCnZdL/XjxFfzTrxT90jaz++ou3xcrgIabSvJrfJjg==", + "version": "12.1.1", + "resolved": "https://registry.npmjs.org/@taquito/michelson-encoder/-/michelson-encoder-12.1.1.tgz", + "integrity": "sha512-mWcA1DHHlFj7UswJpEmml853x9e0IYHyeiKZYAo7DtizHz0jiUWtptCuEWiPQ4fMOreFbYZ6KVYenoVfQVNrqA==", "dependencies": { - "@taquito/rpc": "^11.2.0", - "@taquito/utils": "^11.2.0", + "@taquito/rpc": "^12.1.1", + "@taquito/utils": "^12.1.1", "bignumber.js": "^9.0.2", "fast-json-stable-stringify": "^2.1.0" }, @@ -260,41 +251,42 @@ "node": ">=6.0.0" } }, - "node_modules/@taquito/michelson-encoder/node_modules/@taquito/utils": { - "version": "11.2.0", - "resolved": "https://registry.npmjs.org/@taquito/utils/-/utils-11.2.0.tgz", - "integrity": "sha512-I5LoD5fG9S2Yo4CNpW4u3vF9lUJG1PxkGLi6ntvvH49SBXwo9HJ/n/v04aoE9V7ncA0a7LUm6ucnROagIc2QQQ==", + "node_modules/@taquito/rpc": { + "version": "12.1.1", + "resolved": "https://registry.npmjs.org/@taquito/rpc/-/rpc-12.1.1.tgz", + "integrity": "sha512-CgAF9kdmKLa/UbmiqApDtncCQGiG7kEOIYis8IIa0JUT9JD1H8WBbSNF/oNh4e0soWUK9BL2qU369RFnxIW+iA==", "dependencies": { - "@stablelib/blake2b": "^1.0.1", - "@stablelib/ed25519": "^1.0.2", - "@types/bs58check": "^2.1.0", - "blakejs": "^1.1.1", - "bs58check": "^2.1.2", - "buffer": "^6.0.3", - "elliptic": "^6.5.4", - "typedarray-to-buffer": "^4.0.0" + "@taquito/http-utils": "^12.1.1", + "@taquito/utils": "^12.1.1", + "bignumber.js": "^9.0.2" }, "engines": { "node": ">=6.0.0" } }, - "node_modules/@taquito/rpc": { - "version": "11.2.0", - "resolved": "https://registry.npmjs.org/@taquito/rpc/-/rpc-11.2.0.tgz", - "integrity": "sha512-Hb5KIi1swUIGHg6h6cPJ+6G+6Nfi6Npat4RogOFvULpbn+WQIo+CTUecEW7aWEBuXahs7W0JBcL4a6GbqE3YGg==", + "node_modules/@taquito/taquito": { + "version": "12.1.1", + "resolved": "https://registry.npmjs.org/@taquito/taquito/-/taquito-12.1.1.tgz", + "integrity": "sha512-HvbtClQ7isrDd17X/LEKkPzzeVYA8EMUem3qrkl9qvDO6FpJx/QLbUpYfT2PC0pLUkSrzdLGzmESHAOZhcksaw==", + "hasInstallScript": true, "dependencies": { - "@taquito/http-utils": "^11.2.0", - "@taquito/utils": "^11.2.0", - "bignumber.js": "^9.0.2" + "@taquito/http-utils": "^12.1.1", + "@taquito/local-forging": "^12.1.1", + "@taquito/michel-codec": "^12.1.1", + "@taquito/michelson-encoder": "^12.1.1", + "@taquito/rpc": "^12.1.1", + "@taquito/utils": "^12.1.1", + "bignumber.js": "^9.0.2", + "rxjs": "^6.6.3" }, "engines": { "node": ">=6.0.0" } }, - "node_modules/@taquito/rpc/node_modules/@taquito/utils": { - "version": "11.2.0", - "resolved": "https://registry.npmjs.org/@taquito/utils/-/utils-11.2.0.tgz", - "integrity": "sha512-I5LoD5fG9S2Yo4CNpW4u3vF9lUJG1PxkGLi6ntvvH49SBXwo9HJ/n/v04aoE9V7ncA0a7LUm6ucnROagIc2QQQ==", + "node_modules/@taquito/utils": { + "version": "12.1.1", + "resolved": "https://registry.npmjs.org/@taquito/utils/-/utils-12.1.1.tgz", + "integrity": "sha512-GxNSBrA02vwhy56ayWB49VZficB+j2oyhPdlsRb2CguephmyEYnlUaNV27ILa6dPDW+zv6+QWQj6GyqLBRpIlA==", "dependencies": { "@stablelib/blake2b": "^1.0.1", "@stablelib/ed25519": "^1.0.2", @@ -430,6 +422,21 @@ "@types/node": "*" } }, + "node_modules/@types/yargs": { + "version": "17.0.10", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.10.tgz", + "integrity": "sha512-gmEaFwpj/7f/ROdtIlci1R1VYU1J4j95m8T+Tj3iBgiBFKg1foE/PSl93bBd5T9LDXNPo8UlNN6W0qwD8O5OaA==", + "dev": true, + "dependencies": { + "@types/yargs-parser": "*" + } + }, + "node_modules/@types/yargs-parser": { + "version": "21.0.0", + "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.0.tgz", + "integrity": "sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==", + "dev": true + }, "node_modules/accepts": { "version": "1.3.8", "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz", @@ -463,6 +470,28 @@ "node": ">=0.4.0" } }, + "node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "engines": { + "node": ">=8" + } + }, + "node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, "node_modules/arg": { "version": "4.1.3", "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz", @@ -584,6 +613,14 @@ "safe-buffer": "^5.1.2" } }, + "node_modules/bs58check-ts": { + "version": "0.0.7", + "resolved": "https://registry.npmjs.org/bs58check-ts/-/bs58check-ts-0.0.7.tgz", + "integrity": "sha512-265XwOy8cPx1tB3JpifC/E8WghNBi9RxGbQPp72/7vsNbu/JIkOw0428dYJNL/upFQBm3ZcVJlAN4z9ZXBhtfQ==", + "dependencies": { + "bs58": "^4.0.1" + } + }, "node_modules/buffer": { "version": "6.0.3", "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz", @@ -641,6 +678,32 @@ "safe-buffer": "^5.0.1" } }, + "node_modules/cliui": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", + "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", + "dependencies": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "wrap-ansi": "^7.0.0" + } + }, + "node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, "node_modules/content-disposition": { "version": "0.5.4", "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz", @@ -673,11 +736,6 @@ "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=" }, - "node_modules/cookiejar": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.3.tgz", - "integrity": "sha512-JxbCBUdrfr6AQjOXrxoTvAMJO4HBTUIlBzslcJPAz+/KT8yk53fXun51u+RenNYvad/+Vc2DIz5o9UxlCDymFQ==" - }, "node_modules/create-hash": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz", @@ -749,6 +807,11 @@ "minimalistic-crypto-utils": "^1.0.1" } }, + "node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" + }, "node_modules/encodeurl": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", @@ -757,6 +820,14 @@ "node": ">= 0.8" } }, + "node_modules/escalade": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", + "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", + "engines": { + "node": ">=6" + } + }, "node_modules/escape-html": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", @@ -978,6 +1049,14 @@ "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" }, + "node_modules/get-caller-file": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", + "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", + "engines": { + "node": "6.* || 8.* || >= 10.*" + } + }, "node_modules/get-intrinsic": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz", @@ -1155,6 +1234,14 @@ "node": ">=0.10.0" } }, + "node_modules/is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "engines": { + "node": ">=8" + } + }, "node_modules/is-glob": { "version": "4.0.3", "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", @@ -1396,6 +1483,14 @@ "node": ">= 6" } }, + "node_modules/require-directory": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", + "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/requires-port": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz", @@ -1572,6 +1667,30 @@ "safe-buffer": "~5.2.0" } }, + "node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/to-regex-range": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", @@ -1718,12 +1837,53 @@ "node": ">= 0.8" } }, - "node_modules/xhr2-cookies": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/xhr2-cookies/-/xhr2-cookies-1.1.0.tgz", - "integrity": "sha1-fXdEnQmZGX8VXLc7I99yUF7YnUg=", + "node_modules/wrap-ansi": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/y18n": { + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", + "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", + "engines": { + "node": ">=10" + } + }, + "node_modules/yargs": { + "version": "17.5.1", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.5.1.tgz", + "integrity": "sha512-t6YAJcxDkNX7NFYiVtKvWUz8l+PaKTLiL63mJYWR2GnHq2gjEWISzsLp9wg3aY36dY1j+gfIEL3pIF+XlJJfbA==", "dependencies": { - "cookiejar": "^2.1.1" + "cliui": "^7.0.2", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", + "require-directory": "^2.1.1", + "string-width": "^4.2.3", + "y18n": "^5.0.5", + "yargs-parser": "^21.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/yargs-parser": { + "version": "21.0.1", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.0.1.tgz", + "integrity": "sha512-9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg==", + "engines": { + "node": ">=12" } }, "node_modules/yn": { @@ -1787,8 +1947,11 @@ "@flashbake/core": { "version": "file:endpoints-monorepo/core", "requires": { + "@taquito/local-forging": "^12.0.3", + "@taquito/rpc": "^12.0.3", "@types/lodash": "^4.14.177", "@types/node": "^16.11.7", + "bs58check-ts": "^0.0.7", "lodash": "^4.17.21", "typescript": "^4.4.4" } @@ -1797,47 +1960,20 @@ "version": "file:endpoints-monorepo/relay", "requires": { "@flashbake/core": "file:../core", - "@taquito/taquito": "^11.0.1", + "@taquito/rpc": "^12.1.1", + "@taquito/taquito": "^12.1.1", "@taquito/utils": "^12.1.1", "@types/express": "^4.17.13", "@types/lodash": "^4.14.177", "@types/node": "^17.0.16", "axios": "^0.24.0", + "body-parser": "^1.20.0", "express": "^4.17.2", "http-proxy-middleware": "^2.0.1", "lodash": "^4.17.21", "typescript": "^4.5.4" }, "dependencies": { - "@taquito/taquito": { - "version": "11.2.0", - "resolved": "https://registry.npmjs.org/@taquito/taquito/-/taquito-11.2.0.tgz", - "integrity": "sha512-OJJYPqQiF7IoxWsBavdKDuxi2oeWHHvRph2nqeCyqVx6H+7uQLpZCf0OP5iQ4F6AxoYPyD7DzEsSFH5tOdgqNQ==", - "requires": { - "@taquito/http-utils": "^11.2.0", - "@taquito/michel-codec": "^11.2.0", - "@taquito/michelson-encoder": "^11.2.0", - "@taquito/rpc": "^11.2.0", - "@taquito/utils": "^11.2.0", - "bignumber.js": "^9.0.2", - "rxjs": "^6.6.3" - } - }, - "@taquito/utils": { - "version": "11.2.0", - "resolved": "https://registry.npmjs.org/@taquito/utils/-/utils-11.2.0.tgz", - "integrity": "sha512-I5LoD5fG9S2Yo4CNpW4u3vF9lUJG1PxkGLi6ntvvH49SBXwo9HJ/n/v04aoE9V7ncA0a7LUm6ucnROagIc2QQQ==", - "requires": { - "@stablelib/blake2b": "^1.0.1", - "@stablelib/ed25519": "^1.0.2", - "@types/bs58check": "^2.1.0", - "blakejs": "^1.1.1", - "bs58check": "^2.1.2", - "buffer": "^6.0.3", - "elliptic": "^6.5.4", - "typedarray-to-buffer": "^4.0.0" - } - }, "@types/node": { "version": "17.0.23", "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.23.tgz", @@ -1909,71 +2045,86 @@ "integrity": "sha512-WfqfX/eXGiAd3RJe4VU2snh/ZPwtSjLG4ynQ/vYzvghTh7dHFcI1wl+nrkWG6lGhukOxOsUHfv8dUXr58D0ayg==" }, "@taquito/http-utils": { - "version": "11.2.0", - "resolved": "https://registry.npmjs.org/@taquito/http-utils/-/http-utils-11.2.0.tgz", - "integrity": "sha512-9s9l4z70ah8/pjmc5ARxdwy6GCnsqwYxMITqCqKBT4DKVgI8m8kXkdxaVg+Ob5ZGvRQoVDSgTeSeNg8TUMtc+w==", + "version": "12.1.1", + "resolved": "https://registry.npmjs.org/@taquito/http-utils/-/http-utils-12.1.1.tgz", + "integrity": "sha512-Zlp/eTRVjFs0XEIiAhgxkh6s9npF4dO+e/Sm2XWsDmNPoGI2jdXNH0L+NiKJIOkYcu0CXlcgriTeEaYnbeTvcA==", "requires": { - "xhr2-cookies": "^1.1.0" + "axios": "^0.26.0" + }, + "dependencies": { + "axios": { + "version": "0.26.1", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.26.1.tgz", + "integrity": "sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA==", + "requires": { + "follow-redirects": "^1.14.8" + } + } + } + }, + "@taquito/local-forging": { + "version": "12.1.1", + "resolved": "https://registry.npmjs.org/@taquito/local-forging/-/local-forging-12.1.1.tgz", + "integrity": "sha512-SUA1YYRIpEGsTy5OfUIgIem0k/QsAzGjDCvf/wl5XV/fVBkP/+GN7uvYoqgJblCmsgtsMBhJFtXgs+D6bjGexg==", + "requires": { + "@taquito/utils": "^12.1.1", + "bignumber.js": "^9.0.2" } }, "@taquito/michel-codec": { - "version": "11.2.0", - "resolved": "https://registry.npmjs.org/@taquito/michel-codec/-/michel-codec-11.2.0.tgz", - "integrity": "sha512-ZWu1eyRl9RqOpyHP5h3JKfSPylUMN/91GTWjlJ26GhaMP9YA6mVjJ7pWDrZHFn1QXiS8JgQ7xwsmU+dBqZznSw==" + "version": "12.1.1", + "resolved": "https://registry.npmjs.org/@taquito/michel-codec/-/michel-codec-12.1.1.tgz", + "integrity": "sha512-BAig8YyLyRW5kxV/r0S191W+SvYuiTRJpgSp5IsgCDLAOh+d4/xq6IgU3PuGJgokQDstZdTbjpkrgRCnufR8lw==" }, "@taquito/michelson-encoder": { - "version": "11.2.0", - "resolved": "https://registry.npmjs.org/@taquito/michelson-encoder/-/michelson-encoder-11.2.0.tgz", - "integrity": "sha512-ifU3PSrJiQDovY7MT3RjrBTVToW82vGBwXeTIKIMnnoAjCnZdL/XjxFfzTrxT90jaz++ou3xcrgIabSvJrfJjg==", + "version": "12.1.1", + "resolved": "https://registry.npmjs.org/@taquito/michelson-encoder/-/michelson-encoder-12.1.1.tgz", + "integrity": "sha512-mWcA1DHHlFj7UswJpEmml853x9e0IYHyeiKZYAo7DtizHz0jiUWtptCuEWiPQ4fMOreFbYZ6KVYenoVfQVNrqA==", "requires": { - "@taquito/rpc": "^11.2.0", - "@taquito/utils": "^11.2.0", + "@taquito/rpc": "^12.1.1", + "@taquito/utils": "^12.1.1", "bignumber.js": "^9.0.2", "fast-json-stable-stringify": "^2.1.0" - }, - "dependencies": { - "@taquito/utils": { - "version": "11.2.0", - "resolved": "https://registry.npmjs.org/@taquito/utils/-/utils-11.2.0.tgz", - "integrity": "sha512-I5LoD5fG9S2Yo4CNpW4u3vF9lUJG1PxkGLi6ntvvH49SBXwo9HJ/n/v04aoE9V7ncA0a7LUm6ucnROagIc2QQQ==", - "requires": { - "@stablelib/blake2b": "^1.0.1", - "@stablelib/ed25519": "^1.0.2", - "@types/bs58check": "^2.1.0", - "blakejs": "^1.1.1", - "bs58check": "^2.1.2", - "buffer": "^6.0.3", - "elliptic": "^6.5.4", - "typedarray-to-buffer": "^4.0.0" - } - } } }, "@taquito/rpc": { - "version": "11.2.0", - "resolved": "https://registry.npmjs.org/@taquito/rpc/-/rpc-11.2.0.tgz", - "integrity": "sha512-Hb5KIi1swUIGHg6h6cPJ+6G+6Nfi6Npat4RogOFvULpbn+WQIo+CTUecEW7aWEBuXahs7W0JBcL4a6GbqE3YGg==", + "version": "12.1.1", + "resolved": "https://registry.npmjs.org/@taquito/rpc/-/rpc-12.1.1.tgz", + "integrity": "sha512-CgAF9kdmKLa/UbmiqApDtncCQGiG7kEOIYis8IIa0JUT9JD1H8WBbSNF/oNh4e0soWUK9BL2qU369RFnxIW+iA==", "requires": { - "@taquito/http-utils": "^11.2.0", - "@taquito/utils": "^11.2.0", + "@taquito/http-utils": "^12.1.1", + "@taquito/utils": "^12.1.1", "bignumber.js": "^9.0.2" - }, - "dependencies": { - "@taquito/utils": { - "version": "11.2.0", - "resolved": "https://registry.npmjs.org/@taquito/utils/-/utils-11.2.0.tgz", - "integrity": "sha512-I5LoD5fG9S2Yo4CNpW4u3vF9lUJG1PxkGLi6ntvvH49SBXwo9HJ/n/v04aoE9V7ncA0a7LUm6ucnROagIc2QQQ==", - "requires": { - "@stablelib/blake2b": "^1.0.1", - "@stablelib/ed25519": "^1.0.2", - "@types/bs58check": "^2.1.0", - "blakejs": "^1.1.1", - "bs58check": "^2.1.2", - "buffer": "^6.0.3", - "elliptic": "^6.5.4", - "typedarray-to-buffer": "^4.0.0" - } - } + } + }, + "@taquito/taquito": { + "version": "12.1.1", + "resolved": "https://registry.npmjs.org/@taquito/taquito/-/taquito-12.1.1.tgz", + "integrity": "sha512-HvbtClQ7isrDd17X/LEKkPzzeVYA8EMUem3qrkl9qvDO6FpJx/QLbUpYfT2PC0pLUkSrzdLGzmESHAOZhcksaw==", + "requires": { + "@taquito/http-utils": "^12.1.1", + "@taquito/local-forging": "^12.1.1", + "@taquito/michel-codec": "^12.1.1", + "@taquito/michelson-encoder": "^12.1.1", + "@taquito/rpc": "^12.1.1", + "@taquito/utils": "^12.1.1", + "bignumber.js": "^9.0.2", + "rxjs": "^6.6.3" + } + }, + "@taquito/utils": { + "version": "12.1.1", + "resolved": "https://registry.npmjs.org/@taquito/utils/-/utils-12.1.1.tgz", + "integrity": "sha512-GxNSBrA02vwhy56ayWB49VZficB+j2oyhPdlsRb2CguephmyEYnlUaNV27ILa6dPDW+zv6+QWQj6GyqLBRpIlA==", + "requires": { + "@stablelib/blake2b": "^1.0.1", + "@stablelib/ed25519": "^1.0.2", + "@types/bs58check": "^2.1.0", + "blakejs": "^1.1.1", + "bs58check": "^2.1.2", + "buffer": "^6.0.3", + "elliptic": "^6.5.4", + "typedarray-to-buffer": "^4.0.0" } }, "@tsconfig/node10": { @@ -2097,6 +2248,21 @@ "@types/node": "*" } }, + "@types/yargs": { + "version": "17.0.10", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.10.tgz", + "integrity": "sha512-gmEaFwpj/7f/ROdtIlci1R1VYU1J4j95m8T+Tj3iBgiBFKg1foE/PSl93bBd5T9LDXNPo8UlNN6W0qwD8O5OaA==", + "dev": true, + "requires": { + "@types/yargs-parser": "*" + } + }, + "@types/yargs-parser": { + "version": "21.0.0", + "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.0.tgz", + "integrity": "sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==", + "dev": true + }, "accepts": { "version": "1.3.8", "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz", @@ -2118,6 +2284,19 @@ "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==", "dev": true }, + "ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==" + }, + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "requires": { + "color-convert": "^2.0.1" + } + }, "arg": { "version": "4.1.3", "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz", @@ -2215,6 +2394,14 @@ "safe-buffer": "^5.1.2" } }, + "bs58check-ts": { + "version": "0.0.7", + "resolved": "https://registry.npmjs.org/bs58check-ts/-/bs58check-ts-0.0.7.tgz", + "integrity": "sha512-265XwOy8cPx1tB3JpifC/E8WghNBi9RxGbQPp72/7vsNbu/JIkOw0428dYJNL/upFQBm3ZcVJlAN4z9ZXBhtfQ==", + "requires": { + "bs58": "^4.0.1" + } + }, "buffer": { "version": "6.0.3", "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz", @@ -2252,6 +2439,29 @@ "safe-buffer": "^5.0.1" } }, + "cliui": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", + "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", + "requires": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "wrap-ansi": "^7.0.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, "content-disposition": { "version": "0.5.4", "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz", @@ -2275,11 +2485,6 @@ "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=" }, - "cookiejar": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.3.tgz", - "integrity": "sha512-JxbCBUdrfr6AQjOXrxoTvAMJO4HBTUIlBzslcJPAz+/KT8yk53fXun51u+RenNYvad/+Vc2DIz5o9UxlCDymFQ==" - }, "create-hash": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz", @@ -2341,11 +2546,21 @@ "minimalistic-crypto-utils": "^1.0.1" } }, + "emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" + }, "encodeurl": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=" }, + "escalade": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", + "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==" + }, "escape-html": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", @@ -2515,6 +2730,11 @@ "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" }, + "get-caller-file": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", + "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==" + }, "get-intrinsic": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz", @@ -2636,6 +2856,11 @@ "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=" }, + "is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==" + }, "is-glob": { "version": "4.0.3", "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", @@ -2808,6 +3033,11 @@ "util-deprecate": "^1.0.1" } }, + "require-directory": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", + "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==" + }, "requires-port": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz", @@ -2945,6 +3175,24 @@ "safe-buffer": "~5.2.0" } }, + "string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "requires": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + } + }, + "strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "requires": { + "ansi-regex": "^5.0.1" + } + }, "to-regex-range": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", @@ -3030,14 +3278,40 @@ "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=" }, - "xhr2-cookies": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/xhr2-cookies/-/xhr2-cookies-1.1.0.tgz", - "integrity": "sha1-fXdEnQmZGX8VXLc7I99yUF7YnUg=", + "wrap-ansi": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "requires": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + } + }, + "y18n": { + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", + "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==" + }, + "yargs": { + "version": "17.5.1", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.5.1.tgz", + "integrity": "sha512-t6YAJcxDkNX7NFYiVtKvWUz8l+PaKTLiL63mJYWR2GnHq2gjEWISzsLp9wg3aY36dY1j+gfIEL3pIF+XlJJfbA==", "requires": { - "cookiejar": "^2.1.1" + "cliui": "^7.0.2", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", + "require-directory": "^2.1.1", + "string-width": "^4.2.3", + "y18n": "^5.0.5", + "yargs-parser": "^21.0.0" } }, + "yargs-parser": { + "version": "21.0.1", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.0.1.tgz", + "integrity": "sha512-9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg==" + }, "yn": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz", diff --git a/flashbake/package.json b/flashbake/package.json index 973c9e8..f74c285 100644 --- a/flashbake/package.json +++ b/flashbake/package.json @@ -16,11 +16,13 @@ "dependencies": { "@flashbake/baker-endpoint": "file:endpoints-monorepo/baker-endpoint", "@flashbake/relay": "file:endpoints-monorepo/relay", - "express": "^4.17.2" + "express": "^4.17.2", + "yargs": "^17.5.1" }, "devDependencies": { "@types/express": "^4.17.13", "@types/node": "^16.11.7", + "@types/yargs": "^17.0.10", "ts-node": "^10.4.0", "typescript": "^4.4.4" }