Kovan deployment

ProjectWyvern · Dec 11, 2017 · cd261f1 · cd261f1
1 parent 308d4d2
commit cd261f1
Show file tree

Hide file tree

Showing 28 changed files with 50,164 additions and 7 deletions.
diff --git a/build/contracts/BasicToken.json b/build/contracts/BasicToken.json
diff --git a/build/contracts/BurnableToken.json b/build/contracts/BurnableToken.json
diff --git a/build/contracts/Claimable.json b/build/contracts/Claimable.json
diff --git a/build/contracts/DelayedReleaseToken.json b/build/contracts/DelayedReleaseToken.json
diff --git a/build/contracts/DelegatedShareholderAssociation.json b/build/contracts/DelegatedShareholderAssociation.json
diff --git a/build/contracts/ERC20.json b/build/contracts/ERC20.json
diff --git a/build/contracts/ERC20Basic.json b/build/contracts/ERC20Basic.json
diff --git a/build/contracts/EscrowProvider.json b/build/contracts/EscrowProvider.json
diff --git a/build/contracts/Exchange.json b/build/contracts/Exchange.json
diff --git a/build/contracts/MerkleProof.json b/build/contracts/MerkleProof.json
diff --git a/build/contracts/Migrations.json b/build/contracts/Migrations.json
diff --git a/build/contracts/Ownable.json b/build/contracts/Ownable.json
diff --git a/build/contracts/SafeMath.json b/build/contracts/SafeMath.json
diff --git a/build/contracts/StandardToken.json b/build/contracts/StandardToken.json
diff --git a/build/contracts/TestDAO.json b/build/contracts/TestDAO.json
diff --git a/build/contracts/TestToken.json b/build/contracts/TestToken.json
diff --git a/build/contracts/TokenRecipient.json b/build/contracts/TokenRecipient.json
diff --git a/build/contracts/UTXORedeemableToken.json b/build/contracts/UTXORedeemableToken.json
diff --git a/build/contracts/WyvernDAO.json b/build/contracts/WyvernDAO.json
diff --git a/build/contracts/WyvernExchange.json b/build/contracts/WyvernExchange.json
diff --git a/build/contracts/WyvernToken.json b/build/contracts/WyvernToken.json
diff --git a/migrations/2_deploy_test_token_and_dao.js b/migrations/2_deploy_test_token_and_dao.js
@@ -4,10 +4,10 @@ const TestToken = artifacts.require('./TestToken.sol')
 const TestDAO = artifacts.require('./TestDAO.sol')
 
 module.exports = (deployer, network) => {
-  if (network === 'development') {
+  if (network === 'development' || network === 'kovan') {
     deployer.deploy(TestToken)
       .then(() => {
-        return deployer.deploy(TestDAO, TestToken.address, Math.pow(10, 18) * 1000000, 60 * 24 * 7)
+        return deployer.deploy(TestDAO, TestToken.address, Math.pow(10, 18) * 1000, 60 * 24 * 7)
       })
   }
 }
diff --git a/migrations/3_deploy_token_and_dao.js b/migrations/3_deploy_token_and_dao.js
@@ -6,7 +6,8 @@ const WyvernDAO = artifacts.require('./WyvernDAO.sol')
 
 const { utxoMerkleRoot, utxoAmount } = require('../test/aux.js')
 
-module.exports = (deployer) => {
+module.exports = (deployer, network) => {
+  if (network === 'kovan') return
   deployer.deploy(MerkleProof)
   deployer.link(MerkleProof, WyvernToken)
   deployer.deploy(WyvernToken, utxoMerkleRoot, utxoAmount)

diff --git a/migrations/4_deploy_exchange.js b/migrations/4_deploy_exchange.js
@@ -2,6 +2,8 @@
 
 const WyvernExchange = artifacts.require('./WyvernExchange.sol')
 
-module.exports = (deployer) => {
-  deployer.deploy(WyvernExchange)
+module.exports = (deployer, network) => {
+  if (network === 'development') {
+    deployer.deploy(WyvernExchange)
+  }
 }
diff --git a/package.json b/package.json
@@ -11,6 +11,7 @@
     "bitcoinjs-lib": "https://github.com/ProjectWyvern/bitcoinjs-lib.git",
     "bs58check": "^2.1.0",
     "coveralls": "^3.0.0",
+    "ethereumjs-abi": "^0.6.5",
     "ethereumjs-testrpc": "^6.0.3",
     "ethereumjs-util": "^5.1.2",
     "solidity-coverage": "https://github.com/sc-forks/solidity-coverage.git",

diff --git a/scripts/flatten.sh b/scripts/flatten.sh
@@ -5,6 +5,8 @@ mkdir -p temp
 
 alias flatten="solidity_flattener --solc-paths zeppelin-solidity=$(pwd)/node_modules/zeppelin-solidity"
 
+flatten contracts/TestToken.sol --output temp/TestTokenFlattened.sol
+flatten contracts/TestDAO.sol --output temp/TestDAOFlattened.sol
 flatten contracts/WyvernToken.sol --output temp/WyvernTokenFlattened.sol
 flatten contracts/WyvernDAO.sol --output temp/WyvernDAOFlattened.sol
 flatten contracts/WyvernExchange.sol --output temp/WyvernExchangeFlattened.sol
diff --git a/truffle.js b/truffle.js
@@ -5,6 +5,12 @@ module.exports = {
       port: 8546,
       network_id: '*',
       gas: 6700000
+    },
+    kovan: {
+      host: 'localhost',
+      port: 8545,
+      network_id: '*',
+      gas: 4600000
     }
   },
   solc: {

diff --git a/yarn.lock b/yarn.lock
@@ -774,7 +774,7 @@ bluebird@^2.9.34:
   version "2.11.0"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-2.11.0.tgz#534b9033c022c9579c56ba3b3e5a5caafbb650e1"
 
-bn.js@4.11.6, bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.11.3, bn.js@^4.4.0, bn.js@^4.8.0:
+bn.js@4.11.6, bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.10.0, bn.js@^4.11.3, bn.js@^4.4.0, bn.js@^4.8.0:
   version "4.11.6"
   resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.6.tgz#53344adb14617a13f6e8dd2ce28905d1c0ba3215"
 
@@ -1956,6 +1956,13 @@ ethereum-remix@0.0.4:
   dependencies:
     which "^1.2.10"
 
+ethereumjs-abi@^0.6.5:
+  version "0.6.5"
+  resolved "https://registry.yarnpkg.com/ethereumjs-abi/-/ethereumjs-abi-0.6.5.tgz#5a637ef16ab43473fa72a29ad90871405b3f5241"
+  dependencies:
+    bn.js "^4.10.0"
+    ethereumjs-util "^4.3.0"
+
 ethereumjs-testrpc-sc@6.0.7:
   version "6.0.7"
   resolved "https://registry.yarnpkg.com/ethereumjs-testrpc-sc/-/ethereumjs-testrpc-sc-6.0.7.tgz#580a5b4dfb00d27fa6f4f9126aca56e0c722b2bf"
@@ -1968,6 +1975,16 @@ ethereumjs-testrpc@^6.0.3:
   dependencies:
     webpack "^3.0.0"
 
+ethereumjs-util@^4.3.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/ethereumjs-util/-/ethereumjs-util-4.5.0.tgz#3e9428b317eebda3d7260d854fddda954b1f1bc6"
+  dependencies:
+    bn.js "^4.8.0"
+    create-hash "^1.1.2"
+    keccakjs "^0.2.0"
+    rlp "^2.0.0"
+    secp256k1 "^3.0.1"
+
 ethereumjs-util@^5.1.2:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/ethereumjs-util/-/ethereumjs-util-5.1.2.tgz#25ba0215cbb4c2f0b108a6f96af2a2e62e45921f"
@@ -3098,7 +3115,7 @@ keccak@^1.0.2:
     prebuild-install "^2.0.0"
     safe-buffer "^5.1.0"
 
-keccakjs@^0.2.1:
+keccakjs@^0.2.0, keccakjs@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/keccakjs/-/keccakjs-0.2.1.tgz#1d633af907ef305bbf9f2fa616d56c44561dfa4d"
   dependencies: