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

Update contracts.js

This commit is contained in:
VoR0220 2015-10-25 13:37:57 -05:00 committed by Iuri Matias
parent 9e8ebe9cb3
commit 4b451f0290
1 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
lib/config/contracts.js
View File

@ -60,10 +60,10 @@ ContractsConfig.prototype.compileContracts = function(env) {
options = contractsConfig[className]; options = contractsConfig[className];
if (options.args == null) continue; if (options.args == null) continue;
ref = options.args; ref = options.args; //get arguments
for (j = 0; j < ref.length; j++) { for (j = 0; j < ref.length; j++) {
arg = ref[j]; arg = ref[j];
if (arg[0] === "$") { if (arg[0] === "$") { //check if they are a contract dependency
if (this.contractDependencies[className] === void 0) { if (this.contractDependencies[className] === void 0) {
this.contractDependencies[className] = []; this.contractDependencies[className] = [];
} }
@ -77,26 +77,23 @@ ContractsConfig.prototype.compileContracts = function(env) {
var all_compiled_contracts = {}; var all_compiled_contracts = {};
// compile files // compile files
for (j = 0; j < this.contractFiles.length; j++) { compiled_contracts = this.compiler.compile(this.contractFiles);
contractFile = this.contractFiles[j];
for (var className in compiled_contracts) {
var contract = compiled_contracts[className];
compiled_contracts = this.compiler.compile(contractFile); if (this.is_a_token(className, compiled_contracts)) {
for (var className in compiled_contracts) { continue;
var contract = compiled_contracts[className]; }
if (this.is_a_token(className, compiled_contracts)) { all_compiled_contracts[className] = contract;
continue; this.all_contracts.push(className);
} this.contractDB[className] = {
args: [],
all_compiled_contracts[className] = contract; types: ['file'],
this.all_contracts.push(className); gasPrice: this.blockchainConfig.gasPrice,
this.contractDB[className] = { gasLimit: this.blockchainConfig.gasLimit,
args: [], compiled: contract
types: ['file'],
gasPrice: this.blockchainConfig.gasPrice,
gasLimit: this.blockchainConfig.gasLimit,
compiled: contract
}
} }
} }