@ocap/tx-protocols 1.19.5 → 1.19.7

package/lib/protocols/account/migrate.js

@@ -41,16 +41,21 @@ runner.use(
 );
 
 // Ensure sender exist
-runner.use(pipes.ExtractState({ from: 'tx.from', to: 'senderState', status: 'INVALID_SENDER_STATE', table: 'account' })); // prettier-ignore
+runner.use(pipes.ExtractState({ from: 'tx.from', to: 'senderState', status: 'OK', table: 'account' })); // prettier-ignore
 runner.use(pipes.VerifyAccountMigration({ stateKey: 'senderState', addressKey: 'tx.from' }));
 
 // Ensure tx fee and gas
 runner.use(
   EnsureTxGas((context) => {
-    return { create: 1, update: getRelatedAddresses(context.senderState).length, payment: 0 };
+    return {
+      create: context.senderState ? 1 : 2,
+      update: context.senderState ? getRelatedAddresses(context.senderState).length : 0,
+      payment: 0,
+    };
   })
 );
 runner.use(EnsureTxCost({ attachSenderChanges: true, throwOnInsufficientFund: false }));
+runner.use(pipes.VerifyGasPayer());
 
 // Save context snapshot before updating states
 runner.use(pipes.TakeStateSnapshot());
@@ -62,6 +67,8 @@ runner.use(
 
     const sender = context.senderState;
     const receiver = await statedb.account.get(itx.address, context);
+    const senderTokens = sender?.tokens || { [context.config.token.address]: '0' };
+    const senderAddress = sender?.address || tx.from;
 
     // Ensure receiver does not exist
     if (receiver) {
@@ -73,11 +80,11 @@ runner.use(
       itx.address,
       account.create(
         {
-          ...sender, // copy all old account data to new account
+          ...(sender || { tokens: senderTokens }), // copy all old account data to new account
           ...senderUpdates,
           address: itx.address,
           pk: itx.pk,
-          migratedFrom: uniq(flatten([sender.address, ...sender.migratedFrom])),
+          migratedFrom: sender ? uniq(flatten([sender.address, ...sender.migratedFrom])) : [senderAddress],
         },
         context
       ),
@@ -86,18 +93,23 @@ runner.use(
     debug('new account', newAccount);
 
     // Update old accounts
-    const addresses = getRelatedAddresses(sender);
+    const addresses = sender ? getRelatedAddresses(sender) : [senderAddress];
     const states = await Promise.all(
       addresses.map(async (address) => {
         let state = null;
-        if (address === sender.address) {
-          state = account.update(sender, { migratedTo: itx.address, nonce: tx.nonce }, context);
+        if (address === senderAddress) {
+          state = account.updateOrCreate(
+            sender,
+            { address, tokens: senderTokens, migratedTo: itx.address, nonce: tx.nonce },
+            context
+          );
+          await statedb.account.updateOrCreate(sender, state, context);
         } else {
           const old = await statedb.account.get(address, { traceMigration: false, txn: context.txn });
           state = account.update(old, { migratedTo: itx.address }, context);
+          await statedb.account.update(address, state, context);
         }
 
-        await statedb.account.update(address, state, context);
         return state;
       })
     );
@@ -107,7 +119,7 @@ runner.use(
 
     // Update context
     context.receiverState = newAccount;
-    context.senderState = states.find((x) => x.address === sender.address);
+    context.senderState = states.find((x) => x.address === senderAddress);
 
     return next();
   },

package/lib/protocols/governance/stake.js

@@ -178,6 +178,7 @@ runner.use(
   })
 );
 runner.use(EnsureTxCost({ attachSenderChanges: true }));
+runner.use(pipes.VerifyGasPayer());
 
 // Save context snapshot before updating states
 runner.use(pipes.TakeStateSnapshot());

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.19.5",
+  "version": "1.19.7",
   "description": "Predefined tx pipeline sets to execute certain type of transactions",
   "main": "lib/index.js",
   "files": [
@@ -21,18 +21,18 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@arcblock/did": "1.19.5",
-    "@arcblock/did-util": "1.19.5",
-    "@arcblock/jwt": "1.19.5",
-    "@arcblock/validator": "1.19.5",
-    "@ocap/asset": "1.19.5",
-    "@ocap/mcrypto": "1.19.5",
-    "@ocap/merkle-tree": "1.19.5",
-    "@ocap/message": "1.19.5",
-    "@ocap/state": "1.19.5",
-    "@ocap/tx-pipeline": "1.19.5",
-    "@ocap/util": "1.19.5",
-    "@ocap/wallet": "1.19.5",
+    "@arcblock/did": "1.19.7",
+    "@arcblock/did-util": "1.19.7",
+    "@arcblock/jwt": "1.19.7",
+    "@arcblock/validator": "1.19.7",
+    "@ocap/asset": "1.19.7",
+    "@ocap/mcrypto": "1.19.7",
+    "@ocap/merkle-tree": "1.19.7",
+    "@ocap/message": "1.19.7",
+    "@ocap/state": "1.19.7",
+    "@ocap/tx-pipeline": "1.19.7",
+    "@ocap/util": "1.19.7",
+    "@ocap/wallet": "1.19.7",
     "debug": "^4.3.6",
     "deep-diff": "^1.0.2",
     "empty-value": "^1.0.1",
@@ -47,5 +47,5 @@
     "jest": "^29.7.0",
     "start-server-and-test": "^1.14.0"
   },
-  "gitHead": "9f93acb129f6fee316149f3921a98b88dcccfac3"
+  "gitHead": "b3a8e11bd01dd1dc6e2d222bc7dd2476f278a9f7"
 }