Merge branch 'master' into add_donor_on_donate
This commit is contained in:
Jordi Baylina
GitHub
commit
7b34866559
|
|
@ -1,19 +1,32 @@
|
|||
pragma solidity ^0.4.11;
|
||||
|
||||
contract ILiquidPledgingPlugin {
|
||||
|
||||
/// @param context In which context it is affected.
|
||||
/// 0 -> owner from
|
||||
/// 1 -> First delegate from
|
||||
/// 2 -> Second delegate from
|
||||
/// @notice Plugins are used (much like web hooks) to initiate an action
|
||||
/// upon any donation, delegation, or transfer; this is an optional feature
|
||||
/// and allows for extreme customization of the contract
|
||||
/// @param context The situation that is triggering the plugin:
|
||||
/// 0 -> Plugin for the owner transferring pledge to another party
|
||||
/// 1 -> Plugin for the first delegate transferring pledge to another party
|
||||
/// 2 -> Plugin for the second delegate transferring pledge to another party
|
||||
/// ...
|
||||
/// 255 -> proposedProject from
|
||||
/// 255 -> Plugin for the proposedProject transferring pledge to another party
|
||||
///
|
||||
/// 256 -> owner to
|
||||
/// 257 -> First delegate to
|
||||
/// 258 -> Second delegate to
|
||||
/// 256 -> Plugin for the owner receiving pledge to another party
|
||||
/// 257 -> Plugin for the first delegate receiving pledge to another party
|
||||
/// 258 -> Plugin for the second delegate receiving pledge to another party
|
||||
/// ...
|
||||
/// 511 -> proposedProject to
|
||||
function beforeTransfer(uint64 noteManager, uint64 noteFrom, uint64 noteTo, uint64 context, uint amount) returns (uint maxAllowed);
|
||||
function afterTransfer(uint64 noteManager, uint64 noteFrom, uint64 noteTo, uint64 context, uint amount);
|
||||
/// 511 -> Plugin for the proposedProject receiving pledge to another party
|
||||
function beforeTransfer(
|
||||
uint64 noteManager,
|
||||
uint64 noteFrom,
|
||||
uint64 noteTo,
|
||||
uint64 context,
|
||||
uint amount
|
||||
) returns (uint maxAllowed);
|
||||
function afterTransfer(
|
||||
uint64 noteManager,
|
||||
uint64 noteFrom,
|
||||
uint64 noteTo,
|
||||
uint64 context,
|
||||
uint amount);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,19 +10,19 @@ contract LiquidPledging is LiquidPledgingBase {
|
|||
// Constructor
|
||||
//////
|
||||
|
||||
// This constructor actualy also calls the constructor for the
|
||||
// `LiquidPledgingBase` contract
|
||||
// This constructor also calls the constructor for `LiquidPledgingBase`
|
||||
function LiquidPledging(address _vault) LiquidPledgingBase(_vault) {
|
||||
}
|
||||
|
||||
/// @notice This is how value enters into the system which creates notes. The
|
||||
/// token of value goes into the vault and then the amount in the Note
|
||||
/// relevant to this donor without delegates is increased.
|
||||
/// After that, a normal transfer is done to the idReceiver.
|
||||
/// @notice This is how value enters into the system which creates pledges;
|
||||
/// the token of value goes into the vault and the amount in the pledge
|
||||
/// relevant to this Giver without delegates is increased, and a normal
|
||||
/// transfer is done to the idReceiver
|
||||
/// @param idDonor Identifier of the donor thats donating.
|
||||
/// @param idReceiver To whom it's transfered. Can be the same donor, another
|
||||
/// donor, a delegate or a project
|
||||
function donate(uint64 idDonor, uint64 idReceiver) payable {// TODO change to `pledge()`
|
||||
|
||||
function donate(uint64 idDonor, uint64 idReceiver) payable {
|
||||
if (idDonor == 0) {
|
||||
idDonor = addDonor('', 259200, ILiquidPledgingPlugin(0x0)); // default to 3 day commitTime
|
||||
}
|
||||
|
|
@ -40,7 +40,7 @@ contract LiquidPledging is LiquidPledgingBase {
|
|||
vault.transfer(amount); // transfers the baseToken to the Vault
|
||||
uint64 idNote = findNote(
|
||||
idDonor,
|
||||
new uint64[](0), //what is new
|
||||
new uint64[](0), //what is new?
|
||||
0,
|
||||
0,
|
||||
0,
|
||||
|
|
@ -56,9 +56,9 @@ contract LiquidPledging is LiquidPledgingBase {
|
|||
}
|
||||
|
||||
|
||||
/// @notice This is the main function to move value from one Note to the other
|
||||
/// @param idSender ID of the donor, delegate or project manager that is transfering
|
||||
/// the funds from Note to Note. This manager must have permisions to move the value
|
||||
/// @notice Moves value between notes
|
||||
/// @param idSender ID of the donor, delegate or project manager that is transferring
|
||||
/// the funds from Note to Note. This manager must have permissions to move the value
|
||||
/// @param idNote Id of the note that's moving the value
|
||||
/// @param amount Quantity of value that's being moved
|
||||
/// @param idReceiver Destination of the value, can be a donor sending to a donor or
|
||||
|
|
@ -142,8 +142,8 @@ contract LiquidPledging is LiquidPledgingBase {
|
|||
/// @notice This method is used to withdraw value from the system. This can be used
|
||||
/// by the donors to avoid committing the donation or by project manager to use
|
||||
/// the Ether.
|
||||
/// @param idNote Id of the note that wants to be withdrawed.
|
||||
/// @param amount Quantity of Ether that wants to be withdrawed.
|
||||
/// @param idNote Id of the note that wants to be withdrawn.
|
||||
/// @param amount Quantity of Ether that wants to be withdrawn.
|
||||
function withdraw(uint64 idNote, uint amount) {
|
||||
|
||||
idNote = normalizeNote(idNote);
|
||||
|
|
@ -171,8 +171,8 @@ contract LiquidPledging is LiquidPledgingBase {
|
|||
}
|
||||
|
||||
/// @notice Method called by the vault to confirm a payment.
|
||||
/// @param idNote Id of the note that wants to be withdrawed.
|
||||
/// @param amount Quantity of Ether that wants to be withdrawed.
|
||||
/// @param idNote Id of the note that wants to be withdrawn.
|
||||
/// @param amount Quantity of Ether that wants to be withdrawn.
|
||||
function confirmPayment(uint64 idNote, uint amount) onlyVault {
|
||||
Note storage n = findNote(idNote);
|
||||
|
||||
|
|
@ -201,7 +201,7 @@ contract LiquidPledging is LiquidPledgingBase {
|
|||
|
||||
require(n.paymentState == PaymentState.Paying); //TODO change to revert
|
||||
|
||||
// When a payment is cacnceled, never is assigned to a project.
|
||||
// When a payment is canceled, never is assigned to a project.
|
||||
uint64 oldNote = findNote(
|
||||
n.owner,
|
||||
n.delegationChain,
|
||||
|
|
@ -293,7 +293,7 @@ contract LiquidPledging is LiquidPledgingBase {
|
|||
///////
|
||||
|
||||
// this function is obvious, but it can also be called to undelegate everyone
|
||||
// by setting your self as teh idReceiver
|
||||
// by setting yourself as the idReceiver
|
||||
function transferOwnershipToProject(uint64 idNote, uint amount, uint64 idReceiver) internal {
|
||||
Note storage n = findNote(idNote);
|
||||
|
||||
|
|
@ -348,7 +348,7 @@ contract LiquidPledging is LiquidPledgingBase {
|
|||
doTransfer(idNote, toNote, amount);
|
||||
}
|
||||
|
||||
/// @param q Unmber of undelegations
|
||||
/// @param q Number of undelegations
|
||||
function undelegate(uint64 idNote, uint amount, uint q) internal {
|
||||
Note storage n = findNote(idNote);
|
||||
uint64[] memory newDelegationChain = new uint64[](n.delegationChain.length - q);
|
||||
|
|
@ -396,13 +396,13 @@ contract LiquidPledging is LiquidPledgingBase {
|
|||
}
|
||||
|
||||
// This function does 2 things, #1: it checks to make sure that the pledges are correct
|
||||
// if the a pledged project has already been commited then it changes the owner
|
||||
// if the a pledged project has already been committed then it changes the owner
|
||||
// to be the proposed project (Note that the UI will have to read the commit time and manually
|
||||
// do what this function does to the note for the end user at the expiration of the committime)
|
||||
// do what this function does to the note for the end user at the expiration of the commitTime)
|
||||
// #2: It checks to make sure that if there has been a cancellation in the chain of projects,
|
||||
// then it adjusts the note's owner appropriately.
|
||||
// This call can be called from any body at any time on any node. In general it can be called
|
||||
// to froce the calls of the affected plugins.
|
||||
// to force the calls of the affected plugins, which also need to be predicted by the UI
|
||||
function normalizeNote(uint64 idNote) returns(uint64) {
|
||||
Note storage n = findNote(idNote);
|
||||
|
||||
|
|
|
|||
|
|
@ -2,43 +2,46 @@ pragma solidity ^0.4.11;
|
|||
|
||||
import "./ILiquidPledgingPlugin.sol";
|
||||
|
||||
/// @dev This is declares a few functions from `Vault` so that the
|
||||
/// `LiquidPledgingBase` contract can interface with the `Vault` contract
|
||||
contract Vault {
|
||||
function authorizePayment(bytes32 _ref, address _dest, uint _amount);
|
||||
function () payable;
|
||||
}
|
||||
|
||||
contract LiquidPledgingBase {
|
||||
|
||||
// Limits inserted to prevent large loops that could prevent canceling
|
||||
uint constant MAX_DELEGATES = 20;
|
||||
uint constant MAX_SUBPROJECT_LEVEL = 20;
|
||||
uint constant MAX_INTERPROJECT_LEVEL = 20;
|
||||
|
||||
enum NoteManagerType { Donor, Delegate, Project }// todo change name
|
||||
enum PaymentState { NotPaid, Paying, Paid }
|
||||
enum NoteManagerType { Donor, Delegate, Project } // todo change name Donor Project
|
||||
enum PaymentState { NotPaid, Paying, Paid } // TODO name change NotPaid
|
||||
|
||||
// This struct defines the details of each the NoteManager, these NoteManagers can create
|
||||
struct NoteManager {// change manager
|
||||
NoteManagerType managerType;
|
||||
address addr;
|
||||
string name;
|
||||
uint64 commitTime; // Only used in donors and projects, its the precommitment time
|
||||
uint64 parentProject; // Only for projects
|
||||
bool canceled; // Only for project
|
||||
ILiquidPledgingPlugin plugin; // Handler that is called when one call is affected.
|
||||
/// @dev This struct defines the details of each the NoteManager, these
|
||||
/// NoteManagers can own notes and act as delegates
|
||||
struct NoteManager { // TODO name change NoteManager
|
||||
NoteManagerType managerType; // Giver, Delegate or Campaign
|
||||
address addr; // account or contract address for admin
|
||||
string name;
|
||||
uint64 commitTime; // In seconds, used for Givers' & Delegates' vetos
|
||||
uint64 parentProject; // Only for campaigns
|
||||
bool canceled; //Always false except for canceled campaigns
|
||||
ILiquidPledgingPlugin plugin; // if the plugin is 0x0 then nothing happens if its a contract address than that smart contract is called via the milestone contract
|
||||
}
|
||||
|
||||
struct Note {
|
||||
uint amount;
|
||||
uint64 owner;
|
||||
uint64[] delegationChain; //index numbers!!!!!
|
||||
uint64 owner; //NoteManager
|
||||
uint64[] delegationChain; // list of index numbers
|
||||
uint64 proposedProject; // TODO change the name only used for when delegates are precommiting to a project
|
||||
uint64 commitTime; // At what time the upcoming time will become an owner.
|
||||
uint64 commitTime; // When the proposedProject will become the owner
|
||||
uint64 oldNote; // this points to the Note[] index that the Note was derived from
|
||||
PaymentState paymentState;
|
||||
}
|
||||
|
||||
Note[] notes;
|
||||
NoteManager[] managers; // the list of all the note managers 0 is reserved for no manager
|
||||
NoteManager[] managers; //The list of noteManagers 0 means there is no manager
|
||||
Vault public vault;
|
||||
|
||||
// this mapping allows you to search for a specific note's index number by the hash of that note
|
||||
|
|
@ -59,6 +62,8 @@ contract LiquidPledgingBase {
|
|||
// Constructor
|
||||
//////
|
||||
|
||||
/// @notice The Constructor creates the `LiquidPledgingBase` on the blockchain
|
||||
/// @param _vault Where the ETH is stored that the pledges represent
|
||||
function LiquidPledgingBase(address _vault) {
|
||||
managers.length = 1; // we reserve the 0 manager
|
||||
notes.length = 1; // we reserve the 0 note
|
||||
|
|
@ -70,7 +75,9 @@ contract LiquidPledgingBase {
|
|||
// Managers functions
|
||||
//////
|
||||
|
||||
function addDonor(string name, uint64 commitTime, ILiquidPledgingPlugin plugin) returns (uint64 idDonor) {
|
||||
/// @notice Creates a donor.
|
||||
function addDonor(string name, uint64 commitTime, ILiquidPledgingPlugin plugin
|
||||
) returns (uint64 idDonor) {
|
||||
|
||||
idDonor = uint64(managers.length);
|
||||
|
||||
|
|
@ -88,6 +95,7 @@ contract LiquidPledgingBase {
|
|||
|
||||
event DonorAdded(uint64 indexed idDonor);
|
||||
|
||||
///@notice Changes the address, name or commitTime associated with a specific donor
|
||||
function updateDonor(
|
||||
uint64 idDonor,
|
||||
address newAddr,
|
||||
|
|
@ -95,8 +103,8 @@ contract LiquidPledgingBase {
|
|||
uint64 newCommitTime)
|
||||
{
|
||||
NoteManager storage donor = findManager(idDonor);
|
||||
require(donor.managerType == NoteManagerType.Donor);
|
||||
require(donor.addr == msg.sender);
|
||||
require(donor.managerType == NoteManagerType.Donor);//Must be a Giver
|
||||
require(donor.addr == msg.sender);//current addr had to originate this tx
|
||||
donor.addr = newAddr;
|
||||
donor.name = newName;
|
||||
donor.commitTime = newCommitTime;
|
||||
|
|
@ -105,6 +113,7 @@ contract LiquidPledgingBase {
|
|||
|
||||
event DonorUpdated(uint64 indexed idDonor);
|
||||
|
||||
/// @notice Creates a new Delegate
|
||||
function addDelegate(string name, uint64 commitTime, ILiquidPledgingPlugin plugin) returns (uint64 idDelegate) { //TODO return index number
|
||||
|
||||
idDelegate = uint64(managers.length);
|
||||
|
|
@ -123,6 +132,7 @@ contract LiquidPledgingBase {
|
|||
|
||||
event DelegateAdded(uint64 indexed idDelegate);
|
||||
|
||||
///@notice Changes the address, name or commitTime associated with a specific delegate
|
||||
function updateDelegate(
|
||||
uint64 idDelegate,
|
||||
address newAddr,
|
||||
|
|
@ -139,6 +149,7 @@ contract LiquidPledgingBase {
|
|||
|
||||
event DelegateUpdated(uint64 indexed idDelegate);
|
||||
|
||||
/// @notice Creates a new Campaign
|
||||
function addProject(string name, address projectManager, uint64 parentProject, uint64 commitTime, ILiquidPledgingPlugin plugin) returns (uint64 idProject) {
|
||||
if (parentProject != 0) {
|
||||
NoteManager storage pm = findManager(parentProject);
|
||||
|
|
@ -164,6 +175,7 @@ contract LiquidPledgingBase {
|
|||
|
||||
event ProjectAdded(uint64 indexed idProject);
|
||||
|
||||
///@notice Changes the address, name or commitTime associated with a specific Campaign
|
||||
function updateProject(
|
||||
uint64 idProject,
|
||||
address newAddr,
|
||||
|
|
@ -186,11 +198,11 @@ contract LiquidPledgingBase {
|
|||
// Public constant functions
|
||||
//////////
|
||||
|
||||
|
||||
/// @notice Public constant that states how many notes are in the system
|
||||
function numberOfNotes() constant returns (uint) {
|
||||
return notes.length - 1;
|
||||
}
|
||||
|
||||
/// @notice Public constant that states the details of the specified Note
|
||||
function getNote(uint64 idNote) constant returns(
|
||||
uint amount,
|
||||
uint64 owner,
|
||||
|
|
@ -209,7 +221,8 @@ contract LiquidPledgingBase {
|
|||
oldNote = n.oldNote;
|
||||
paymentState = n.paymentState;
|
||||
}
|
||||
// This is to return the delegates one by one, because you can not return an array
|
||||
/// @notice Public constant that states the delegates one by one, because
|
||||
/// an array cannot be returned
|
||||
function getNoteDelegate(uint64 idNote, uint idxDelegate) constant returns(
|
||||
uint64 idDelegate,
|
||||
address addr,
|
||||
|
|
@ -221,18 +234,19 @@ contract LiquidPledgingBase {
|
|||
addr = delegate.addr;
|
||||
name = delegate.name;
|
||||
}
|
||||
|
||||
/// @notice Public constant that states the number of admins in the system
|
||||
function numberOfNoteManagers() constant returns(uint) {
|
||||
return managers.length - 1;
|
||||
}
|
||||
|
||||
/// @notice Public constant that states the details of the specified admin
|
||||
function getNoteManager(uint64 idManager) constant returns (
|
||||
NoteManagerType managerType,
|
||||
address addr,
|
||||
string name,
|
||||
uint64 commitTime,
|
||||
uint64 parentProject,
|
||||
bool canceled)
|
||||
bool canceled,
|
||||
address plugin)
|
||||
{
|
||||
NoteManager storage m = findManager(idManager);
|
||||
managerType = m.managerType;
|
||||
|
|
@ -241,15 +255,17 @@ contract LiquidPledgingBase {
|
|||
commitTime = m.commitTime;
|
||||
parentProject = m.parentProject;
|
||||
canceled = m.canceled;
|
||||
plugin = address(m.plugin);
|
||||
}
|
||||
|
||||
////////
|
||||
// Private methods
|
||||
///////
|
||||
|
||||
// All notes exist... but if the note hasn't been created in this system yet then it wouldn't
|
||||
// be in the hash array hNoteddx[]
|
||||
// this function creates a balloon if one is not created already... this ballon has 0 for the amount
|
||||
/// @notice All notes technically exist... but if the note hasn't been
|
||||
/// created in this system yet then it wouldn't be in the hash array
|
||||
/// hNoteddx[]; this creates a Pledge with and amount of 0 if one is not
|
||||
/// created already...
|
||||
function findNote(
|
||||
uint64 owner,
|
||||
uint64[] delegationChain,
|
||||
|
|
@ -282,7 +298,7 @@ contract LiquidPledgingBase {
|
|||
uint64 constant NOTFOUND = 0xFFFFFFFFFFFFFFFF;
|
||||
|
||||
// helper function that searches the delegationChain fro a specific delegate and
|
||||
// level of delegation returns their idx in the delegation cahin which reflect their level of authority
|
||||
// level of delegation returns their idx in the delegation chain which reflect their level of authority
|
||||
function getDelegateIdx(Note n, uint64 idDelegate) internal returns(uint64) {
|
||||
for (uint i=0; i<n.delegationChain.length; i++) {
|
||||
if (n.delegationChain[i] == idDelegate) return uint64(i);
|
||||
|
|
@ -338,8 +354,8 @@ contract LiquidPledgingBase {
|
|||
return isProjectCanceled2(m.parentProject);
|
||||
}
|
||||
|
||||
// this makes it easy to cancel projects
|
||||
// @param idNote the note that may or may not be cancelled
|
||||
// @notice A helper function for canceling projects
|
||||
// @param idNote the note that may or may not be canceled
|
||||
function getOldestNoteNotCanceled(uint64 idNote) internal constant returns(uint64) { //todo rename
|
||||
if (idNote == 0) return 0;
|
||||
Note storage n = findNote(idNote);
|
||||
|
|
@ -356,8 +372,4 @@ contract LiquidPledgingBase {
|
|||
function checkManagerOwner(NoteManager m) internal constant {
|
||||
require((msg.sender == m.addr) || (msg.sender == address(m.plugin)));
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ contract Owned {
|
|||
/// but after this function is called the current owner still has ownership
|
||||
/// powers in this contract; change of ownership is a 2 step process
|
||||
/// @param _newOwner The address of the new owner. A simple contract with
|
||||
/// the abilitiy to accept ownership but the inability to do anything else
|
||||
/// the ability to accept ownership but the inability to do anything else
|
||||
/// can be used to create an unowned contract to achieve decentralization
|
||||
function changeOwner(address _newOwner) onlyOwner {
|
||||
newOwner = _newOwner;
|
||||
|
|
@ -34,7 +34,7 @@ contract Owned {
|
|||
|
||||
/// @notice `newOwner` can accept ownership over this contract
|
||||
function acceptOwnership() {
|
||||
if (msg.sender == newOwner) {
|
||||
require(msg.sender == newOwner) {
|
||||
owner = newOwner;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,37 +1,54 @@
|
|||
pragma solidity ^0.4.11;
|
||||
|
||||
/// @title Vault
|
||||
/// @author Jordi Baylina
|
||||
/// @notice This contract holds ether securely for liquid pledging systems. For
|
||||
/// this iteration the funds will come straight from the Giveth Multisig as a
|
||||
/// safety precaution, but once fully tested and optimized this contract will
|
||||
/// be a safe place to store funds equipped with optional variable time delays
|
||||
/// to allow for an optional escape hatch to be implemented
|
||||
import "./Owned.sol";
|
||||
|
||||
/// @dev This is declares a few functions from `LiquidPledging` so that the
|
||||
/// `Vault` contract can interface with the `LiquidPledging` contract
|
||||
contract LiquidPledging {
|
||||
function confirmPayment(uint64 idNote, uint amount);
|
||||
function cancelPayment(uint64 idNote, uint amount);
|
||||
}
|
||||
|
||||
|
||||
/// @dev `Vault` is a higher level contract built off of the `Owned`
|
||||
/// contract that holds funds for the liquid pledging system.
|
||||
contract Vault is Owned {
|
||||
|
||||
LiquidPledging public liquidPledging;
|
||||
bool public autoPay;
|
||||
LiquidPledging public liquidPledging; // liquidPledging contract's address
|
||||
bool public autoPay; // if false, payments will take 2 txs to be completed
|
||||
|
||||
enum PaymentState {
|
||||
Pending,
|
||||
Paid,
|
||||
Canceled
|
||||
Pending, // means the payment is awaiting confirmation
|
||||
Paid, // means the payment has been sent
|
||||
Canceled // means the payment will never be sent
|
||||
}
|
||||
|
||||
/// @dev `Payment` is a public structure that describes the details of
|
||||
/// each payment the `ref` param makes it easy to track the movements of
|
||||
/// funds transparently by its connection to other `Payment` structs
|
||||
struct Payment {
|
||||
PaymentState state;
|
||||
bytes32 ref;
|
||||
address dest;
|
||||
uint amount;
|
||||
PaymentState state; //
|
||||
bytes32 ref; // an input that references details from other contracts
|
||||
address dest; // recipient of the ETH
|
||||
uint amount; // amount of ETH (in wei) to be sent
|
||||
}
|
||||
|
||||
// @dev An array that contains all the payments for this Vault
|
||||
Payment[] public payments;
|
||||
|
||||
// @dev `liquidPledging` is the only address that can call a function with
|
||||
/// this modifier
|
||||
modifier onlyLiquidPledging() {
|
||||
require(msg.sender == address(liquidPledging));
|
||||
_;
|
||||
}
|
||||
|
||||
/// @dev USED FOR TESTING???
|
||||
function VaultMock() {
|
||||
|
||||
}
|
||||
|
|
@ -41,6 +58,7 @@ contract Vault is Owned {
|
|||
}
|
||||
|
||||
function setLiquidPledging(address _newLiquidPledging) onlyOwner {
|
||||
require(address(liquidPledging) == 0x0);
|
||||
liquidPledging = LiquidPledging(_newLiquidPledging);
|
||||
}
|
||||
|
||||
|
|
@ -74,7 +92,7 @@ contract Vault is Owned {
|
|||
require(p.state == PaymentState.Pending);
|
||||
|
||||
p.state = PaymentState.Paid;
|
||||
p.dest.transfer(p.amount);
|
||||
p.dest.transfer(p.amount); // only ETH denominated in wei
|
||||
|
||||
liquidPledging.confirmPayment(uint64(p.ref), p.amount);
|
||||
|
||||
|
|
@ -117,5 +135,4 @@ contract Vault is Owned {
|
|||
event ConfirmPayment(uint indexed idPayment);
|
||||
event CancelPayment(uint indexed idPayment);
|
||||
event AuthorizePayment(uint indexed idPayment, bytes32 indexed ref, address indexed dest, uint amount);
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue