diff --git a/embarkConfig/contracts.js b/embarkConfig/contracts.js index b7d3863..eff82c1 100644 --- a/embarkConfig/contracts.js +++ b/embarkConfig/contracts.js @@ -103,22 +103,12 @@ module.exports = { LiquidPledging: { instanceOf: 'LiquidPledgingMock' }, - RecoveryVault: {}, - LPFactory: { - args: ['$LPVault', '$LiquidPledging'], - }, // contracts for testing - StandardToken: {}, - Kernel: { - file: "@aragon/os/contracts/kernel/Kernel.sol" - }, - ACL: { - file: "@aragon/os/contracts/acl/ACL.sol" - } + StandardToken: {} }, afterDeploy: async (deps) => { - await deps.contracts.LiquidPledging.methods.initialize(deps.contracts.LPVault.options.address).send({gas: 1000000}); - await deps.contracts.LPVault.methods.initialize(deps.contracts.LiquidPledging.options.address).send({gas: 1000000}); + await deps.contracts.LiquidPledging.methods.initialize(deps.contracts.LPVault.options.address).send({gas: 1000000, from: deps.web3.eth.defaultAccount}); + await deps.contracts.LPVault.methods.initialize(deps.contracts.LiquidPledging.options.address).send({gas: 1000000, from: deps.web3.eth.defaultAccount}); } // afterDeploy: [ diff --git a/src/actions.js b/src/actions.js index 9a20bd3..111eeb6 100644 --- a/src/actions.js +++ b/src/actions.js @@ -68,22 +68,26 @@ class Actions { } async listProjects() { - let numProjects = await LiquidPledging.methods.numberOfPledgeAdmins().call(); - - const table = new Table({ - head: ['Id', 'Name', 'URL', 'ParentProject', 'Status', 'Commit Time', 'Owner', 'Plugin'] - }); + try { + let numProjects = await this.contracts.LiquidPledging.methods.numberOfPledgeAdmins().call(); + + const table = new Table({ + head: ['Id', 'Name', 'URL', 'ParentProject', 'Status', 'Commit Time', 'Owner', 'Plugin'] + }); - for(let i = 1; i <= numProjects; i++){ - const pledge = await LiquidPledging.methods.getPledgeAdmin(i).call(); - if(pledge.adminType !== '2') continue; + for(let i = 1; i <= numProjects; i++){ + const pledge = await this.contracts.LiquidPledging.methods.getPledgeAdmin(i).call(); + if(pledge.adminType !== '2') continue; - table.push( - [i, pledge.name, pledge.url, pledge.parentProject, pledge.canceled ? 'Canceled' : 'Active', pledge.commitTime, pledge.addr, pledge.plugin] - ); + table.push( + [i, pledge.name, pledge.url, pledge.parentProject, pledge.canceled ? 'Canceled' : 'Active', pledge.commitTime, pledge.addr, pledge.plugin] + ); + } + + console.log(table.toString()); + } catch(error){ + console.log("Couldn't obtain the list of projects: ", error.message); } - - console.log(table.toString()); } addGiver(params) {