@ocap/tx-protocols 1.13.80 → 1.13.81

package/lib/protocols/asset/create.js

@@ -70,6 +70,10 @@ runner.use(
 runner.use(pipes.ExtractState({ from: 'tx.from', to: 'senderState', status: 'INVALID_SENDER_STATE', table: 'account' })); // prettier-ignore
 runner.use(pipes.VerifyAccountMigration({ senderKey: 'senderState' }));
 
+// Ensure delegation
+runner.use(pipes.ExtractState({ from: 'tx.delegator', to: 'delegatorState', status: 'OK', table: 'account' }));
+runner.use(pipes.VerifyDelegation({ type: 'signature', signerKey: 'senderState', delegatorKey: 'delegatorState' }));
+
 // Check if parent is a factory
 runner.use(pipes.ExtractState({ from: 'itx.parent', to: 'factoryState', status: 'OK', table: 'factory' }));
 runner.use(
@@ -93,7 +97,9 @@ runner.use(ensureTxFee);
 // Update asset state
 runner.use(
   async (context, next) => {
-    const { tx, itx, assetData, statedb, senderState, senderUpdates, vaultState, vaultUpdates } = context;
+    const { tx, itx, assetData, statedb, senderState, delegatorState, senderUpdates, vaultState, vaultUpdates } =
+      context;
+    const owner = delegatorState ? delegatorState.address : senderState.address;
 
     const [newSenderState, assetState, newVaultState] = await Promise.all([
       statedb.account.update(
@@ -102,11 +108,7 @@ runner.use(
         context
       ),
 
-      statedb.asset.create(
-        itx.address,
-        asset.create({ ...itx, data: assetData, owner: senderState.address }, context),
-        context
-      ),
+      statedb.asset.create(itx.address, asset.create({ ...itx, data: assetData, owner }, context), context),
 
       isEmpty(vaultUpdates)
         ? vaultState

package/lib/protocols/factory/create.js

@@ -83,6 +83,10 @@ runner.use(
 runner.use(pipes.ExtractState({ from: 'tx.from', to: 'senderState', table: 'account', status: 'INVALID_SENDER_STATE' })); // prettier-ignore
 runner.use(pipes.VerifyAccountMigration({ senderKey: 'senderState' }));
 
+// Ensure delegation
+runner.use(pipes.ExtractState({ from: 'tx.delegator', to: 'delegatorState', status: 'OK', table: 'account' }));
+runner.use(pipes.VerifyDelegation({ type: 'signature', signerKey: 'senderState', delegatorKey: 'delegatorState' }));
+
 // Ensure tokens exist if we are creating an factory that consume tokens
 runner.use(pipes.ExtractState({ from: 'factoryTokens', to: 'tokenStates', table: 'token', status: 'INVALID_FACTORY_INPUT' })); // prettier-ignore
 
@@ -107,8 +111,10 @@ runner.use(ensureTxFee);
 // Create factory state
 runner.use(
   async (context, next) => {
-    const { tx, itx, statedb, senderState, senderUpdates, vaultState, vaultUpdates, factoryProps } = context;
+    const { tx, itx, statedb, senderState, delegatorState, senderUpdates, vaultState, vaultUpdates, factoryProps } =
+      context;
     const tokens = { [context.config.token.address]: '0' };
+    const owner = delegatorState ? delegatorState.address : senderState.address;
 
     const [newSenderState, factoryState, newVaultState] = await Promise.all([
       // Update owner state
@@ -119,11 +125,7 @@ runner.use(
       ),
 
       // Create factory state
-      statedb.factory.create(
-        itx.address,
-        factory.create({ ...factoryProps, tokens, owner: senderState.address }, context),
-        context
-      ),
+      statedb.factory.create(itx.address, factory.create({ ...factoryProps, tokens, owner }, context), context),
 
       isEmpty(vaultUpdates)
         ? vaultState

package/lib/protocols/governance/claim-stake.js

@@ -3,6 +3,7 @@ const Joi = require('@ocap/validator');
 const { BN } = require('@ocap/util');
 const { Runner, pipes } = require('@ocap/tx-pipeline');
 const { account, asset, stake, evidence } = require('@ocap/state');
+const getRelatedAddresses = require('@ocap/util/lib/get-related-addr');
 
 // eslint-disable-next-line global-require
 const debug = require('debug')(`${require('../../../package.json').name}:acquire-asset-v2`);
@@ -26,14 +27,16 @@ runner.use(({ itx }, next) => {
   return next(error ? new Error('INVALID_TX', `Invalid itx: ${error.message}`) : null);
 });
 
-// 2. verify stake state
+// 2. verify stake state & sender state
+runner.use(pipes.ExtractState({ from: 'tx.from', to: 'senderState', status: 'INVALID_SENDER_STATE', table: 'account' })); // prettier-ignore
 runner.use(pipes.ExtractState({ from: 'itx.address', to: 'stakeState', status: 'INVALID_STAKE_STATE', table: 'stake' })); // prettier-ignore
+runner.use(pipes.VerifyAccountMigration({ senderKey: 'senderState' }));
 runner.use(
   pipes.VerifyInfo([
     {
       error: 'SENDER_NOT_MATCH',
       message: 'You are not allowed to claim stake from this address',
-      fn: ({ tx, stakeState }) => tx.from === stakeState.sender,
+      fn: ({ senderState, stakeState }) => getRelatedAddresses(senderState).includes(stakeState.sender),
     },
   ])
 );
@@ -92,10 +95,8 @@ runner.use(
   })
 );
 
-// 6. verify sender & receiver
-runner.use(pipes.ExtractState({ from: 'tx.from', to: 'senderState', status: 'INVALID_SENDER_STATE', table: 'account' })); // prettier-ignore
+// 6. verify receiver states
 runner.use(pipes.ExtractState({ from: 'receivers', to: 'receiverStates', status: 'INVALID_RECEIVER_STATE', table: 'account' })); // prettier-ignore
-runner.use(pipes.VerifyAccountMigration({ senderKey: 'senderState' }));
 
 // 7. verify token state and balance
 runner.use(pipes.ExtractState({ from: 'tokens', to: 'tokenStates', status: 'INVALID_TOKEN', table: 'token' }));
@@ -147,15 +148,12 @@ runner.use(
       const { owner, tokens, assets } = x;
 
       // Update receiver balance
-      receiverUpdates[owner] = applyTokenUpdates(
-        tokens,
-        receiverStates.find((s) => s.address === owner),
-        'add'
-      );
+      const ownerState = receiverStates.find((s) => getRelatedAddresses(s).includes(owner));
+      receiverUpdates[ownerState.address] = applyTokenUpdates(tokens, ownerState, 'add');
 
       // Update asset owner
       assets.forEach((a) => {
-        assetUpdates[a] = { owner };
+        assetUpdates[a] = { owner: ownerState.address };
       });
 
       // Update Stake Revoked fields

package/lib/protocols/governance/revoke-stake.js

@@ -2,6 +2,7 @@ const isEmpty = require('empty-value');
 const { BN } = require('@ocap/util');
 const { Runner, pipes } = require('@ocap/tx-pipeline');
 const { account, stake } = require('@ocap/state');
+const getRelatedAddresses = require('@ocap/util/lib/get-related-addr');
 
 // eslint-disable-next-line global-require
 const debug = require('debug')(`${require('../../../package.json').name}:acquire-asset-v2`);
@@ -42,16 +43,19 @@ runner.use(
 // 3. verify itx size: set hard limit here because more output leads to longer tx execute time
 runner.use(pipes.VerifyListSize({ listKey: ['outputs', 'receivers', 'tokens', 'assets'] }));
 
-// 4. verify stake state
-runner.use(
-  pipes.ExtractState({ from: 'itx.address', to: 'stakeState', status: 'INVALID_STAKE_STATE', table: 'stake' })
-);
+// 4. verify sender & receiver
+runner.use(pipes.ExtractState({ from: 'tx.from', to: 'senderState', status: 'INVALID_SENDER_STATE', table: 'account' })); // prettier-ignore
+runner.use(pipes.ExtractState({ from: 'receivers', to: 'receiverStates', status: 'INVALID_RECEIVER_STATE', table: 'account' })); // prettier-ignore
+runner.use(pipes.VerifyAccountMigration({ senderKey: 'senderState' }));
+
+// 5. verify stake state
+runner.use(pipes.ExtractState({ from: 'itx.address', to: 'stakeState', status: 'INVALID_STAKE_STATE', table: 'stake' })); // prettier-ignore
 runner.use(
   pipes.VerifyInfo([
     {
       error: 'SENDER_NOT_MATCH',
       message: 'You are not allowed to revoke stake from this address',
-      fn: ({ tx, stakeState }) => tx.from === stakeState.sender,
+      fn: ({ senderState, stakeState }) => getRelatedAddresses(senderState).includes(stakeState.sender),
     },
     {
       error: 'STAKE_NOT_REVOCABLE',
@@ -61,15 +65,6 @@ runner.use(
   ])
 );
 
-// 5. verify sender & receiver
-runner.use(
-  pipes.ExtractState({ from: 'tx.from', to: 'senderState', status: 'INVALID_SENDER_STATE', table: 'account' })
-);
-runner.use(
-  pipes.ExtractState({ from: 'receivers', to: 'receiverStates', status: 'INVALID_RECEIVER_STATE', table: 'account' })
-);
-runner.use(pipes.VerifyAccountMigration({ senderKey: 'senderState' }));
-
 // 6. verify token state and balance
 runner.use(pipes.ExtractState({ from: 'tokens', to: 'tokenStates', status: 'INVALID_TOKEN', table: 'token' }));
 runner.use((context, next) => {
@@ -104,8 +99,8 @@ runner.use(
     const { tx, itx, outputs, statedb, senderState, stakeState } = context;
 
     const stakeUpdates = {
-      tokens: stakeState.tokens,
-      assets: stakeState.assets,
+      tokens: stakeState.tokens || {},
+      assets: stakeState.assets || [],
       revokedTokens: stakeState.revokedTokens || {},
       revokedAssets: stakeState.revokedAssets || [],
     };

package/lib/protocols/rollup/create.js

@@ -66,10 +66,12 @@ runner.use(
   ])
 );
 
-// 1. ensure sender & validators exist
+// 1. ensure sender, validators, delegation
 runner.use(pipes.ExtractState({ from: 'tx.from', to: 'senderState', status: 'INVALID_SENDER_STATE', table: 'account' })); // prettier-ignore
 runner.use(pipes.ExtractState({ from: 'seedValidators', to: 'validatorStates', status: 'INVALID_VALIDATOR_STATE', table: 'account' })); // prettier-ignore
 runner.use(pipes.VerifyAccountMigration({ signerKey: 'validatorStates', senderKey: 'senderState' }));
+runner.use(pipes.ExtractState({ from: 'tx.delegator', to: 'delegatorState', status: 'OK', table: 'account' }));
+runner.use(pipes.VerifyDelegation({ type: 'signature', signerKey: 'senderState', delegatorKey: 'delegatorState' }));
 
 // 2. ensure token exist and match
 runner.use(pipes.ExtractState({ from: 'itx.tokenAddress', to: 'tokenState', status: 'INVALID_TOKEN', table: 'token' }));
@@ -111,7 +113,17 @@ runner.use(ensureTxFee);
 // 5. create rollup state
 runner.use(
   async (context, next) => {
-    const { tx, formattedItx, rollupData, statedb, senderState, senderUpdates, vaultState, vaultUpdates } = context;
+    const {
+      tx,
+      formattedItx,
+      rollupData,
+      statedb,
+      senderState,
+      delegatorState,
+      senderUpdates,
+      vaultState,
+      vaultUpdates,
+    } = context;
 
     const [newSenderState, rollupState, newVaultState] = await Promise.all([
       statedb.account.update(
@@ -125,7 +137,7 @@ runner.use(
         rollup.create(
           {
             ...formattedItx,
-            issuer: senderState.address,
+            issuer: delegatorState ? delegatorState.address : senderState.address,
             validators: formattedItx.seedValidators,
             data: rollupData,
           },

package/lib/protocols/token/create.js

@@ -61,6 +61,10 @@ runner.use(
 runner.use(pipes.ExtractState({ from: 'tx.from', to: 'senderState', status: 'INVALID_SENDER_STATE', table: 'account' })); // prettier-ignore
 runner.use(pipes.VerifyAccountMigration({ senderKey: 'senderState' }));
 
+// Ensure delegation
+runner.use(pipes.ExtractState({ from: 'tx.delegator', to: 'delegatorState', status: 'OK', table: 'account' }));
+runner.use(pipes.VerifyDelegation({ type: 'signature', signerKey: 'senderState', delegatorKey: 'delegatorState' }));
+
 // Ensure token not exist
 runner.use(pipes.ExtractState({ from: 'itx.address', to: 'tokenState', table: 'token', status: 'OK' }));
 runner.use(
@@ -93,34 +97,47 @@ runner.use(ensureTxFee);
 // Update sender state, token state
 runner.use(
   async (context, next) => {
-    const { tx, itx, statedb, senderState, senderUpdates, vaultState, vaultUpdates } = context;
+    const { tx, itx, statedb, senderState, delegatorState, senderUpdates, vaultState, vaultUpdates } = context;
     const data = decodeAnySafe(itx.data);
+    const owner = delegatorState ? delegatorState.address : senderState.address;
 
-    // We are definitely creating a different token, so it is safe to set tokens to initial supply
+    const delegatorUpdates = {};
     senderUpdates.tokens = senderUpdates.tokens || {};
-    senderUpdates.tokens[itx.address] = itx.initialSupply;
 
-    const [newSenderState, tokenState, newVaultState] = await Promise.all([
+    // We are definitely creating a different token, so it is safe to set tokens to initial supply
+    if (delegatorState) {
+      delegatorUpdates.tokens = delegatorState.tokens || {};
+      delegatorUpdates.tokens[itx.address] = itx.initialSupply;
+    } else {
+      senderUpdates.tokens[itx.address] = itx.initialSupply;
+    }
+
+    const [newSenderState, tokenState, newVaultState, newDelegatorState] = await Promise.all([
       statedb.account.update(
         senderState.address,
         account.update(senderState, { nonce: tx.nonce, pk: tx.pk, ...senderUpdates }, context),
         context
       ),
 
-      statedb.token.create(
-        itx.address,
-        token.create({ ...cloneDeep(itx), data, issuer: senderState.address }, context),
-        context
-      ),
+      statedb.token.create(itx.address, token.create({ ...cloneDeep(itx), data, issuer: owner }, context), context),
 
       isEmpty(vaultUpdates)
         ? vaultState
         : statedb.account.update(vaultState.address, account.update(vaultState, vaultUpdates, context), context),
+
+      delegatorState
+        ? statedb.account.update(
+            delegatorState.address,
+            account.update(delegatorState, delegatorUpdates, context),
+            context
+          )
+        : null,
     ]);
 
     context.senderState = newSenderState;
     context.tokenState = tokenState;
     context.vaultState = newVaultState;
+    context.delegatorState = newDelegatorState;
 
     debug('create token v2', tokenState);
 

package/lib/protocols/trade/transfer-v3.js

@@ -6,6 +6,7 @@ const isEqual = require('lodash/isEqual');
 const { BN } = require('@ocap/util');
 const { Runner, pipes } = require('@ocap/tx-pipeline');
 const { account, asset } = require('@ocap/state');
+const getRelatedAddresses = require('@ocap/util/lib/get-related-addr');
 
 // eslint-disable-next-line global-require
 const debug = require('debug')(`${require('../../../package.json').name}:transfer-v2`);
@@ -163,20 +164,13 @@ runner.use(
     });
 
     const receiverUpdates = {};
-    outputs.forEach((x) => {
-      const { owner, tokensList } = x;
-      receiverUpdates[owner] = applyTokenUpdates(
-        tokensList,
-        receiverStates.find((s) => s.address === owner) || {},
-        'add'
-      );
-    });
-
     const assetUpdates = {};
     outputs.forEach((x) => {
-      const { owner, assetsList } = x;
+      const { owner, tokensList, assetsList } = x;
+      const ownerState = receiverStates.find((s) => getRelatedAddresses(s).includes(owner)) || { address: owner };
+      receiverUpdates[ownerState.address] = applyTokenUpdates(tokensList, ownerState, 'add');
       assetsList.forEach((address) => {
-        assetUpdates[address] = { owner };
+        assetUpdates[address] = { owner: ownerState.address };
       });
     });
 
@@ -213,10 +207,11 @@ runner.use(
         receivers
           .filter((x) => x !== senderState.address)
           .map((x) => {
-            const receiverState = receiverStates.find((s) => s.address === x);
+            const receiverState = receiverStates.find((s) => getRelatedAddresses(s).includes(x));
+            const owner = receiverState ? receiverState.address : x;
             return statedb.account.updateOrCreate(
               receiverState,
-              account.updateOrCreate(receiverState, { ...receiverUpdates[x], address: x }, context),
+              account.updateOrCreate(receiverState, { ...receiverUpdates[owner], address: owner }, context),
               context
             );
           })

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.13.80",
+  "version": "1.13.81",
   "description": "Predefined tx pipeline sets to execute certain type of transactions",
   "main": "lib/index.js",
   "files": [
@@ -19,17 +19,17 @@
   "author": "wangshijun <wangshijun2010@gmail.com> (http://github.com/wangshijun)",
   "license": "MIT",
   "dependencies": {
-    "@arcblock/did": "1.13.80",
-    "@arcblock/did-util": "1.13.80",
-    "@ocap/asset": "1.13.80",
-    "@ocap/mcrypto": "1.13.80",
-    "@ocap/merkle-tree": "1.13.80",
-    "@ocap/message": "1.13.80",
-    "@ocap/state": "1.13.80",
-    "@ocap/tx-pipeline": "1.13.80",
-    "@ocap/util": "1.13.80",
-    "@ocap/validator": "1.13.80",
-    "@ocap/wallet": "1.13.80",
+    "@arcblock/did": "1.13.81",
+    "@arcblock/did-util": "1.13.81",
+    "@ocap/asset": "1.13.81",
+    "@ocap/mcrypto": "1.13.81",
+    "@ocap/merkle-tree": "1.13.81",
+    "@ocap/message": "1.13.81",
+    "@ocap/state": "1.13.81",
+    "@ocap/tx-pipeline": "1.13.81",
+    "@ocap/util": "1.13.81",
+    "@ocap/validator": "1.13.81",
+    "@ocap/wallet": "1.13.81",
     "debug": "^4.3.2",
     "empty-value": "^1.0.1",
     "lodash": "^4.17.21",
@@ -42,5 +42,5 @@
   "devDependencies": {
     "jest": "^27.3.1"
   },
-  "gitHead": "7f41804dd27327380c984ed53d5056a7c97e15d5"
+  "gitHead": "30dc84516ba83034ddd347bede3b9487e8973cba"
 }