@ocap/tx-protocols 1.25.1 → 1.25.3

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

@@ -152,7 +152,10 @@ runner.use(pipes.VerifyBlocked({ stateKeys: ['senderState'] }));
 // verify staking: get address, extract state, verify amount
 runner.use((context, next) => {
   const { tx, itx } = context;
-  context.stakeAddress = toStakeAddress(tx.from, tx.from, itx.token.symbol);
+  // stake from sender to main token
+  const sender = tx.delegator || tx.from;
+  const receiver = context.config.token.address;
+  context.stakeAddress = toStakeAddress(sender, receiver, itx.token.symbol);
   return next();
 });
 runner.use(

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

@@ -1,7 +1,10 @@
 const get = require('lodash/get');
 const { CustomError: Error } = require('@ocap/util/lib/error');
+const { verifyUrl } = require('@ocap/util/lib/url');
 const { verify: verifyVC } = require('@arcblock/vc');
 
+const isTest = ['development', 'test'].includes(process.env.NODE_ENV) || !!process.env.CI;
+
 module.exports =
   ({ tokenKey = 'itx.token' } = {}) =>
   async (context, next) => {
@@ -9,16 +12,48 @@ module.exports =
 
     if (!website) return next();
 
+    try {
+      await verifyUrl(
+        website,
+        isTest
+          ? {
+              protocols: ['http:', 'https:'],
+              blockedHosts: [],
+              allowIp: true,
+            }
+          : {
+              checkDns: true,
+            }
+      );
+    } catch (error) {
+      return next(new Error('INVALID_WEBSITE', `Website ${website} must be a valid URL: ${error.message}`));
+    }
+
     const {
       tx: { from, delegator },
       config: { chainId },
     } = context;
 
     const sender = delegator || from;
-    const verificationUrl = `${website}/.well-known/ocap/tokens.json`;
+
+    const { origin } = new URL(website);
+    const verificationUrl = `${origin}/.well-known/ocap/tokens.json`;
 
     try {
-      const response = await fetch(verificationUrl);
+      const response = await fetch(verificationUrl, {
+        redirect: 'manual',
+      });
+
+      if (!response || !response.ok) {
+        context?.logger.info('Website verification failed', {
+          symbol,
+          website,
+          status: response?.status,
+          statusText: response?.statusText,
+        });
+        return next(new Error('INVALID_WEBSITE', `Website ${website} verification failed`));
+      }
+
       const data = await response.json();
 
       const valids = await Promise.all(

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

@@ -2,14 +2,29 @@ const get = require('lodash/get');
 const { CustomError: Error } = require('@ocap/util/lib/error');
 const { verifyUrl } = require('@ocap/util/lib/url');
 
+const isTest = ['development', 'test'].includes(process.env.NODE_ENV) || !!process.env.CI;
+
 module.exports =
   ({ urlKeys = ['itx.token.website', 'itx.token.metadata.value.communityUrl'] } = {}) =>
-  (context, next) => {
+  async (context, next) => {
     for (const key of urlKeys) {
       const url = get(context, key);
-      if (url && !verifyUrl(url)) {
+      if (!url) continue;
+
+      try {
+        await verifyUrl(
+          url,
+          isTest
+            ? {
+                protocols: ['http:', 'https:'],
+                blockedHosts: [],
+                allowIp: true,
+              }
+            : {}
+        );
+      } catch (error) {
         const name = key.split('.').pop();
-        return next(new Error('INVALID_TX', `${name} is not valid`));
+        return next(new Error('INVALID_TX', `${name} is not valid: ${error.message}`));
       }
     }
 

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.25.1",
+  "version": "1.25.3",
   "description": "Predefined tx pipeline sets to execute certain type of transactions",
   "main": "lib/index.js",
   "files": [
@@ -19,20 +19,20 @@
     "empty-value": "^1.0.1",
     "lodash": "^4.17.21",
     "url-join": "^4.0.1",
-    "@arcblock/did": "1.25.1",
-    "@arcblock/did-util": "1.25.1",
-    "@arcblock/jwt": "1.25.1",
-    "@arcblock/validator": "1.25.1",
-    "@arcblock/vc": "1.25.1",
-    "@ocap/client": "1.25.1",
-    "@ocap/mcrypto": "1.25.1",
-    "@ocap/merkle-tree": "1.25.1",
-    "@ocap/state": "1.25.1",
-    "@ocap/message": "1.25.1",
-    "@ocap/util": "1.25.1",
-    "@ocap/tx-pipeline": "1.25.1",
-    "@ocap/wallet": "1.25.1",
-    "@ocap/asset": "1.25.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"
   },
   "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.1",
-    "@ocap/statedb-memory": "1.25.1"
+    "@ocap/e2e-test": "1.25.3",
+    "@ocap/statedb-memory": "1.25.3"
   },
   "scripts": {
     "lint": "eslint tests lib",