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

fix solc warnings

This commit is contained in:
perissology 2018-01-15 14:36:17 -08:00
parent a6593d32b3
commit 80a8e5a9b4
3 changed files with 40 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contracts/ILiquidPledgingPlugin.sol
View File

@ -49,7 +49,7 @@ contract ILiquidPledgingPlugin {
uint64 pledgeFrom, uint64 pledgeFrom,
uint64 pledgeTo, uint64 pledgeTo,
uint64 context, uint64 context,
uint amount ) returns (uint maxAllowed); uint amount ) public returns (uint maxAllowed);
/// @notice Plugins are used (much like web hooks) to initiate an action /// @notice Plugins are used (much like web hooks) to initiate an action
/// upon any donation, delegation, or transfer; this is an optional feature /// upon any donation, delegation, or transfer; this is an optional feature
@ -77,5 +77,5 @@ contract ILiquidPledgingPlugin {
uint64 pledgeTo, uint64 pledgeTo,
uint64 context, uint64 context,
uint amount uint amount
); ) public;
} }

30
contracts/LiquidPledging.sol
View File

@ -41,7 +41,7 @@ contract LiquidPledging is LiquidPledgingBase {
address _vault, address _vault,
address _escapeHatchCaller, address _escapeHatchCaller,
address _escapeHatchDestination address _escapeHatchDestination
) LiquidPledgingBase(_vault, _escapeHatchCaller, _escapeHatchDestination) { ) LiquidPledgingBase(_vault, _escapeHatchCaller, _escapeHatchDestination) public {
} }
@ -53,7 +53,7 @@ contract LiquidPledging is LiquidPledgingBase {
/// @param idGiver The id of the Giver donating; if 0, a new id is created /// @param idGiver The id of the Giver donating; if 0, a new id is created
/// @param idReceiver The Admin receiving the donation; can be any Admin: /// @param idReceiver The Admin receiving the donation; can be any Admin:
/// the Giver themselves, another Giver, a Delegate or a Project /// the Giver themselves, another Giver, a Delegate or a Project
function donate(uint64 idGiver, uint64 idReceiver) payable { function donate(uint64 idGiver, uint64 idReceiver) public payable {
if (idGiver == 0) { if (idGiver == 0) {
// default to a 3 day (259200 seconds) commitTime // default to a 3 day (259200 seconds) commitTime
@ -98,7 +98,7 @@ contract LiquidPledging is LiquidPledgingBase {
uint64 idPledge, uint64 idPledge,
uint amount, uint amount,
uint64 idReceiver uint64 idReceiver
){ ) public {
idPledge = normalizePledge(idPledge); idPledge = normalizePledge(idPledge);
@ -224,7 +224,7 @@ contract LiquidPledging is LiquidPledgingBase {
/// intendedProject /// intendedProject
/// @param idPledge Id of the pledge that is to be redeemed into ether /// @param idPledge Id of the pledge that is to be redeemed into ether
/// @param amount Quantity of ether (in wei) to be authorized /// @param amount Quantity of ether (in wei) to be authorized
function withdraw(uint64 idPledge, uint amount) { function withdraw(uint64 idPledge, uint amount) public {
idPledge = normalizePledge(idPledge); // Updates pledge info idPledge = normalizePledge(idPledge); // Updates pledge info
Pledge storage p = findPledge(idPledge); Pledge storage p = findPledge(idPledge);
require(p.pledgeState == PledgeState.Pledged); require(p.pledgeState == PledgeState.Pledged);
@ -249,7 +249,7 @@ contract LiquidPledging is LiquidPledgingBase {
/// from Paying to Paid /// from Paying to Paid
/// @param idPledge Id of the pledge that is to be withdrawn /// @param idPledge Id of the pledge that is to be withdrawn
/// @param amount Quantity of ether (in wei) to be withdrawn /// @param amount Quantity of ether (in wei) to be withdrawn
function confirmPayment(uint64 idPledge, uint amount) onlyVault { function confirmPayment(uint64 idPledge, uint amount) public onlyVault {
Pledge storage p = findPledge(idPledge); Pledge storage p = findPledge(idPledge);
require(p.pledgeState == PledgeState.Paying); require(p.pledgeState == PledgeState.Paying);
@ -270,7 +270,7 @@ contract LiquidPledging is LiquidPledgingBase {
/// from Paying back to Pledged /// from Paying back to Pledged
/// @param idPledge Id of the pledge that's withdraw is to be canceled /// @param idPledge Id of the pledge that's withdraw is to be canceled
/// @param amount Quantity of ether (in wei) to be canceled /// @param amount Quantity of ether (in wei) to be canceled
function cancelPayment(uint64 idPledge, uint amount) onlyVault { function cancelPayment(uint64 idPledge, uint amount) public onlyVault {
Pledge storage p = findPledge(idPledge); Pledge storage p = findPledge(idPledge);
require(p.pledgeState == PledgeState.Paying); //TODO change to revert???????????????????????????? require(p.pledgeState == PledgeState.Paying); //TODO change to revert????????????????????????????
@ -292,7 +292,7 @@ contract LiquidPledging is LiquidPledgingBase {
/// @notice Changes the `project.canceled` flag to `true`; cannot be undone /// @notice Changes the `project.canceled` flag to `true`; cannot be undone
/// @param idProject Id of the project that is to be canceled /// @param idProject Id of the project that is to be canceled
function cancelProject(uint64 idProject) { function cancelProject(uint64 idProject) public {
PledgeAdmin storage project = findAdmin(idProject); PledgeAdmin storage project = findAdmin(idProject);
checkAdminOwner(project); checkAdminOwner(project);
project.canceled = true; project.canceled = true;
@ -305,7 +305,7 @@ contract LiquidPledging is LiquidPledgingBase {
/// @param idPledge Id of the pledge that is to be canceled /// @param idPledge Id of the pledge that is to be canceled
/// @param amount Quantity of ether (in wei) to be transfered to the /// @param amount Quantity of ether (in wei) to be transfered to the
/// `oldPledge` /// `oldPledge`
function cancelPledge(uint64 idPledge, uint amount) { function cancelPledge(uint64 idPledge, uint amount) public {
idPledge = normalizePledge(idPledge); idPledge = normalizePledge(idPledge);
Pledge storage p = findPledge(idPledge); Pledge storage p = findPledge(idPledge);
@ -344,7 +344,7 @@ contract LiquidPledging is LiquidPledgingBase {
uint64 idSender, uint64 idSender,
uint[] pledgesAmounts, uint[] pledgesAmounts,
uint64 idReceiver uint64 idReceiver
) { ) public {
for (uint i = 0; i < pledgesAmounts.length; i++ ) { for (uint i = 0; i < pledgesAmounts.length; i++ ) {
uint64 idPledge = uint64( pledgesAmounts[i] & (D64-1) ); uint64 idPledge = uint64( pledgesAmounts[i] & (D64-1) );
uint amount = pledgesAmounts[i] / D64; uint amount = pledgesAmounts[i] / D64;
@ -358,7 +358,7 @@ contract LiquidPledging is LiquidPledgingBase {
/// @param pledgesAmounts An array of Pledge amounts and the idPledges with /// @param pledgesAmounts An array of Pledge amounts and the idPledges with
/// which the amounts are associated; these are extrapolated using the D64 /// which the amounts are associated; these are extrapolated using the D64
/// bitmask /// bitmask
function mWithdraw(uint[] pledgesAmounts) { function mWithdraw(uint[] pledgesAmounts) public {
for (uint i = 0; i < pledgesAmounts.length; i++ ) { for (uint i = 0; i < pledgesAmounts.length; i++ ) {
uint64 idPledge = uint64( pledgesAmounts[i] & (D64-1) ); uint64 idPledge = uint64( pledgesAmounts[i] & (D64-1) );
uint amount = pledgesAmounts[i] / D64; uint amount = pledgesAmounts[i] / D64;
@ -371,7 +371,7 @@ contract LiquidPledging is LiquidPledgingBase {
/// efficiently /// efficiently
/// @param pledgesAmounts An array of pledge amounts and IDs which are extrapolated /// @param pledgesAmounts An array of pledge amounts and IDs which are extrapolated
/// using the D64 bitmask /// using the D64 bitmask
function mConfirmPayment(uint[] pledgesAmounts) { function mConfirmPayment(uint[] pledgesAmounts) public {
for (uint i = 0; i < pledgesAmounts.length; i++ ) { for (uint i = 0; i < pledgesAmounts.length; i++ ) {
uint64 idPledge = uint64( pledgesAmounts[i] & (D64-1) ); uint64 idPledge = uint64( pledgesAmounts[i] & (D64-1) );
uint amount = pledgesAmounts[i] / D64; uint amount = pledgesAmounts[i] / D64;
@ -384,7 +384,7 @@ contract LiquidPledging is LiquidPledgingBase {
/// efficiently /// efficiently
/// @param pledgesAmounts An array of pledge amounts and IDs which are extrapolated /// @param pledgesAmounts An array of pledge amounts and IDs which are extrapolated
/// using the D64 bitmask /// using the D64 bitmask
function mCancelPayment(uint[] pledgesAmounts) { function mCancelPayment(uint[] pledgesAmounts) public {
for (uint i = 0; i < pledgesAmounts.length; i++ ) { for (uint i = 0; i < pledgesAmounts.length; i++ ) {
uint64 idPledge = uint64( pledgesAmounts[i] & (D64-1) ); uint64 idPledge = uint64( pledgesAmounts[i] & (D64-1) );
uint amount = pledgesAmounts[i] / D64; uint amount = pledgesAmounts[i] / D64;
@ -396,7 +396,7 @@ contract LiquidPledging is LiquidPledgingBase {
/// @notice `mNormalizePledge` allows for multiple pledges to be /// @notice `mNormalizePledge` allows for multiple pledges to be
/// normalized efficiently /// normalized efficiently
/// @param pledges An array of pledge IDs /// @param pledges An array of pledge IDs
function mNormalizePledge(uint64[] pledges) { function mNormalizePledge(uint64[] pledges) public {
for (uint i = 0; i < pledges.length; i++ ) { for (uint i = 0; i < pledges.length; i++ ) {
normalizePledge( pledges[i] ); normalizePledge( pledges[i] );
} }
@ -601,7 +601,7 @@ contract LiquidPledging is LiquidPledgingBase {
/// plugins, which also need to be predicted by the UI /// plugins, which also need to be predicted by the UI
/// @param idPledge This is the id of the pledge that will be normalized /// @param idPledge This is the id of the pledge that will be normalized
/// @return The normalized Pledge! /// @return The normalized Pledge!
function normalizePledge(uint64 idPledge) returns(uint64) { function normalizePledge(uint64 idPledge) public returns(uint64) {
Pledge storage p = findPledge(idPledge); Pledge storage p = findPledge(idPledge);
@ -800,7 +800,7 @@ contract LiquidPledging is LiquidPledgingBase {
///////////// /////////////
/// @notice Basic helper function to return the current time /// @notice Basic helper function to return the current time
function getTime() internal returns (uint) { function getTime() internal view returns (uint) {
return now; return now;
} }

44
contracts/LiquidPledgingBase.sol
View File

@ -25,8 +25,8 @@ import "giveth-common-contracts/contracts/Escapable.sol";
/// the ETH that backs the Pledges, only after `LiquidPledging` authorizes /// the ETH that backs the Pledges, only after `LiquidPledging` authorizes
/// payments can Pledges be converted for ETH /// payments can Pledges be converted for ETH
interface LPVault { interface LPVault {
function authorizePayment(bytes32 _ref, address _dest, uint _amount); function authorizePayment(bytes32 _ref, address _dest, uint _amount) public;
function () payable; function () public payable;
} }
/// @dev `LiquidPledgingBase` is the base level contract used to carry out /// @dev `LiquidPledgingBase` is the base level contract used to carry out
@ -127,7 +127,7 @@ contract LiquidPledgingBase is Escapable {
string url, string url,
uint64 commitTime, uint64 commitTime,
ILiquidPledgingPlugin plugin ILiquidPledgingPlugin plugin
) returns (uint64 idGiver) { ) public returns (uint64 idGiver) {
require(isValidPlugin(plugin)); // Plugin check require(isValidPlugin(plugin)); // Plugin check
@ -162,7 +162,7 @@ contract LiquidPledgingBase is Escapable {
address newAddr, address newAddr,
string newName, string newName,
string newUrl, string newUrl,
uint64 newCommitTime) uint64 newCommitTime) public
{ {
PledgeAdmin storage giver = findAdmin(idGiver); PledgeAdmin storage giver = findAdmin(idGiver);
require(giver.adminType == PledgeAdminType.Giver); // Must be a Giver require(giver.adminType == PledgeAdminType.Giver); // Must be a Giver
@ -191,7 +191,7 @@ contract LiquidPledgingBase is Escapable {
string url, string url,
uint64 commitTime, uint64 commitTime,
ILiquidPledgingPlugin plugin ILiquidPledgingPlugin plugin
) returns (uint64 idDelegate) { ) public returns (uint64 idDelegate) {
require(isValidPlugin(plugin)); // Plugin check require(isValidPlugin(plugin)); // Plugin check
@ -228,7 +228,8 @@ contract LiquidPledgingBase is Escapable {
address newAddr, address newAddr,
string newName, string newName,
string newUrl, string newUrl,
uint64 newCommitTime) { uint64 newCommitTime) public
{
PledgeAdmin storage delegate = findAdmin(idDelegate); PledgeAdmin storage delegate = findAdmin(idDelegate);
require(delegate.adminType == PledgeAdminType.Delegate); require(delegate.adminType == PledgeAdminType.Delegate);
require(delegate.addr == msg.sender);// Current addr had to send this tx require(delegate.addr == msg.sender);// Current addr had to send this tx
@ -260,7 +261,8 @@ contract LiquidPledgingBase is Escapable {
uint64 parentProject, uint64 parentProject,
uint64 commitTime, uint64 commitTime,
ILiquidPledgingPlugin plugin ILiquidPledgingPlugin plugin
) returns (uint64 idProject) { ) public returns (uint64 idProject)
{
require(isValidPlugin(plugin)); require(isValidPlugin(plugin));
if (parentProject != 0) { if (parentProject != 0) {
@ -303,7 +305,7 @@ contract LiquidPledgingBase is Escapable {
address newAddr, address newAddr,
string newName, string newName,
string newUrl, string newUrl,
uint64 newCommitTime) uint64 newCommitTime) public
{ {
PledgeAdmin storage project = findAdmin(idProject); PledgeAdmin storage project = findAdmin(idProject);
require(project.adminType == PledgeAdminType.Project); require(project.adminType == PledgeAdminType.Project);
@ -324,7 +326,7 @@ contract LiquidPledgingBase is Escapable {
/// @notice A constant getter that returns the total number of pledges /// @notice A constant getter that returns the total number of pledges
/// @return The total number of Pledges in the system /// @return The total number of Pledges in the system
function numberOfPledges() constant returns (uint) { function numberOfPledges() public constant returns (uint) {
return pledges.length - 1; return pledges.length - 1;
} }
@ -333,7 +335,7 @@ contract LiquidPledgingBase is Escapable {
/// @return the amount, owner, the number of delegates (but not the actual /// @return the amount, owner, the number of delegates (but not the actual
/// delegates, the intendedProject (if any), the current commit time and /// delegates, the intendedProject (if any), the current commit time and
/// the previous pledge this pledge was derived from /// the previous pledge this pledge was derived from
function getPledge(uint64 idPledge) constant returns( function getPledge(uint64 idPledge) public constant returns(
uint amount, uint amount,
uint64 owner, uint64 owner,
uint64 nDelegates, uint64 nDelegates,
@ -355,7 +357,7 @@ contract LiquidPledgingBase is Escapable {
/// @notice Getter to find Delegate w/ the Pledge ID & the Delegate index /// @notice Getter to find Delegate w/ the Pledge ID & the Delegate index
/// @param idPledge The id number representing the pledge being queried /// @param idPledge The id number representing the pledge being queried
/// @param idxDelegate The index number for the delegate in this Pledge /// @param idxDelegate The index number for the delegate in this Pledge
function getPledgeDelegate(uint64 idPledge, uint idxDelegate) constant returns( function getPledgeDelegate(uint64 idPledge, uint idxDelegate) public constant returns(
uint64 idDelegate, uint64 idDelegate,
address addr, address addr,
string name string name
@ -369,7 +371,7 @@ contract LiquidPledgingBase is Escapable {
/// @notice A constant getter used to check how many total Admins exist /// @notice A constant getter used to check how many total Admins exist
/// @return The total number of admins (Givers, Delegates and Projects) . /// @return The total number of admins (Givers, Delegates and Projects) .
function numberOfPledgeAdmins() constant returns(uint) { function numberOfPledgeAdmins() public constant returns(uint) {
return admins.length - 1; return admins.length - 1;
} }
@ -386,7 +388,7 @@ contract LiquidPledgingBase is Escapable {
/// canceled /// canceled
/// @return plugin This is Project's liquidPledging plugin allowing for /// @return plugin This is Project's liquidPledging plugin allowing for
/// extended functionality /// extended functionality
function getPledgeAdmin(uint64 idAdmin) constant returns ( function getPledgeAdmin(uint64 idAdmin) public constant returns (
PledgeAdminType adminType, PledgeAdminType adminType,
address addr, address addr,
string name, string name,
@ -436,7 +438,7 @@ contract LiquidPledgingBase is Escapable {
PledgeState state PledgeState state
) internal returns (uint64) ) internal returns (uint64)
{ {
bytes32 hPledge = sha3( bytes32 hPledge = keccak256(
owner, delegationChain, intendedProject, commitTime, oldPledge, state); owner, delegationChain, intendedProject, commitTime, oldPledge, state);
uint64 idx = hPledge2idx[hPledge]; uint64 idx = hPledge2idx[hPledge];
if (idx > 0) return idx; if (idx > 0) return idx;
@ -450,7 +452,7 @@ contract LiquidPledgingBase is Escapable {
/// @notice A getter to look up a Admin's details /// @notice A getter to look up a Admin's details
/// @param idAdmin The id for the Admin to lookup /// @param idAdmin The id for the Admin to lookup
/// @return The PledgeAdmin struct for the specified Admin /// @return The PledgeAdmin struct for the specified Admin
function findAdmin(uint64 idAdmin) internal returns (PledgeAdmin storage) { function findAdmin(uint64 idAdmin) internal view returns (PledgeAdmin storage) {
require(idAdmin < admins.length); require(idAdmin < admins.length);
return admins[idAdmin]; return admins[idAdmin];
} }
@ -458,7 +460,7 @@ contract LiquidPledgingBase is Escapable {
/// @notice A getter to look up a Pledge's details /// @notice A getter to look up a Pledge's details
/// @param idPledge The id for the Pledge to lookup /// @param idPledge The id for the Pledge to lookup
/// @return The PledgeA struct for the specified Pledge /// @return The PledgeA struct for the specified Pledge
function findPledge(uint64 idPledge) internal returns (Pledge storage) { function findPledge(uint64 idPledge) internal view returns (Pledge storage) {
require(idPledge < pledges.length); require(idPledge < pledges.length);
return pledges[idPledge]; return pledges[idPledge];
} }
@ -474,7 +476,7 @@ contract LiquidPledgingBase is Escapable {
/// `admins` array index `idDelegate` this returns that delegates /// `admins` array index `idDelegate` this returns that delegates
/// corresponding index in the delegationChain. Otherwise it returns /// corresponding index in the delegationChain. Otherwise it returns
/// the NOTFOUND constant /// the NOTFOUND constant
function getDelegateIdx(Pledge p, uint64 idDelegate) internal returns(uint64) { function getDelegateIdx(Pledge p, uint64 idDelegate) internal pure returns(uint64) {
for (uint i=0; i < p.delegationChain.length; i++) { for (uint i=0; i < p.delegationChain.length; i++) {
if (p.delegationChain[i] == idDelegate) return uint64(i); if (p.delegationChain[i] == idDelegate) return uint64(i);
} }
@ -495,7 +497,7 @@ contract LiquidPledgingBase is Escapable {
/// the delegates for a specified pledge /// the delegates for a specified pledge
/// @param p The Pledge being queried /// @param p The Pledge being queried
/// @return The maximum commitTime out of the owner and all the delegates /// @return The maximum commitTime out of the owner and all the delegates
function maxCommitTime(Pledge p) internal returns(uint commitTime) { function maxCommitTime(Pledge p) internal view returns(uint commitTime) {
PledgeAdmin storage m = findAdmin(p.owner); PledgeAdmin storage m = findAdmin(p.owner);
commitTime = m.commitTime; // start with the owner's commitTime commitTime = m.commitTime; // start with the owner's commitTime
@ -521,7 +523,7 @@ contract LiquidPledgingBase is Escapable {
/// @notice A getter to find if a specified Project has been canceled /// @notice A getter to find if a specified Project has been canceled
/// @param projectId The Admin id number used to specify the Project /// @param projectId The Admin id number used to specify the Project
/// @return True if the Project has been canceled /// @return True if the Project has been canceled
function isProjectCanceled(uint64 projectId) constant returns (bool) { function isProjectCanceled(uint64 projectId) public constant returns (bool) {
PledgeAdmin storage m = findAdmin(projectId); PledgeAdmin storage m = findAdmin(projectId);
if (m.adminType == PledgeAdminType.Giver) return false; if (m.adminType == PledgeAdminType.Giver) return false;
assert(m.adminType == PledgeAdminType.Project); assert(m.adminType == PledgeAdminType.Project);
@ -569,7 +571,7 @@ contract LiquidPledgingBase is Escapable {
usePluginWhitelist = useWhitelist; usePluginWhitelist = useWhitelist;
} }
function isValidPlugin(address addr) public returns(bool) { function isValidPlugin(address addr) public view returns(bool) {
if (!usePluginWhitelist || addr == 0x0) return true; if (!usePluginWhitelist || addr == 0x0) return true;
bytes32 contractHash = getCodeHash(addr); bytes32 contractHash = getCodeHash(addr);
@ -577,7 +579,7 @@ contract LiquidPledgingBase is Escapable {
return pluginWhitelist[contractHash]; return pluginWhitelist[contractHash];
} }
function getCodeHash(address addr) public returns(bytes32) { function getCodeHash(address addr) public view returns(bytes32) {
bytes memory o_code; bytes memory o_code;
assembly { assembly {
// retrieve the size of the code, this needs assembly // retrieve the size of the code, this needs assembly