@ocap/tx-protocols 1.25.3 → 1.25.5

package/lib/protocols/token-factory/burn.js

@@ -247,10 +247,6 @@ runner.use(
       });
     });
 
-    // update sender
-    if (senderChange) {
-      accountUpdates[senderChange.address] = applyTokenChange(accountUpdates[senderChange.address], senderChange);
-    }
     // Ensure the sender exists in accountUpdates, because even if there is no balance change, we need to update his nonce
     if (!accountUpdates[tx.from]) {
       accountUpdates[tx.from] = senderState || {};
@@ -275,6 +271,14 @@ runner.use(
       }
     );
 
+    // update sender
+    if (senderChange) {
+      accountUpdates[senderChange.address] = applyTokenChange(
+        accountUpdates[senderChange.address] || senderState,
+        senderChange
+      );
+    }
+
     const [newAccountStates, newTokenFactoryState, newTokenState] = await Promise.all([
       // update accounts
       Promise.all(
@@ -284,10 +288,13 @@ runner.use(
           const state = [senderState, receiverState, ownerState, ...signerStates].find((x) => x?.address === address);
 
           // Should only update nonce and pk for sender and new accounts
-          const actualUpdates =
-            address === tx.from || !state
-              ? { ...updates, address, nonce: tx.nonce, pk: tx.pk }
-              : pick(updates, ['tokens']);
+          const actualUpdates = state ? pick(updates, ['tokens']) : { ...updates, address };
+
+          // Should only update nonce and pk for sender
+          if (address === tx.from) {
+            actualUpdates.pk = tx.pk;
+            actualUpdates.nonce = tx.nonce;
+          }
 
           return statedb.account.updateOrCreate(state, account.updateOrCreate(state, actualUpdates, context), context);
         })

package/lib/protocols/token-factory/mint.js

@@ -252,10 +252,6 @@ runner.use(
       });
     });
 
-    // update sender
-    if (senderChange) {
-      accountUpdates[senderChange.address] = applyTokenChange(accountUpdates[senderChange.address], senderChange);
-    }
     // Ensure the sender exists in accountUpdates, because even if there is no balance change, we need to update his nonce
     if (!accountUpdates[tx.from]) {
       accountUpdates[tx.from] = senderState || {};
@@ -280,6 +276,14 @@ runner.use(
       }
     );
 
+    // update sender
+    if (senderChange) {
+      accountUpdates[senderChange.address] = applyTokenChange(
+        accountUpdates[senderChange.address] || senderState,
+        senderChange
+      );
+    }
+
     const [newAccountStates, newTokenFactoryState, newTokenState] = await Promise.all([
       // update accounts
       Promise.all(
@@ -288,11 +292,13 @@ runner.use(
           // the sender and receiver are allowed to be created in the transaction.
           const state = [senderState, receiverState, ownerState, ...signerStates].find((x) => x?.address === address);
 
-          // Should only update nonce and pk for sender and new accounts
-          const actualUpdates =
-            address === tx.from || !state
-              ? { ...updates, address, nonce: tx.nonce, pk: tx.pk }
-              : pick(updates, ['tokens']);
+          const actualUpdates = state ? pick(updates, ['tokens']) : { ...updates, address };
+
+          // Should only update nonce and pk for sender
+          if (address === tx.from) {
+            actualUpdates.pk = tx.pk;
+            actualUpdates.nonce = tx.nonce;
+          }
 
           return statedb.account.updateOrCreate(state, account.updateOrCreate(state, actualUpdates, context), context);
         })

package/lib/protocols/token-factory/pipes/verify-icon.js

@@ -19,7 +19,7 @@ module.exports =
       return next(new Error('INVALID_ICON', `Token Icon must be less than ${Math.floor(size / 1024)}k`));
     }
 
-    const sanitizedIcon = sanitizeSvg(icon);
+    const sanitizedIcon = sanitizeSvg(icon, { preserveCase: true });
 
     set(context, iconKey, sanitizedIcon);
 

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.25.3",
+  "version": "1.25.5",
   "description": "Predefined tx pipeline sets to execute certain type of transactions",
   "main": "lib/index.js",
   "files": [
@@ -13,26 +13,26 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@blocklet/xss": "^0.2.7",
+    "@blocklet/xss": "^0.2.8",
     "debug": "^4.3.6",
     "deep-diff": "^1.0.2",
     "empty-value": "^1.0.1",
     "lodash": "^4.17.21",
     "url-join": "^4.0.1",
-    "@arcblock/did-util": "1.25.3",
-    "@arcblock/jwt": "1.25.3",
-    "@arcblock/validator": "1.25.3",
-    "@arcblock/vc": "1.25.3",
-    "@ocap/asset": "1.25.3",
-    "@ocap/client": "1.25.3",
-    "@ocap/mcrypto": "1.25.3",
-    "@ocap/merkle-tree": "1.25.3",
-    "@arcblock/did": "1.25.3",
-    "@ocap/message": "1.25.3",
-    "@ocap/state": "1.25.3",
-    "@ocap/tx-pipeline": "1.25.3",
-    "@ocap/util": "1.25.3",
-    "@ocap/wallet": "1.25.3"
+    "@arcblock/did": "1.25.5",
+    "@arcblock/did-util": "1.25.5",
+    "@arcblock/jwt": "1.25.5",
+    "@arcblock/validator": "1.25.5",
+    "@ocap/asset": "1.25.5",
+    "@arcblock/vc": "1.25.5",
+    "@ocap/client": "1.25.5",
+    "@ocap/mcrypto": "1.25.5",
+    "@ocap/merkle-tree": "1.25.5",
+    "@ocap/message": "1.25.5",
+    "@ocap/state": "1.25.5",
+    "@ocap/tx-pipeline": "1.25.5",
+    "@ocap/util": "1.25.5",
+    "@ocap/wallet": "1.25.5"
   },
   "resolutions": {
     "bn.js": "5.2.2",
@@ -41,8 +41,8 @@
   "devDependencies": {
     "jest": "^29.7.0",
     "start-server-and-test": "^1.14.0",
-    "@ocap/e2e-test": "1.25.3",
-    "@ocap/statedb-memory": "1.25.3"
+    "@ocap/statedb-memory": "1.25.5",
+    "@ocap/e2e-test": "1.25.5"
   },
   "scripts": {
     "lint": "eslint tests lib",