Merge 5083d39 into a33938c

Cryptonomic · Jul 27, 2020 · a35e248 · a35e248
2 parents a33938c + 5083d39
commit a35e248
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 18 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/chain/tezos/TezosNodeWriter.ts b/src/chain/tezos/TezosNodeWriter.ts
@@ -653,9 +653,8 @@ export namespace TezosNodeWriter {
     /**
      * Dry run the given operation and return consumed resources. 
      * 
-     * Note: Estimating an operation on an unrevealed account is not supported and will fail.
-     *
-     * TODO: Add support for estimating multiple operations so that reveals can be processed.
+     * Note: Estimating an operation on an unrevealed account is not supported and will fail. Use
+     *       `estimateOperations` instead.
      * 
      * @param {string} server Tezos node to connect to
      * @param {string} chainid The chain ID to apply the operation on. 
@@ -666,12 +665,28 @@ export namespace TezosNodeWriter {
         server: string,
         chainid: string,
         operation: TezosP2PMessageTypes.Operation
+    ): Promise<{ gas: number, storageCost: number }> {
+        return estimateOperations(server, chainid, [operation])
+    }
+
+    /**
+     * Dry run the given operations and return consumed resources. 
+     * 
+     * @param {string} server Tezos node to connect to
+     * @param {string} chainid The chain ID to apply the operation on. 
+     * @param {TezosP2PMessageTypes.Operation} operations An array of operations to estimate.
+     * @returns A two-element object gas and storage costs. Throws an error if one was encountered.
+     */
+    export async function estimateOperations(
+        server: string,
+        chainid: string,
+        operations: Array<TezosP2PMessageTypes.Operation>
     ): Promise<{ gas: number, storageCost: number }> {
         const fake_signature = 'edsigu6xFLH2NpJ1VcYshpjW99Yc1TAL1m2XBqJyXrxcZQgBMo8sszw2zm626yjpA3pWMhjpsahLrWdmvX9cqhd4ZEUchuBuFYy';
         const fake_chainid = 'NetXdQprcVkpaWU';
         const fake_branch = 'BL94i2ShahPx3BoNs6tJdXDdGeoJ9ukwujUA2P8WJwULYNdimmq';
 
-        const response = await performPostRequest(server, `chains/${chainid}/blocks/head/helpers/scripts/run_operation`, { chain_id: fake_chainid, operation: { branch: fake_branch, contents: [operation], signature: fake_signature } });
+        const response = await performPostRequest(server, `chains/${chainid}/blocks/head/helpers/scripts/run_operation`, { chain_id: fake_chainid, operation: { branch: fake_branch, contents: operations, signature: fake_signature } });
         const responseText = await response.text();
 
         parseRPCError(responseText);