Refactor fee result

.dockerignore

@@ -15,6 +15,7 @@ packages/*/tests
 packages/*/doc
 packages/*/docs
 packages/*/dist
+packages/*/wasm
 packages/*/node_modules
 
 !packages/platform-test-suite/test

packages/dapi/Cargo.toml.template

@@ -0,0 +1,14 @@
+# Workspace template with Rust packages required for DAPI (needed for Docker build)
+[workspace]
+
+members = [
+    "packages/rs-platform-value",
+    "packages/dashpay-contract",
+    "packages/withdrawals-contract",
+    "packages/masternode-reward-shares-contract",
+    "packages/feature-flags-contract",
+    "packages/dpns-contract",
+    "packages/data-contracts",
+    "packages/rs-dpp",
+    "packages/wasm-dpp"
+]

packages/dapi/Dockerfile

@@ -1,38 +1,40 @@
-# syntax = docker/dockerfile:1.3
-FROM node:16-alpine3.16 as builder
-
-ARG NODE_ENV=production
-ENV NODE_ENV ${NODE_ENV}
-
-RUN apk update && \
-    apk --no-cache upgrade && \
-    apk add --no-cache git \
-                       openssh-client \
-                       python3 \
-                       alpine-sdk \
-                       zeromq-dev
-
-# Enable corepack https://github.com/nodejs/corepack
-RUN corepack enable
+# syntax = docker/dockerfile:1.5
+FROM strophy/buildbase:0.0.4 as builder
 
 WORKDIR /platform
 
-# Copy yarn files
-COPY .yarn ./.yarn
-COPY package.json yarn.lock .yarnrc.yml .pnp.* ./
+# Copy yarn and Cargo files
+COPY .yarn /platform/.yarn
+COPY .cargo /platform/.cargo
+COPY package.json yarn.lock .yarnrc.yml .pnp.* Cargo.lock rust-toolchain.toml ./
+# Use Cargo.toml.template instead of Cargo.toml from project root to avoid copying unnecessary Rust packages
+COPY packages/dapi/Cargo.toml.template ./Cargo.toml
+
+# Print build output
+RUN yarn config set enableInlineBuilds true
 
 # Copy only necessary packages from monorepo
 COPY packages/dapi packages/dapi
 COPY packages/dapi-grpc packages/dapi-grpc
 COPY packages/js-dpp packages/js-dpp
+COPY packages/rs-dpp packages/rs-dpp
+COPY packages/wasm-dpp packages/wasm-dpp
 COPY packages/js-grpc-common packages/js-grpc-common
-COPY packages/feature-flags-contract packages/feature-flags-contract
-COPY packages/masternode-reward-shares-contract packages/masternode-reward-shares-contract
 COPY packages/dpns-contract packages/dpns-contract
 COPY packages/dashpay-contract packages/dashpay-contract
+COPY packages/data-contracts packages/data-contracts
+COPY packages/rs-platform-value packages/rs-platform-value
+COPY packages/withdrawals-contract packages/withdrawals-contract
+COPY packages/masternode-reward-shares-contract packages/masternode-reward-shares-contract
+COPY packages/feature-flags-contract packages/feature-flags-contract
 
-# Print build output
-RUN yarn config set enableInlineBuilds true
+# Build WASM DPP
+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 \
+    yarn workspace @dashevo/wasm-dpp build && \
+    cargo clean
 
 # Install DAPI-specific dependencies using previous
 # node_modules directory to reuse built binaries
@@ -41,7 +43,6 @@ RUN --mount=type=cache,target=/tmp/unplugged \
     yarn workspaces focus --production @dashevo/dapi && \
     cp -R /platform/.yarn/unplugged /tmp/
 
-
 FROM node:16-alpine3.16
 
 ARG NODE_ENV=production
@@ -57,6 +58,9 @@ WORKDIR /platform
 
 COPY --from=builder /platform /platform
 
+# Remove Rust sources
+RUN rm -rf packages/rs-dpp packages/rs-platform-value
+
 RUN cp /platform/packages/dapi/.env.example /platform/packages/dapi/.env
 
 EXPOSE 2500 2501 2510

packages/dapi/lib/externalApis/drive/DriveClient.js

@@ -54,7 +54,7 @@ class DriveClient {
       return Buffer.from(response.value, 'base64');
     }
 
-    throw createGrpcErrorFromDriveResponse(response.code, response.info);
+    throw await createGrpcErrorFromDriveResponse(response.code, response.info);
   }
 
   /**

packages/dapi/lib/grpcServer/handlers/createGrpcErrorFromDriveResponse.js

@@ -14,9 +14,15 @@ const {
     },
   },
 } = require('@dashevo/grpc-common');
+
+let {
+  deserializeConsensusError,
+} = require('@dashevo/wasm-dpp');
+
+const { default: loadWasmDpp } = require('@dashevo/wasm-dpp');
+
 const GrpcErrorCodes = require('@dashevo/grpc-common/lib/server/error/GrpcErrorCodes');
 const AlreadyExistsGrpcError = require('@dashevo/grpc-common/lib/server/error/AlreadyExistsGrpcError');
-const createConsensusError = require('@dashevo/dpp/lib/errors/consensus/createConsensusError');
 
 /**
  * @param {Object} data
@@ -48,7 +54,9 @@ const COMMON_ERROR_CLASSES = {
  * @param {string} info
  * @return {GrpcError}
  */
-function createGrpcErrorFromDriveResponse(code, info) {
+async function createGrpcErrorFromDriveResponse(code, info) {
+  ({ deserializeConsensusError } = await loadWasmDpp());
+
   if (code === undefined) {
     return new InternalGrpcError(new Error('Drive’s error code is empty'));
   }
@@ -101,7 +109,7 @@ function createGrpcErrorFromDriveResponse(code, info) {
 
   // DPP errors
   if (code >= 1000 && code < 5000) {
-    const consensusError = createConsensusError(code, data.arguments || []);
+    const consensusError = deserializeConsensusError(data.serializedError || []);
 
     // Basic
     if (code >= 1000 && code < 2000) {

packages/dapi/lib/grpcServer/handlers/platform/broadcastStateTransitionHandlerFactory.js

@@ -51,7 +51,7 @@ function broadcastStateTransitionHandlerFactory(rpcClient, createGrpcErrorFromDr
     }
 
     if (result.code !== 0) {
-      throw createGrpcErrorFromDriveResponse(result.code, result.info);
+      throw await createGrpcErrorFromDriveResponse(result.code, result.info);
     }
 
     return new BroadcastStateTransitionResponse();

packages/dapi/lib/grpcServer/handlers/platform/waitForStateTransitionResultHandlerFactory.js

@@ -42,8 +42,11 @@ function waitForStateTransitionResultHandlerFactory(
    * @param {Object} txDeliverResult
    * @return {StateTransitionBroadcastError}
    */
-  function createStateTransitionDeliverError(txDeliverResult) {
-    const grpcError = createGrpcErrorFromDriveResponse(txDeliverResult.code, txDeliverResult.info);
+  async function createStateTransitionDeliverError(txDeliverResult) {
+    const grpcError = await createGrpcErrorFromDriveResponse(
+      txDeliverResult.code,
+      txDeliverResult.info,
+    );
 
     const error = new StateTransitionBroadcastError();
 
@@ -95,7 +98,9 @@ function waitForStateTransitionResultHandlerFactory(
     const response = new WaitForStateTransitionResultResponse();
 
     if (result instanceof TransactionErrorResult) {
-      const error = createStateTransitionDeliverError(result.getResult());
+      const error = await createStateTransitionDeliverError(
+        result.getResult(),
+      );
 
       response.setError(error);
 

packages/dapi/package.json

@@ -33,11 +33,13 @@
     "all": true
   },
   "dependencies": {
+    "@dashevo/bls": "~1.2.7",
     "@dashevo/dapi-grpc": "workspace:*",
     "@dashevo/dashcore-lib": "~0.20.0",
     "@dashevo/dashd-rpc": "^18.2.0",
     "@dashevo/dpp": "workspace:*",
     "@dashevo/grpc-common": "workspace:*",
+    "@dashevo/wasm-dpp": "workspace:*",
     "@grpc/grpc-js": "^1.3.7",
     "ajv": "^8.6.0",
     "bs58": "^4.0.1",

packages/dapi/scripts/api.js

@@ -1,6 +1,7 @@
 // Entry point for DAPI.
 const dotenv = require('dotenv');
 const grpc = require('@grpc/grpc-js');
+const loadBLS = require('@dashevo/bls');
 
 const {
   server: {
@@ -13,7 +14,8 @@ const {
   getPlatformDefinition,
 } = require('@dashevo/dapi-grpc');
 
-const DashPlatformProtocol = require('@dashevo/dpp');
+const DashPlatformProtocolJS = require('@dashevo/dpp');
+const { default: loadWasmDpp } = require('@dashevo/wasm-dpp');
 
 const { client: RpcClient } = require('jayson/promise');
 
@@ -39,6 +41,9 @@ const platformHandlersFactory = require(
 );
 
 async function main() {
+  const { DashPlatformProtocol } = await loadWasmDpp();
+  const blsSignatures = await loadBLS();
+
   /* Application start */
   const configValidationResult = validateConfig(config);
   if (!configValidationResult.isValid) {
@@ -65,8 +70,7 @@ async function main() {
     port: config.tendermintCore.port,
   });
 
-  const dppForParsingContracts = new DashPlatformProtocol();
-  await dppForParsingContracts.initialize();
+  const dppForParsingContracts = new DashPlatformProtocol(blsSignatures, {});
   const driveStateRepository = new DriveStateRepository(driveClient, dppForParsingContracts);
 
   log.info(`Connecting to Tenderdash on ${config.tendermintCore.host}:${config.tendermintCore.port}`);
@@ -94,10 +98,11 @@ async function main() {
   });
   log.info(`JSON RPC server is listening on port ${config.rpcServer.port}`);
 
-  const dpp = new DashPlatformProtocol({
-    stateRepository: driveStateRepository,
-  });
-  await dpp.initialize();
+  const dpp = new DashPlatformProtocol(blsSignatures, driveStateRepository);
+  // const dpp = new DashPlatformProtocolJS({
+  //   stateRepository: driveStateRepository,
+  // });
+  // await dpp.initialize();
 
   // Start GRPC server
   log.info('Starting GRPC server');