diff --git a/VERSIONS.md b/VERSIONS.md index 8865dfb..1744acb 100644 --- a/VERSIONS.md +++ b/VERSIONS.md @@ -8,6 +8,11 @@ ### Deprecations +## Version 2.5.0 +### Features +- update versions of dependencies + + ## Version 2.4.3 ### Fixes - reduce data returned from contract compilation to restore pre-update behavior diff --git a/contracts/OwnedRegistrar.sol b/contracts/OwnedRegistrar.sol index 78b2bd6..630aca6 100755 --- a/contracts/OwnedRegistrar.sol +++ b/contracts/OwnedRegistrar.sol @@ -18,14 +18,14 @@ pragma solidity ^0.4.24; -import './ENS.sol'; +import './AbstractENS.sol'; import './Core.sol'; /** * A registrar that allocates subdomains to the first person to claim them. */ contract OwnedRegistrar is Owned { - ENS ens; + AbstractENS ens; bytes32 rootNode; /** @@ -33,7 +33,7 @@ contract OwnedRegistrar is Owned { * @param ensAddr The address of the ENS registry. * @param node The node that this registrar administers. */ - constructor(ENS ensAddr, bytes32 node) public { + constructor(AbstractENS ensAddr, bytes32 node) public { ens = ensAddr; rootNode = node; } diff --git a/lib/solc.js b/lib/solc.js index c23e796..e2a7af3 100755 --- a/lib/solc.js +++ b/lib/solc.js @@ -54,7 +54,7 @@ const libraryDependencies = { // setting a value to a falsy value will depeloy it and its dependants const librariesAddresses = { core: { - 'ENS.sol:ENS': + 'AbstractENS.sol:AbstractENS': '0xc913ac6522344187bc9C88C9f9302b005500FfF9', 'verifications/KeyHolderLibrary.sol:KeyHolderLibrary': '0x9712325360aE316c333ACc0714170E49594d9592', @@ -72,7 +72,7 @@ const librariesAddresses = { '0x21c89be4C8990413B1C225aAc91BFb7a74f33cC4', }, testcore: { - 'ENS.sol:ENS': + 'AbstractENS.sol:AbstractENS': '0xd9b054d2FFA8Cf301885Af53db86971881E2EA54', 'verifications/KeyHolderLibrary.sol:KeyHolderLibrary': '0xcd4F22D95C62aad0B12e5493c3264629800B6740', @@ -90,7 +90,7 @@ const librariesAddresses = { '0x21c89be4C8990413B1C225aAc91BFb7a74f33cC4', }, local: { - 'ENS.sol:ENS': + 'AbstractENS.sol:AbstractENS': '0x9f8063ac44D23C99E943eA3DE3E1bb6Ab7678df0', 'verifications/KeyHolderLibrary.sol:KeyHolderLibrary': '', @@ -167,10 +167,10 @@ class Solc { const chain = this._getEnvironment(); if (chain !== 'testnet') { - const ensRegex = new RegExp(librariesAddresses.testcore['ENS.sol:ENS'], 'i'); + const ensRegex = new RegExp(librariesAddresses.testcore['AbstractENS.sol:AbstractENS'], 'i'); for (let f in solFiles) { solFiles[f] = - (await solFiles[f]).replace(ensRegex, librariesAddresses[chain]['ENS.sol:ENS']); + (await solFiles[f]).replace(ensRegex, librariesAddresses[chain]['AbstractENS.sol:AbstractENS']); } } @@ -210,7 +210,7 @@ class Solc { const errors = output.errors ? output.errors.filter(error => error.severity === 'error') : null; if (errors && errors.length) { - this.log('Contract compile error: \n' + errors, 'error') + this.log('Contract compile error: \n' + JSON.stringify(errors, null, 2), 'error') process.exit(1) } else if (output.errors) { const warnings = {}; @@ -286,9 +286,7 @@ class Solc { // smart-contracts-core project was linked, too process.chdir(path.resolve(__dirname)) - const core_src = [solPath, - findup('node_modules/ens/contracts'), - ].map(modulePath => path.resolve(__dirname, modulePath)) + const core_src = [ path.resolve(__dirname, solPath) ] additionalPaths = Array.isArray(additionalPaths) ? additionalPaths : [additionalPaths] diff --git a/package.json b/package.json index 953c4c2..6099f26 100644 --- a/package.json +++ b/package.json @@ -2,15 +2,14 @@ "license": "Apache-2.0", "author": "evan GmbH", "dependencies": { - "ens": "github:ethereum/ens#6c0cf08eab71b41d54ac516138d4e1f2c32ff5c9", - "ethereumjs-tx": "1.3.1", - "findup-sync": "^2.0.0", + "ethereumjs-tx": "1.3.4", + "findup-sync": "^4.0.0", "fs-readdir-recursive": "^1.1.0", - "solc": "0.5.4" + "solc": "^0.5.10" }, "description": "evan.network core smart contracts", "devDependencies": { - "web3": "1.0.0-beta.55" + "web3": "2.0.0-alpha" }, "engines": { "node": ">=8.0.0" @@ -33,5 +32,5 @@ "scripts": { "build-contracts": "node ./scripts/build-contracts.js" }, - "version": "2.4.3" -} \ No newline at end of file + "version": "2.5.0" +}