From 0499f9d911144b155a24bcd7b2fe5205f9ef22e2 Mon Sep 17 00:00:00 2001 From: pshenmic Date: Fri, 14 Apr 2023 17:44:04 +0300 Subject: [PATCH 1/8] feat(dashmate): replace js-drive with rs-drive --- packages/dashmate/docker-compose.platform.build.yml | 2 +- packages/dashmate/docker-compose.platform.yml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/dashmate/docker-compose.platform.build.yml b/packages/dashmate/docker-compose.platform.build.yml index aad9f564bc7..acf00bbdf76 100644 --- a/packages/dashmate/docker-compose.platform.build.yml +++ b/packages/dashmate/docker-compose.platform.build.yml @@ -4,7 +4,7 @@ services: drive_abci: build: context: ${PLATFORM_SOURCE_PATH:?err} - dockerfile: ${PLATFORM_SOURCE_PATH:?err}/packages/js-drive/Dockerfile + dockerfile: ${PLATFORM_SOURCE_PATH:?err}/packages/rs-drive-abci/Dockerfile image: drive:local stop_grace_period: 30s diff --git a/packages/dashmate/docker-compose.platform.yml b/packages/dashmate/docker-compose.platform.yml index 3f5e213a116..0929a7d73bc 100644 --- a/packages/dashmate/docker-compose.platform.yml +++ b/packages/dashmate/docker-compose.platform.yml @@ -7,10 +7,11 @@ services: depends_on: - core volumes: - - drive_abci_data:/platform/packages/js-drive/db + - drive_abci_data:/var/lib/platform/rs-drive-abci/db - ${PLATFORM_DRIVE_ABCI_LOG_PRETTY_DIRECTORY_PATH:?err}:/var/log/pretty - ${PLATFORM_DRIVE_ABCI_LOG_JSON_DIRECTORY_PATH:?err}:/var/log/json environment: + - DB_PATH=/var/lib/platform/rs-drive-abci/db - CORE_JSON_RPC_USERNAME=${CORE_RPC_USER:?err} - CORE_JSON_RPC_PASSWORD=${CORE_RPC_PASSWORD:?err} - CORE_JSON_RPC_HOST=core From 59dc939a3259a5c183023ef8e9c74bef3dc001ac Mon Sep 17 00:00:00 2001 From: Ivan Shumkov Date: Tue, 18 Apr 2023 19:54:39 +0800 Subject: [PATCH 2/8] tests: increase funding for mn shares --- .../test/e2e/masternodeRewardShares.spec.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/platform-test-suite/test/e2e/masternodeRewardShares.spec.js b/packages/platform-test-suite/test/e2e/masternodeRewardShares.spec.js index d22ee570102..f10a39c6b87 100644 --- a/packages/platform-test-suite/test/e2e/masternodeRewardShares.spec.js +++ b/packages/platform-test-suite/test/e2e/masternodeRewardShares.spec.js @@ -21,7 +21,7 @@ describe('Masternode Reward Shares', () => { await dpp.initialize(); client = await createClientWithFundedWallet( - 8000000, + 10000000, ); const masternodeRewardSharesContract = await client.platform.contracts.get( @@ -89,7 +89,7 @@ describe('Masternode Reward Shares', () => { // Masternode identity should exist expect(masternodeOwnerIdentity).to.exist(); - await client.platform.identities.topUp(masternodeOwnerIdentity.getId(), 1900000); + await client.platform.identities.topUp(masternodeOwnerIdentity.getId(), 2000000); // Since we cannot create "High" level key for masternode Identities automatically, // (this key is used to sign state transitions, other than "update") From e25e52ace3ab97687ac5a9d9b88cdefe98a85bf3 Mon Sep 17 00:00:00 2001 From: Ivan Shumkov Date: Tue, 18 Apr 2023 19:58:30 +0800 Subject: [PATCH 3/8] tests: add some wait intervals --- .../test/e2e/masternodeRewardShares.spec.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/packages/platform-test-suite/test/e2e/masternodeRewardShares.spec.js b/packages/platform-test-suite/test/e2e/masternodeRewardShares.spec.js index f10a39c6b87..9cd9ebd8f9e 100644 --- a/packages/platform-test-suite/test/e2e/masternodeRewardShares.spec.js +++ b/packages/platform-test-suite/test/e2e/masternodeRewardShares.spec.js @@ -91,6 +91,9 @@ describe('Masternode Reward Shares', () => { await client.platform.identities.topUp(masternodeOwnerIdentity.getId(), 2000000); + // Additional wait time to mitigate testnet latency + await waitForSTPropagated(); + // Since we cannot create "High" level key for masternode Identities automatically, // (this key is used to sign state transitions, other than "update") // we add this key here @@ -154,6 +157,9 @@ describe('Masternode Reward Shares', () => { await client.platform.broadcastStateTransition( stateTransition, ); + + // Additional wait time to mitigate testnet latency + await waitForSTPropagated(); }); it('should be able to create reward shares with existing identity', async () => { From ee7db233fc547c22ccbc7ec91b1cb559e4d15f02 Mon Sep 17 00:00:00 2001 From: Lukasz Klimek <842586+lklimek@users.noreply.github.com> Date: Tue, 18 Apr 2023 14:38:47 +0200 Subject: [PATCH 4/8] chore(rs-dpp): fix build issues in rs-dpp --- .../consensus/abstract_consensus_error.rs | 32 +++++++++---------- .../document_batch_transition/mod.rs | 2 -- .../wasm-dpp/src/errors/consensus_error.rs | 3 ++ 3 files changed, 19 insertions(+), 18 deletions(-) diff --git a/packages/rs-dpp/src/errors/consensus/abstract_consensus_error.rs b/packages/rs-dpp/src/errors/consensus/abstract_consensus_error.rs index 1b784d424fd..74eac9fa77b 100644 --- a/packages/rs-dpp/src/errors/consensus/abstract_consensus_error.rs +++ b/packages/rs-dpp/src/errors/consensus/abstract_consensus_error.rs @@ -18,8 +18,8 @@ use crate::consensus::basic::identity::{ MissingMasterPublicKeyError, }; use crate::consensus::state::identity::IdentityAlreadyExistsError; +use crate::errors::consensus::basic; #[cfg(test)] -use crate::errors::consensus::basic::TestConsensusError; use crate::errors::consensus::basic::{ BasicError, IncompatibleProtocolVersionError, JsonSchemaError, UnsupportedProtocolVersionError, }; @@ -40,11 +40,11 @@ pub enum ConsensusError { #[error("default error")] DefaultError, #[error(transparent)] - JsonSchemaError(JsonSchemaError), + JsonSchemaError(basic::JsonSchemaError), #[error(transparent)] - UnsupportedProtocolVersionError(UnsupportedProtocolVersionError), + UnsupportedProtocolVersionError(basic::UnsupportedProtocolVersionError), #[error(transparent)] - IncompatibleProtocolVersionError(IncompatibleProtocolVersionError), + IncompatibleProtocolVersionError(basic::IncompatibleProtocolVersionError), #[error(transparent)] DuplicatedIdentityPublicKeyBasicIdError(DuplicatedIdentityPublicKeyIdError), #[error(transparent)] @@ -107,7 +107,7 @@ pub enum ConsensusError { StateError(Box), #[error(transparent)] - BasicError(Box), + BasicError(Box), #[error("Parsing of serialized object failed due to: {parsing_error}")] SerializedObjectParsingError { parsing_error: anyhow::Error }, @@ -135,11 +135,11 @@ pub enum ConsensusError { #[cfg(test)] #[cfg_attr(test, error(transparent))] - TestConsensusError(TestConsensusError), + TestConsensusError(basic::TestConsensusError), } impl ConsensusError { - pub fn json_schema_error(&self) -> Option<&JsonSchemaError> { + pub fn json_schema_error(&self) -> Option<&basic::JsonSchemaError> { match self { ConsensusError::JsonSchemaError(err) => Some(err), _ => None, @@ -212,24 +212,24 @@ impl Default for ConsensusError { impl<'a> From> for ConsensusError { fn from(validation_error: ValidationError<'a>) -> Self { - Self::JsonSchemaError(JsonSchemaError::from(validation_error)) + Self::JsonSchemaError(basic::JsonSchemaError::from(validation_error)) } } -impl From for ConsensusError { - fn from(json_schema_error: JsonSchemaError) -> Self { +impl From for ConsensusError { + fn from(json_schema_error: basic::JsonSchemaError) -> Self { Self::JsonSchemaError(json_schema_error) } } -impl From for ConsensusError { - fn from(error: UnsupportedProtocolVersionError) -> Self { +impl From for ConsensusError { + fn from(error: crate::errors::consensus::basic::UnsupportedProtocolVersionError) -> Self { Self::UnsupportedProtocolVersionError(error) } } -impl From for ConsensusError { - fn from(error: IncompatibleProtocolVersionError) -> Self { +impl From for ConsensusError { + fn from(error: basic::IncompatibleProtocolVersionError) -> Self { Self::IncompatibleProtocolVersionError(error) } } @@ -277,8 +277,8 @@ impl From for ConsensusError { } } -impl From for ConsensusError { - fn from(se: BasicError) -> Self { +impl From for ConsensusError { + fn from(se: basic::BasicError) -> Self { ConsensusError::BasicError(Box::new(se)) } } diff --git a/packages/wasm-dpp/src/document/state_transition/document_batch_transition/mod.rs b/packages/wasm-dpp/src/document/state_transition/document_batch_transition/mod.rs index 108b5b5981c..f2bac1521c7 100644 --- a/packages/wasm-dpp/src/document/state_transition/document_batch_transition/mod.rs +++ b/packages/wasm-dpp/src/document/state_transition/document_batch_transition/mod.rs @@ -1,5 +1,4 @@ use dpp::identity::KeyID; -use dpp::state_transition::fee::calculate_state_transition_fee_factory::calculate_state_transition_fee; use dpp::{ document::{ document_transition::document_base_transition, @@ -16,7 +15,6 @@ use dpp::{ use js_sys::{Array, Reflect}; use serde::{Deserialize, Serialize}; -use dpp::platform_value::btreemap_extensions::BTreeValueMapReplacementPathHelper; use dpp::platform_value::{BinaryData, ReplacementType}; use wasm_bindgen::prelude::*; diff --git a/packages/wasm-dpp/src/errors/consensus_error.rs b/packages/wasm-dpp/src/errors/consensus_error.rs index d91d5ffca64..16e3e9729ac 100644 --- a/packages/wasm-dpp/src/errors/consensus_error.rs +++ b/packages/wasm-dpp/src/errors/consensus_error.rs @@ -198,6 +198,9 @@ pub fn from_consensus_error_ref(e: &DPPConsensusError) -> JsValue { DPPConsensusError::ValueError(value_error) => { PlatformValueErrorWasm::new(value_error.clone()).into() } + DPPConsensusError::InvalidIdentityAssetLockProofChainLockValidationError(_) => todo!(), + #[cfg(test)] + DPPConsensusError::TestConsensusError(_) => todo!(), DPPConsensusError::DefaultError => panic!(), //not possible DPPConsensusError::InvalidIdentityAssetLockProofChainLockValidationError(e) => { InvalidIdentityAssetLockProofChainLockValidationErrorWasm::from(e).into() From 2f9660cebb7498f8ca2a3daae5d87c5f71c2056b Mon Sep 17 00:00:00 2001 From: Lukasz Klimek <842586+lklimek@users.noreply.github.com> Date: Tue, 18 Apr 2023 16:57:26 +0200 Subject: [PATCH 5/8] revert(dashmate): revert invalid config schema url --- packages/dashmate/configs/schema/configFileJsonSchema.js | 2 +- packages/dashmate/configs/schema/configJsonSchema.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/dashmate/configs/schema/configFileJsonSchema.js b/packages/dashmate/configs/schema/configFileJsonSchema.js index 6ddf9346767..4a29ae4e9a0 100644 --- a/packages/dashmate/configs/schema/configFileJsonSchema.js +++ b/packages/dashmate/configs/schema/configFileJsonSchema.js @@ -1,5 +1,5 @@ module.exports = { - $schema: 'https://schema.dash.org/dpp-0-4-0/meta/data-contract#', + $schema: 'http://json-schema.org/draft-07/schema#', type: 'object', properties: { configFormatVersion: { diff --git a/packages/dashmate/configs/schema/configJsonSchema.js b/packages/dashmate/configs/schema/configJsonSchema.js index d4c6df0429d..8045b2e9beb 100644 --- a/packages/dashmate/configs/schema/configJsonSchema.js +++ b/packages/dashmate/configs/schema/configJsonSchema.js @@ -1,7 +1,7 @@ const { NETWORKS } = require('../../src/constants'); module.exports = { - $schema: 'https://schema.dash.org/dpp-0-4-0/meta/data-contract#', + $schema: 'http://json-schema.org/draft-07/schema#', type: 'object', definitions: { docker: { From 2b7053e90e0ae0568d372860e28123c20d82d975 Mon Sep 17 00:00:00 2001 From: Lukasz Klimek <842586+lklimek@users.noreply.github.com> Date: Wed, 19 Apr 2023 12:35:09 +0200 Subject: [PATCH 6/8] build(rs-drive-abci): adjust build for dashmate --- package.json | 12 +-- packages/dashmate/docker-compose.platform.yml | 18 +--- packages/rs-drive-abci/Dockerfile | 102 +++++++++++++++++- scripts/configure_dotenv.sh | 6 +- 4 files changed, 112 insertions(+), 26 deletions(-) diff --git a/package.json b/package.json index a3170a24d7f..39198a5878d 100644 --- a/package.json +++ b/package.json @@ -10,16 +10,16 @@ "reset": "yarn run clean:data --force && yarn run setup", "test": "ultra -r $* test", "test:dapi": "ultra -r --filter \"packages/@(dapi|platform-test-suite)\" test", - "test:dapi-grpc": "ultra -r --filter \"packages/@(dapi|js-dapi-client|dapi-grpc|js-dash-sdk|js-drive|wallet-lib|platform-test-suite)\" test", - "test:dashpay-contract": "ultra -r --filter \"packages/@(dashpay-contract|js-dash-sdk|js-drive|js-dapi-client|js-dpp|wallet-lib|dapi|platform-test-suite)\" test", - "test:dpns-contract": "ultra -r --filter \"packages/@(dpns-contract|js-dash-sdk|js-drive|js-dapi-client|js-dpp|wallet-lib|dapi|platform-test-suite)\" test", - "test:feature-flags-contract": "ultra -r --filter \"packages/@(feature-flags-contract|js-dash-sdk|js-drive|js-dapi-client|js-dpp|wallet-lib|dapi|platform-test-suite)\" test", + "test:dapi-grpc": "ultra -r --filter \"packages/@(dapi|js-dapi-client|dapi-grpc|js-dash-sdk|wallet-lib|platform-test-suite)\" test", + "test:dashpay-contract": "ultra -r --filter \"packages/@(dashpay-contract|js-dash-sdk|js-dapi-client|js-dpp|wallet-lib|dapi|platform-test-suite)\" test", + "test:dpns-contract": "ultra -r --filter \"packages/@(dpns-contract|js-dash-sdk|js-dapi-client|js-dpp|wallet-lib|dapi|platform-test-suite)\" test", + "test:feature-flags-contract": "ultra -r --filter \"packages/@(feature-flags-contract|js-dash-sdk|js-dapi-client|js-dpp|wallet-lib|dapi|platform-test-suite)\" test", "test:dapi-client": "ultra -r --filter \"packages/@(js-dapi-client|wallet-lib|js-dash-sdk|platform-test-suite)\" test", "test:sdk": "ultra -r --filter \"packages/@(js-dash-sdk|platform-test-suite)\" test", "test:spv": "ultra -r --filter \"packages/@(dash-spv|js-dapi-client)\" test", "test:dpp": "ultra -r test", - "test:drive": "ultra -r --filter \"packages/@(js-drive|platform-test-suite)\" test", - "test:grpc-common": "ultra -r --filter \"packages/@(js-grpc-common|dapi-grpc|dapi|js-dapi-client|js-dash-sdk|js-drive|wallet-lib|platform-test-suite)\" test", + "test:drive": "cargo test", + "test:grpc-common": "ultra -r --filter \"packages/@(js-grpc-common|dapi-grpc|dapi|js-dapi-client|js-dash-sdk|wallet-lib|platform-test-suite)\" test", "test:suite": "yarn workspace @dashevo/platform-test-suite test", "test:suite:browsers": "yarn workspace @dashevo/platform-test-suite test:browsers", "test:wallet-lib": "ultra -r --filter \"packages/@(wallet-lib|js-dash-sdk|platform-test-suite)\" test", diff --git a/packages/dashmate/docker-compose.platform.yml b/packages/dashmate/docker-compose.platform.yml index 0929a7d73bc..859df02b78f 100644 --- a/packages/dashmate/docker-compose.platform.yml +++ b/packages/dashmate/docker-compose.platform.yml @@ -7,11 +7,10 @@ services: depends_on: - core volumes: - - drive_abci_data:/var/lib/platform/rs-drive-abci/db - - ${PLATFORM_DRIVE_ABCI_LOG_PRETTY_DIRECTORY_PATH:?err}:/var/log/pretty - - ${PLATFORM_DRIVE_ABCI_LOG_JSON_DIRECTORY_PATH:?err}:/var/log/json + - drive_abci_data:/var/lib/platform/rs-drive-abci environment: - - DB_PATH=/var/lib/platform/rs-drive-abci/db + - BLOCK_SPACING_MS=3000 # TODO: sync with tenderdash + - CHAIN_ID=devnet # TODO: sync with tenderdash chain id - CORE_JSON_RPC_USERNAME=${CORE_RPC_USER:?err} - CORE_JSON_RPC_PASSWORD=${CORE_RPC_PASSWORD:?err} - CORE_JSON_RPC_HOST=core @@ -28,17 +27,10 @@ services: - MASTERNODE_REWARD_SHARES_SECOND_PUBLIC_KEY=${PLATFORM_MASTERNODE_REWARD_SHARES_SECOND_PUBLIC_KEY} - WITHDRAWALS_MASTER_PUBLIC_KEY=${PLATFORM_WITHDRAWALS_MASTER_PUBLIC_KEY} - WITHDRAWALS_SECOND_PUBLIC_KEY=${PLATFORM_WITHDRAWALS_SECOND_PUBLIC_KEY} - - NODE_ENV=${ENVIRONMENT:?err} - - LOG_STDOUT_LEVEL=${PLATFORM_DRIVE_ABCI_LOG_STDOUT_LEVEL:?err} - - LOG_PRETTY_FILE_LEVEL=${PLATFORM_DRIVE_ABCI_LOG_PRETTY_FILE_LEVEL:?err} - - LOG_PRETTY_FILE_PATH=/var/log/pretty/${PLATFORM_DRIVE_ABCI_LOG_PRETTY_FILE_NAME:?err} - - LOG_JSON_FILE_LEVEL=${PLATFORM_DRIVE_ABCI_LOG_JSON_FILE_LEVEL:?err} - - LOG_JSON_FILE_PATH=/var/log/json/${PLATFORM_DRIVE_ABCI_LOG_JSON_FILE_NAME:?err} - - INITIAL_CORE_CHAINLOCKED_HEIGHT=${PLATFORM_DRIVE_TENDERDASH_GENESIS_INITIAL_CORE_CHAIN_LOCKED_HEIGHT:-1} - - VALIDATOR_SET_LLMQ_TYPE=${PLATFORM_DRIVE_ABCI_VALIDATOR_SET_LLMQ_TYPE:?err} + - QUORUM_SIZE=5 # TODO: sync with Tenderdash + - QUORUM_TYPE=${PLATFORM_DRIVE_ABCI_VALIDATOR_SET_LLMQ_TYPE:?err} - NETWORK=${NETWORK} - TENDERDASH_P2P_PORT=${PLATFORM_DRIVE_TENDERDASH_P2P_PORT} - command: yarn workspace @dashevo/drive abci stop_grace_period: 30s drive_tenderdash: diff --git a/packages/rs-drive-abci/Dockerfile b/packages/rs-drive-abci/Dockerfile index e9948ff17a5..c2521a33a4f 100644 --- a/packages/rs-drive-abci/Dockerfile +++ b/packages/rs-drive-abci/Dockerfile @@ -29,13 +29,17 @@ FROM rust:alpine${ALPINE_VERSION} as deps RUN apk add --no-cache \ alpine-sdk \ bash \ - clang-dev \ + clang-static clang-dev \ + llvm-static llvm-dev \ git \ linux-headers \ openssl-dev \ perl \ unzip \ - wget + cmake \ + python3 \ + wget \ + xz SHELL ["/bin/bash", "-c"] @@ -59,6 +63,15 @@ RUN if [[ "$TARGETARCH" == "arm64" ]] ; then export SCC_ARCH=aarch64; else expor tar -C /tmp -xz && \ mv /tmp/sccache-*/sccache /usr/bin/ +# Install emcmake, dependency of bls-signatures -> bls-dash-sys + +RUN curl -Ls \ + https://github.com/emscripten-core/emsdk/archive/refs/tags/3.1.36.tar.gz | \ + tar -C /opt -xz && \ + ln -s /opt/emsdk-* /opt/emsdk && \ + /opt/emsdk/emsdk install latest && \ + /opt/emsdk/emsdk activate latest + # # EXECUTE BUILD # @@ -97,7 +110,9 @@ ARG CARGO_BUILD_PROFILE=dev # 5. We also set RUSTC to include exact toolchain name in compilation command, and # include this in cache key # 6. We build `dashcore-rpc` first, as arm64 builder on github hangs if we don't do this. -RUN --mount=type=cache,sharing=private,target=/root/.cache/sccache \ +RUN rm /usr/bin/cc && ln -s /usr/bin/clang /usr/bin/cc + +RUN --mount=type=cache,sharing=shared,target=/root/.cache/sccache \ --mount=type=cache,sharing=shared,target=${CARGO_HOME}/registry/index \ --mount=type=cache,sharing=shared,target=${CARGO_HOME}/registry/cache \ --mount=type=cache,sharing=shared,target=${CARGO_HOME}/git/db \ @@ -137,6 +152,85 @@ COPY --from=build /usr/src/platform/packages/rs-drive-abci/.env.example /var/lib # Double-check that we don't have missing deps RUN ldd /usr/bin/drive-abci +# +# CONFIGURATION +# Hint: generated with: +# `` +# sed -E 's/^([A-Z].+$)/ENV \1/g' packages/rs-drive-abci/.env.example +# `` +# + +# ABCI host and port to listen +ENV ABCI_BIND_ADDRESS="tcp://0.0.0.0:26658" + +ENV DB_PATH=/tmp/db + +# GroveDB database file +ENV GROVEDB_LATEST_FILE=${DB_PATH}/latest_state + +# Cache size for Data Contracts +ENV DATA_CONTRACTS_GLOBAL_CACHE_SIZE=500 +ENV DATA_CONTRACTS_BLOCK_CACHE_SIZE=200 + +# DashCore JSON-RPC host, port and credentials +# Read more: https://dashcore.readme.io/docs/core-api-ref-remote-procedure-calls +ENV CORE_JSON_RPC_HOST=127.0.0.1 +ENV CORE_JSON_RPC_PORT=9998 +ENV CORE_JSON_RPC_USERNAME=dashrpc +ENV CORE_JSON_RPC_PASSWORD=password + +# DashCore ZMQ host and port +ENV CORE_ZMQ_HOST=127.0.0.1 +ENV CORE_ZMQ_PORT=29998 +ENV CORE_ZMQ_CONNECTION_RETRIES=16 + +ENV NETWORK=testnet + +ENV INITIAL_CORE_CHAINLOCKED_HEIGHT=1243 + +# https://github.com/dashevo/dashcore-lib/blob/286c33a9d29d33f05d874c47a9b33764a0be0cf1/lib/constants/index.js#L42-L57 +ENV VALIDATOR_SET_LLMQ_TYPE=100 +ENV VALIDATOR_SET_QUORUM_ROTATION_BLOCK_COUNT=1024 + +ENV DKG_INTERVAL=24 +ENV MIN_QUORUM_VALID_MEMBERS=3 + +# DPNS Contract + +ENV DPNS_MASTER_PUBLIC_KEY=02649a81b760e8635dd3a4fad8911388ed09d7c1680558a890180d4edc8bcece7e +ENV DPNS_SECOND_PUBLIC_KEY=03f5ea3ab4bf594c28997eb8f83873532275ac2edd36e586b137ed42d15d510948 + +# Dashpay Contract + +ENV DASHPAY_MASTER_PUBLIC_KEY=022d6d70c9d24d03904713db17fb74c9201801ba0e3aed0f5d91e89df388e94aa6 +ENV DASHPAY_SECOND_PUBLIC_KEY=028c0a26c87b2e7f1aebbbeace9e687d774e037f5b50a6905b5f6fa24495b502cd + +# Feature flags contract + +ENV FEATURE_FLAGS_MASTER_PUBLIC_KEY=034ee04c509083ecd09e76fa53e0b5331b39120c19607cd04c4f167707dbb42302 +ENV FEATURE_FLAGS_SECOND_PUBLIC_KEY=03c755ae1b79dbcc79020aad3ccdfcb142fc6e74f1afc220fca1e275a87aa12cf8 + +# Masternode reward shares contract + +ENV MASTERNODE_REWARD_SHARES_MASTER_PUBLIC_KEY=02099cc210c7b6c7f566099046ddc92615342db326184940bf3811026ea328c85e +ENV MASTERNODE_REWARD_SHARES_SECOND_PUBLIC_KEY=02bf55f97f189895da29824781053140ee66b2bf47760246504fbe502985096af5 + +# Withdrawals contract + +ENV WITHDRAWALS_MASTER_PUBLIC_KEY=027057cdf58628635ef7b75e6b6c90dd996a16929cd68130e16b9328d429e5e03a +ENV WITHDRAWALS_SECOND_PUBLIC_KEY=022084d827fea4823a69aa7c8d3e02fe780eaa0ef1e5e9841af395ba7e40465ab6 + +ENV TENDERDASH_P2P_PORT=26656 + +ENV QUORUM_SIZE=5 +ENV QUORUM_TYPE=llmq_25_67 +ENV CHAIN_ID=devnet +ENV BLOCK_SPACING_MS=3000 + +# +# END OF CONFIGURATION +# + # # Create new non-root user # @@ -151,6 +245,6 @@ USER $USERNAME WORKDIR /var/lib/platform/rs-drive-abci ENTRYPOINT ["/usr/bin/drive-abci"] -CMD ["start"] +CMD ["-vv", "start"] EXPOSE 26658 diff --git a/scripts/configure_dotenv.sh b/scripts/configure_dotenv.sh index 9acc1d2bf57..fed61e223d8 100755 --- a/scripts/configure_dotenv.sh +++ b/scripts/configure_dotenv.sh @@ -10,7 +10,7 @@ LOGS_PATH="$PROJECT_ROOT_PATH/logs" CONFIG=local DAPI_PATH="${PACKAGES_PATH}"/dapi -DRIVE_PATH="${PACKAGES_PATH}"/js-drive +DRIVE_PATH="${PACKAGES_PATH}"/rs-drive-abci SDK_PATH="${PACKAGES_PATH}"/js-dash-sdk WALLET_LIB_PATH="${PACKAGES_PATH}"/wallet-lib @@ -33,7 +33,7 @@ echo "DAPI_SEED=127.0.0.1:2443:self-signed FAUCET_ADDRESS=${FAUCET_ADDRESS} FAUCET_PRIVATE_KEY=${FAUCET_PRIVATE_KEY} DPNS_CONTRACT_ID=${DPNS_CONTRACT_ID} -NETWORK=regtest" >> "${SDK_ENV_FILE_PATH}" +NETWORK=regtest" >>"${SDK_ENV_FILE_PATH}" #EOF # DRIVE: @@ -47,5 +47,5 @@ touch "${WALLET_LIB_ENV_FILE_PATH}" #cat << 'EOF' >> ${SDK_ENV_FILE_PATH} echo "DAPI_SEED=127.0.0.1:2443:self-signed FAUCET_PRIVATE_KEY=${FAUCET_PRIVATE_KEY} -NETWORK=regtest" >> "${WALLET_LIB_ENV_FILE_PATH}" +NETWORK=regtest" >>"${WALLET_LIB_ENV_FILE_PATH}" #EOF From 3bf2034b667d435810c86425011a3547e1af74ae Mon Sep 17 00:00:00 2001 From: Lukasz Klimek <842586+lklimek@users.noreply.github.com> Date: Wed, 19 Apr 2023 12:54:21 +0200 Subject: [PATCH 7/8] build remove js-drive and rs-drive-nodejs from build --- Cargo.lock | 151 +----------- Cargo.toml | 1 - package.json | 16 +- yarn.lock | 661 ++------------------------------------------------- 4 files changed, 34 insertions(+), 795 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 451b625e837..53af8fffa8e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -508,7 +508,7 @@ checksum = "4acbb09d9ee8e23699b9634375c72795d095bf268439da88562cf9b501f181fa" dependencies = [ "camino", "cargo-platform", - "semver 1.0.17", + "semver", "serde", "serde_json", ] @@ -591,7 +591,7 @@ checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" dependencies = [ "glob", "libc", - "libloading 0.7.4", + "libloading", ] [[package]] @@ -1169,16 +1169,6 @@ dependencies = [ "tracing-subscriber", ] -[[package]] -name = "drive-nodejs" -version = "0.24.0-dev.1" -dependencies = [ - "drive", - "drive-abci", - "neon", - "num 0.4.0", -] - [[package]] name = "ed" version = "0.2.2" @@ -1401,7 +1391,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aba3510011eee8825018be07f08d9643421de007eaf62a3bde58d89b058abfa7" dependencies = [ "lazy_static", - "num 0.2.1", + "num", ] [[package]] @@ -1890,16 +1880,6 @@ version = "0.2.141" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5" -[[package]] -name = "libloading" -version = "0.6.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "351a32417a12d5f7e82c368a66781e307834dae04c6ce0cd4456d52989229883" -dependencies = [ - "cfg-if", - "winapi", -] - [[package]] name = "libloading" version = "0.7.4" @@ -2119,47 +2099,6 @@ version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" -[[package]] -name = "neon" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28e15415261d880aed48122e917a45e87bb82cf0260bb6db48bbab44b7464373" -dependencies = [ - "neon-build", - "neon-macros", - "neon-runtime", - "semver 0.9.0", - "smallvec", -] - -[[package]] -name = "neon-build" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bac98a702e71804af3dacfde41edde4a16076a7bbe889ae61e56e18c5b1c811" - -[[package]] -name = "neon-macros" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7288eac8b54af7913c60e0eb0e2a7683020dffa342ab3fd15e28f035ba897cf" -dependencies = [ - "quote", - "syn 1.0.109", - "syn-mid", -] - -[[package]] -name = "neon-runtime" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4676720fa8bb32c64c3d9f49c47a47289239ec46b4bdb66d0913cc512cb0daca" -dependencies = [ - "cfg-if", - "libloading 0.6.7", - "smallvec", -] - [[package]] name = "nohash-hasher" version = "0.2.0" @@ -2198,25 +2137,11 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b8536030f9fea7127f841b45bb6243b27255787fb4eb83958aa1ef9d2fdc0c36" dependencies = [ - "num-bigint 0.2.6", - "num-complex 0.2.4", - "num-integer", - "num-iter", - "num-rational 0.2.4", - "num-traits", -] - -[[package]] -name = "num" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43db66d1170d347f9a065114077f7dccb00c1b9478c89384490a3425279a4606" -dependencies = [ - "num-bigint 0.4.3", - "num-complex 0.4.3", + "num-bigint", + "num-complex", "num-integer", "num-iter", - "num-rational 0.4.1", + "num-rational", "num-traits", ] @@ -2231,17 +2156,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "num-bigint" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - [[package]] name = "num-cmp" version = "0.1.0" @@ -2258,15 +2172,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "num-complex" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e0d21255c828d6f128a1e41534206671e8c3ea0c62f32291e808dc82cff17d" -dependencies = [ - "num-traits", -] - [[package]] name = "num-derive" version = "0.3.3" @@ -2306,19 +2211,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c000134b5dbf44adc5cb772486d335293351644b801551abe8f75c84cfa4aef" dependencies = [ "autocfg", - "num-bigint 0.2.6", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-rational" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" -dependencies = [ - "autocfg", - "num-bigint 0.4.3", + "num-bigint", "num-integer", "num-traits", ] @@ -2977,7 +2870,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.17", + "semver", ] [[package]] @@ -3085,15 +2978,6 @@ dependencies = [ "cc", ] -[[package]] -name = "semver" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" -dependencies = [ - "semver-parser", -] - [[package]] name = "semver" version = "1.0.17" @@ -3103,12 +2987,6 @@ dependencies = [ "serde", ] -[[package]] -name = "semver-parser" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" - [[package]] name = "serde" version = "1.0.160" @@ -3397,17 +3275,6 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "syn-mid" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baa8e7560a164edb1621a55d18a0c59abf49d360f47aa7b821061dd7eea7fac9" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "synstructure" version = "0.12.6" @@ -3446,7 +3313,7 @@ source = "git+https://github.com/dashpay/rs-tenderdash-abci#e66a7d6683c0843f11e9 dependencies = [ "bytes", "prost", - "semver 1.0.17", + "semver", "tenderdash-proto", "thiserror", "tracing", diff --git a/Cargo.toml b/Cargo.toml index 1e84b12d923..0353b5edae1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,7 +6,6 @@ members = [ "packages/rs-drive", "packages/rs-platform-value", "packages/rs-drive-abci", - "packages/rs-drive-nodejs", "packages/dashpay-contract", "packages/withdrawals-contract", "packages/masternode-reward-shares-contract", diff --git a/package.json b/package.json index 39198a5878d..813502242d9 100644 --- a/package.json +++ b/package.json @@ -10,16 +10,16 @@ "reset": "yarn run clean:data --force && yarn run setup", "test": "ultra -r $* test", "test:dapi": "ultra -r --filter \"packages/@(dapi|platform-test-suite)\" test", - "test:dapi-grpc": "ultra -r --filter \"packages/@(dapi|js-dapi-client|dapi-grpc|js-dash-sdk|wallet-lib|platform-test-suite)\" test", - "test:dashpay-contract": "ultra -r --filter \"packages/@(dashpay-contract|js-dash-sdk|js-dapi-client|js-dpp|wallet-lib|dapi|platform-test-suite)\" test", - "test:dpns-contract": "ultra -r --filter \"packages/@(dpns-contract|js-dash-sdk|js-dapi-client|js-dpp|wallet-lib|dapi|platform-test-suite)\" test", - "test:feature-flags-contract": "ultra -r --filter \"packages/@(feature-flags-contract|js-dash-sdk|js-dapi-client|js-dpp|wallet-lib|dapi|platform-test-suite)\" test", + "test:dapi-grpc": "ultra -r --filter \"packages/@(dapi|js-dapi-client|dapi-grpc|js-dash-sdk|js-drive|wallet-lib|platform-test-suite)\" test", + "test:dashpay-contract": "ultra -r --filter \"packages/@(dashpay-contract|js-dash-sdk|js-drive|js-dapi-client|js-dpp|wallet-lib|dapi|platform-test-suite)\" test", + "test:dpns-contract": "ultra -r --filter \"packages/@(dpns-contract|js-dash-sdk|js-drive|js-dapi-client|js-dpp|wallet-lib|dapi|platform-test-suite)\" test", + "test:feature-flags-contract": "ultra -r --filter \"packages/@(feature-flags-contract|js-dash-sdk|js-drive|js-dapi-client|js-dpp|wallet-lib|dapi|platform-test-suite)\" test", "test:dapi-client": "ultra -r --filter \"packages/@(js-dapi-client|wallet-lib|js-dash-sdk|platform-test-suite)\" test", "test:sdk": "ultra -r --filter \"packages/@(js-dash-sdk|platform-test-suite)\" test", "test:spv": "ultra -r --filter \"packages/@(dash-spv|js-dapi-client)\" test", "test:dpp": "ultra -r test", - "test:drive": "cargo test", - "test:grpc-common": "ultra -r --filter \"packages/@(js-grpc-common|dapi-grpc|dapi|js-dapi-client|js-dash-sdk|wallet-lib|platform-test-suite)\" test", + "test:drive": "ultra -r --filter \"packages/@(js-drive|platform-test-suite)\" test", + "test:grpc-common": "ultra -r --filter \"packages/@(js-grpc-common|dapi-grpc|dapi|js-dapi-client|js-dash-sdk|js-drive|wallet-lib|platform-test-suite)\" test", "test:suite": "yarn workspace @dashevo/platform-test-suite test", "test:suite:browsers": "yarn workspace @dashevo/platform-test-suite test:browsers", "test:wallet-lib": "ultra -r --filter \"packages/@(wallet-lib|js-dash-sdk|platform-test-suite)\" test", @@ -59,14 +59,12 @@ "packages/wallet-lib", "packages/js-dash-sdk", "packages/dapi", - "packages/js-drive", "packages/dashmate", "packages/platform-test-suite", "packages/masternode-reward-shares-contract", "packages/dash-spv", "packages/wasm-dpp", - "packages/withdrawals-contract", - "packages/rs-drive-nodejs" + "packages/withdrawals-contract" ], "resolutions": { "elliptic": "^6.5.4", diff --git a/yarn.lock b/yarn.lock index 8a95a3b3940..5a245765a17 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1281,17 +1281,6 @@ __metadata: languageName: node linkType: hard -"@dashevo/abci@github:dashpay/js-abci#09f72120bc2059144f72eb7a246d632ead3fc3c6": - version: 0.24.0-dev.1 - resolution: "@dashevo/abci@https://github.com/dashpay/js-abci.git#commit=09f72120bc2059144f72eb7a246d632ead3fc3c6" - dependencies: - "@dashevo/protobufjs": 6.10.5 - bl: ^1.2.3 - protocol-buffers-encodings: ^1.1.0 - checksum: aaf41ab7fada6504606daf6ef238f2240bac4307ecde77bd77b8c10aecfd0b73fb8cfb40b2ad91a5bc6440572c93580da51013e188bb85dc46c4120b7c8c2236 - languageName: node - linkType: hard - "@dashevo/bench-suite@workspace:packages/bench-suite": version: 0.0.0-use.local resolution: "@dashevo/bench-suite@workspace:packages/bench-suite" @@ -1631,63 +1620,6 @@ __metadata: languageName: unknown linkType: soft -"@dashevo/drive@workspace:packages/js-drive": - version: 0.0.0-use.local - resolution: "@dashevo/drive@workspace:packages/js-drive" - dependencies: - "@dashevo/abci": "github:dashpay/js-abci#09f72120bc2059144f72eb7a246d632ead3fc3c6" - "@dashevo/dapi-grpc": "workspace:*" - "@dashevo/dashcore-lib": ~0.20.0 - "@dashevo/dashd-rpc": ^18.2.0 - "@dashevo/dashpay-contract": "workspace:*" - "@dashevo/dp-services-ctl": "github:dashevo/js-dp-services-ctl#v0.19-dev" - "@dashevo/dpns-contract": "workspace:*" - "@dashevo/dpp": "workspace:*" - "@dashevo/feature-flags-contract": "workspace:*" - "@dashevo/grpc-common": "workspace:*" - "@dashevo/masternode-reward-shares-contract": "workspace:*" - "@dashevo/rs-drive": "workspace:*" - "@dashevo/withdrawals-contract": "workspace:*" - "@types/pino": ^6.3.0 - ajv: ^8.6.0 - ajv-keywords: ^5.0.0 - awilix: ^4.2.6 - babel-eslint: ^10.1.0 - blake3: ^2.1.4 - bs58: ^4.0.1 - cbor: ^8.0.0 - chai: ^4.3.4 - chai-as-promised: ^7.1.1 - chai-string: ^1.5.0 - chalk: ^4.1.0 - dirty-chai: ^2.0.1 - dotenv-expand: ^5.1.0 - dotenv-safe: ^8.2.0 - eslint: ^7.32.0 - eslint-config-airbnb-base: ^14.2.1 - eslint-plugin-import: ^2.24.2 - find-my-way: ^2.2.2 - js-merkle: ^0.1.5 - levelup: ^4.4.0 - lodash: ^4.17.21 - long: ^5.2.0 - memdown: ^5.1.0 - mocha: ^9.1.2 - moment: ^2.29.4 - node-graceful: ^3.0.1 - nyc: ^15.1.0 - pino: ^6.4.0 - pino-multi-stream: ^5.2.0 - pino-pretty: ^4.0.3 - rimraf: ^3.0.2 - setimmediate: ^1.0.5 - sinon: ^11.1.2 - sinon-chai: ^3.7.0 - through2: ^3.0.1 - zeromq: ^5.2.8 - languageName: unknown - linkType: soft - "@dashevo/feature-flags-contract@workspace:*, @dashevo/feature-flags-contract@workspace:packages/feature-flags-contract": version: 0.0.0-use.local resolution: "@dashevo/feature-flags-contract@workspace:packages/feature-flags-contract" @@ -1873,28 +1805,6 @@ __metadata: languageName: node linkType: hard -"@dashevo/rs-drive@workspace:*, @dashevo/rs-drive@workspace:packages/rs-drive-nodejs": - version: 0.0.0-use.local - resolution: "@dashevo/rs-drive@workspace:packages/rs-drive-nodejs" - dependencies: - "@dashevo/dashcore-lib": ~0.20.0 - "@dashevo/dpp": "workspace:*" - "@dashevo/withdrawals-contract": "workspace:*" - cargo-cp-artifact: ^0.1.6 - cbor: ^8.0.0 - chai: ^4.3.4 - dirty-chai: ^2.0.1 - eslint: ^7.32.0 - eslint-config-airbnb-base: ^14.2.1 - eslint-plugin-import: ^2.24.2 - mocha: ^9.1.2 - neon-cli: ^0.10.1 - neon-load-or-build: ^2.2.2 - neon-tag-prebuild: "github:shumkov/neon-tag-prebuild#patch-1" - ultra-runner: ^3.10.5 - languageName: unknown - linkType: soft - "@dashevo/wallet-lib@workspace:*, @dashevo/wallet-lib@workspace:packages/wallet-lib": version: 0.0.0-use.local resolution: "@dashevo/wallet-lib@workspace:packages/wallet-lib" @@ -2119,13 +2029,6 @@ __metadata: languageName: node linkType: hard -"@hapi/bourne@npm:^2.0.0": - version: 2.0.0 - resolution: "@hapi/bourne@npm:2.0.0" - checksum: 2ea0922101d3fecec43428194c72c5dbe0be908dd7ad07347879dc720820ac410ead79a4c349a2e1726e8af062464160c6d32b6566bbc4c60865923f9d7dd006 - languageName: node - linkType: hard - "@humanwhocodes/config-array@npm:^0.5.0": version: 0.5.0 resolution: "@humanwhocodes/config-array@npm:0.5.0" @@ -3136,37 +3039,6 @@ __metadata: languageName: node linkType: hard -"@types/pino-pretty@npm:*": - version: 4.7.3 - resolution: "@types/pino-pretty@npm:4.7.3" - dependencies: - "@types/node": "*" - "@types/pino": 6.3 - checksum: 40fe67e73d26242d1f741ba62bd57aa4ce34842376878137f16befde3df0dd5ee39c30bc89da3d5e99848f69b00b73010863a740fd469585e0852ea656cb5b7b - languageName: node - linkType: hard - -"@types/pino-std-serializers@npm:*": - version: 2.4.1 - resolution: "@types/pino-std-serializers@npm:2.4.1" - dependencies: - "@types/node": "*" - checksum: a156e25882db9aade2576dbe6414379efcdd4fad24211d3f22f20e0cd4bee569215799ee5cd9b2b15282f18461a8a54573ff42bf6bee5d35b72513be2f78bdec - languageName: node - linkType: hard - -"@types/pino@npm:6.3, @types/pino@npm:^6.3.0": - version: 6.3.12 - resolution: "@types/pino@npm:6.3.12" - dependencies: - "@types/node": "*" - "@types/pino-pretty": "*" - "@types/pino-std-serializers": "*" - sonic-boom: ^2.1.0 - checksum: 801735146669312d02459781e5180220630eaef643da36dc5a9a97520e7ecc3da7270f31a86fcdcb1dc835073c9143fc628024ba5e3a0ea7cbb86aada4897709 - languageName: node - linkType: hard - "@types/qs@npm:*": version: 6.9.7 resolution: "@types/qs@npm:6.9.7" @@ -3745,17 +3617,6 @@ __metadata: languageName: node linkType: hard -"ajv-keywords@npm:^5.0.0": - version: 5.0.0 - resolution: "ajv-keywords@npm:5.0.0" - dependencies: - fast-deep-equal: ^3.1.3 - peerDependencies: - ajv: ^8.0.0 - checksum: 239dd46383a861f9e1dda1f463542ddfa07b4aed886eccb2a4328672c886030b5fdbb7869e0e293ba5549c9b86b23b40fa0e3c0785047e081302f00e41b1e4c1 - languageName: node - linkType: hard - "ajv@npm:^6.10.0, ajv@npm:^6.10.2, ajv@npm:^6.12.4, ajv@npm:^6.12.5": version: 6.12.6 resolution: "ajv@npm:6.12.6" @@ -3986,32 +3847,6 @@ __metadata: languageName: node linkType: hard -"args@npm:^5.0.1": - version: 5.0.1 - resolution: "args@npm:5.0.1" - dependencies: - camelcase: 5.0.0 - chalk: 2.4.2 - leven: 2.1.0 - mri: 1.1.4 - checksum: 51e2a05f32d15b8e292f000e6b232118df61b8f4fd446b17bb4e99df9ab47fe2c4a01924d7f967a6f08e82f9c19be277b08ed22bceff058aca849144ef8efed3 - languageName: node - linkType: hard - -"array-back@npm:^3.0.1, array-back@npm:^3.1.0": - version: 3.1.0 - resolution: "array-back@npm:3.1.0" - checksum: 7205004fcd0f9edd926db921af901b083094608d5b265738d0290092f9822f73accb468e677db74c7c94ef432d39e5ed75a7b1786701e182efb25bbba9734209 - languageName: node - linkType: hard - -"array-back@npm:^4.0.1, array-back@npm:^4.0.2": - version: 4.0.2 - resolution: "array-back@npm:4.0.2" - checksum: f30603270771eeb54e5aad5f54604c62b3577a18b6db212a7272b2b6c32049121b49431f656654790ed1469411e45f387e7627c0de8fd0515995cc40df9b9294 - languageName: node - linkType: hard - "array-buffer-byte-length@npm:^1.0.0": version: 1.0.0 resolution: "array-buffer-byte-length@npm:1.0.0" @@ -4175,13 +4010,6 @@ __metadata: languageName: node linkType: hard -"atomic-sleep@npm:^1.0.0": - version: 1.0.0 - resolution: "atomic-sleep@npm:1.0.0" - checksum: b95275afb2f80732f22f43a60178430c468906a415a7ff18bcd0feeebc8eec3930b51250aeda91a476062a90e07132b43a1794e8d8ffcf9b650e8139be75fa36 - languageName: node - linkType: hard - "available-typed-arrays@npm:^1.0.5": version: 1.0.5 resolution: "available-typed-arrays@npm:1.0.5" @@ -4418,16 +4246,6 @@ __metadata: languageName: node linkType: hard -"bl@npm:^1.2.3": - version: 1.2.3 - resolution: "bl@npm:1.2.3" - dependencies: - readable-stream: ^2.3.5 - safe-buffer: ^5.1.1 - checksum: 123f097989ce2fa9087ce761cd41176aaaec864e28f7dfe5c7dab8ae16d66d9844f849c3ad688eb357e3c5e4f49b573e3c0780bb8bc937206735a3b6f8569a5f - languageName: node - linkType: hard - "bl@npm:^2.2.1": version: 2.2.1 resolution: "bl@npm:2.2.1" @@ -4851,13 +4669,6 @@ __metadata: languageName: node linkType: hard -"camelcase@npm:5.0.0": - version: 5.0.0 - resolution: "camelcase@npm:5.0.0" - checksum: 8bfe920e0472d79d34f0279da1391f155bcce7fc74c99b49dafae4f787396040a34f4023da837ab0b4372e63224b460f9524b495906863c38876faea9da53705 - languageName: node - linkType: hard - "camelcase@npm:^5.0.0, camelcase@npm:^5.3.1": version: 5.3.1 resolution: "camelcase@npm:5.3.1" @@ -4891,15 +4702,6 @@ __metadata: languageName: node linkType: hard -"cargo-cp-artifact@npm:^0.1.6": - version: 0.1.6 - resolution: "cargo-cp-artifact@npm:0.1.6" - bin: - cargo-cp-artifact: bin/cargo-cp-artifact.js - checksum: 2f5d2f3e73372c9d398746372e8d1f7b171f27c8d4e4e9f7de898ead93b29631d62ea26c1ae352fa2c1542e124c2c77ac8a60acc5634bb433133ee2c7c6f1e09 - languageName: node - linkType: hard - "cbor@npm:^8.0.0": version: 8.1.0 resolution: "cbor@npm:8.1.0" @@ -4954,17 +4756,6 @@ __metadata: languageName: node linkType: hard -"chalk@npm:2.4.2, chalk@npm:^2.0.0, chalk@npm:^2.0.1, chalk@npm:^2.1.0, chalk@npm:^2.4.2": - version: 2.4.2 - resolution: "chalk@npm:2.4.2" - dependencies: - ansi-styles: ^3.2.1 - escape-string-regexp: ^1.0.5 - supports-color: ^5.3.0 - checksum: ec3661d38fe77f681200f878edbd9448821924e0f93a9cefc0e26a33b145f1027a2084bf19967160d11e1f03bfe4eaffcabf5493b89098b2782c3fe0b03d80c2 - languageName: node - linkType: hard - "chalk@npm:^1.0.0": version: 1.1.3 resolution: "chalk@npm:1.1.3" @@ -4978,6 +4769,17 @@ __metadata: languageName: node linkType: hard +"chalk@npm:^2.0.0, chalk@npm:^2.0.1, chalk@npm:^2.1.0, chalk@npm:^2.4.2": + version: 2.4.2 + resolution: "chalk@npm:2.4.2" + dependencies: + ansi-styles: ^3.2.1 + escape-string-regexp: ^1.0.5 + supports-color: ^5.3.0 + checksum: ec3661d38fe77f681200f878edbd9448821924e0f93a9cefc0e26a33b145f1027a2084bf19967160d11e1f03bfe4eaffcabf5493b89098b2782c3fe0b03d80c2 + languageName: node + linkType: hard + "chalk@npm:^3.0.0": version: 3.0.0 resolution: "chalk@npm:3.0.0" @@ -5350,39 +5152,6 @@ __metadata: languageName: node linkType: hard -"command-line-args@npm:^5.1.1": - version: 5.2.1 - resolution: "command-line-args@npm:5.2.1" - dependencies: - array-back: ^3.1.0 - find-replace: ^3.0.0 - lodash.camelcase: ^4.3.0 - typical: ^4.0.0 - checksum: e759519087be3cf2e86af8b9a97d3058b4910cd11ee852495be881a067b72891f6a32718fb685ee6d41531ab76b2b7bfb6602f79f882cd4b7587ff1e827982c7 - languageName: node - linkType: hard - -"command-line-commands@npm:^3.0.1": - version: 3.0.2 - resolution: "command-line-commands@npm:3.0.2" - dependencies: - array-back: ^4.0.1 - checksum: 2cf5409af0910b9ea3c405814d68ef6134d22849b7f41c32153b807e9f52c67c486472ab042ca96f80cf2e5ab19db830a52ef2070ae189513e6188b6692db903 - languageName: node - linkType: hard - -"command-line-usage@npm:^6.1.0": - version: 6.1.3 - resolution: "command-line-usage@npm:6.1.3" - dependencies: - array-back: ^4.0.2 - chalk: ^2.4.2 - table-layout: ^1.0.2 - typical: ^5.2.0 - checksum: 8261d4e5536eb0bcddee0ec5e89c05bb2abd18e5760785c8078ede5020bc1c612cbe28eb6586f5ed4a3660689748e5aaad4a72f21566f4ef39393694e2fa1a0b - languageName: node - linkType: hard - "commander@npm:4.0.1": version: 4.0.1 resolution: "commander@npm:4.0.1" @@ -6037,7 +5806,7 @@ __metadata: languageName: node linkType: hard -"dateformat@npm:^4.5.0, dateformat@npm:^4.5.1": +"dateformat@npm:^4.5.0": version: 4.6.3 resolution: "dateformat@npm:4.6.3" checksum: c3aa0617c0a5b30595122bc8d1bee6276a9221e4d392087b41cbbdf175d9662ae0e50d0d6dcdf45caeac5153c4b5b0844265f8cd2b2245451e3da19e39e3b65d @@ -6151,7 +5920,7 @@ __metadata: languageName: node linkType: hard -"deep-extend@npm:^0.6.0, deep-extend@npm:~0.6.0": +"deep-extend@npm:^0.6.0": version: 0.6.0 resolution: "deep-extend@npm:0.6.0" checksum: 7be7e5a8d468d6b10e6a67c3de828f55001b6eb515d014f7aeb9066ce36bd5717161eb47d6a0f7bed8a9083935b465bc163ee2581c8b128d29bf61092fdf57a7 @@ -7214,13 +6983,6 @@ __metadata: languageName: node linkType: hard -"fast-decode-uri-component@npm:^1.0.0": - version: 1.0.1 - resolution: "fast-decode-uri-component@npm:1.0.1" - checksum: 427a48fe0907e76f0e9a2c228e253b4d8a8ab21d130ee9e4bb8339c5ba4086235cf9576831f7b20955a752eae4b525a177ff9d5825dd8d416e7726939194fbee - languageName: node - linkType: hard - "fast-deep-equal@npm:^3.1.1, fast-deep-equal@npm:^3.1.3": version: 3.1.3 resolution: "fast-deep-equal@npm:3.1.3" @@ -7271,20 +7033,6 @@ __metadata: languageName: node linkType: hard -"fast-redact@npm:^3.0.0": - version: 3.0.2 - resolution: "fast-redact@npm:3.0.2" - checksum: f4ffdf48f1647dbe0411884e5dca85ebef0762d1ce1937f6779beaea5c83ef7c35416d800b2bff60f1a252b670d1707f9484c9a5d0ef721e68f3dae94b420fa8 - languageName: node - linkType: hard - -"fast-safe-stringify@npm:^2.0.7, fast-safe-stringify@npm:^2.0.8": - version: 2.1.1 - resolution: "fast-safe-stringify@npm:2.1.1" - checksum: a851cbddc451745662f8f00ddb622d6766f9bd97642dabfd9a405fb0d646d69fc0b9a1243cbf67f5f18a39f40f6fa821737651ff1bceeba06c9992ca2dc5bd3d - languageName: node - linkType: hard - "fastest-levenshtein@npm:^1.0.12, fastest-levenshtein@npm:^1.0.7": version: 1.0.12 resolution: "fastest-levenshtein@npm:1.0.12" @@ -7292,13 +7040,6 @@ __metadata: languageName: node linkType: hard -"fastify-warning@npm:^0.2.0": - version: 0.2.0 - resolution: "fastify-warning@npm:0.2.0" - checksum: c19ebccf54a3122877d2248400772ca98bacbabdf97826211ede29246c640d47431a2eebed1f52f9421139ed5e52e42d3bd4aefc46e27b6f34add3507529fd97 - languageName: node - linkType: hard - "fastq@npm:^1.6.0": version: 1.13.0 resolution: "fastq@npm:1.13.0" @@ -7384,26 +7125,6 @@ __metadata: languageName: node linkType: hard -"find-my-way@npm:^2.2.2": - version: 2.2.5 - resolution: "find-my-way@npm:2.2.5" - dependencies: - fast-decode-uri-component: ^1.0.0 - safe-regex2: ^2.0.0 - semver-store: ^0.3.0 - checksum: 93303495659720c55c92e6cd7c430861c722865ac93454eac8b014954db82cfbcbac20826e74d871cef8883d484b2b8dc15a435b8964696bcdffe76afce5ade1 - languageName: node - linkType: hard - -"find-replace@npm:^3.0.0": - version: 3.0.0 - resolution: "find-replace@npm:3.0.0" - dependencies: - array-back: ^3.0.1 - checksum: 6b04bcfd79027f5b84aa1dfe100e3295da989bdac4b4de6b277f4d063e78f5c9e92ebc8a1fec6dd3b448c924ba404ee051cc759e14a3ee3e825fa1361025df08 - languageName: node - linkType: hard - "find-up@npm:5.0.0, find-up@npm:^5.0.0": version: 5.0.0 resolution: "find-up@npm:5.0.0" @@ -7480,13 +7201,6 @@ __metadata: languageName: node linkType: hard -"flatstr@npm:^1.0.12": - version: 1.0.12 - resolution: "flatstr@npm:1.0.12" - checksum: e1bb562c94b119e958bf37e55738b172b5f8aaae6532b9660ecd877779f8559dbbc89613ba6b29ccc13447e14c59277d41450f785cf75c30df9fce62f459e9a8 - languageName: node - linkType: hard - "flatted@npm:^3.1.0, flatted@npm:^3.2.6": version: 3.2.7 resolution: "flatted@npm:3.2.7" @@ -7794,15 +7508,6 @@ fsevents@~2.3.2: languageName: node linkType: hard -"git-config@npm:0.0.7": - version: 0.0.7 - resolution: "git-config@npm:0.0.7" - dependencies: - iniparser: ~1.0.5 - checksum: 99a7e203061fa2bf5a1ca9a888c0b86b2f1d8d104f57ae82cdaf61cf344dc4b67a85250572686d76c70ba0a8e83a7ca4993d2a9efe0a42ea03b5b65ebcaef97d - languageName: node - linkType: hard - "git-raw-commits@npm:^2.0.8": version: 2.0.10 resolution: "git-raw-commits@npm:2.0.10" @@ -8523,34 +8228,6 @@ fsevents@~2.3.2: languageName: node linkType: hard -"iniparser@npm:~1.0.5": - version: 1.0.5 - resolution: "iniparser@npm:1.0.5" - checksum: eba0ec2d6856dd1d1cc6c6234c683aee67d923c054c851e3d583f2436bd4fc14b29f9d39f3f94bac9cfa211d8310558c557e1e983fddc82e07ad6a6524cabc2a - languageName: node - linkType: hard - -"inquirer@npm:^7.3.3": - version: 7.3.3 - resolution: "inquirer@npm:7.3.3" - dependencies: - ansi-escapes: ^4.2.1 - chalk: ^4.1.0 - cli-cursor: ^3.1.0 - cli-width: ^3.0.0 - external-editor: ^3.0.3 - figures: ^3.0.0 - lodash: ^4.17.19 - mute-stream: 0.0.8 - run-async: ^2.4.0 - rxjs: ^6.6.0 - string-width: ^4.1.0 - strip-ansi: ^6.0.0 - through: ^2.3.6 - checksum: 4d387fc1eb6126acbd58cbdb9ad99d2887d181df86ab0c2b9abdf734e751093e2d5882c2b6dc7144d9ab16b7ab30a78a1d7f01fb6a2850a44aeb175d1e3f8778 - languageName: node - linkType: hard - "inquirer@npm:^8.0.0": version: 8.2.0 resolution: "inquirer@npm:8.2.0" @@ -9234,20 +8911,6 @@ fsevents@~2.3.2: languageName: node linkType: hard -"jmespath@npm:^0.15.0": - version: 0.15.0 - resolution: "jmespath@npm:0.15.0" - checksum: 353bb9e69cc4c1560be0a4df43cb4020abc246e1c60cb5b55dcc76d8c858383f1633faf22ccaf6a5e09568a2077d0f4f1e989e6fcfd496b5cef87964cc8cb9e7 - languageName: node - linkType: hard - -"joycon@npm:^2.2.5": - version: 2.2.5 - resolution: "joycon@npm:2.2.5" - checksum: 930bb748c0ade3b70cca756aa559916a3e0df36b06b0ace629d9c4a6081d235d3d7a93eb7d3094d53ab7a3658bcd5c6a54e4ed235e5f5c03a177597a669081eb - languageName: node - linkType: hard - "js-base64@npm:^2.1.9": version: 2.6.4 resolution: "js-base64@npm:2.6.4" @@ -9689,13 +9352,6 @@ fsevents@~2.3.2: languageName: node linkType: hard -"leven@npm:2.1.0": - version: 2.1.0 - resolution: "leven@npm:2.1.0" - checksum: f7b4a01b15c0ee2f92a04c0367ea025d10992b044df6f0d4ee1a845d4a488b343e99799e2f31212d72a2b1dea67124f57c1bb1b4561540df45190e44b5b8b394 - languageName: node - linkType: hard - "levn@npm:^0.4.1": version: 0.4.1 resolution: "levn@npm:0.4.1" @@ -10110,13 +9766,6 @@ fsevents@~2.3.2: languageName: node linkType: hard -"make-promises-safe@npm:^5.1.0": - version: 5.1.0 - resolution: "make-promises-safe@npm:5.1.0" - checksum: 6e59ed8c568b422e4d707d171bf7d9a05ef483bad09749ddbab79e059498572b01e3f58baae7ce49d1e748e693823eb633d3875ae86fa5131242683e71ba73fe - languageName: node - linkType: hard - "map-obj@npm:^1.0.0": version: 1.0.1 resolution: "map-obj@npm:1.0.1" @@ -10587,13 +10236,6 @@ fsevents@~2.3.2: languageName: node linkType: hard -"moment@npm:^2.29.4": - version: 2.29.4 - resolution: "moment@npm:2.29.4" - checksum: 0ec3f9c2bcba38dc2451b1daed5daded747f17610b92427bebe1d08d48d8b7bdd8d9197500b072d14e326dd0ccf3e326b9e3d07c5895d3d49e39b6803b76e80e - languageName: node - linkType: hard - "mongodb@npm:^3.3.4": version: 3.7.3 resolution: "mongodb@npm:3.7.3" @@ -10624,13 +10266,6 @@ fsevents@~2.3.2: languageName: node linkType: hard -"mri@npm:1.1.4": - version: 1.1.4 - resolution: "mri@npm:1.1.4" - checksum: e65b9aed3b9e423ad4c11f529ab1b9280f65dce8fb476d0da236b5c570ad3322fbbcd2393180855f1474f8b0f982d76ad398766fbd47b8a5ab4069e325d0268e - languageName: node - linkType: hard - "ms@npm:2.0.0": version: 2.0.0 resolution: "ms@npm:2.0.0" @@ -10741,53 +10376,6 @@ fsevents@~2.3.2: languageName: node linkType: hard -"neon-cli@npm:^0.10.1": - version: 0.10.1 - resolution: "neon-cli@npm:0.10.1" - dependencies: - chalk: ^4.1.0 - command-line-args: ^5.1.1 - command-line-commands: ^3.0.1 - command-line-usage: ^6.1.0 - git-config: 0.0.7 - handlebars: ^4.7.6 - inquirer: ^7.3.3 - make-promises-safe: ^5.1.0 - rimraf: ^3.0.2 - semver: ^7.3.2 - toml: ^3.0.0 - ts-typed-json: ^0.3.2 - validate-npm-package-license: ^3.0.4 - validate-npm-package-name: ^3.0.0 - bin: - neon: bin/cli.js - checksum: 284e7ec9e3d7e643abc3f521e0969ee73e22297b6f7102e9526770b1c9f5a73c650ceef12497eb51ed9818ac2d3f53448ad8ef77a88108dae70a7bae2e131402 - languageName: node - linkType: hard - -"neon-load-or-build@npm:^2.2.2": - version: 2.2.2 - resolution: "neon-load-or-build@npm:2.2.2" - bin: - neon-load-or-build: ./bin.js - neon-load-or-build-optional: ./optional.js - neon-load-or-build-test: ./build-test.js - checksum: 3cafba0e26ad2d343c9c0bcbaaeef34fd646941da401a02bb7307a99095774c4bbbe4d2e168641e50f7228cb933ac9c5e68db390ec7e52dc9d01be99b5a90258 - languageName: node - linkType: hard - -"neon-tag-prebuild@github:shumkov/neon-tag-prebuild#patch-1": - version: 1.1.0 - resolution: "neon-tag-prebuild@https://github.com/shumkov/neon-tag-prebuild.git#commit=a429834da27432b129eceb737e4d2b3f03fa5496" - dependencies: - mkdirp: ^1.0.4 - node-abi: ^2.19.1 - bin: - neon-tag-prebuild: ./bin.js - checksum: 00a16bf27c06e0fa021be8019942490b4dc4f9cfd09b13eda042fdbc1f3873b7d74438f3b0d327651f77b93d087dd6ca5b9497bfc73457d12870f15cff0f0066 - languageName: node - linkType: hard - "net@npm:^1.0.2": version: 1.0.2 resolution: "net@npm:1.0.2" @@ -10825,15 +10413,6 @@ fsevents@~2.3.2: languageName: node linkType: hard -"node-abi@npm:^2.19.1": - version: 2.30.1 - resolution: "node-abi@npm:2.30.1" - dependencies: - semver: ^5.4.1 - checksum: 3f4b0c912ce4befcd7ceab4493ba90b51d60dfcc90f567c93f731d897ef8691add601cb64c181683b800f21d479d68f9a6e15d8ab8acd16a5706333b9e30a881 - languageName: node - linkType: hard - "node-fetch@npm:^2.6.7": version: 2.6.7 resolution: "node-fetch@npm:2.6.7" @@ -11821,61 +11400,6 @@ fsevents@~2.3.2: languageName: node linkType: hard -"pino-multi-stream@npm:^5.2.0": - version: 5.3.0 - resolution: "pino-multi-stream@npm:5.3.0" - dependencies: - pino: ^6.0.0 - checksum: 10ddb859836a1d8e4894a408c4bc0c00ca67fe81c2c1aa8ff1534720a5e1ad0261a976239408ec5cdfa5fd7f0444c83d6caa00189efe5cf95b230ed9a32ee6d5 - languageName: node - linkType: hard - -"pino-pretty@npm:^4.0.3": - version: 4.8.0 - resolution: "pino-pretty@npm:4.8.0" - dependencies: - "@hapi/bourne": ^2.0.0 - args: ^5.0.1 - chalk: ^4.0.0 - dateformat: ^4.5.1 - fast-safe-stringify: ^2.0.7 - jmespath: ^0.15.0 - joycon: ^2.2.5 - pump: ^3.0.0 - readable-stream: ^3.6.0 - rfdc: ^1.3.0 - split2: ^3.1.1 - strip-json-comments: ^3.1.1 - bin: - pino-pretty: bin.js - checksum: 8e2e4cdb80c7f8b4df318f30415c98a09f952174a7dd9b0910041f995b8476fc177568e950ea3ce5967303c46356df37d13f822cff99c848e4177c957d3b1dad - languageName: node - linkType: hard - -"pino-std-serializers@npm:^3.1.0": - version: 3.2.0 - resolution: "pino-std-serializers@npm:3.2.0" - checksum: 77e29675b116e42ae9fe6d4ef52ef3a082ffc54922b122d85935f93ddcc20277f0b0c873c5c6c5274a67b0409c672aaae3de6bcea10a2d84699718dda55ba95b - languageName: node - linkType: hard - -"pino@npm:^6.0.0, pino@npm:^6.4.0": - version: 6.13.3 - resolution: "pino@npm:6.13.3" - dependencies: - fast-redact: ^3.0.0 - fast-safe-stringify: ^2.0.8 - fastify-warning: ^0.2.0 - flatstr: ^1.0.12 - pino-std-serializers: ^3.1.0 - quick-format-unescaped: ^4.0.3 - sonic-boom: ^1.0.2 - bin: - pino: bin.js - checksum: a580decd47a1c8b32a846ba1cb478087b523636d697bd4c57833d10b3f2b35c7d06739715ad9a291b41caf002b8d1bbf98674bfb3e99989fd41b7d934cca861c - languageName: node - linkType: hard - "pkg-dir@npm:^2.0.0": version: 2.0.0 resolution: "pkg-dir@npm:2.0.0" @@ -12058,16 +11582,6 @@ fsevents@~2.3.2: languageName: node linkType: hard -"protocol-buffers-encodings@npm:^1.1.0": - version: 1.1.1 - resolution: "protocol-buffers-encodings@npm:1.1.1" - dependencies: - signed-varint: ^2.0.1 - varint: 5.0.0 - checksum: 1b22d6d05bbd6249cbfe9a792003945a3a4cb49c2d0e19a4b10ea2a9b543d610fcf244108133f7a5df83479a8e8cded51a33845477c1490361bfbe66a49c64ae - languageName: node - linkType: hard - "prr@npm:~1.0.1": version: 1.0.1 resolution: "prr@npm:1.0.1" @@ -12175,13 +11689,6 @@ fsevents@~2.3.2: languageName: node linkType: hard -"quick-format-unescaped@npm:^4.0.3": - version: 4.0.4 - resolution: "quick-format-unescaped@npm:4.0.4" - checksum: 7bc32b99354a1aa46c089d2a82b63489961002bb1d654cee3e6d2d8778197b68c2d854fd23d8422436ee1fdfd0abaddc4d4da120afe700ade68bd357815b26fd - languageName: node - linkType: hard - "quick-lru@npm:^4.0.1": version: 4.0.1 resolution: "quick-lru@npm:4.0.1" @@ -12302,7 +11809,7 @@ fsevents@~2.3.2: languageName: node linkType: hard -"readable-stream@npm:2 || 3, readable-stream@npm:3, readable-stream@npm:^3.0.0, readable-stream@npm:^3.1.1, readable-stream@npm:^3.4.0, readable-stream@npm:^3.5.0, readable-stream@npm:^3.6.0": +"readable-stream@npm:3, readable-stream@npm:^3.0.0, readable-stream@npm:^3.1.1, readable-stream@npm:^3.4.0, readable-stream@npm:^3.5.0, readable-stream@npm:^3.6.0": version: 3.6.0 resolution: "readable-stream@npm:3.6.0" dependencies: @@ -12398,13 +11905,6 @@ fsevents@~2.3.2: languageName: node linkType: hard -"reduce-flatten@npm:^2.0.0": - version: 2.0.0 - resolution: "reduce-flatten@npm:2.0.0" - checksum: 64393ef99a16b20692acfd60982d7fdbd7ff8d9f8f185c6023466444c6dd2abb929d67717a83cec7f7f8fb5f46a25d515b3b2bf2238fdbfcdbfd01d2a9e73cb8 - languageName: node - linkType: hard - "regenerate-unicode-properties@npm:^9.0.0": version: 9.0.0 resolution: "regenerate-unicode-properties@npm:9.0.0" @@ -12643,13 +12143,6 @@ fsevents@~2.3.2: languageName: node linkType: hard -"ret@npm:~0.2.0": - version: 0.2.2 - resolution: "ret@npm:0.2.2" - checksum: 774964bb413a3525e687bca92d81c1cd75555ec33147c32ecca22f3d06409e35df87952cfe3d57afff7650a0f7e42139cf60cb44e94c29dde390243bc1941f16 - languageName: node - linkType: hard - "retry@npm:^0.12.0": version: 0.12.0 resolution: "retry@npm:0.12.0" @@ -12719,7 +12212,7 @@ fsevents@~2.3.2: languageName: node linkType: hard -"rxjs@npm:^6.6.0, rxjs@npm:^6.6.7": +"rxjs@npm:^6.6.7": version: 6.6.7 resolution: "rxjs@npm:6.6.7" dependencies: @@ -12762,15 +12255,6 @@ fsevents@~2.3.2: languageName: node linkType: hard -"safe-regex2@npm:^2.0.0": - version: 2.0.0 - resolution: "safe-regex2@npm:2.0.0" - dependencies: - ret: ~0.2.0 - checksum: f5e182fca040dedd50ae052ea0eb035d9903b2db71243d5d8b43299735857288ef2ab52546a368d9c6fd1333b2a0d039297925e78ffc14845354f3f6158af7c2 - languageName: node - linkType: hard - "safe-stable-stringify@npm:^1.1.0": version: 1.1.1 resolution: "safe-stable-stringify@npm:1.1.1" @@ -12844,14 +12328,7 @@ fsevents@~2.3.2: languageName: node linkType: hard -"semver-store@npm:^0.3.0": - version: 0.3.0 - resolution: "semver-store@npm:0.3.0" - checksum: b38f747123e850191526a912657c653c7e5963d164a8daf99e52aa30bc8c5bdac176dc6dab714e17a1a8489ac138c18ff7161b1961f1882888bce637990442dd - languageName: node - linkType: hard - -"semver@npm:2 || 3 || 4 || 5, semver@npm:^5.4.1, semver@npm:^5.5.0, semver@npm:^5.7.1": +"semver@npm:2 || 3 || 4 || 5, semver@npm:^5.5.0, semver@npm:^5.7.1": version: 5.7.1 resolution: "semver@npm:5.7.1" bin: @@ -13073,15 +12550,6 @@ fsevents@~2.3.2: languageName: node linkType: hard -"signed-varint@npm:^2.0.1": - version: 2.0.1 - resolution: "signed-varint@npm:2.0.1" - dependencies: - varint: ~5.0.0 - checksum: a9fd2d954d62149d5dcbf7292c028d5665046763bd3e2b68f5603fca9248c808ca727f0b70e8e785d292c40f6a43b7406d56a37c7b06becd3c6ad0972c5d0e94 - languageName: node - linkType: hard - "simple-swizzle@npm:^0.2.2": version: 0.2.2 resolution: "simple-swizzle@npm:0.2.2" @@ -13241,25 +12709,6 @@ fsevents@~2.3.2: languageName: node linkType: hard -"sonic-boom@npm:^1.0.2": - version: 1.4.1 - resolution: "sonic-boom@npm:1.4.1" - dependencies: - atomic-sleep: ^1.0.0 - flatstr: ^1.0.12 - checksum: 189fa8fe5c2dc05d3513fc1a4926a2f16f132fa6fa0b511745a436010cdcd9c1d3b3cb6a9d7c05bd32a965dc77673a5ac0eb0992e920bdedd16330d95323124f - languageName: node - linkType: hard - -"sonic-boom@npm:^2.1.0": - version: 2.3.1 - resolution: "sonic-boom@npm:2.3.1" - dependencies: - atomic-sleep: ^1.0.0 - checksum: 4f5022de97483bb6f889415e342f9a451dbdebbe732df454f7d6e417cc80e813c19e2d646ad5ae20a92510a34c311fb9fbc440864bb234b78b3a2100467d851b - languageName: node - linkType: hard - "sort-keys@npm:^4.2.0": version: 4.2.0 resolution: "sort-keys@npm:4.2.0" @@ -13364,7 +12813,7 @@ fsevents@~2.3.2: languageName: node linkType: hard -"split2@npm:^3.0.0, split2@npm:^3.1.1": +"split2@npm:^3.0.0": version: 3.2.2 resolution: "split2@npm:3.2.2" dependencies: @@ -13781,18 +13230,6 @@ fsevents@~2.3.2: languageName: node linkType: hard -"table-layout@npm:^1.0.2": - version: 1.0.2 - resolution: "table-layout@npm:1.0.2" - dependencies: - array-back: ^4.0.1 - deep-extend: ~0.6.0 - typical: ^5.2.0 - wordwrapjs: ^4.0.0 - checksum: 8f41b5671f101a5195747ec1727b1d35ea2cd5bf85addda11cc2f4b36892db9696ce3c2c7334b5b8a122505b34d19135fede50e25678df71b0439e0704fd953f - languageName: node - linkType: hard - "table@npm:^5.4.6": version: 5.4.6 resolution: "table@npm:5.4.6" @@ -13983,16 +13420,6 @@ fsevents@~2.3.2: languageName: node linkType: hard -"through2@npm:^3.0.1": - version: 3.0.2 - resolution: "through2@npm:3.0.2" - dependencies: - inherits: ^2.0.4 - readable-stream: 2 || 3 - checksum: 47c9586c735e7d9cbbc1029f3ff422108212f7cc42e06d5cc9fff7901e659c948143c790e0d0d41b1b5f89f1d1200bdd200c7b72ad34f42f9edbeb32ea49e8b7 - languageName: node - linkType: hard - "through2@npm:^4.0.0": version: 4.0.2 resolution: "through2@npm:4.0.2" @@ -14071,13 +13498,6 @@ fsevents@~2.3.2: languageName: node linkType: hard -"toml@npm:^3.0.0": - version: 3.0.0 - resolution: "toml@npm:3.0.0" - checksum: 5d7f1d8413ad7780e9bdecce8ea4c3f5130dd53b0a4f2e90b93340979a137739879d7b9ce2ce05c938b8cc828897fe9e95085197342a1377dd8850bf5125f15f - languageName: node - linkType: hard - "touch@npm:^3.1.0": version: 3.1.0 resolution: "touch@npm:3.1.0" @@ -14223,13 +13643,6 @@ fsevents@~2.3.2: languageName: node linkType: hard -"ts-typed-json@npm:^0.3.2": - version: 0.3.2 - resolution: "ts-typed-json@npm:0.3.2" - checksum: 141c976da04b290076c7fdb79cc05429315a974a41ecab6cb78cd63fac832062fd9fd8de8166f52955037874f0bf97d51306e723318b05a22f66666ebbc7ca53 - languageName: node - linkType: hard - "tsconfig-paths@npm:^3.11.0, tsconfig-paths@npm:^3.5.0": version: 3.12.0 resolution: "tsconfig-paths@npm:3.12.0" @@ -14407,20 +13820,6 @@ typescript@^3.9.5: languageName: node linkType: hard -"typical@npm:^4.0.0": - version: 4.0.0 - resolution: "typical@npm:4.0.0" - checksum: a242081956825328f535e6195a924240b34daf6e7fdb573a1809a42b9f37fb8114fa99c7ab89a695e0cdb419d4149d067f6723e4b95855ffd39c6c4ca378efb3 - languageName: node - linkType: hard - -"typical@npm:^5.2.0": - version: 5.2.0 - resolution: "typical@npm:5.2.0" - checksum: ccaeb151a9a556291b495571ca44c4660f736fb49c29314bbf773c90fad92e9485d3cc2b074c933866c1595abbbc962f2b8bfc6e0f52a8c6b0cdd205442036ac - languageName: node - linkType: hard - "ua-parser-js@npm:^1.0.33": version: 1.0.33 resolution: "ua-parser-js@npm:1.0.33" @@ -14683,7 +14082,7 @@ typescript@^3.9.5: languageName: node linkType: hard -"validate-npm-package-license@npm:^3.0.1, validate-npm-package-license@npm:^3.0.4": +"validate-npm-package-license@npm:^3.0.1": version: 3.0.4 resolution: "validate-npm-package-license@npm:3.0.4" dependencies: @@ -14709,13 +14108,6 @@ typescript@^3.9.5: languageName: node linkType: hard -"varint@npm:5.0.0": - version: 5.0.0 - resolution: "varint@npm:5.0.0" - checksum: 527c65ad87f1d140c03cf734d5c193430ef75fc21b7ec9d2b72f06ee19dbf686be70e0bee27674db3807cedb73ba13ce36a589427ebe52ac620de11686a74c1c - languageName: node - linkType: hard - "varint@npm:^6.0.0": version: 6.0.0 resolution: "varint@npm:6.0.0" @@ -14723,13 +14115,6 @@ typescript@^3.9.5: languageName: node linkType: hard -"varint@npm:~5.0.0": - version: 5.0.2 - resolution: "varint@npm:5.0.2" - checksum: e1a66bf9a6cea96d1f13259170d4d41b845833acf3a9df990ea1e760d279bd70d5b1f4c002a50197efd2168a2fd43eb0b808444600fd4d23651e8d42fe90eb05 - languageName: node - linkType: hard - "vary@npm:^1": version: 1.1.2 resolution: "vary@npm:1.1.2" @@ -15049,16 +14434,6 @@ typescript@^3.9.5: languageName: node linkType: hard -"wordwrapjs@npm:^4.0.0": - version: 4.0.1 - resolution: "wordwrapjs@npm:4.0.1" - dependencies: - reduce-flatten: ^2.0.0 - typical: ^5.2.0 - checksum: 3d927f3c95d0ad990968da54c0ad8cde2801d8e91006cd7474c26e6b742cc8557250ce495c9732b2f9db1f903601cb74ec282e0f122ee0d02d7abe81e150eea8 - languageName: node - linkType: hard - "workerpool@npm:6.2.0": version: 6.2.0 resolution: "workerpool@npm:6.2.0" From 77363af7c8926789c7eae53396415f4ccacfe058 Mon Sep 17 00:00:00 2001 From: Lukasz Klimek <842586+lklimek@users.noreply.github.com> Date: Wed, 19 Apr 2023 13:14:57 +0200 Subject: [PATCH 8/8] build(rs-drive-abci): minor Dockerfile changes --- packages/dashmate/docker-compose.platform.yml | 2 +- packages/rs-drive-abci/Dockerfile | 26 ++++++++++--------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/packages/dashmate/docker-compose.platform.yml b/packages/dashmate/docker-compose.platform.yml index 859df02b78f..6cc471198af 100644 --- a/packages/dashmate/docker-compose.platform.yml +++ b/packages/dashmate/docker-compose.platform.yml @@ -7,7 +7,7 @@ services: depends_on: - core volumes: - - drive_abci_data:/var/lib/platform/rs-drive-abci + - drive_abci_data:/var/lib/dash/rs-drive-abci environment: - BLOCK_SPACING_MS=3000 # TODO: sync with tenderdash - CHAIN_ID=devnet # TODO: sync with tenderdash chain id diff --git a/packages/rs-drive-abci/Dockerfile b/packages/rs-drive-abci/Dockerfile index c2521a33a4f..81ab91027f9 100644 --- a/packages/rs-drive-abci/Dockerfile +++ b/packages/rs-drive-abci/Dockerfile @@ -77,7 +77,7 @@ RUN curl -Ls \ # FROM deps as build -WORKDIR /usr/src/platform +WORKDIR /usr/src/dash-platform COPY . . @@ -123,7 +123,7 @@ RUN --mount=type=cache,sharing=shared,target=/root/.cache/sccache \ cargo build \ --package drive-abci \ --config net.git-fetch-with-cli=true && \ - cp /usr/src/platform/target/*/drive-abci /usr/src/platform/drive-abci && \ + cp /usr/src/dash-platform/target/*/drive-abci /usr/src/dash-platform/drive-abci && \ cargo clean && \ sccache --show-stats @@ -135,19 +135,16 @@ FROM alpine:${ALPINE_VERSION} AS release LABEL maintainer="Dash Developers " LABEL description="Drive ABCI Rust" -VOLUME /var/lib/platform - -ENV DB_PATH=/var/lib/platform/rs-drive-abci/db # # Install binaries and data # -WORKDIR /var/lib/platform +WORKDIR /var/lib/dash RUN apk add --no-cache libgcc libstdc++ -COPY --from=build /usr/src/platform/drive-abci /usr/bin/drive-abci -COPY --from=build /usr/src/platform/packages/rs-drive-abci/.env.example /var/lib/platform/rs-drive-abci/.env +COPY --from=build /usr/src/dash-platform/drive-abci /usr/bin/drive-abci +COPY --from=build /usr/src/dash-platform/packages/rs-drive-abci/.env.example /var/lib/dash/rs-drive-abci/.env # Double-check that we don't have missing deps RUN ldd /usr/bin/drive-abci @@ -231,19 +228,24 @@ ENV BLOCK_SPACING_MS=3000 # END OF CONFIGURATION # +# Create a volume +VOLUME /var/lib/dash + +ENV DB_PATH=/var/lib/dash/rs-drive-abci/db + # # Create new non-root user # -ARG USERNAME=platform +ARG USERNAME=dash ARG USER_UID=1000 ARG USER_GID=$USER_UID RUN addgroup -g $USER_GID $USERNAME && \ - adduser -D -u $USER_UID -G $USERNAME -h /var/lib/platform/rs-drive-abci $USERNAME && \ - chown -R $USER_UID:$USER_GID /var/lib/platform/rs-drive-abci + adduser -D -u $USER_UID -G $USERNAME -h /var/lib/dash/rs-drive-abci $USERNAME && \ + chown -R $USER_UID:$USER_GID /var/lib/dash/rs-drive-abci USER $USERNAME -WORKDIR /var/lib/platform/rs-drive-abci +WORKDIR /var/lib/dash/rs-drive-abci ENTRYPOINT ["/usr/bin/drive-abci"] CMD ["-vv", "start"]