@ocap/state 1.18.161 → 1.18.163

package/lib/states/tx.js

@@ -18,6 +18,34 @@ const FORGE_TOKEN_HOLDER = 'zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz';
 const FORGE_FEE_RECEIVER = 'z1EJUBdbPYqMiWHfRZvSAvbYeWcEHB19Xyfc';
 const QLDB_MIGRATION_TIME = new Date('2021-05-03T12:46:56.245Z');
 
+function eachReceipts(receipts, callback) {
+  (receipts || []).forEach((receipt) => {
+    (receipt.changes || []).forEach((change) => {
+      callback(receipt.address, change);
+    });
+  });
+}
+
+function groupReceiptTokenChanges(receipts) {
+  /**
+   * Map of address to token changes
+   * @type {Record<string, {[tokenAddress: string]: string}>}
+   */
+  const tokenChanges = {};
+  // get token changes for each account by receipts
+  eachReceipts(receipts || [], (address, change) => {
+    if (toTypeInfo(change.target).role !== RoleType.ROLE_TOKEN) return;
+    if (change.value === '0') return;
+    if (!tokenChanges[address]) {
+      tokenChanges[address] = {};
+    }
+    const tokenChange = tokenChanges[address];
+    tokenChange[change.target] = new BN(tokenChange[change.target] || 0).add(new BN(change.value)).toString();
+  });
+
+  return tokenChanges;
+}
+
 // Receiver = Whose asset have net gain
 const getTxReceiver = ({ tx, itx, typeUrl }) => {
   switch (typeUrl) {
@@ -433,13 +461,15 @@ const getRetrieveSwapReceipts = (tx) => [
   },
 ];
 
-const getMigrateReceipts = (tx, { fromState }) => {
+const getMigrateReceipts = (tx, context) => {
+  const fromState = context.fromState || context.senderState;
+
   if (!fromState?.tokens) return [];
   if (!tx.itxJson?.address) return [];
 
-  const changes = fromState.tokens
-    .filter((x) => x.value && x.value !== '0')
-    .map((x) => ({ target: x.address, action: 'migrate', value: x.value }));
+  const changes = Object.entries(fromState.tokens)
+    .filter(([, value]) => value && value !== '0')
+    .map(([address, value]) => ({ target: address, action: 'migrate', value }));
 
   return changes.length
     ? [
@@ -456,6 +486,7 @@ const getDeclareReceipts = (tx, { config, time }) => {
 
   if (!tx.itxJson?.issuer) return [];
   if (!config?.token) return [];
+  if (!time) return [];
   if (txTime >= QLDB_MIGRATION_TIME) return [];
 
   const gas = fromTokenToUnit('0.5', config.token.decimal);
@@ -766,5 +797,7 @@ module.exports = {
   mergeTxReceipts,
   attachPaidTxGas,
   verifyTxReceipts,
+  eachReceipts,
+  groupReceiptTokenChanges,
   FORGE_TOKEN_HOLDER,
 };

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.18.161",
+  "version": "1.18.163",
   "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.161",
-    "@arcblock/validator": "1.18.161",
-    "@ocap/contract": "1.18.161",
-    "@ocap/mcrypto": "1.18.161",
-    "@ocap/message": "1.18.161",
-    "@ocap/util": "1.18.161",
-    "@ocap/wallet": "1.18.161",
+    "@arcblock/did": "1.18.163",
+    "@arcblock/validator": "1.18.163",
+    "@ocap/contract": "1.18.163",
+    "@ocap/mcrypto": "1.18.163",
+    "@ocap/message": "1.18.163",
+    "@ocap/util": "1.18.163",
+    "@ocap/wallet": "1.18.163",
     "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": "5d8436fdf5218fcbf2218b77ae370d50617ba3d0"
+  "gitHead": "c4bb7fae24dbac7a56ffbb84d19f64b90ea770b7"
 }