Merge pull request #2376 from Emurgo/chore/token-and-nft-count-method

Function for counting token and NFT types
Emurgo · Oct 8, 2021 · 4802444 · 4802444
2 parents 14aed31 + 73c720a
commit 4802444
Show file tree

Hide file tree

Showing 37 changed files with 353 additions and 7 deletions.
diff --git a/packages/yoroi-extension/app/api/ada/index.js b/packages/yoroi-extension/app/api/ada/index.js
@@ -142,6 +142,7 @@ import type {
   AccountStateFunc,
   AddressUtxoFunc,
   TokenInfoFunc,
+  MultiAssetMintMetadataFunc
 } from './lib/state-fetch/types';
 import type {
   FilterFunc,
@@ -252,6 +253,7 @@ export type AdaGetTransactionsRequest = {|
   checkAddressesInUse: FilterFunc,
   getBestBlock: BestBlockFunc,
   getTokenInfo: TokenInfoFunc,
+  getMultiAssetMetadata: MultiAssetMintMetadataFunc,
 |};
 
 // notices
@@ -658,6 +660,7 @@ export default class AdaApi {
           request.getTransactionsHistoryForAddresses,
           request.getBestBlock,
           request.getTokenInfo,
+          request.getMultiAssetMetadata
         );
       }
       const fetchedTxs = await getAllTransactions({

diff --git a/packages/yoroi-extension/app/api/ada/lib/state-fetch/IFetcher.js b/packages/yoroi-extension/app/api/ada/lib/state-fetch/IFetcher.js
@@ -12,6 +12,7 @@ import type {
   CatalystRoundInfoRequest, CatalystRoundInfoResponse,
   BestBlockRequest, BestBlockResponse,
   TokenInfoRequest, TokenInfoResponse,
+  MultiAssetMintMetadataRequest, MultiAssetMintMetadataResponse,
 } from './types';
 import type {
   FilterUsedRequest, FilterUsedResponse,
@@ -30,4 +31,6 @@ export interface IFetcher {
   getCatalystRoundInfo(body: CatalystRoundInfoRequest): Promise<CatalystRoundInfoResponse>;
   getTokenInfo(body: TokenInfoRequest): Promise<TokenInfoResponse>;
   checkAddressesInUse(body: FilterUsedRequest): Promise<FilterUsedResponse>;
+  getMultiAssetMintMetadata(body: MultiAssetMintMetadataRequest)
+    : Promise<MultiAssetMintMetadataResponse>;
 }
diff --git a/packages/yoroi-extension/app/api/ada/lib/state-fetch/batchedFetcher.js b/packages/yoroi-extension/app/api/ada/lib/state-fetch/batchedFetcher.js
@@ -18,6 +18,8 @@ import type {
   TxBodiesFunc,
   UtxoSumFunc,
   RemoteTransaction,
+  MultiAssetMintMetadataRequest,
+  MultiAssetMintMetadataResponse
 } from './types';
 import type {
   FilterFunc, FilterUsedRequest, FilterUsedResponse,
@@ -97,6 +99,11 @@ export class BatchedFetcher implements IFetcher {
     this.baseFetcher.sendTx(body)
   )
 
+  getMultiAssetMintMetadata: MultiAssetMintMetadataRequest
+    => Promise<MultiAssetMintMetadataResponse> = (body) => (
+    this.baseFetcher.getMultiAssetMintMetadata(body)
+  )
+
   getAccountState: AccountStateRequest => Promise<AccountStateResponse> = (body) => (
     batchGetAccountState(this.baseFetcher.getAccountState)(body)
   )

diff --git a/packages/yoroi-extension/app/api/ada/lib/state-fetch/mockNetwork.js b/packages/yoroi-extension/app/api/ada/lib/state-fetch/mockNetwork.js
@@ -13,6 +13,7 @@ import type {
   SignedRequestInternal,
   RemoteTransactionInput,
   TokenInfoFunc,
+  MultiAssetMintMetadataFunc
 } from './types';
 import type {
   FilterUsedRequest, FilterUsedResponse, FilterFunc,
@@ -672,3 +673,8 @@ export function genGetTokenInfo(
 ): TokenInfoFunc {
   return async (_) => ({});
 }
+
+export function genGetMultiAssetMetadata(
+): MultiAssetMintMetadataFunc {
+  return async (_) => ({});
+}
diff --git a/packages/yoroi-extension/app/api/ada/lib/state-fetch/remoteFetcher.js b/packages/yoroi-extension/app/api/ada/lib/state-fetch/remoteFetcher.js
@@ -25,6 +25,8 @@ import type {
   UtxoSumResponse,
   CatalystRoundInfoRequest,
   CatalystRoundInfoResponse,
+  MultiAssetMintMetadataRequest,
+  MultiAssetMintMetadataResponse,
 } from './types';
 import type { FilterUsedRequest, FilterUsedResponse, } from '../../../common/lib/state-fetch/currencySpecificTypes';
 
@@ -427,4 +429,23 @@ export class RemoteFetcher implements IFetcher {
         throw new GetCatalystRoundInfoApiError();
       });
   }
+
+  getMultiAssetMintMetadata: MultiAssetMintMetadataRequest
+    => Promise<MultiAssetMintMetadataResponse> = async (body) => {
+      const { BackendService } = body.network.Backend;
+      if (BackendService == null) throw new Error(`${nameof(this.getMultiAssetMintMetadata)} missing backend url`);
+      return await axios(
+        `${BackendService}/api/multiAsset/metadata`,
+        {
+          method: 'post',
+          data: {
+            assets: body.assets
+          }
+        }
+      ).then(response => response.data)
+      .catch((error) => {
+        Logger.error(`${nameof(RemoteFetcher)}::${nameof(this.getMultiAssetMintMetadata)} error: ` + stringifyError(error));
+        return {};
+      });
+  }
 }
diff --git a/packages/yoroi-extension/app/api/ada/lib/state-fetch/types.js b/packages/yoroi-extension/app/api/ada/lib/state-fetch/types.js
@@ -360,4 +360,28 @@ export type CatalystRoundInfoResponse = {|
 |};
 
 export type CatalystRoundInfoFunc = (body: CatalystRoundInfoRequest)
-                                      => Promise<CatalystRoundInfoResponse>;
+                                      => Promise<CatalystRoundInfoResponse>;
+
+// Multi Asset Mint Metadata
+
+export type MultiAssetMintMetadataFunc = (body: MultiAssetMintMetadataRequest)
+  => Promise<MultiAssetMintMetadataResponse>;
+
+export type MultiAssetMintMetadataRequest = {|
+  ...BackendNetworkInfo,
+  assets: MultiAssetMintMetadataRequestAsset[]
+|};
+
+export type MultiAssetMintMetadataRequestAsset = {|
+  name: string,
+  policy: string
+|}
+
+export type MultiAssetMintMetadataResponse = {|
+  ...{[key: string]: MultiAssetMintMetadataResponseAsset[]}
+|}
+
+export type MultiAssetMintMetadataResponseAsset = {|
+  key: string,
+  metadata: {[key: string]: any}
+|}
diff --git a/...roi-extension/app/api/ada/lib/storage/bridge/tests/__snapshots__/multiwallet.test.js.snap b/...roi-extension/app/api/ada/lib/storage/bridge/tests/__snapshots__/multiwallet.test.js.snap
@@ -582,6 +582,7 @@ Array [
         "Digest": 6.262633522161549e-167,
         "Identifier": "",
         "IsDefault": true,
+        "IsNFT": false,
         "Metadata": Object {
           "assetName": "",
           "longName": null,
@@ -597,6 +598,7 @@ Array [
         "Digest": 6.262633522161549e-167,
         "Identifier": "",
         "IsDefault": true,
+        "IsNFT": false,
         "Metadata": Object {
           "assetName": "",
           "longName": null,
@@ -612,6 +614,7 @@ Array [
         "Digest": 6.262633522161549e-167,
         "Identifier": "",
         "IsDefault": true,
+        "IsNFT": false,
         "Metadata": Object {
           "boxId": "",
           "description": null,
@@ -628,6 +631,7 @@ Array [
         "Digest": 6.262633522161549e-167,
         "Identifier": "",
         "IsDefault": true,
+        "IsNFT": false,
         "Metadata": Object {
           "assetName": "",
           "longName": null,
@@ -643,6 +647,7 @@ Array [
         "Digest": 6.262633522161549e-167,
         "Identifier": "",
         "IsDefault": true,
+        "IsNFT": false,
         "Metadata": Object {
           "assetName": "",
           "longName": null,

diff --git a/...s/yoroi-extension/app/api/ada/lib/storage/bridge/tests/__snapshots__/shelley.test.js.snap b/...s/yoroi-extension/app/api/ada/lib/storage/bridge/tests/__snapshots__/shelley.test.js.snap
@@ -439,6 +439,7 @@ Array [
         "Digest": 6.262633522161549e-167,
         "Identifier": "",
         "IsDefault": true,
+        "IsNFT": false,
         "Metadata": Object {
           "assetName": "",
           "longName": null,
@@ -454,6 +455,7 @@ Array [
         "Digest": 6.262633522161549e-167,
         "Identifier": "",
         "IsDefault": true,
+        "IsNFT": false,
         "Metadata": Object {
           "assetName": "",
           "longName": null,
@@ -469,6 +471,7 @@ Array [
         "Digest": 6.262633522161549e-167,
         "Identifier": "",
         "IsDefault": true,
+        "IsNFT": false,
         "Metadata": Object {
           "boxId": "",
           "description": null,
@@ -485,6 +488,7 @@ Array [
         "Digest": 6.262633522161549e-167,
         "Identifier": "",
         "IsDefault": true,
+        "IsNFT": false,
         "Metadata": Object {
           "assetName": "",
           "longName": null,
@@ -500,6 +504,7 @@ Array [
         "Digest": 6.262633522161549e-167,
         "Identifier": "",
         "IsDefault": true,
+        "IsNFT": false,
         "Metadata": Object {
           "assetName": "",
           "longName": null,

diff --git a/...yoroi-extension/app/api/ada/lib/storage/bridge/tests/__snapshots__/simpleTxs.test.js.snap b/...yoroi-extension/app/api/ada/lib/storage/bridge/tests/__snapshots__/simpleTxs.test.js.snap
@@ -443,6 +443,7 @@ Array [
         "Digest": 6.262633522161549e-167,
         "Identifier": "",
         "IsDefault": true,
+        "IsNFT": false,
         "Metadata": Object {
           "assetName": "",
           "longName": null,
@@ -458,6 +459,7 @@ Array [
         "Digest": 6.262633522161549e-167,
         "Identifier": "",
         "IsDefault": true,
+        "IsNFT": false,
         "Metadata": Object {
           "assetName": "",
           "longName": null,
@@ -473,6 +475,7 @@ Array [
         "Digest": 6.262633522161549e-167,
         "Identifier": "",
         "IsDefault": true,
+        "IsNFT": false,
         "Metadata": Object {
           "boxId": "",
           "description": null,
@@ -489,6 +492,7 @@ Array [
         "Digest": 6.262633522161549e-167,
         "Identifier": "",
         "IsDefault": true,
+        "IsNFT": false,
         "Metadata": Object {
           "assetName": "",
           "longName": null,
@@ -504,6 +508,7 @@ Array [
         "Digest": 6.262633522161549e-167,
         "Identifier": "",
         "IsDefault": true,
+        "IsNFT": false,
         "Metadata": Object {
           "assetName": "",
           "longName": null,

diff --git a/...es/yoroi-extension/app/api/ada/lib/storage/bridge/tests/__snapshots__/status.test.js.snap b/...es/yoroi-extension/app/api/ada/lib/storage/bridge/tests/__snapshots__/status.test.js.snap
@@ -899,6 +899,7 @@ Array [
         "Digest": 6.262633522161549e-167,
         "Identifier": "",
         "IsDefault": true,
+        "IsNFT": false,
         "Metadata": Object {
           "assetName": "",
           "longName": null,
@@ -914,6 +915,7 @@ Array [
         "Digest": 6.262633522161549e-167,
         "Identifier": "",
         "IsDefault": true,
+        "IsNFT": false,
         "Metadata": Object {
           "assetName": "",
           "longName": null,
@@ -929,6 +931,7 @@ Array [
         "Digest": 6.262633522161549e-167,
         "Identifier": "",
         "IsDefault": true,
+        "IsNFT": false,
         "Metadata": Object {
           "boxId": "",
           "description": null,
@@ -945,6 +948,7 @@ Array [
         "Digest": 6.262633522161549e-167,
         "Identifier": "",
         "IsDefault": true,
+        "IsNFT": false,
         "Metadata": Object {
           "assetName": "",
           "longName": null,
@@ -960,6 +964,7 @@ Array [
         "Digest": 6.262633522161549e-167,
         "Identifier": "",
         "IsDefault": true,
+        "IsNFT": false,
         "Metadata": Object {
           "assetName": "",
           "longName": null,
@@ -2062,6 +2067,7 @@ Array [
         "Digest": 6.262633522161549e-167,
         "Identifier": "",
         "IsDefault": true,
+        "IsNFT": false,
         "Metadata": Object {
           "assetName": "",
           "longName": null,
@@ -2077,6 +2083,7 @@ Array [
         "Digest": 6.262633522161549e-167,
         "Identifier": "",
         "IsDefault": true,
+        "IsNFT": false,
         "Metadata": Object {
           "assetName": "",
           "longName": null,
@@ -2092,6 +2099,7 @@ Array [
         "Digest": 6.262633522161549e-167,
         "Identifier": "",
         "IsDefault": true,
+        "IsNFT": false,
         "Metadata": Object {
           "boxId": "",
           "description": null,
@@ -2108,6 +2116,7 @@ Array [
         "Digest": 6.262633522161549e-167,
         "Identifier": "",
         "IsDefault": true,
+        "IsNFT": false,
         "Metadata": Object {
           "assetName": "",
           "longName": null,
@@ -2123,6 +2132,7 @@ Array [
         "Digest": 6.262633522161549e-167,
         "Identifier": "",
         "IsDefault": true,
+        "IsNFT": false,
         "Metadata": Object {
           "assetName": "",
           "longName": null,