embarklabs
/
embark
mirror of https://github.com/embarklabs/embark.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

increase default gas value; add parameters

This commit is contained in:
Iuri Matias 2018-01-17 11:23:32 -05:00
parent 61470a32d7
commit 32d63514bf
8 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
boilerplate/config/blockchain.json
View File

@ -13,6 +13,7 @@
"account": { "account": {
"password": "config/development/password" "password": "config/development/password"
}, },
"targetGasLimit": 8000000,
"wsOrigins": "http://localhost:8000", "wsOrigins": "http://localhost:8000",
"wsRPC": true, "wsRPC": true,
"wsHost": "localhost", "wsHost": "localhost",

2
boilerplate/config/development/genesis.json
View File

@ -12,5 +12,5 @@
"timestamp": "0x00", "timestamp": "0x00",
"parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000", "parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
"extraData": "0x", "extraData": "0x",
"gasLimit": "0x4c4b40" "gasLimit": "0x7a1200"
} }

1
demo/config/blockchain.json
View File

@ -13,6 +13,7 @@
"account": { "account": {
"password": "config/development/password" "password": "config/development/password"
}, },
"targetGasLimit": 8000000,
"wsOrigins": "http://localhost:8000", "wsOrigins": "http://localhost:8000",
"wsRPC": true, "wsRPC": true,
"wsHost": "localhost", "wsHost": "localhost",

2
demo/config/development/genesis.json
View File

@ -12,5 +12,5 @@
"timestamp": "0x00", "timestamp": "0x00",
"parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000", "parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
"extraData": "0x", "extraData": "0x",
"gasLimit": "0x4c4b40" "gasLimit": "0x7a1200"
} }

3
lib/cmds/blockchain/blockchain.js
View File

@ -37,7 +37,8 @@ var Blockchain = function(options) {
wsPort: this.blockchainConfig.wsPort || 8546, wsPort: this.blockchainConfig.wsPort || 8546,
wsOrigins: this.blockchainConfig.wsOrigins || false, wsOrigins: this.blockchainConfig.wsOrigins || false,
wsApi: (this.blockchainConfig.wsApi || ['eth', 'web3', 'net', 'shh']), wsApi: (this.blockchainConfig.wsApi || ['eth', 'web3', 'net', 'shh']),
vmdebug: this.blockchainConfig.vmdebug || false vmdebug: this.blockchainConfig.vmdebug || false,
targetGasLimit: this.blockchainConfig.targetGasLimit || false
}; };
if (this.blockchainConfig === {} || JSON.stringify(this.blockchainConfig) === '{"enabled":true}') { if (this.blockchainConfig === {} || JSON.stringify(this.blockchainConfig) === '{"enabled":true}') {

6
lib/cmds/blockchain/geth_commands.js
View File

@ -193,6 +193,12 @@ class GethCommands {
} }
callback(null, ""); callback(null, "");
}, },
function gasLimit(callback) {
if (config.targetGasLimit) {
return callback(null, "--targetgaslimit " + config.targetGasLimit);
}
callback(null, "");
},
function mineWhenNeeded(callback) { function mineWhenNeeded(callback) {
if (config.mineWhenNeeded) { if (config.mineWhenNeeded) {
return callback(null, "js .embark/" + self.env + "/js/mine.js"); return callback(null, "js .embark/" + self.env + "/js/mine.js");

1
test_app/config/blockchain.json
View File

@ -13,6 +13,7 @@
"account": { "account": {
"password": "config/development/password" "password": "config/development/password"
}, },
"targetGasLimit": 8000000,
"wsOrigins": "http://localhost:8000", "wsOrigins": "http://localhost:8000",
"wsRPC": true, "wsRPC": true,
"wsHost": "localhost", "wsHost": "localhost",

2
test_app/config/development/genesis.json
View File

@ -12,5 +12,5 @@
"timestamp": "0x00", "timestamp": "0x00",
"parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000", "parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
"extraData": "0x", "extraData": "0x",
"gasLimit": "0x4c4b40" "gasLimit": "0x7a1200"
} }