diff --git a/config/blockchain.js b/config/blockchain.js index 3266aca..90e26d9 100644 --- a/config/blockchain.js +++ b/config/blockchain.js @@ -92,10 +92,7 @@ module.exports = { networkType: "livenet", syncMode: "light", rpcCorsDomain: "http://localhost:8000", - wsOrigins: "http://localhost:8000", - account: { - password: "config/livenet/password" - } + wsOrigins: "http://localhost:8000" } // you can name an environment with specific settings and then specify with diff --git a/config/contracts.js b/config/contracts.js index ed7f146..58cdca8 100644 --- a/config/contracts.js +++ b/config/contracts.js @@ -93,21 +93,23 @@ module.exports = { ] }, "contracts": { - "TestToken": { "deploy": false }, + "TestToken": { deploy: false }, "MiniMeTokenFactory": { - "address": "0x6bfa86a71a7dbc68566d5c741f416e3009804279" + address: "0x6bfa86a71a7dbc68566d5c741f416e3009804279" }, "SNT": { - "instanceOf": "MiniMeToken", - "address": "0xc55cf4b03948d7ebc8b9e8bad92643703811d162" + instanceOf: "MiniMeToken", + address: "0xc55cf4b03948d7ebc8b9e8bad92643703811d162" }, "PollManager": { - "args": ["$SNT"], - "gasPrice": 5000000000 + args: ["$SNT"], + gasPrice: 5000000000, + from: "0x00000...." + } } }, - + "testnet_devcoin":{ deployment: { host: "localhost", @@ -120,26 +122,28 @@ module.exports = { ] }, "contracts": { - "TestToken": { "deploy": false }, + "TestToken": { deploy: false }, "MiniMeTokenFactory": { - "gasPrice": 5000000000 + address: "0x6bfa86a71a7dbc68566d5c741f416e3009804279" }, "SNT": { - "instanceOf": "MiniMeToken", - "args": [ + instanceOf: "MiniMeToken", + args: [ "$MiniMeTokenFactory", "0x0000000000000000000000000000000000000000", 0, - "Status Core Dev Token (TEST)", + "Status Core Dev Meeting Token (TEST)", 18, - "SCT", + "SCDMT", true ], - "gasPrice": 5000000000 + gasPrice: 5000000000, + from: "0x00000...." }, "PollManager": { - "args": ["$SNT"], - "gasPrice": 5000000000 + args: ["$SNT"], + gasPrice: 5000000000, + from: "0x00000...." } } }, @@ -178,6 +182,33 @@ module.exports = { } }, + + + livenet_devcoin: { + deployment: { + host: "localhost", + port: 8545, + type: "rpc", + accounts: [ + { + privateKey: "0x00000...." + } + ] + }, + "contracts": { + "TestToken": { "deploy": false }, + "MiniMeTokenFactory": { + "address": "0xa1c957C0210397D2d0296341627B74411756d476" + }, + "SNT": { + "address": "0x05fD4a5c96c54a17D845D62C6cB00E39D39BeaF4" + }, + "PollManager": { + "address": "0x83d84673b33be2d782a829b5d7cb337190dc36a3" + } + } + }, + // you can name an environment with specific settings and then specify with // "embark run custom_name" or "embark blockchain custom_name" //custom_name: { diff --git a/config/storage.js b/config/storage.js index 52a148f..de123e3 100644 --- a/config/storage.js +++ b/config/storage.js @@ -28,7 +28,7 @@ module.exports = { // default environment, merges with the settings in default // assumed to be the intended environment by `embark run` development: { - enabled: false, + enabled: true, provider: "ipfs", upload: { host: "localhost",