@theqrl/hypc 0.0.2 → 0.2.0

package/linker.js

@@ -5,6 +5,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 const assert_1 = __importDefault(require("assert"));
 const js_sha3_1 = require("js-sha3");
 const helpers_1 = require("./common/helpers");
+const ADDRESS_HEX_LENGTH = 128;
+const ADDRESS_PREFIX = 'Q';
+const PREFIXED_ADDRESS_LENGTH = ADDRESS_HEX_LENGTH + ADDRESS_PREFIX.length;
+const PLACEHOLDER_MARKER_LENGTH = 4;
+const HASH_PLACEHOLDER_MARKER_LENGTH = 6;
+const PLACEHOLDER_BODY_LENGTH = ADDRESS_HEX_LENGTH - PLACEHOLDER_MARKER_LENGTH;
+const HASH_PLACEHOLDER_BODY_LENGTH = ADDRESS_HEX_LENGTH - HASH_PLACEHOLDER_MARKER_LENGTH;
 /**
  * Generates a new-style library placeholder from a fully-qualified library name.
  *
@@ -13,8 +20,15 @@ const helpers_1 = require("./common/helpers");
  *
  * @param fullyQualifiedLibraryName Fully qualified library name.
  */
+function libraryHash(fullyQualifiedLibraryName, length) {
+    let hash = (0, js_sha3_1.keccak256)(fullyQualifiedLibraryName);
+    while (hash.length < length) {
+        hash += (0, js_sha3_1.keccak256)(hash);
+    }
+    return hash.slice(0, length);
+}
 function libraryHashPlaceholder(fullyQualifiedLibraryName) {
-    return `$${(0, js_sha3_1.keccak256)(fullyQualifiedLibraryName).slice(0, 34)}$`;
+    return `$${libraryHash(fullyQualifiedLibraryName, HASH_PLACEHOLDER_BODY_LENGTH)}$`;
 }
 /**
  * Finds all placeholders corresponding to the specified library label and replaces them
@@ -30,9 +44,8 @@ function libraryHashPlaceholder(fullyQualifiedLibraryName) {
  *     It will **not** be padded with zeros if too short.
  */
 function replacePlaceholder(bytecode, label, address) {
-    // truncate to 36 characters
-    const truncatedName = label.slice(0, 36);
-    const libLabel = `__${truncatedName.padEnd(36, '_')}__`;
+    const truncatedName = label.slice(0, PLACEHOLDER_BODY_LENGTH);
+    const libLabel = `__${truncatedName.padEnd(PLACEHOLDER_BODY_LENGTH, '_')}__`;
     while (bytecode.indexOf(libLabel) >= 0) {
         bytecode = bytecode.replace(libLabel, address);
     }
@@ -44,14 +57,14 @@ function replacePlaceholder(bytecode, label, address) {
  * See [Library Linking](https://docs.soliditylang.org/en/latest/using-the-compiler.html#library-linking)
  * for a full explanation of the linking process.
  *
- * Example of a legacy placeholder: `__lib.hyp:L_____________________________`
- * Example of a new-style placeholder: `__$7484607a72fb0587588e5a1e608f0b16de$__`
+ * Example of an old-style placeholder: `__lib.hyp:L...__` padded to 64 bytes.
+ * Example of a new-style placeholder: `__$<122 hex characters>$__`
  *
- * @param bytecode Hex-encoded bytecode string. All 40-byte substrings starting and ending with
+ * @param bytecode Hex-encoded bytecode string. All 64-byte substrings starting and ending with
  *     `__` will be interpreted as placeholders.
  *
  * @param libraries Mapping between fully qualified library names and the hex-encoded
- *     addresses they should be replaced with. Addresses shorter than 40 characters are automatically padded with zeros.
+ *     addresses they should be replaced with.
  *
  * @returns bytecode Hex-encoded bytecode string with placeholders replaced with addresses.
  *    Note that some placeholders may remain in the bytecode if `libraries` does not provide addresses for all of them.
@@ -66,7 +79,7 @@ function linkBytecode(bytecode, libraries) {
             throw new Error(`No address provided for library ${fullyQualifiedLibraryName}`);
         }
         // API compatible with the standard JSON i/o
-        // {"lib.hyp": {"L": "Z..."}}
+        // {"lib.hyp": {"L": "Q..."}}
         if ((0, helpers_1.isObject)(libraryObjectOrAddress)) {
             for (const [unqualifiedLibraryName, address] of Object.entries(libraryObjectOrAddress)) {
                 librariesComplete[unqualifiedLibraryName] = address;
@@ -85,11 +98,13 @@ function linkBytecode(bytecode, libraries) {
     }
     for (const libraryName in librariesComplete) {
         let hexAddress = librariesComplete[libraryName];
-        if (!hexAddress.startsWith('Z') || hexAddress.length > 41) {
+        if (!hexAddress.startsWith(ADDRESS_PREFIX) ||
+            hexAddress.length !== PREFIXED_ADDRESS_LENGTH ||
+            !/^[0-9a-fA-F]+$/.test(hexAddress.slice(ADDRESS_PREFIX.length))) {
             throw new Error(`Invalid address specified for ${libraryName}`);
         }
-        // remove 0x prefix
-        hexAddress = hexAddress.slice(1).padStart(40, '0');
+        // remove address prefix
+        hexAddress = hexAddress.slice(ADDRESS_PREFIX.length);
         bytecode = replacePlaceholder(bytecode, libraryName, hexAddress);
         bytecode = replacePlaceholder(bytecode, libraryHashPlaceholder(libraryName), hexAddress);
     }
@@ -97,17 +112,17 @@ function linkBytecode(bytecode, libraries) {
 }
 /**
  * Finds locations of all library address placeholders in the hex-encoded bytecode.
- * Returns information in a format matching `zvm.bytecode.linkReferences` output
+ * Returns information in a format matching `qrvm.bytecode.linkReferences` output
  * in Standard JSON.
  *
  * See [Library Linking](https://docs.soliditylang.org/en/latest/using-the-compiler.html#library-linking)
  * for a full explanation of library placeholders and linking process.
  *
- * WARNING: The output matches `zvm.bytecode.linkReferences` exactly only in
+ * WARNING: The output matches `qrvm.bytecode.linkReferences` exactly only in
  * case of old-style placeholders created from fully qualified library names
  * of no more than 36 characters, and even then only if the name does not start
  * or end with an underscore. This is different from
- * `zvm.bytecode.linkReferences`, which uses fully qualified library names.
+ * `qrvm.bytecode.linkReferences`, which uses fully qualified library names.
  * This is a limitation of the placeholder format - the fully qualified names
  * are not preserved in the compiled bytecode and cannot be reconstructed
  * without external information.
@@ -116,37 +131,33 @@ function linkBytecode(bytecode, libraries) {
  *
  * @returns linkReferences A mapping between library labels and their locations
  * in the bytecode. In case of old-style placeholders the label is a fully
- * qualified library name truncated to 36 characters. For new-style placeholders
- * it's the first 34 characters of the hex-encoded hash of the fully qualified
- * library name, with a leading and trailing $ character added. Note that the
+ * qualified library name truncated to 124 characters. For new-style placeholders
+ * it's the address-width hash label of the fully qualified library name, with a leading
+ * and trailing $ character added. Note that the
  * offsets and lengths refer to the *binary* (not hex-encoded) bytecode, just
- * like in `zvm.bytecode.linkReferences`.
+ * like in `qrvm.bytecode.linkReferences`.
  */
 function findLinkReferences(bytecode) {
     (0, assert_1.default)(typeof bytecode === 'string');
-    // find 40 bytes in the pattern of __...<36 digits>...__
-    // e.g. __Lib.hyp:L_____________________________
+    // find 64-byte placeholders in the pattern of __...__
+    // e.g. __Lib.hyp:L_____________________________ or __$<122 hex digits>$__
     const linkReferences = {};
-    let offset = 0;
-    while (true) {
-        const found = bytecode.match(/__(.{36})__/);
-        if (!found) {
-            break;
-        }
+    const placeholderPattern = /__(.{124})__/g;
+    let found;
+    while ((found = placeholderPattern.exec(bytecode)) !== null) {
         const start = found.index;
+        const placeholder = found[1];
         // trim trailing underscores
         // NOTE: this has no way of knowing if the trailing underscore was part of the name
-        const libraryName = found[1].replace(/_+$/gm, '');
+        const libraryName = placeholder.replace(/_+$/gm, '');
         if (!linkReferences[libraryName]) {
             linkReferences[libraryName] = [];
         }
         // offsets are in bytes in binary representation (and not hex)
         linkReferences[libraryName].push({
-            start: (offset + start) / 2,
-            length: 20
+            start: start / 2,
+            length: ADDRESS_HEX_LENGTH / 2
         });
-        offset += start + 20;
-        bytecode = bytecode.slice(start + 20);
     }
     return linkReferences;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@theqrl/hypc",
-    "version": "0.0.2",
+    "version": "0.2.0",
     "description": "Hyperion compiler",
     "main": "index.js",
     "bin": {
@@ -15,10 +15,10 @@
         "prepack": "node build/pack-publish-block.js",
         "build:tarball": "npm run updateBinary && npm run build && BYPASS_SAFETY_CHECK=true npm pack ./dist",
         "publish:tarball": "tarball=$(npm run --silent tarballName) && ls \"$tarball\" && BYPASS_SAFETY_CHECK=true npm publish --access public \"$tarball\"",
-        "tarballName": "jq --raw-output '.name + \"-\" + .version + \".tgz\"' package.json",
+        "tarballName": "jq --raw-output '(.name | sub(\"@\"; \"\") | gsub(\"/\"; \"-\")) + \"-\" + .version + \".tgz\"' package.json",
         "copyTestFiles": "cp -r ./test/resources ./dist/test/",
         "pretest": "npm run lint && npm run build && npm run copyTestFiles",
-        "test": "cd dist && tape ./test/index.js",
+        "test": "cd dist && tape ./test/index.js --no-remote-versions",
         "coverage": "nyc npm run test",
         "coveralls": "npm run coverage && coveralls <coverage/lcov.info"
     },
@@ -27,7 +27,7 @@
         "url": "git+https://github.com/theQRL/hypc-js.git"
     },
     "keywords": [
-        "zond",
+        "qrl",
         "hyperion",
         "compiler"
     ],

package/test/cli.js

@@ -168,7 +168,7 @@ const __1 = __importDefault(require("../"));
             settings: {
                 outputSelection: {
                     '*': {
-                        '*': ['zvm.bytecode', 'userdoc']
+                        '*': ['qrvm.bytecode', 'userdoc']
                     }
                 }
             },

package/test/compiler.js

@@ -56,7 +56,7 @@ function runTests(hypc, versionText) {
     function getBytecodeStandard(output, fileName, contractName) {
         try {
             const outputFile = output.contracts[fileName];
-            return outputFile[contractName].zvm.bytecode.object;
+            return outputFile[contractName].qrvm.bytecode.object;
         }
         catch (e) {
             return '';
@@ -69,7 +69,7 @@ function runTests(hypc, versionText) {
                 [fileName, contractName] = resplitFileNameOnFirstColon(fileName, contractName);
             }
             const outputFile = output.contracts[fileName];
-            return outputFile[contractName].zvm.gasEstimates;
+            return outputFile[contractName].qrvm.gasEstimates;
         }
         catch (e) {
             return '';
@@ -314,7 +314,7 @@ function runTests(hypc, versionText) {
                     settings: {
                         outputSelection: {
                             '*': {
-                                '*': ['zvm.bytecode']
+                                '*': ['qrvm.bytecode']
                             }
                         }
                     },
@@ -329,7 +329,7 @@ function runTests(hypc, versionText) {
                 };
                 function bytecodeExists(output, fileName, contractName) {
                     try {
-                        return output.contracts[fileName][contractName].zvm.bytecode.object.length > 0;
+                        return output.contracts[fileName][contractName].qrvm.bytecode.object.length > 0;
                     }
                     catch (e) {
                         return false;
@@ -351,7 +351,7 @@ function runTests(hypc, versionText) {
                     settings: {
                         outputSelection: {
                             '*': {
-                                '*': ['zvm.bytecode']
+                                '*': ['qrvm.bytecode']
                             }
                         }
                     },
@@ -384,7 +384,7 @@ function runTests(hypc, versionText) {
                     settings: {
                         outputSelection: {
                             '*': {
-                                '*': ['zvm.bytecode']
+                                '*': ['qrvm.bytecode']
                             }
                         }
                     },
@@ -404,14 +404,13 @@ function runTests(hypc, versionText) {
                 }
                 function bytecodeExists(output, fileName, contractName) {
                     try {
-                        return output.contracts[fileName][contractName].zvm.bytecode.object.length > 0;
+                        return output.contracts[fileName][contractName].qrvm.bytecode.object.length > 0;
                     }
                     catch (e) {
                         return false;
                     }
                 }
                 const output = JSON.parse(hypc.lowlevel.compileStandard(JSON.stringify(input), { import: findImports }));
-                console.log(JSON.stringify(input));
                 st.ok(bytecodeExists(output, 'a.hyp', 'A'));
                 st.ok(bytecodeExists(output, 'b.hyp', 'B'));
                 st.end();
@@ -422,7 +421,7 @@ function runTests(hypc, versionText) {
                     settings: {
                         outputSelection: {
                             '*': {
-                                '*': ['zvm.bytecode', 'zvm.gasEstimates']
+                                '*': ['qrvm.bytecode', 'qrvm.gasEstimates']
                             }
                         }
                     },
@@ -459,7 +458,7 @@ function runTests(hypc, versionText) {
                     settings: {
                         outputSelection: {
                             '*': {
-                                '*': ['zvm.bytecode', 'zvm.gasEstimates']
+                                '*': ['qrvm.bytecode', 'qrvm.gasEstimates']
                             }
                         }
                     },
@@ -504,7 +503,7 @@ function runTests(hypc, versionText) {
                     settings: {
                         outputSelection: {
                             '*': {
-                                '*': ['zvm.bytecode', 'zvm.gasEstimates']
+                                '*': ['qrvm.bytecode', 'qrvm.gasEstimates']
                             }
                         }
                     },
@@ -533,7 +532,7 @@ function runTests(hypc, versionText) {
                     settings: {
                         outputSelection: {
                             '*': {
-                                '*': ['zvm.bytecode']
+                                '*': ['qrvm.bytecode']
                             }
                         }
                     },
@@ -574,12 +573,12 @@ function runTests(hypc, versionText) {
                     settings: {
                         libraries: {
                             'lib.hyp': {
-                                L: 'Z4200000000000000000000000000000000000001'
+                                L: 'Q42424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242'
                             }
                         },
                         outputSelection: {
                             '*': {
-                                '*': ['zvm.bytecode']
+                                '*': ['qrvm.bytecode']
                             }
                         }
                     },
@@ -609,7 +608,7 @@ function runTests(hypc, versionText) {
                     settings: {
                         outputSelection: {
                             '*': {
-                                '*': ['zvm.bytecode']
+                                '*': ['qrvm.bytecode']
                             }
                         }
                     },
@@ -634,12 +633,12 @@ function runTests(hypc, versionText) {
                     settings: {
                         libraries: {
                             'lib.hyp': {
-                                L: 'Z4200000000000000000000000000000000000001'
+                                L: 'Q42424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242'
                             }
                         },
                         outputSelection: {
                             '*': {
-                                '*': ['zvm.bytecode']
+                                '*': ['qrvm.bytecode']
                             }
                         }
                     },
@@ -695,7 +694,7 @@ function runTests(hypc, versionText) {
                     settings: {
                         outputSelection: {
                             '*': {
-                                '*': ['zvm.bytecode']
+                                '*': ['qrvm.bytecode']
                             }
                         }
                     },
@@ -718,7 +717,7 @@ function runTests(hypc, versionText) {
                     settings: {
                         outputSelection: {
                             '*': {
-                                '*': ['zvm.bytecode']
+                                '*': ['qrvm.bytecode']
                             }
                         }
                     },
@@ -755,7 +754,7 @@ function runTests(hypc, versionText) {
                         settings: {
                             outputSelection: {
                                 '*': {
-                                    '*': ['zvm.bytecode']
+                                    '*': ['qrvm.bytecode']
                                 }
                             }
                         },
@@ -778,7 +777,8 @@ runTests(__1.default, 'latest');
 if (!noRemoteVersions) {
     // New compiler interface features 0.0.1
     const versions = [
-        'v0.0.1+commit.360d2d0'
+        'v0.0.1+commit.360d2d05',
+        'v0.1.0+commit.4b493011'
     ];
     for (let version in versions) {
         version = versions[version];

package/test/linker.js

@@ -5,6 +5,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const tape_1 = __importDefault(require("tape"));
 const linker_1 = __importDefault(require("../linker"));
+const LIB_HYP_L_64_BYTE_HASH = '7b407da2c9e54c64181b59f93be76d2e1be3a7a0dd4078c3bae5ca6125235fe45e6d0232229f7006f00e49901dd0bb51b52ac3ea8beef0422713a65cf0';
+const LIB_HYP_L_64_BYTE_PLACEHOLDER = `__$${LIB_HYP_L_64_BYTE_HASH}$__`;
+const ADDRESS_64_BYTES = '42'.repeat(64);
+const PREFIXED_ADDRESS_64_BYTES = `Q${ADDRESS_64_BYTES}`;
+function oldStylePlaceholder(libraryName) {
+    return `__${libraryName.slice(0, 124).padEnd(124, '_')}__`;
+}
 (0, tape_1.default)('Link references', function (t) {
     t.test('Empty bytecode', function (st) {
         st.deepEqual(linker_1.default.findLinkReferences(''), {});
@@ -14,119 +21,68 @@ const linker_1 = __importDefault(require("../linker"));
         st.deepEqual(linker_1.default.findLinkReferences('6060604052341561000f57600080fd'), {});
         st.end();
     });
-    t.test('One reference', function (st) {
-        const bytecode = '6060604052341561000f57600080fd5b60f48061001d6000396000f300606060405260043610603e5763ffffffff7c010000000000000000000000000000000000000000000000000000000060003504166326121ff081146043575b600080fd5b3415604d57600080fd5b60536055565b005b73__lib2.hyp:L____________________________6326121ff06040518163ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040160006040518083038186803b151560b357600080fd5b6102c65a03f4151560c357600080fd5b5050505600a165627a7a723058207979b30bd4a07c77b02774a511f2a1dd04d7e5d65b5c2735b5fc96ad61d43ae40029';
-        st.deepEqual(linker_1.default.findLinkReferences(bytecode), { 'lib2.hyp:L': [{ start: 116, length: 20 }] });
+    t.test('One 64-byte hashed reference', function (st) {
+        const bytecode = `6060${LIB_HYP_L_64_BYTE_PLACEHOLDER}6060`;
+        st.deepEqual(linker_1.default.findLinkReferences(bytecode), { [`$${LIB_HYP_L_64_BYTE_HASH}$`]: [{ start: 2, length: 64 }] });
         st.end();
     });
-    t.test('Two references', function (st) {
-        const bytecode = '6060604052341561000f57600080fd5b61011a8061001e6000396000f30060606040526004361060255763ffffffff60e060020a60003504166326121ff08114602a575b600080fd5b3415603457600080fd5b603a603c565b005b73__lib2.hyp:L____________________________6326121ff06040518163ffffffff1660e060020a02815260040160006040518083038186803b1515608157600080fd5b6102c65a03f41515609157600080fd5b50505073__linkref.hyp:Lx________________________6326121ff06040518163ffffffff1660e060020a02815260040160006040518083038186803b151560d957600080fd5b6102c65a03f4151560e957600080fd5b5050505600a165627a7a72305820fdfb8eab411d7bc86d7dfbb0c985c30bebf1cc105dc5b807291551b3d5aa29d90029';
-        st.deepEqual(linker_1.default.findLinkReferences(bytecode), { 'lib2.hyp:L': [{ start: 92, length: 20 }], 'linkref.hyp:Lx': [{ start: 180, length: 20 }] });
+    t.test('One 64-byte old-style reference', function (st) {
+        const bytecode = `6060${oldStylePlaceholder('lib.hyp:L')}6060`;
+        st.deepEqual(linker_1.default.findLinkReferences(bytecode), { 'lib.hyp:L': [{ start: 2, length: 64 }] });
         st.end();
     });
-    t.test('Library name with leading underscore', function (st) {
-        const bytecode = '6060604052341561000f57600080fd5b60f48061001d6000396000f300606060405260043610603e5763ffffffff7c010000000000000000000000000000000000000000000000000000000060003504166326121ff081146043575b600080fd5b3415604d57600080fd5b60536055565b005b73__lib2.hyp:_L___________________________6326121ff06040518163ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040160006040518083038186803b151560b357600080fd5b6102c65a03f4151560c357600080fd5b5050505600a165627a7a7230582089689827bbf0b7dc385ffcb4b1deb9f9e61741f61f89b4af65f806ff2b0d73470029';
-        st.deepEqual(linker_1.default.findLinkReferences(bytecode), { 'lib2.hyp:_L': [{ start: 116, length: 20 }] });
-        st.end();
-    });
-    t.test('Library name with leading underscore (without fqdn)', function (st) {
-        const bytecode = '6060604052341561000f57600080fd5b60f48061001d6000396000f300606060405260043610603e5763ffffffff7c010000000000000000000000000000000000000000000000000000000060003504166326121ff081146043575b600080fd5b3415604d57600080fd5b60536055565b005b73___L____________________________________6326121ff06040518163ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040160006040518083038186803b151560b357600080fd5b6102c65a03f4151560c357600080fd5b5050505600a165627a7a7230582089689827bbf0b7dc385ffcb4b1deb9f9e61741f61f89b4af65f806ff2b0d73470029';
-        st.deepEqual(linker_1.default.findLinkReferences(bytecode), { _L: [{ start: 116, length: 20 }] });
-        st.end();
-    });
-    t.test('Library name with underscore in the name', function (st) {
-        const bytecode = '6060604052341561000f57600080fd5b60f48061001d6000396000f300606060405260043610603e5763ffffffff7c010000000000000000000000000000000000000000000000000000000060003504166326121ff081146043575b600080fd5b3415604d57600080fd5b60536055565b005b73__lib2.hyp:L_L__________________________6326121ff06040518163ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040160006040518083038186803b151560b357600080fd5b6102c65a03f4151560c357600080fd5b5050505600a165627a7a723058205cb324a27452cc7f8894a57cb0e3ddce2dce0c423e4fc993a3dd51287abd49110029';
-        st.deepEqual(linker_1.default.findLinkReferences(bytecode), { 'lib2.hyp:L_L': [{ start: 116, length: 20 }] });
-        st.end();
-    });
-    // Note: this is a case the reference finder cannot properly handle as there's no way to tell
-    t.test('Library name with trailing underscore', function (st) {
-        const bytecode = '6060604052341561000f57600080fd5b60f48061001d6000396000f300606060405260043610603e5763ffffffff7c010000000000000000000000000000000000000000000000000000000060003504166326121ff081146043575b600080fd5b3415604d57600080fd5b60536055565b005b73__lib2.hyp:L____________________________6326121ff06040518163ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040160006040518083038186803b151560b357600080fd5b6102c65a03f4151560c357600080fd5b5050505600a165627a7a7230582058e61511a603707222cfa83fd3ae4269f94eb86513cb9042cf0b44877403d85c0029';
-        st.deepEqual(linker_1.default.findLinkReferences(bytecode), { 'lib2.hyp:L': [{ start: 116, length: 20 }] });
-        st.end();
-    });
-    t.test('Invalid input (too short)', function (st) {
-        const bytecode = '6060604052341561000____66606060606060';
-        st.deepEqual(linker_1.default.findLinkReferences(bytecode), {});
+    t.test('Two references with same library name', function (st) {
+        const bytecode = `6060${oldStylePlaceholder('lib.hyp:L')}6060${oldStylePlaceholder('lib.hyp:L')}6060`;
+        st.deepEqual(linker_1.default.findLinkReferences(bytecode), { 'lib.hyp:L': [{ start: 2, length: 64 }, { start: 68, length: 64 }] });
         st.end();
     });
-    t.test('Invalid input (1 byte short)', function (st) {
-        const bytecode = '6060604052341561000__lib2.hyp:L___________________________66606060606060';
+    t.test('Invalid 20-byte reference is ignored', function (st) {
+        const bytecode = '6060__$7484607a72fb0587588e5a1e608f0b16de$__6060';
         st.deepEqual(linker_1.default.findLinkReferences(bytecode), {});
         st.end();
     });
-    t.test('Two references with same library name', function (st) {
-        const bytecode = '6060604052341561000f57600080fd5b61011a8061001e6000396000f30060606040526004361060255763ffffffff60e060020a60003504166326121ff08114602a575b600080fd5b3415603457600080fd5b603a603c565b005b73__lib2.hyp:L____________________________6326121ff06040518163ffffffff1660e060020a02815260040160006040518083038186803b1515608157600080fd5b6102c65a03f41515609157600080fd5b50505073__lib2.hyp:L____________________________6326121ff06040518163ffffffff1660e060020a02815260040160006040518083038186803b151560d957600080fd5b6102c65a03f4151560e957600080fd5b5050505600a165627a7a72305820fdfb8eab411d7bc86d7dfbb0c985c30bebf1cc105dc5b807291551b3d5aa29d90029';
-        st.deepEqual(linker_1.default.findLinkReferences(bytecode), { 'lib2.hyp:L': [{ start: 92, length: 20 }, { start: 180, length: 20 }] });
-        st.end();
-    });
 });
 (0, tape_1.default)('Linking', function (t) {
-    t.test('link properly', function (st) {
-        /*
-          'lib.hyp': 'library L { function f() public returns (uint) { return 7; } }',
-          'cont.hyp': 'import "lib.hyp"; contract x { function g() public { L.f(); } }'
-        */
-        let bytecode = '608060405234801561001057600080fd5b5061011f806100206000396000f300608060405260043610603f576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063e2179b8e146044575b600080fd5b348015604f57600080fd5b5060566058565b005b73__lib.hyp:L_____________________________6326121ff06040518163ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040160206040518083038186803b15801560b757600080fd5b505af415801560ca573d6000803e3d6000fd5b505050506040513d602081101560df57600080fd5b8101908080519060200190929190505050505600a165627a7a72305820ea2f6353179c181d7162544d637b7fe2d9e8da9803a0e2d9eafc2188d1d59ee30029';
-        bytecode = linker_1.default.linkBytecode(bytecode, { 'lib.hyp:L': 'Z123456' });
-        st.ok(bytecode.indexOf('_') < 0);
+    t.test('64-byte hashed placeholder', function (st) {
+        let bytecode = `6060${LIB_HYP_L_64_BYTE_PLACEHOLDER}6060`;
+        bytecode = linker_1.default.linkBytecode(bytecode, { 'lib.hyp:L': PREFIXED_ADDRESS_64_BYTES });
+        st.equal(bytecode, `6060${ADDRESS_64_BYTES}6060`);
         st.end();
     });
-    t.test('link properly with two-level configuration (from standard JSON)', function (st) {
-        /*
-          'lib.hyp': 'library L { function f() public returns (uint) { return 7; } }',
-          'cont.hyp': 'import "lib.hyp"; contract x { function g() public { L.f(); } }'
-        */
-        let bytecode = '608060405234801561001057600080fd5b5061011f806100206000396000f300608060405260043610603f576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063e2179b8e146044575b600080fd5b348015604f57600080fd5b5060566058565b005b73__lib.hyp:L_____________________________6326121ff06040518163ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040160206040518083038186803b15801560b757600080fd5b505af415801560ca573d6000803e3d6000fd5b505050506040513d602081101560df57600080fd5b8101908080519060200190929190505050505600a165627a7a72305820ea2f6353179c181d7162544d637b7fe2d9e8da9803a0e2d9eafc2188d1d59ee30029';
-        bytecode = linker_1.default.linkBytecode(bytecode, { 'lib.hyp': { L: 'Z123456' } });
-        st.ok(bytecode.indexOf('_') < 0);
+    t.test('64-byte old-style placeholder', function (st) {
+        let bytecode = `6060${oldStylePlaceholder('lib.hyp:L')}6060`;
+        bytecode = linker_1.default.linkBytecode(bytecode, { 'lib.hyp:L': PREFIXED_ADDRESS_64_BYTES });
+        st.equal(bytecode, `6060${ADDRESS_64_BYTES}6060`);
         st.end();
     });
-    t.test('linker to fail with missing library', function (st) {
-        /*
-          'lib.hyp': 'library L { function f() public returns (uint) { return 7; } }',
-          'cont.hyp': 'import "lib.hyp"; contract x { function g() public { L.f(); } }'
-        */
-        let bytecode = '608060405234801561001057600080fd5b5061011f806100206000396000f300608060405260043610603f576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063e2179b8e146044575b600080fd5b348015604f57600080fd5b5060566058565b005b73__lib.hyp:L_____________________________6326121ff06040518163ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040160206040518083038186803b15801560b757600080fd5b505af415801560ca573d6000803e3d6000fd5b505050506040513d602081101560df57600080fd5b8101908080519060200190929190505050505600a165627a7a72305820ea2f6353179c181d7162544d637b7fe2d9e8da9803a0e2d9eafc2188d1d59ee30029';
-        bytecode = linker_1.default.linkBytecode(bytecode, {});
-        st.ok(bytecode.indexOf('_') >= 0);
+    t.test('64-byte old-style placeholder with two-level configuration', function (st) {
+        let bytecode = `6060${oldStylePlaceholder('lib.hyp:L')}6060`;
+        bytecode = linker_1.default.linkBytecode(bytecode, { 'lib.hyp': { L: PREFIXED_ADDRESS_64_BYTES } });
+        st.equal(bytecode, `6060${ADDRESS_64_BYTES}6060`);
         st.end();
     });
-    t.test('linker to fail with invalid address', function (st) {
-        /*
-          'lib.hyp': 'library L { function f() public returns (uint) { return 7; } }',
-          'cont.hyp': 'import "lib.hyp"; contract x { function g() public { L.f(); } }'
-        */
-        const bytecode = '608060405234801561001057600080fd5b5061011f806100206000396000f300608060405260043610603f576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063e2179b8e146044575b600080fd5b348015604f57600080fd5b5060566058565b005b73__lib.hyp:L_____________________________6326121ff06040518163ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040160206040518083038186803b15801560b757600080fd5b505af415801560ca573d6000803e3d6000fd5b505050506040513d602081101560df57600080fd5b8101908080519060200190929190505050505600a165627a7a72305820ea2f6353179c181d7162544d637b7fe2d9e8da9803a0e2d9eafc2188d1d59ee30029';
-        st.throws(function () {
-            linker_1.default.linkBytecode(bytecode, { 'lib.hyp:L': '' });
-        });
+    t.test('missing library leaves placeholder unresolved', function (st) {
+        const bytecode = `6060${oldStylePlaceholder('lib.hyp:L')}6060`;
+        st.equal(linker_1.default.linkBytecode(bytecode, {}), bytecode);
         st.end();
     });
-    t.test('linker properly with truncated library name', function (st) {
-        /*
-          'lib.hyp': 'library L1234567890123456789012345678901234567890 { function f() public returns (uint) { return 7; } }',
-          'cont.hyp': 'import "lib.hyp"; contract x { function g() public { L1234567890123456789012345678901234567890.f(); } }'
-        */
-        let bytecode = '608060405234801561001057600080fd5b5061011f806100206000396000f300608060405260043610603f576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063e2179b8e146044575b600080fd5b348015604f57600080fd5b5060566058565b005b73__lib.hyp:L123456789012345678901234567__6326121ff06040518163ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040160206040518083038186803b15801560b757600080fd5b505af415801560ca573d6000803e3d6000fd5b505050506040513d602081101560df57600080fd5b8101908080519060200190929190505050505600a165627a7a723058209f88ff686bd8ceb0fc08853dc1332d5ff81dbcf5af3a1e9aa366828091761f8c0029';
-        bytecode = linker_1.default.linkBytecode(bytecode, { 'lib.hyp:L1234567890123456789012345678901234567890': 'Z123456' });
-        st.ok(bytecode.indexOf('_') < 0);
+    t.test('short address is invalid', function (st) {
+        const bytecode = `6060${oldStylePlaceholder('lib.hyp:L')}6060`;
+        st.throws(function () {
+            linker_1.default.linkBytecode(bytecode, { 'lib.hyp:L': 'Q123456' });
+        });
         st.end();
     });
-    t.test('hashed placeholder', function (st) {
-        let bytecode = '6060604052341561000__$7484607a72fb0587588e5a1e608f0b16de$__66606060606060';
-        bytecode = linker_1.default.linkBytecode(bytecode, { 'lib2.hyp:L': 'Z123456' });
-        st.equal(bytecode, '6060604052341561000000000000000000000000000000000000012345666606060606060');
+    t.test('non-hex address is invalid', function (st) {
+        const bytecode = `6060${oldStylePlaceholder('lib.hyp:L')}6060`;
+        st.throws(function () {
+            linker_1.default.linkBytecode(bytecode, { 'lib.hyp:L': `Q${'z'.repeat(128)}` });
+        });
         st.end();
     });
-    t.test('link properly when library doesn\'t have colon in name', function (st) {
-        /*
-          'lib.hyp': 'library L { function f() public returns (uint) { return 7; } }',
-          'cont.hyp': 'import "lib.hyp"; contract x { function g() public { L.f(); } }'
-        */
-        let bytecode = '608060405234801561001057600080fd5b5061011f806100206000396000f300608060405260043610603f576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff168063e2179b8e146044575b600080fd5b348015604f57600080fd5b5060566058565b005b73__libName_______________________________6326121ff06040518163ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040160206040518083038186803b15801560b757600080fd5b505af415801560ca573d6000803e3d6000fd5b505050506040513d602081101560df57600080fd5b8101908080519060200190929190505050505600a165627a7a72305820ea2f6353179c181d7162544d637b7fe2d9e8da9803a0e2d9eafc2188d1d59ee30029';
-        bytecode = linker_1.default.linkBytecode(bytecode, { libName: 'Z123456' });
-        st.ok(bytecode.indexOf('_') < 0);
+    t.test('20-byte placeholder is not linked', function (st) {
+        const bytecode = '6060__$7484607a72fb0587588e5a1e608f0b16de$__6060';
+        st.equal(linker_1.default.linkBytecode(bytecode, { 'lib2.hyp:L': PREFIXED_ADDRESS_64_BYTES }), bytecode);
         st.end();
     });
 });

package/test/translate.js

@@ -53,11 +53,11 @@ const versionToSemver = translate_1.default.versionToSemver;
         st.end();
     });
     t.test('Broken 0.1.3', function (st) {
-        st.equal(versionToSemver('0.1.3-0/.-/clang/int linked to libzond-0.9.92-0/.-/clang/int'), '0.1.3');
+        st.equal(versionToSemver('0.1.3-0/.-/clang/int linked to libqrl-0.9.92-0/.-/clang/int'), '0.1.3');
         st.end();
     });
     t.test('Old style 0.2.0', function (st) {
-        st.equal(versionToSemver('0.2.0-e7098958/.-Emscripten/clang/int linked to libzond-1.1.1-bbb80ab0/.-Emscripten/clang/int'), '0.2.0+commit.e7098958');
+        st.equal(versionToSemver('0.2.0-e7098958/.-Emscripten/clang/int linked to libqrl-1.1.1-bbb80ab0/.-Emscripten/clang/int'), '0.2.0+commit.e7098958');
         st.end();
     });
     t.test('Old style 0.3.5', function (st) {

package/translate.js

@@ -7,8 +7,8 @@ const linker_1 = __importDefault(require("./linker"));
 /// Old style: 0.3.6-3fc68da5/Release-Emscripten/clang
 ///            0.3.5-371690f0/Release-Emscripten/clang/Interpreter
 ///            0.3.5-0/Release-Emscripten/clang/Interpreter
-///            0.2.0-e7098958/.-Emscripten/clang/int linked to libzond-1.1.1-bbb80ab0/.-Emscripten/clang/int
-///            0.1.3-0/.-/clang/int linked to libzond-0.9.92-0/.-/clang/int
+///            0.2.0-e7098958/.-Emscripten/clang/int linked to libqrl-1.1.1-bbb80ab0/.-Emscripten/clang/int
+///            0.1.3-0/.-/clang/int linked to libqrl-0.9.92-0/.-/clang/int
 ///            0.1.2-5c3bfd4b*/.-/clang/int
 ///            0.1.1-6ff4cd6b/RelWithDebInfo-Emscripten/clang/int
 /// New style: 0.4.5+commit.b318366e.Emscripten.clang
@@ -106,7 +106,7 @@ function translateJsonCompilerOutput(output, libraries) {
         const contractOutput = {
             abi: JSON.parse(contractInput.interface),
             metadata: contractInput.metadata,
-            zvm: {
+            qrvm: {
                 legacyAssembly: contractInput.assembly,
                 bytecode: {
                     object: contractInput.bytecode && linker_1.default.linkBytecode(contractInput.bytecode, libraries || {}),

package/contractA_hyp_A.bin

@@ -1 +0,0 @@
-6080604052348015600e575f80fd5b50603e80601a5f395ff3fe60806040525f80fdfea26469706673582212207da9777c17d9abc5309ba89332ae703efba54bf7fb9c290d475d6c0f7cb7a6c86468797063430000020033

package/contractB_hyp_B.bin

@@ -1 +0,0 @@
-6080604052348015600e575f80fd5b50603e80601a5f395ff3fe60806040525f80fdfea264697066735822122019ceaad2fc0893d39b61042424757a67bf6723d77172da4c38279007c2723bbf6468797063430000020033

package/importA_hyp_C.bin

@@ -1 +0,0 @@
-6080604052348015600e575f80fd5b5060ab8061001b5f395ff3fe6080604052348015600e575f80fd5b50600436106026575f3560e01c806326121ff014602a575b5f80fd5b60306044565b604051603b9190605e565b60405180910390f35b5f90565b5f819050919050565b6058816048565b82525050565b5f602082019050606f5f8301846051565b9291505056fea264697066735822122003aa2795a073c7ca2063308c3a8a13fb3a1ce6028c399f889636bd9eabe1f73f6468797063430000020033

package/importB_hyp_D.bin

@@ -1 +0,0 @@
-6080604052348015600e575f80fd5b5060ab8061001b5f395ff3fe6080604052348015600e575f80fd5b50600436106026575f3560e01c806326121ff014602a575b5f80fd5b60306044565b604051603b9190605e565b60405180910390f35b5f90565b5f819050919050565b6058816048565b82525050565b5f602082019050606f5f8301846051565b9291505056fea2646970667358221220f96d6c685f4fe201ee93ca17a8b69d8182984a86c16908f46d7becc54efcfb846468797063430000020033

package/libX_hyp_X.bin

@@ -1 +0,0 @@
-6055604b600b8282823980515f1a607314603f577f4e487b71000000000000000000000000000000000000000000000000000000005f525f60045260245ffd5b305f52607381538281f3fe730000000000000000000000000000000000000000301460806040525f80fdfea2646970667358221220e78306f3d7dc80c45acbd51f639ead3e6f620f10144ea624b2c7e88c6c1504e96468797063430000020033

package/libY_hyp_Y.bin

@@ -1 +0,0 @@
-6055604b600b8282823980515f1a607314603f577f4e487b71000000000000000000000000000000000000000000000000000000005f525f60045260245ffd5b305f52607381538281f3fe730000000000000000000000000000000000000000301460806040525f80fdfea2646970667358221220fe2cbe5e62e395650d519ac764d3d5271e9af30d3e271d1c291677812e14d7ce6468797063430000020033

package/libZ_hyp_Z.bin

@@ -1 +0,0 @@
-6055604b600b8282823980515f1a607314603f577f4e487b71000000000000000000000000000000000000000000000000000000005f525f60045260245ffd5b305f52607381538281f3fe730000000000000000000000000000000000000000301460806040525f80fdfea26469706673582212208cf9773d6268fc017aed7c3282d7e4ec482fd3b5d956250412103e5d65854bfc6468797063430000020033

package/test/resources/fixtureAsmJson.hyp

@@ -1,8 +0,0 @@
-contract C {
-  // Leaving an empty line here intentionally
-
-
-  function f() public returns (bytes4) {
-    return this.f.selector;
-  }
-}