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

seperate LPConstants

This commit is contained in:
perissology 2018-03-12 08:51:16 -07:00
parent 371fc582f8
commit c5e874e245
4 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
contracts/LPConstants.sol Normal file
View File

@ -0,0 +1,8 @@
pragma solidity ^0.4.18;
import "@aragon/os/contracts/kernel/KernelStorage.sol";
contract LPConstants is KernelConstants {
bytes32 constant public VAULT_APP_ID = keccak256("vault");
bytes32 constant public LP_APP_ID = keccak256("liquidPledging");
}

6
contracts/LPFactory.sol
View File

@ -3,14 +3,12 @@ pragma solidity ^0.4.18;
import "@aragon/os/contracts/factory/DAOFactory.sol"; import "@aragon/os/contracts/factory/DAOFactory.sol";
import "./LPVault.sol"; import "./LPVault.sol";
import "./LiquidPledging.sol"; import "./LiquidPledging.sol";
import "./LPConstants.sol";
contract LPFactory is DAOFactory { contract LPFactory is LPConstants, DAOFactory {
address public vaultBase; address public vaultBase;
address public lpBase; address public lpBase;
bytes32 constant public VAULT_APP_ID = keccak256("vault");
bytes32 constant public LP_APP_ID = keccak256("liquidPledging");
event DeployVault(address vault); event DeployVault(address vault);
event DeployLiquidPledging(address liquidPledging); event DeployLiquidPledging(address liquidPledging);

4
index.js
View File

@ -3,3 +3,7 @@ exports.LiquidPledging = contracts.LiquidPledging;
exports.LiquidPledgingState = require('./lib/liquidPledgingState.js'); exports.LiquidPledgingState = require('./lib/liquidPledgingState.js');
exports.LPVault = contracts.LPVault; exports.LPVault = contracts.LPVault;
exports.LPFactory = contracts.LPFactory; exports.LPFactory = contracts.LPFactory;
exports.test = {
StandardTokenTest: contracts.StandardToken,
assertFail: require('./test/helpers/assertFail')
};

4
package.json
View File

@ -9,7 +9,7 @@
}, },
"scripts": { "scripts": {
"test": "npm run build; mocha --harmony", "test": "npm run build; mocha --harmony",
"sol-compile": "solcpiler -i './contracts/{LPVault,LPFactory,LiquidPledging,LiquidPledgingMock,test/{TestSimpleProjectPluginFactory,StandardToken}}.sol' --solc-version v0.4.18+commit.9cf6e910", "sol-compile": "solcpiler --solc-version v0.4.18+commit.9cf6e910",
"js-compile": "babel -d lib/ js/", "js-compile": "babel -d lib/ js/",
"build": "npm run sol-compile; npm run js-compile", "build": "npm run sol-compile; npm run js-compile",
"prepublish": "npm run build" "prepublish": "npm run build"
@ -44,7 +44,7 @@
"lerna": "^2.2.0", "lerna": "^2.2.0",
"mocha": "^3.5.0", "mocha": "^3.5.0",
"random-bytes": "^1.0.0", "random-bytes": "^1.0.0",
"solcpiler": "^0.0.15", "solcpiler": "https://github.com/perissology/solcpiler.git#b60ac51b",
"web3": "1.0.0-beta.24" "web3": "1.0.0-beta.24"
}, },
"homepage": "https://github.com/Giveth/liquidpledging#readme", "homepage": "https://github.com/Giveth/liquidpledging#readme",