@ocap/tx-protocols 1.19.6 → 1.19.8

package/lib/index.js

@@ -3,7 +3,6 @@ const states = require('@ocap/state');
 const transferV2 = require('./protocols/trade/transfer-v2');
 const transferV3 = require('./protocols/trade/transfer-v3');
 const exchangeV2 = require('./protocols/trade/exchange-v2');
-const declare = require('./protocols/account/declare');
 const migrate = require('./protocols/account/migrate');
 const delegate = require('./protocols/account/delegate');
 const revokeDelegate = require('./protocols/account/revoke-delegate');
@@ -44,7 +43,6 @@ const createExecutor = ({ filter, runAsLambda }) => {
     exchangeV2,
 
     // account
-    declare,
     accountMigrate: migrate,
     delegate,
     revokeDelegate,

package/lib/protocols/account/delegate.js

@@ -188,7 +188,11 @@ runner.use(
       // update receiver
       receiverState
         ? Promise.resolve(receiverState)
-        : statedb.account.create(receiver, account.create({ address: receiver }, context), context),
+        : statedb.account.create(
+            receiver,
+            account.create({ address: receiver, tokens: { [context.config.token.address]: '0' } }, context),
+            context
+          ),
 
       delegationState
         ? statedb.delegation.update(itx.address, delegation.update(delegationState, { ...itx, from: sender, ops: merged }, context), context) // prettier-ignore

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.6",
+  "version": "1.19.8",
   "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.6",
-    "@arcblock/did-util": "1.19.6",
-    "@arcblock/jwt": "1.19.6",
-    "@arcblock/validator": "1.19.6",
-    "@ocap/asset": "1.19.6",
-    "@ocap/mcrypto": "1.19.6",
-    "@ocap/merkle-tree": "1.19.6",
-    "@ocap/message": "1.19.6",
-    "@ocap/state": "1.19.6",
-    "@ocap/tx-pipeline": "1.19.6",
-    "@ocap/util": "1.19.6",
-    "@ocap/wallet": "1.19.6",
+    "@arcblock/did": "1.19.8",
+    "@arcblock/did-util": "1.19.8",
+    "@arcblock/jwt": "1.19.8",
+    "@arcblock/validator": "1.19.8",
+    "@ocap/asset": "1.19.8",
+    "@ocap/mcrypto": "1.19.8",
+    "@ocap/merkle-tree": "1.19.8",
+    "@ocap/message": "1.19.8",
+    "@ocap/state": "1.19.8",
+    "@ocap/tx-pipeline": "1.19.8",
+    "@ocap/util": "1.19.8",
+    "@ocap/wallet": "1.19.8",
     "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": "a884f23e66c8b498f2bf8d1efbbb3b0d024f4a9d"
+  "gitHead": "c64c55f04a40357501cc3ecf4e5e7531aee15ffe"
 }

package/lib/protocols/account/declare.js

@@ -1,61 +0,0 @@
-const { CustomError: Error } = require('@ocap/util/lib/error');
-const { Joi } = require('@arcblock/validator');
-const { Runner, pipes } = require('@ocap/tx-pipeline');
-const { account } = require('@ocap/state');
-const { toBase58 } = require('@ocap/util');
-
-const runner = new Runner();
-
-runner.use(pipes.VerifyMultiSig(0));
-
-// verify itx
-const schema = Joi.object({
-  issuer: Joi.DID().prefix().optional().allow(''),
-  moniker: Joi.string()
-    .regex(/^[a-zA-Z0-9][-a-zA-Z0-9_]{2,128}$/)
-    .required(),
-  data: Joi.any().optional(),
-}).options({ stripUnknown: true, noDefaults: false });
-runner.use(({ itx }, next) => {
-  const { error } = schema.validate(itx);
-  if (error) {
-    return next(new Error('INVALID_TX', `Invalid itx: ${error.message}`));
-  }
-  return next();
-});
-
-// Ensure sender does not exist
-runner.use(pipes.ExtractState({ from: 'tx.from', to: 'senderState' }));
-runner.use(pipes.VerifySender({ state: 'senderState' }));
-runner.use(pipes.VerifyAccountMigration({ stateKey: 'senderState', addressKey: 'tx.from' }));
-
-// The issuer must exist in the ledger
-runner.use(pipes.ExtractState({ from: 'itx.issuer', to: 'issuerState', status: 'INVALID_TX' }));
-
-// Save context snapshot before updating states
-runner.use(pipes.TakeStateSnapshot());
-
-// Create account state
-runner.use(
-  async (context, next) => {
-    const { tx, itx, statedb } = context;
-    const tokens = { [context.config.token.address]: '0' };
-
-    const [senderState] = await Promise.all([
-      statedb.account.create(
-        tx.from,
-        account.create({ address: tx.from, pk: toBase58(tx.pk), nonce: tx.nonce, tokens, ...itx }, context),
-        context
-      ),
-    ]);
-
-    context.senderState = senderState;
-
-    next();
-  },
-  { persistError: true }
-);
-
-runner.use(pipes.VerifyStateDiff());
-
-module.exports = runner;