Merge pull request #153 from gnosis/fix-release-blockers

Fix release blockers
gnosis · Oct 29, 2018 · 04e79ae · 04e79ae
2 parents 0294126 + 1981f4e
commit 04e79ae
Show file tree

Hide file tree

Showing 15 changed files with 604 additions and 2,339 deletions.
diff --git a/contracts/Migrations.sol b/contracts/Migrations.sol
@@ -1,5 +1,6 @@
 pragma solidity ^0.4.24;
 import "canonical-weth/contracts/WETH9.sol";
+import "openzeppelin-solidity/contracts/token/ERC20/DetailedERC20.sol";
 
 contract Migrations {
     address public owner;

diff --git a/docs/EtherToken.rst b/docs/EtherToken.rst
diff --git a/docs/HumanFriendlyToken.rst b/docs/HumanFriendlyToken.rst
diff --git a/docs/Math.rst b/docs/Math.rst
diff --git a/docs/StandardToken.rst b/docs/StandardToken.rst
diff --git a/docs/Token.rst b/docs/Token.rst
diff --git a/docs/index.rst b/docs/index.rst
@@ -105,18 +105,15 @@ Contributors
    CentralizedOracle
    DifficultyOracleFactory
    DifficultyOracle
-   EtherToken
    EventFactory
    Event
    FutarchyOracleFactory
    FutarchyOracle
-   HumanFriendlyToken
    LMSRMarketMaker
    MajorityOracleFactory
    MajorityOracle
    MarketMaker
    Market
-   Math
    Oracle
    OutcomeToken
    ScalarEvent
@@ -126,8 +123,6 @@ Contributors
    StandardMarket
    StandardMarketWithPriceLoggerFactory
    StandardMarketWithPriceLogger
-   StandardToken
-   Token
    UltimateOracleFactory
    UltimateOracle
 

diff --git a/ensurebc.js b/ensurebc.js
@@ -0,0 +1,18 @@
+const fs = require('fs-extra')
+const path = require('path')
+
+const artifactsDir = path.join('build', 'contracts')
+
+for(const [newName, bcName] of [
+    ['ERC20', 'Token'],
+    ['DetailedERC20', 'HumanFriendlyToken'],
+    ['WETH9', 'EtherToken'],
+    ['Fixed192x64Math', 'Math'],
+])
+    fs.copySync(path.join(artifactsDir, newName + '.json'), path.join(artifactsDir, bcName + '.json'))
+
+const gasStatsFile = path.join('build', 'gas-stats.json')
+const gasStatsObj = fs.readJsonSync(gasStatsFile)
+gasStatsObj.EtherToken = gasStatsObj.WETH9
+gasStatsObj.Token = gasStatsObj.ERC20
+fs.writeJsonSync(gasStatsFile, gasStatsObj, { spaces: 2 })
diff --git a/migrations/05_deploy_oracle_prototypes.js b/migrations/05_deploy_oracle_prototypes.js
@@ -1,17 +1,11 @@
-const CentralizedOracle = artifacts.require('CentralizedOracle')
-const FutarchyOracle = artifacts.require('FutarchyOracle')
-const MajorityOracle = artifacts.require('MajorityOracle')
-const SignedMessageOracle = artifacts.require('SignedMessageOracle')
-const UltimateOracle = artifacts.require('UltimateOracle')
-
-const MAX_UINT = web3.toBigNumber(2).pow(256).sub(1)
-
 module.exports = function (deployer) {
-    deployer.deploy([
-        CentralizedOracle,
-        FutarchyOracle,
-        MajorityOracle,
-        SignedMessageOracle,
-        UltimateOracle,
-    ])
+    for(const contractName of [
+        'CentralizedOracle',
+        'FutarchyOracle',
+        'MajorityOracle',
+        'SignedMessageOracle',
+        'UltimateOracle',
+    ]) {
+        deployer.deploy(artifacts.require(contractName))
+    }
 }
diff --git a/migrations/06_deploy_event_prototypes.js b/migrations/06_deploy_event_prototypes.js
@@ -1,11 +1,9 @@
-const CategoricalEvent = artifacts.require('CategoricalEvent')
-const ScalarEvent = artifacts.require('ScalarEvent')
-const OutcomeToken = artifacts.require('OutcomeToken')
-
 module.exports = function (deployer) {
-    deployer.deploy([
-        CategoricalEvent,
-        ScalarEvent,
-        OutcomeToken,
-    ])
+    for(const contractName of [
+        'CategoricalEvent',
+        'ScalarEvent',
+        'OutcomeToken',
+    ]) {
+        deployer.deploy(artifacts.require(contractName))
+    }
 }
diff --git a/migrations/07_deploy_market_prototypes.js b/migrations/07_deploy_market_prototypes.js
@@ -1,10 +1,8 @@
-const CategoricalEvent = artifacts.require('CategoricalEvent')
-const StandardMarket = artifacts.require('StandardMarket')
-const StandardMarketWithPriceLogger = artifacts.require('StandardMarketWithPriceLogger')
-
 module.exports = function (deployer) {
-    deployer.deploy([
-        StandardMarket,
-        StandardMarketWithPriceLogger,
-    ])
+    for(const contractName of [
+        'StandardMarket',
+        'StandardMarketWithPriceLogger',
+    ]) {
+        deployer.deploy(artifacts.require(contractName))
+    }
 }