@ocap/tx-pipeline 1.18.64 → 1.18.66

package/lib/pipes/verify-delegation.js

@@ -6,9 +6,10 @@ const isEmpty = require('empty-value');
 const { CustomError: Error } = require('@ocap/util/lib/error');
 const { getListField } = require('@ocap/util/lib/get-list-field');
 const { toDelegateAddress } = require('@arcblock/did-util');
+const { getRelatedAddresses } = require('@ocap/util/lib/get-related-addr');
 
 // eslint-disable-next-line global-require
-const debug = require('debug')(`${require('../../package.json').name}:pipe:verify-delegation`);
+// const debug = require('debug')(`${require('../../package.json').name}:pipe:verify-delegation`);
 
 // Must be piped after `extract-state` or `extract-signer` pipe
 module.exports = function CreateVerifyDelegationPipe({
@@ -20,11 +21,22 @@ module.exports = function CreateVerifyDelegationPipe({
   return async function VerifyDelegation(context, next) {
     const { tx, txType, statedb } = context;
 
-    const getDelegationState = (signerState, delegatorState) => {
+    const getDelegationState = async (signerState, delegatorState) => {
       if (delegatorState) {
-        const address = toDelegateAddress(signerState.address, delegatorState.address);
-        debug('query', { from: signerState.address, to: signerState.address, address });
-        return statedb.delegation.get(address, context);
+        // Delegator should be interpreted as delegatee here, we should check if there are any delegation on the migration chain
+        const related = getRelatedAddresses(delegatorState);
+        const delegateStates = await Promise.all(
+          related.map(async (x) => {
+            const delegation = await statedb.delegation.get(toDelegateAddress(signerState.address, x), context);
+            if (delegation) {
+              delegation.to = x;
+            }
+
+            return delegation;
+          })
+        );
+
+        return delegateStates.find((x) => x);
       }
 
       return null;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.18.64",
+  "version": "1.18.66",
   "description": "Pipeline runner and common pipelines to process transactions",
   "main": "lib/index.js",
   "files": [
@@ -29,16 +29,16 @@
     "elliptic": "6.5.3"
   },
   "dependencies": {
-    "@arcblock/did": "1.18.64",
-    "@arcblock/did-util": "1.18.64",
-    "@ocap/mcrypto": "1.18.64",
-    "@ocap/message": "1.18.64",
-    "@ocap/state": "1.18.64",
-    "@ocap/util": "1.18.64",
-    "@ocap/wallet": "1.18.64",
+    "@arcblock/did": "1.18.66",
+    "@arcblock/did-util": "1.18.66",
+    "@ocap/mcrypto": "1.18.66",
+    "@ocap/message": "1.18.66",
+    "@ocap/state": "1.18.66",
+    "@ocap/util": "1.18.66",
+    "@ocap/wallet": "1.18.66",
     "debug": "^4.3.4",
     "empty-value": "^1.0.1",
     "lodash": "^4.17.21"
   },
-  "gitHead": "92a63cf24ca10bca45c37151054b34486536b93a"
+  "gitHead": "c58f71969c58af63eb88cb9f0e0e9e92e4826617"
 }