fixed #5

Author: coranos

package-lock.json

@@ -24,6 +24,7 @@
     "itest": "./node_modules/mocha/bin/mocha --recursive -t 100000 test/integration"
   },
   "dependencies": {
+    "@bananocoin/banano-ipfs": "^1.0.1",
     "@bananocoin/bananojs": "^2.4.15",
     "abort-controller": "^3.0.0",
     "await-semaphore": "^0.1.3",

package.json

@@ -114,8 +114,8 @@ const getNftAssetsOwners = async (context, req, res) => {
   }
 
   /* istanbul ignore if */
-  if (ipfsResp.representative === undefined) {
-    throw Error('ipfsResp.representative is required');
+  if (ipfsResp.representative_account === undefined) {
+    throw Error('ipfsResp.representative_account is required');
   }
 
   const histBody = {
@@ -152,7 +152,7 @@ const getNftAssetsOwners = async (context, req, res) => {
   } else {
     resp.success = true;
     resp.asset_owners = [];
-    const representativeAccount = await bananojs.getBananoAccount(representative);
+    const representativeAccount = ipfsResp.representative_account;
     loggingUtil.log(ACTION, 'representativeAccount', representativeAccount);
     let templateAssetCounter = 0;
     for (let ix = 0; ix < histResponseJson.history.length; ix++) {

scripts/actions/get-nft-template-owner.js

@@ -1,5 +1,6 @@
 'use strict';
 // libraries
+const bananoIpfs = require('@bananocoin/banano-ipfs');
 const bs58 = require('bs58');
 const AbortController = require('abort-controller');
 
@@ -677,31 +678,14 @@ const addRep = async (bananojs, json, inFieldNmPrefix, outFieldNmPrefix, errors,
   if (value === undefined) {
     throw Error(`'${key}' not a key in ${Object.keys(json)}`);
   }
-  if (!regExp.test(value)) {
-    errors.push(`${key}:'${value}' not Qm+base58`);
+  const representativeAccountFieldNm = `${outFieldNmPrefix}representative_account`;
+  try {
+    const representative = bananoIpfs.ifpsCidToAccount(value);
+    json[representativeAccountFieldNm] = representative;
+    return success;
+  } catch (error) {
+    errors.push(`${key}:'${value}' error '${error.message}'`);
     return false;
-  } else {
-    const bytes = bs58.decode(value);
-
-    const hexFieldNm = `${outFieldNmPrefix}ipfs_cid_hex`;
-    const hexBase58FieldNm = `${outFieldNmPrefix}ipfs_cid_hex_base58`;
-
-    const hexValue = bytes.toString('hex');
-    json[hexFieldNm] = hexValue;
-    json[hexBase58FieldNm] = bs58.encode(Buffer.from(bytes));
-
-    const regExp = new RegExp('^1220[0123456789abcdefABCDEF]{64}$');
-    if (!regExp.test(hexValue)) {
-      // check https://github.com/multiformats/js-cid
-      errors.push(`${hexFieldNm}:'${hexValue}' not 64 hex characters after prefix 1220, ${hexValue.length}`);
-      return false;
-    } else {
-      const representativeFieldNm = `${outFieldNmPrefix}representative`;
-      const representativeAccountFieldNm = `${outFieldNmPrefix}representative_account`;
-      json[representativeFieldNm] = hexValue.substring(4);
-      json[representativeAccountFieldNm] = await bananojs.getBananoAccount(json[representativeFieldNm]);
-      return success;
-    }
   }
 };
 

scripts/ipfs-util.js

@@ -152,11 +152,11 @@ window.hideOwnerAssetCheckWrappers = () => {
 window.showGalleryWrappers = () => {
   hide('navigationWrapper');
   show('galleryWrapper');
-}
+};
 
 window.hideGalleryWrappers = () => {
   show('navigationWrapper');
   hide('galleryWrapper');
-}
+};
 
 export {addNavigation};

static-html/actions/navigation.js

@@ -62,7 +62,6 @@ describe(actionUtil.ACTION, () => {
     const expectedResponse = {
       content_type: 'application/json',
       ipfs_cid: goodIpfsCid,
-      representative: '1d2c906def1e5e04841de91c8b65e0f37c30a3d45c6a2c454fd332d2906f8d57',
       representative_account: 'ban_19bek3pyy9ky1k43utawjfky3wuw84jxaq5c7j4nznsktca8z5cqrfg8egjn',
       json: {
         command: 'nft_template',

test/unit/get-nft-info-test.js

@@ -787,7 +787,7 @@ describe(actionUtil.ACTION, () => {
         'unsupported version:\'\' supported versions:["0.0.1"]',
         'max_supply:\'\' not an integer',
         'transferable:\'\' not a boolean',
-        'art_data_ipfs_cid:\'\' not Qm+base58',
+        'art_data_ipfs_cid:\'\' error \'ipfs_cid:\'\' not valid v0 CID (Qm+base58)\'',
         'previous:\'\' not 64 hex characters',
       ],
       ipfs_cid: badJsonIpfsCid,
@@ -846,7 +846,7 @@ describe(actionUtil.ACTION, () => {
     const expectedResponse = {
       'content_type': 'application/json',
       'errors': [
-        'art_data_ipfs_cid:\'Qm#\' not Qm+base58',
+        'art_data_ipfs_cid:\'Qm#\' error \'ipfs_cid:\'Qm#\' not valid v0 CID (Qm+base58)\'',
         'previous:\'AB\' not 64 hex characters',
       ],
       'ipfs_cid': badJsonBase58Cid,
@@ -877,15 +877,13 @@ describe(actionUtil.ACTION, () => {
     const expectedResponse = {
       'content_type': 'application/json',
       'errors': [
-        'art_ipfs_cid_hex:\'500080c4b27277b22c373e4f0dbbc86091707c6cc1745a1b3efcf66664bbde9ceb\' not 64 hex characters after prefix 1220, 66',
+        'art_data_ipfs_cid:\'QmQJXwo7Ee1cgP2QVRMQGrgz29knQrUMfciq2wQWAvdzz\' error \'ipfsCidHex:\'500080c4b27277b22c373e4f0dbbc86091707c6cc1745a1b3efcf66664bbde9ceb\' not 64 hex chars after prefix 1220, 66\'',
         'previous:\'AB\' not 64 hex characters',
       ],
       'ipfs_cid': badJsonBase58ShortCid,
       'json': {
         'command': 'nft_template',
         'art_data_ipfs_cid': 'QmQJXwo7Ee1cgP2QVRMQGrgz29knQrUMfciq2wQWAvdzz',
-        'art_ipfs_cid_hex': '500080c4b27277b22c373e4f0dbbc86091707c6cc1745a1b3efcf66664bbde9ceb',
-        'art_ipfs_cid_hex_base58': 'QmQJXwo7Ee1cgP2QVRMQGrgz29knQrUMfciq2wQWAvdzz',
         'issuer': '',
         'max_supply': '1',
         'previous': 'AB',