@ocap/state 1.22.2 → 1.23.0

package/lib/states/tx.js

@@ -341,25 +341,24 @@ const getCreateTokenReceipts = (tx) => {
 };
 
 const getMintTokenReceipts = (tx, ctx) => {
-  const { reserveAddress, tokenAddress, owner } = ctx.tokenFactoryState;
-  const hasFee = ctx.reserveFee && new BN(ctx.reserveFee).gt(ZERO);
+  const { inputChanges, tokenFactoryState } = ctx;
+  const { reserveAddress, tokenAddress, owner } = tokenFactoryState;
+  const hasFee = new BN(ctx.reserveFee || '0').gt(ZERO);
 
-  return [
-    {
-      address: tx.from,
+  const inputReceipts = inputChanges.map((input) => {
+    return {
+      address: input.address,
       changes: [
         {
           target: reserveAddress,
           action: 'swap',
-          value: `-${ctx.reserveAmount}`,
+          value: input.delta,
         },
-        hasFee && {
-          target: reserveAddress,
-          action: 'fee',
-          value: `-${ctx.reserveFee}`,
-        },
-      ].filter(Boolean),
-    },
+      ],
+    };
+  });
+
+  return inputReceipts.concat([
     {
       address: tx.itxJson.receiver,
       changes: [
@@ -374,30 +373,39 @@ const getMintTokenReceipts = (tx, ctx) => {
       address: owner,
       changes: hasFee ? [{ target: reserveAddress, action: 'fee', value: `${ctx.reserveFee}` }] : [],
     },
-  ];
+  ]);
 };
 
 const getBurnTokenReceipts = (tx, ctx) => {
-  const { reserveAddress, tokenAddress, owner } = ctx.tokenFactoryState;
-  const hasFee = ctx.reserveFee && new BN(ctx.reserveFee).gt(ZERO);
+  const { inputChanges, tokenFactoryState } = ctx;
+  const { reserveAddress, tokenAddress, owner } = tokenFactoryState;
 
-  return [
-    {
-      address: tx.from,
+  const fee = new BN(ctx.reserveFee || '0');
+  const receiveAmount = new BN(ctx.reserveAmount).sub(fee).toString();
+
+  const inputReceipts = inputChanges.map((input) => {
+    return {
+      address: input.address,
       changes: [
-        { target: tokenAddress, action: 'burn', value: `-${tx.itxJson.amount}` },
-        hasFee && { target: reserveAddress, action: 'fee', value: `-${ctx.reserveFee}` },
-      ].filter(Boolean),
-    },
+        {
+          target: tokenAddress,
+          action: 'burn',
+          value: input.delta,
+        },
+      ],
+    };
+  });
+
+  return inputReceipts.concat([
     {
       address: tx.itxJson.receiver,
-      changes: [{ target: reserveAddress, action: 'swap', value: `${ctx.reserveAmount}` }],
+      changes: [{ target: reserveAddress, action: 'swap', value: receiveAmount }],
     },
     {
       address: owner,
-      changes: hasFee ? [{ target: reserveAddress, action: 'fee', value: `${ctx.reserveFee}` }] : [],
+      changes: fee.gt(ZERO) ? [{ target: reserveAddress, action: 'fee', value: `${ctx.reserveFee}` }] : [],
     },
-  ];
+  ]);
 };
 
 // Following only exist for legacy support purpose

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.22.2",
+  "version": "1.23.0",
   "description": "",
   "main": "lib/index.js",
   "files": [
@@ -12,18 +12,18 @@
   "dependencies": {
     "bloom-filters": "^1.3.9",
     "lodash": "^4.17.21",
-    "@arcblock/did": "1.22.2",
-    "@arcblock/validator": "1.22.2",
-    "@ocap/mcrypto": "1.22.2",
-    "@ocap/contract": "1.22.2",
-    "@ocap/message": "1.22.2",
-    "@ocap/util": "1.22.2",
-    "@ocap/wallet": "1.22.2"
+    "@arcblock/did": "1.23.0",
+    "@arcblock/validator": "1.23.0",
+    "@ocap/contract": "1.23.0",
+    "@ocap/mcrypto": "1.23.0",
+    "@ocap/util": "1.23.0",
+    "@ocap/wallet": "1.23.0",
+    "@ocap/message": "1.23.0"
   },
   "devDependencies": {
     "jest": "^29.7.0",
     "start-server-and-test": "^1.14.0",
-    "@ocap/e2e-test": "1.22.2"
+    "@ocap/e2e-test": "1.23.0"
   },
   "keywords": [],
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",