fix: too much resource information & deposit batch error

BeakerTools · Apr 25, 2024 · bb04140 · bb04140
1 parent 7d868c0
commit bb04140
Show file tree

Hide file tree

Showing 2 changed files with 113 additions and 92 deletions.
diff --git a/src/GatewayProcessor/GatewayProcessor.ts b/src/GatewayProcessor/GatewayProcessor.ts
@@ -267,103 +267,26 @@ export class GatewayProcessor {
     resource_addresses: ResourceAddress[],
   ): Promise<Map<ResourceAddress, ResourceInformation>> {
     let resource_map = new Map<ResourceAddress, ResourceInformation>();
-
-    let resp = await this.entityDetails(resource_addresses);
-    resp.items.forEach((item) => {
-      if (item.details) {
-        let name: string | undefined;
-        let description: string | undefined;
-        let icon: string | undefined;
-        let symbol: string | undefined;
-
-        item.metadata.items.forEach((metadata) => {
-          switch (metadata.key) {
-            case "name": {
-              if (metadata.value.programmatic_json.kind === "String") {
-                name = metadata.value.programmatic_json.value;
-              } else if (metadata.value.programmatic_json.kind === "Enum") {
-                let field = metadata.value.programmatic_json.fields[0]!;
-                if (field.kind === "String") {
-                  name = field.value.toString();
-                }
-              }
-              break;
-            }
-            case "description": {
-              if (metadata.value.programmatic_json.kind === "String") {
-                description = metadata.value.programmatic_json.value;
-              } else if (metadata.value.programmatic_json.kind === "Enum") {
-                let field = metadata.value.programmatic_json.fields[0]!;
-                if (field.kind === "String") {
-                  description = field.value.toString();
-                }
-              }
-              break;
-            }
-            case "icon_url": {
-              if (metadata.value.programmatic_json.kind === "Enum") {
-                let field = metadata.value.programmatic_json.fields[0]!;
-                if (field.kind === "String") {
-                  icon = field.value.toString();
-                }
-              } else if (metadata.value.programmatic_json.kind === "String") {
-                icon = metadata.value.programmatic_json.value;
-              }
-              break;
-            }
-            case "symbol": {
-              if (metadata.value.programmatic_json.kind === "String") {
-                symbol = metadata.value.programmatic_json.value;
-              } else if (metadata.value.programmatic_json.kind === "Enum") {
-                let field = metadata.value.programmatic_json.fields[0]!;
-                if (field.kind === "String") {
-                  symbol = field.value.toString();
-                }
-              }
-            }
-          }
-        });
-
-        if (name) {
-          switch (item.details.type) {
-            case "NonFungibleResource": {
-              resource_map.set(item.address, {
-                type: "NonFungible",
-                information: {
-                  name: name,
-                  address: item.address,
-                  description: description,
-                  icon: icon,
-                },
-              });
-              break;
-            }
-            case "FungibleResource": {
-              resource_map.set(item.address, {
-                type: "Fungible",
-                information: {
-                  name: name,
-                  address: item.address,
-                  description: description,
-                  icon: icon,
-                  symbol: symbol,
-                },
-              });
-              break;
-            }
-          }
-        }
-      }
-    });
-
-    return resource_map;
+    const batches = divideInBatches(resource_addresses, 20);
+    const limit = pLimit(this._concurrencyLimit);
+    await Promise.all(
+        batches.map(async (batch) => {
+          const items = await limit( () => {
+            return this.limitedResourcesInformation(batch)
+          });
+          items.forEach((value, key) => {
+            resource_map.set(key, value)
+          })
+        }),
+    );
+    return resource_map
   }
 
   /**
    * Retrieves fungibles resources associated with specified component address.
    * @param entity Address of the component.
    */
-  async getFungibleResourcesHeldBy(
+   async getFungibleResourcesHeldBy(
     entity: ComponentAddress,
   ): Promise<FungibleResource[]> {
     const resp = await this.entityDetails([entity]);
@@ -626,6 +549,104 @@ export class GatewayProcessor {
     );
   }
 
+  /**
+   * Takes up to 20 resource addresses as input
+   */
+  private async limitedResourcesInformation(resource_addresses: ResourceAddress[]): Promise<Map<ResourceAddress, ResourceInformation>>{
+    let resource_map = new Map<ResourceAddress, ResourceInformation>();
+
+    let resp = await this.entityDetails(resource_addresses);
+    resp.items.forEach((item) => {
+      if (item.details) {
+        let name: string | undefined;
+        let description: string | undefined;
+        let icon: string | undefined;
+        let symbol: string | undefined;
+
+        item.metadata.items.forEach((metadata) => {
+          switch (metadata.key) {
+            case "name": {
+              if (metadata.value.programmatic_json.kind === "String") {
+                name = metadata.value.programmatic_json.value;
+              } else if (metadata.value.programmatic_json.kind === "Enum") {
+                let field = metadata.value.programmatic_json.fields[0]!;
+                if (field.kind === "String") {
+                  name = field.value.toString();
+                }
+              }
+              break;
+            }
+            case "description": {
+              if (metadata.value.programmatic_json.kind === "String") {
+                description = metadata.value.programmatic_json.value;
+              } else if (metadata.value.programmatic_json.kind === "Enum") {
+                let field = metadata.value.programmatic_json.fields[0]!;
+                if (field.kind === "String") {
+                  description = field.value.toString();
+                }
+              }
+              break;
+            }
+            case "icon_url": {
+              if (metadata.value.programmatic_json.kind === "Enum") {
+                let field = metadata.value.programmatic_json.fields[0]!;
+                if (field.kind === "String") {
+                  icon = field.value.toString();
+                }
+              } else if (metadata.value.programmatic_json.kind === "String") {
+                icon = metadata.value.programmatic_json.value;
+              }
+              break;
+            }
+            case "symbol": {
+              if (metadata.value.programmatic_json.kind === "String") {
+                symbol = metadata.value.programmatic_json.value;
+              } else if (metadata.value.programmatic_json.kind === "Enum") {
+                let field = metadata.value.programmatic_json.fields[0]!;
+                if (field.kind === "String") {
+                  symbol = field.value.toString();
+                }
+              }
+            }
+          }
+        });
+
+        if (name) {
+          switch (item.details.type) {
+            case "NonFungibleResource": {
+              resource_map.set(item.address, {
+                type: "NonFungible",
+                information: {
+                  name: name,
+                  address: item.address,
+                  description: description,
+                  icon: icon,
+                },
+              });
+              break;
+            }
+            case "FungibleResource": {
+              resource_map.set(item.address, {
+                type: "Fungible",
+                information: {
+                  name: name,
+                  address: item.address,
+                  description: description,
+                  icon: icon,
+                  symbol: symbol,
+                },
+              });
+              break;
+            }
+          }
+        }
+      }
+    });
+
+    return resource_map;
+  }
+
+
   private async keyValueStoreData(
     kvs_address: string,
     keys: StateKeyValueStoreDataRequestKeyItem[],

diff --git a/src/StringManifest/MethodsHelper.ts b/src/StringManifest/MethodsHelper.ts
@@ -146,7 +146,7 @@ export function createProofOfAmount(
  * @param account Account where to deposit the resources.
  */
 export function depositBatch(account: AccountAddress): string {
-  return callMethod(account, "deposit_batch", [`Expression("ENTIRE_WORKTOP")`]);
+  return callMethod("deposit_batch", account, [`Expression("ENTIRE_WORKTOP")`]);
 }
 
 /**