status-im
/
embark-area-51
mirror of https://github.com/status-im/embark-area-51.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

treat library as dependencies for contract deployment

This commit is contained in:
Iuri Matias 2017-07-16 13:31:40 -04:00
parent ecab599d00
commit acee934467
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/contracts/contracts.js
View File

@ -137,8 +137,15 @@ class ContractsManager {
for (className in self.contracts) { for (className in self.contracts) {
contract = self.contracts[className]; contract = self.contracts[className];
if (contract.args === []) continue; // look in code for dependencies
let libMatches = (contract.code.match(/\:(.*?)(?=_)/g) || []);
for (let match of libMatches) {
self.contractDependencies[className] = self.contractDependencies[className] || [];
self.contractDependencies[className].push(match.substr(1));
}
// look in arguments for dependencies
if (contract.args === []) continue;
let ref = contract.args; let ref = contract.args;
for (let j = 0; j < ref.length; j++) { for (let j = 0; j < ref.length; j++) {
let arg = ref[j]; let arg = ref[j];

4
test_app/app/contracts/test.sol
View File

@ -1,6 +1,6 @@
pragma solidity ^0.4.11; pragma solidity ^0.4.11;
library AMyLib { library ZAMyLib {
function add(uint _a, uint _b) returns (uint _c) { function add(uint _a, uint _b) returns (uint _c) {
return _a + _b; return _a + _b;
@ -11,7 +11,7 @@ library AMyLib {
contract Test { contract Test {
function testAdd() constant returns (uint _result) { function testAdd() constant returns (uint _result) {
return AMyLib.add(1, 2); return ZAMyLib.add(1, 2);
} }
} }