Merge branch 'master' of github.com:wavesplatform/data-service into release/v0.34.0

dvshur · dvshur · commit b9134699341b · 2022-09-26T16:10:48.000+03:00
diff --git a/src/daemons/candles/sql/query.js b/src/daemons/candles/sql/query.js
@@ -62,7 +62,14 @@ const selectExchanges = pg({ t: 'txs_7' }).select({
   height: 't.height',
   candle_time: pgRawDateTrunc('t.time_stamp')('minute'),
   amount: 't.amount',
-  price: 't.price',
+  price: pg.raw(`
+    CASE WHEN t.tx_version > 2
+      THEN t.price::numeric
+        * 10^(select decimals from assets where asset_id = t.price_asset_id)
+        * 10^(select -decimals from assets where asset_id = t.amount_asset_id)
+      ELSE t.price::numeric
+    END
+  `),
 });
 
 /** selectExchangesAfterTimestamp :: Date -> QueryBuilder */
diff --git a/src/daemons/pairs/sql/fillTable.ts b/src/daemons/pairs/sql/fillTable.ts
@@ -7,7 +7,14 @@ const selectExchanges = pg({ t: 'txs_7' })
     amount_asset_id: 't.amount_asset_id',
     price_asset_id: 't.price_asset_id',
     amount: 't.amount',
-    price: 't.price',
+    price: pg.raw(`
+      CASE WHEN t.tx_version > 2
+        THEN t.price::numeric
+          * 10^(select decimals from assets where asset_id = t.price_asset_id)
+          * 10^(select -decimals from assets where asset_id = t.amount_asset_id)
+        ELSE t.price::numeric
+      END
+    `),
     time_stamp: 't.time_stamp',
     sender: 't.sender',
   })
diff --git a/src/services/transactions/burn/repo/sql/query.js b/src/services/transactions/burn/repo/sql/query.js
@@ -1,6 +1,6 @@
 const pg = require('knex')({ client: 'pg' });
 
-const select = pg({ t: 'txs_6' }).select('*');
+const select = pg({ t: 'txs_6' });
 
 const selectFromFiltered = (filtered) =>
   filtered.select({
diff --git a/src/services/transactions/exchange/modifyDecimals.ts b/src/services/transactions/exchange/modifyDecimals.ts
@@ -1,67 +1,119 @@
 import { Task } from 'folktale/concurrency/task';
-import { defaultTo, splitEvery, zipWith } from 'ramda';
+import { defaultTo, zipObj } from 'ramda';
 import { AppError } from '../../../errorHandling';
 import { AssetsService } from '../../assets';
-import { ExchangeTx, OrderType } from './repo/types';
+import { ExchangeTx, OrderPriceMode, OrderType } from './repo/types';
 
 const wavesByDefault = defaultTo('WAVES');
 
-export const modifyDecimals = (assetsService: AssetsService) => (
-  txs: ExchangeTx[]
-): Task<AppError, ExchangeTx[]> =>
-  assetsService
-    .precisions({
-      ids: txs
-        .map((tx) => [
-          wavesByDefault(tx.feeAsset),
-          wavesByDefault(tx.order1.assetPair.amountAsset),
-          wavesByDefault(tx.order1.assetPair.priceAsset),
-          tx.order1.orderType === OrderType.Buy
-            ? wavesByDefault(tx.order1.matcherFeeAssetId)
-            : wavesByDefault(tx.order2.matcherFeeAssetId),
-          tx.order1.orderType === OrderType.Sell
-            ? wavesByDefault(tx.order1.matcherFeeAssetId)
-            : wavesByDefault(tx.order2.matcherFeeAssetId),
-          wavesByDefault(tx.order1.matcherFeeAssetId),
-          wavesByDefault(tx.order2.matcherFeeAssetId),
-        ])
-        .reduce((acc, cur) => acc.concat(cur), []),
-    })
-    .map((v: number[]) =>
-      zipWith(
-        (
-          tx,
+export const modifyDecimals =
+  (assetsService: AssetsService) =>
+  (txs: ExchangeTx[]): Task<AppError, ExchangeTx[]> => {
+    // extract unique assetIds participating in provided transactions
+    const participatingAssetIds = Array.from(
+      txs.reduce(
+        (assetIds, tx) =>
           [
-            feePrecision,
-            amountPrecision,
-            pricePrecision,
-            buyMatcherFeePrecision,
-            sellMatcherFeePrecision,
-            order1MatcherFeePrecision,
-            order2MatcherFeePrecision,
+            tx.feeAsset,
+            tx.order1.assetPair.amountAsset,
+            tx.order1.assetPair.priceAsset,
+            tx.order1.matcherFeeAssetId,
+            tx.order2.matcherFeeAssetId,
           ]
-        ) => ({
-          ...tx,
-          fee: tx.fee.shiftedBy(-feePrecision),
-          amount: tx.amount.shiftedBy(-amountPrecision),
-          price: tx.price.shiftedBy(-8 - pricePrecision + amountPrecision),
-          buyMatcherFee: tx.buyMatcherFee.shiftedBy(-buyMatcherFeePrecision),
-          sellMatcherFee: tx.sellMatcherFee.shiftedBy(-sellMatcherFeePrecision),
-          order1: {
-            ...tx.order1,
-            amount: tx.order1.amount.shiftedBy(-amountPrecision),
-            price: tx.order1.price.shiftedBy(-8 - pricePrecision + amountPrecision),
-            matcherFee: tx.order1.matcherFee.shiftedBy(-order1MatcherFeePrecision),
-          },
-          order2: {
-            ...tx.order2,
-            amount: tx.order2.amount.shiftedBy(-amountPrecision),
-            price: tx.order2.price.shiftedBy(-8 - pricePrecision + amountPrecision),
-            matcherFee: tx.order2.matcherFee.shiftedBy(-order2MatcherFeePrecision),
-          }
-        })
-        ,
-        txs,
-        splitEvery(v.length / txs.length, v)
+            .map(wavesByDefault)
+            .reduce((set, id) => set.add(id), assetIds),
+        new Set<string>()
       )
     );
+
+    return assetsService
+      .precisions({ ids: participatingAssetIds })
+      .map(zipObj(participatingAssetIds))
+      .map((precisionsMap) => {
+        const p = (assetId: string | null | undefined): number =>
+          precisionsMap[wavesByDefault(assetId)];
+
+        return txs.map((tx) => {
+          const feePrecision = p(tx.feeAsset);
+
+          const amountAssetPrecision = p(tx.order1.assetPair.amountAsset);
+          const priceAssetPrecision = p(tx.order1.assetPair.priceAsset);
+
+          // exchange v3 support
+          const txPricePrecision =
+            !tx.version || tx.version < 3
+              ? 8 + priceAssetPrecision - amountAssetPrecision
+              : 8;
+
+          const order1MatcherFeePrecision = p(tx.order1.matcherFeeAssetId);
+          // order v4 price mode support
+          const order1PricePrecision =
+            tx.order1.version < 4 || tx.order1.priceMode === OrderPriceMode.AssetDecimals
+              ? 8 + priceAssetPrecision - amountAssetPrecision
+              : 8;
+
+          const order2MatcherFeePrecision = p(tx.order2.matcherFeeAssetId);
+          // order v4 price mode support
+          const order2PricePrecision =
+            tx.order2.version < 4 || tx.order2.priceMode === OrderPriceMode.AssetDecimals
+              ? 8 + priceAssetPrecision - amountAssetPrecision
+              : 8;
+
+          const buyMatcherFeePrecision =
+            tx.order1.orderType === OrderType.Buy
+              ? order1MatcherFeePrecision
+              : order2MatcherFeePrecision;
+
+          const sellMatcherFeePrecision =
+            tx.order1.orderType === OrderType.Sell
+              ? order1MatcherFeePrecision
+              : order2MatcherFeePrecision;
+
+          console.log(
+            JSON.stringify({
+              event: {
+                name: 'EXCHANGE_TRANSACTION_DECIMALS',
+                txId: tx.id,
+                txVersion: tx.version,
+                amountAssetPrecision,
+                priceAssetPrecision,
+                txPricePrecision: txPricePrecision,
+                txFeePrecision: feePrecision,
+                buyMatcherFeePrecision,
+                sellMatcherFeePrecision,
+                order1Version: tx.order1.version,
+                order1PriceMode: tx.order1.priceMode,
+                order1MatcherFeePrecision,
+                order1PricePrecision,
+                order2Version: tx.order2.version,
+                order2PriceMode: tx.order2.priceMode,
+                order2MatcherFeePrecision,
+                order2PricePrecision,
+              },
+              timestamp: new Date().toISOString(),
+            })
+          );
+
+          return {
+            ...tx,
+            fee: tx.fee.shiftedBy(-feePrecision),
+            amount: tx.amount.shiftedBy(-amountAssetPrecision),
+            price: tx.price.shiftedBy(-txPricePrecision),
+            buyMatcherFee: tx.buyMatcherFee.shiftedBy(-buyMatcherFeePrecision),
+            sellMatcherFee: tx.sellMatcherFee.shiftedBy(-sellMatcherFeePrecision),
+            order1: {
+              ...tx.order1,
+              amount: tx.order1.amount.shiftedBy(-amountAssetPrecision),
+              price: tx.order1.price.shiftedBy(-order1PricePrecision),
+              matcherFee: tx.order1.matcherFee.shiftedBy(-order1MatcherFeePrecision),
+            },
+            order2: {
+              ...tx.order2,
+              amount: tx.order2.amount.shiftedBy(-amountAssetPrecision),
+              price: tx.order2.price.shiftedBy(-order2PricePrecision),
+              matcherFee: tx.order2.matcherFee.shiftedBy(-order2MatcherFeePrecision),
+            },
+          };
+        });
+      });
+  };
diff --git a/src/services/transactions/exchange/repo/schema.ts b/src/services/transactions/exchange/repo/schema.ts
@@ -1,6 +1,6 @@
 import { Joi } from '../../../../utils/validation';
-
 import commonFields from '../../_common/commonFieldsSchemas';
+import { OrderPriceMode, OrderType } from './types';
 
 const orderTypes = (prefix: string) => ({
   [`${prefix}_id`]: Joi.string()
@@ -11,7 +11,7 @@ const orderTypes = (prefix: string) => ({
     .required()
     .allow(null),
   [`${prefix}_type`]: Joi.string()
-    .noNullChars()
+    .valid(OrderType.Buy, OrderType.Sell)
     .required(),
   [`${prefix}_sender`]: Joi.string()
     .base58()
@@ -21,8 +21,8 @@ const orderTypes = (prefix: string) => ({
     .required(),
   [`${prefix}_signature`]: Joi.string()
     .base58()
-    .allow('')
-    .required(),
+    .required()
+    .allow(""),
   [`${prefix}_matcher_fee`]: Joi.object()
     .bignumber()
     .required(),
@@ -41,6 +41,12 @@ const orderTypes = (prefix: string) => ({
   [`${prefix}_matcher_fee_asset_id`]: Joi.string()
     .assetId()
     .allow(null),
+  [`${prefix}_eip712signature`]: Joi.string()
+    .eip712Signature()
+    .allow(null),
+  [`${prefix}_price_mode`]: Joi.string()
+    .valid(OrderPriceMode.AssetDecimals, OrderPriceMode.FixedDecimals)
+    .allow(null),
 });
 
 export const result = Joi.object().keys({
diff --git a/src/services/transactions/exchange/repo/sql/query.js b/src/services/transactions/exchange/repo/sql/query.js
@@ -37,7 +37,9 @@ const columns = {
   o1_amount: pg.raw("(t.order1->>'amount')::double precision"),
   o1_matcher_fee: pg.raw("(t.order1->>'matcherFee')::double precision"),
   o1_matcher_fee_asset_id: pg.raw("t.order1->>'matcherFeeAssetId'"),
-
+  o1_price_mode: pg.raw("t.order1->>'priceMode'"),
+  o1_eip712signature: pg.raw("t.order1->>'eip712Signature'"),
+  
   o2_id: pg.raw("t.order2->>'id'"),
   o2_version: pg.raw("t.order2->>'version'"),
   o2_time_stamp: pg.raw("text_timestamp_cast(t.order2->>'timestamp')"),
@@ -50,6 +52,8 @@ const columns = {
   o2_amount: pg.raw("(t.order2->>'amount')::double precision"),
   o2_matcher_fee: pg.raw("(t.order2->>'matcherFee')::double precision"),
   o2_matcher_fee_asset_id: pg.raw("t.order2->>'matcherFeeAssetId'"),
+  o2_price_mode: pg.raw("t.order2->>'priceMode'"),
+  o2_eip712signature: pg.raw("t.order2->>'eip712Signature'"),
 };
 
 const select = pg({ t: 'txs_7' });
diff --git a/src/services/transactions/exchange/repo/transformTxInfo.ts b/src/services/transactions/exchange/repo/transformTxInfo.ts
@@ -8,7 +8,7 @@ import { ExchangeTx, ExchangeTxDbResponse } from './types';
 
 const createOrder = (prefix: string) => <T extends Record<string, any>>({
   [`${prefix}_id`]: id,
-  [`${prefix}_version`]: version,
+  [`${prefix}_version`]: versionStr,
   [`${prefix}_sender_public_key`]: senderPublicKey,
   [`${prefix}_sender`]: sender,
   [`${prefix}_type`]: orderType,
@@ -19,12 +19,17 @@ const createOrder = (prefix: string) => <T extends Record<string, any>>({
   [`${prefix}_signature`]: signature,
   [`${prefix}_matcher_fee`]: matcherFee,
   [`${prefix}_matcher_fee_asset_id`]: matcherFeeAssetId,
+  [`${prefix}_price_mode`]: priceMode,
+  [`${prefix}_eip712signature`]: eip712Signature,
   price_asset: priceAsset,
   amount_asset: amountAsset,
   sender_public_key: matcherPublicKey,
 }: T) => {
-  const tx = {
+  const version = parseInt(versionStr) || 1;
+
+  const o: any = {
     id,
+    version,
     senderPublicKey,
     matcherPublicKey,
     assetPair: {
@@ -40,7 +45,15 @@ const createOrder = (prefix: string) => <T extends Record<string, any>>({
     matcherFee,
     signature,
   };
-  return version === '3' ? { ...tx, matcherFeeAssetId } : tx;
+  
+  if (version > 2) o.matcherFeeAssetId = matcherFeeAssetId;
+
+  if (version > 3) {
+    o.priceMode = priceMode;
+    o.eip712Signature = eip712Signature;
+  }
+
+  return o;
 };
 
 type ExchangeTxFields = {
diff --git a/src/services/transactions/exchange/repo/types.ts b/src/services/transactions/exchange/repo/types.ts
@@ -39,14 +39,19 @@ export type ExchangeTxDbResponse = RawTx & {
   o2_matcher_fee_asset_id: string;
 };
 
+export enum OrderPriceMode {
+  AssetDecimals = 'assetDecimals',
+  FixedDecimals = 'fixedDecimals',
+}
+
 export enum OrderType {
   Buy = 'buy',
   Sell = 'sell',
 }
 
 type Order = {
   id: string;
-  version: string;
+  version: number;
   orderType: OrderType;
   sender: string;
   senderPublicKey: string;
@@ -60,7 +65,9 @@ type Order = {
   assetPair: {
     amountAsset: string;
     priceAsset: string;
-  }
+  },
+  eip712Signature?: string | null;
+  priceMode?: OrderPriceMode | null;
 };
 
 export type ExchangeTx = Tx & {
diff --git a/src/utils/regex.ts b/src/utils/regex.ts
@@ -4,6 +4,7 @@ export const interval: RegExp = /^\d+[smhdwMY]$/;
 export const base58: RegExp = new RegExp(`^${base58Chars}$`);
 export const assetId: RegExp = new RegExp(`^(?:WAVES|${base58Chars})$`);
 export const noNullChars: RegExp = /^[^\x00]*$/;
+export const eip712Signature: RegExp = /^0x([A-Fa-f0-9])*$/;
 
 // string doesn't have dangding unescaped slash at the end
 export const saneForDbLike: RegExp = /^(?:.*[^\\])?(?:\\\\)*$/;
diff --git a/src/utils/validation/joi.js b/src/utils/validation/joi.js
@@ -33,6 +33,7 @@ module.exports = rawJoi
       base64Prefixed: 'must be a string of "base64:${base64EncodedString}"',
       noNullChars: 'must not contain unicode null characters',
       saneForDbLike: 'must not end with unescaped slash symbol',
+      eip712Signature: 'must be a hex-encoded string starting with `0x`',
       pair: 'must be a valid pair string',
       period: {
         value: 'interval must be a valid interval value',
@@ -59,6 +60,9 @@ module.exports = rawJoi
         { regex: regex.saneForDbLike, errorCode: 'string.saneForDbLike' },
         { regex: regex.noNullChars, errorCode: 'string.noNullChars' },
       ]),
+      regexRule(joi, 'eip712Signature', [
+        { regex: regex.eip712Signature, errorCode: 'string.eip712Signature' },
+      ]),
       {
         name: 'base64Prefixed',
         validate(_, value, state, options) {
