Merge 20c0629 into e280b3e

package.json

@@ -1,6 +1,6 @@
 {
   "name": "conseiljs",
-  "version": "5.0.5",
+  "version": "5.0.6",
   "description": "Client-side library for Tezos dApp development.",
   "browser": "dist/index-web.js",
   "main": "dist/index.js",

src/chain/tezos/TezosMessageUtil.ts

@@ -552,4 +552,48 @@ export namespace TezosMessageUtils {
 
         return n.toJSNumber();
     }
+
+    /**
+     * Calculate the address of a contract that was originated.
+     *
+     * @param operationHash The operation group hash.
+     * @param index The index of the origination operation in the operation group.
+     */
+    export function calculateContractAddress(operationHash: string, index: number): string {
+        // Decode and slice two byte prefix off operation hash.
+        const decoded: Uint8Array = base58check.decode(operationHash).slice(2)
+
+        // Merge the decoded buffer with the operation prefix.
+        let decodedAndOperationPrefix: Array<number> = []
+        for (let i = 0; i < decoded.length; i++) {
+            decodedAndOperationPrefix.push(decoded[i])
+        }
+        decodedAndOperationPrefix = decodedAndOperationPrefix.concat([
+            (index & 0xff000000) >> 24,
+            (index & 0x00ff0000) >> 16,
+            (index & 0x0000ff00) >> 8,
+            index & 0x000000ff,
+        ])
+
+        // Hash and encode.
+        const hash = blakejs.blake2b(new Uint8Array(decodedAndOperationPrefix), null, 20)
+        const smartContractAddressPrefix = new Uint8Array([2, 90, 121]) // KT1
+        const prefixedBytes = mergeBytes(smartContractAddressPrefix, hash)
+        return base58check.encode(prefixedBytes)
+    }
+
+    /**
+     * Helper to merge two Uint8Arrays.
+     * 
+     * @param a The first array.
+     * @param b The second array.
+     * @returns A new array that contains b appended to the end of a.
+     */
+    function mergeBytes(a: Uint8Array, b: Uint8Array): Uint8Array {
+        const merged = new Uint8Array(a.length + b.length)
+        merged.set(a)
+        merged.set(b, a.length)
+
+        return merged
+    }
 }

src/chain/tezos/TezosNodeWriter.ts

@@ -50,11 +50,10 @@ export namespace TezosNodeWriter {
      */
     // TODO: move to an appropriate place
     export function forgeOperations(branch: string, operations: TezosP2PMessageTypes.Operation[]): string {
-        log.debug('TezosNodeWriter.forgeOperations:');
-        log.debug(JSON.stringify(operations));
+        log.debug(`TezosNodeWriter.forgeOperations: ${JSON.stringify(operations)}`);
         let encoded = TezosMessageUtils.writeBranch(branch);
         operations.forEach(m => encoded += TezosMessageCodec.encodeOperation(m));
-
+        log.debug(`TezosNodeWriter.forgeOperations: ${encoded}`);
         return encoded;
     }
 
@@ -649,12 +648,8 @@ export namespace TezosNodeWriter {
             storageCost: resources.storageCost + fixedOriginationStorageCost
         }
     }
-
     /**
-     * Dry run the given operation and return consumed resources. 
-     * 
-     * Note: Estimating an operation on an unrevealed account is not supported and will fail. Remember to prepend
-     * the Reveal operation if required.
+     * Dry run the given operation
      * 
      * @param {string} server Tezos node to connect to
      * @param {string} chainid The chain ID to apply the operation on. 
@@ -666,16 +661,7 @@ export namespace TezosNodeWriter {
         chainid: string,
         ...operations: 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: operations, signature: fake_signature } });
-        const responseText = await response.text();
-
-        parseRPCError(responseText);
-
-        const responseJSON = JSON.parse(responseText);
+        const responseJSON = dryRunOperation(server, chainid, ...operations);
 
         let gas = 0;
         let storageCost = 0;
@@ -701,6 +687,36 @@ export namespace TezosNodeWriter {
         return { gas, storageCost };
     }
 
+    /**
+     * Dry run the given operation and return consumed resources.
+     *
+     * Note: Estimating an operation on an unrevealed account is not supported and will fail. Remember to prepend
+     * the Reveal operation if required.
+
+     * @param {string} server Tezos node to connect to
+     * @param {string} chainid The chain ID to apply the operation on.
+     * @param {TezosP2PMessageTypes.Operation} operations A set of operations to update.
+     * @returns {Promise<object>} JSON-encoded response
+     */
+    export async function dryRunOperation(
+        server: string,
+        chainid: string,
+        ...operations: TezosP2PMessageTypes.Operation[]
+    ): Promise<Response> {
+        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: operations, signature: fake_signature } });
+        const responseText = await response.text();
+
+        parseRPCError(responseText);
+
+        const responseJSON = JSON.parse(responseText);
+
+        return responseJSON;
+    }
+
     /**
      * This function checks if the server response contains an error. There are multiple formats for errors coming
      * back from the server, this method attempts to normalized them for downstream parsing.