@ocap/state 1.18.152 → 1.18.153

package/lib/states/tx.js

@@ -62,6 +62,12 @@ const getTxSender = ({ tx, typeUrl }) => {
   }
 };
 
+const getReceiptChange = (receipts, { address, action }) => {
+  const receipt = receipts.filter((x) => !address || x.address === address);
+  const changes = receipt.map((x) => x.changes.filter((c) => !action || c.action === action)).flat();
+  return changes;
+};
+
 const getTransferReceipts = (tx) => {
   const senderReceipt = { address: tx.from, changes: [] };
   const receiverReceipt = { address: tx.itxJson.to, changes: [] };
@@ -118,6 +124,34 @@ const getReceiptsFromContext = (ctx) => {
   return [];
 };
 
+/**
+ * Add receipts for tx that have gasPaid but no receipts
+ * This is used to handle legacy data that gas receipts were not properly recorded
+ */
+const getReceiptsFromGasPaid = (tx, { config, typeUrl }) => {
+  const gasReceipt = getReceiptChange(tx.receipts || [], { action: 'gas' });
+  const gasPaid = new BN(tx.gasPaid || 0);
+
+  // For new transactions being created, gas receipts are usually attached by getReceiptsFromContext before,
+  // so we don't add duplicate gas receipts here
+  if (gasReceipt.length) return [];
+  if (gasPaid.lte(ZERO)) return [];
+
+  const gasPayerMap = {
+    AccountMigrateTx: tx.itxJson?.address,
+  };
+  const gasPayer = gasPayerMap[typeUrl] || tx.from;
+  // Cannot determine who received the gas fee in legacy data
+  const gasReceiver = config?.vaults?.txGas?.[0] || FORGE_FEE_RECEIVER;
+
+  if (!gasPayer) return [];
+
+  return [
+    { address: gasPayer, changes: [{ target: '', action: 'gas', value: gasPaid.neg().toString() }] },
+    { address: gasReceiver, changes: [{ target: '', action: 'gas', value: gasPaid.toString() }] },
+  ];
+};
+
 const getTransferV3Receipts = (tx) => [
   ...getReceiptsFromTxInput(tx.itxJson.inputs, '-', 'transfer'),
   ...getReceiptsFromTxInput(tx.itxJson.outputs, '', 'transfer'),
@@ -506,6 +540,7 @@ const verifyTxReceipts = (receipts, typeUrl, ctx = {}) => {
       CreateRollupBlockTx: ['burn', 'mint'],
       AccountMigrateTx: ['migrate'],
       ApproveWithdrawTx: ['burn'],
+      SetupSwapTx: ['swap'],
     }[typeUrl] || [];
 
   for (const [target, changes] of Object.entries(targets)) {
@@ -561,12 +596,15 @@ const verifyTxReceipts = (receipts, typeUrl, ctx = {}) => {
  * @return {Array} list of receipts
  */
 const getTxReceipts = ({ tx, code }, ctx = {}) => {
+  const typeUrl = upperFirst(camelCase(tx?.itxJson?._type || ''));
+
   if (code !== 'OK') {
-    return ctx.gasPaid ? getReceiptsFromContext(ctx) : [];
+    const receiptsFromContext = ctx.gasPaid ? getReceiptsFromContext(ctx) : [];
+    const receiptsFromGas = getReceiptsFromGasPaid(tx, { ...ctx, typeUrl });
+    return receiptsFromContext.concat(receiptsFromGas);
   }
 
   let receipts = Array.isArray(ctx.receipts) ? ctx.receipts : [];
-  const typeUrl = upperFirst(camelCase(tx.itxJson._type));
 
   if (['TransferTx', 'TransferV2Tx'].includes(typeUrl)) {
     receipts = receipts.concat(getTransferReceipts(tx, ctx));
@@ -611,6 +649,7 @@ const getTxReceipts = ({ tx, code }, ctx = {}) => {
   }
 
   receipts = receipts.concat(getReceiptsFromContext(ctx));
+  receipts = receipts.concat(getReceiptsFromGasPaid(tx, { ...ctx, typeUrl }));
 
   const merged = mergeTxReceipts(receipts).filter((x) => x.address && Array.isArray(x.changes) && x.changes.length);
 

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.18.152",
+  "version": "1.18.153",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -18,13 +18,13 @@
     "coverage": "start-server-and-test start http://127.0.0.1:4001 test:ci"
   },
   "dependencies": {
-    "@arcblock/did": "1.18.152",
-    "@arcblock/validator": "1.18.152",
-    "@ocap/contract": "1.18.152",
-    "@ocap/mcrypto": "1.18.152",
-    "@ocap/message": "1.18.152",
-    "@ocap/util": "1.18.152",
-    "@ocap/wallet": "1.18.152",
+    "@arcblock/did": "1.18.153",
+    "@arcblock/validator": "1.18.153",
+    "@ocap/contract": "1.18.153",
+    "@ocap/mcrypto": "1.18.153",
+    "@ocap/message": "1.18.153",
+    "@ocap/util": "1.18.153",
+    "@ocap/wallet": "1.18.153",
     "bloom-filters": "^1.3.9",
     "lodash": "^4.17.21"
   },
@@ -35,5 +35,5 @@
   "keywords": [],
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
-  "gitHead": "4f31d06aa2a15b57a7d00fdec6241376f10ee873"
+  "gitHead": "ad18c565becef73d6ee782502c3f4858de43b68b"
 }