status-im/liquid-funding
2
0
Fork 0
mirror of https://github.com/status-im/liquid-funding.git synced 2025-02-13 20:06:25 +00:00
Code Issues Projects Releases Wiki Activity

Plugins added

Browse Source
This commit is contained in:
Jordi Baylina 2017-09-13 14:41:08 +02:00
parent 0a2251aae2
commit 5ea28b94ca
No known key found for this signature in database
GPG Key ID: 7480C80C1BE43112
12 changed files with 399 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build/ILiquidPledgingPlugin.sol.js Normal file
View File

@ -0,0 +1,6 @@
/* This is an autogenerated file. DO NOT EDIT MANUALLY */
exports.ILiquidPledgingPluginAbi = [{"constant":false,"inputs":[{"name":"noteManager","type":"uint64"},{"name":"noteFrom","type":"uint64"},{"name":"noteTo","type":"uint64"},{"name":"context","type":"uint64"},{"name":"amount","type":"uint256"}],"name":"onTransfer","outputs":[{"name":"maxAllowed","type":"uint256"}],"payable":false,"type":"function"}]
exports.ILiquidPledgingPluginByteCode = "0x"
exports._solcVersion = "0.4.15+commit.bbb8e64f.Emscripten.clang"
exports._sha256 = "0xd63558e8c3447ba049eb7dbd54f5183be48d41b6d21564642d7817cd5af81820"

20
build/ILiquidPledgingPlugin_all.sol Normal file
View File

@ -0,0 +1,20 @@
//File: ./contracts/ILiquidPledgingPlugin.sol
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
/// ...
/// 255 -> proposedProject from
///
/// 256 -> owner to
/// 257 -> First delegate to
/// 258 -> Second delegate to
/// ...
/// 511 -> proposedProject to
function onTransfer(uint64 noteManager, uint64 noteFrom, uint64 noteTo, uint64 context, uint amount) returns (uint maxAllowed);
}

12
build/LiquidPledging.sol.js
View File

File diff suppressed because one or more lines are too long

8
build/LiquidPledgingBase.sol.js
View File

File diff suppressed because one or more lines are too long

67
build/LiquidPledgingBase_all.sol
View File

@ -1,7 +1,29 @@
//File: contracts/ILiquidPledgingPlugin.sol
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
/// ...
/// 255 -> proposedProject from
///
/// 256 -> owner to
/// 257 -> First delegate to
/// 258 -> Second delegate to
/// ...
/// 511 -> proposedProject to
function onTransfer(uint64 noteManager, uint64 noteFrom, uint64 noteTo, uint64 context, uint amount) returns (uint maxAllowed);
}
//File: ./contracts/LiquidPledgingBase.sol
pragma solidity ^0.4.11;
contract Vault {
function authorizePayment(bytes32 _ref, address _dest, uint _amount);
function () payable;
@ -24,6 +46,7 @@ contract LiquidPledgingBase {
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.
}
struct Note {
@ -69,14 +92,15 @@ contract LiquidPledgingBase {
// Managers functions
//////
function addDonor(string name, uint64 commitTime) {//Todo return idManager
function addDonor(string name, uint64 commitTime, ILiquidPledgingPlugin plugin) {//Todo return idManager
managers.push(NoteManager(
NoteManagerType.Donor,
msg.sender,
name,
commitTime,
0,
false));
false,
plugin));
DonorAdded(uint64(managers.length-1));
}
@ -87,7 +111,8 @@ contract LiquidPledgingBase {
uint64 idDonor,
address newAddr,
string newName,
uint64 newCommitTime)
uint64 newCommitTime,
ILiquidPledgingPlugin newPlugin)
{
NoteManager storage donor = findManager(idDonor);
require(donor.managerType == NoteManagerType.Donor);
@ -95,37 +120,46 @@ contract LiquidPledgingBase {
donor.addr = newAddr;
donor.name = newName;
donor.commitTime = newCommitTime;
donor.plugin = newPlugin;
DonorUpdated(idDonor);
}
event DonorUpdated(uint64 indexed idDonor);
function addDelegate(string name) { //TODO return index number
function addDelegate(string name, uint64 commitTime, ILiquidPledgingPlugin plugin) { //TODO return index number
managers.push(NoteManager(
NoteManagerType.Delegate,
msg.sender,
name,
commitTime,
0,
0,
false));
false,
plugin));
DeegateAdded(uint64(managers.length-1));
}
event DeegateAdded(uint64 indexed idDelegate);
function updateDelegate(uint64 idDelegate, address newAddr, string newName) {
function updateDelegate(
uint64 idDelegate,
address newAddr,
string newName,
uint64 newCommitTime,
ILiquidPledgingPlugin newPlugin) {
NoteManager storage delegate = findManager(idDelegate);
require(delegate.managerType == NoteManagerType.Delegate);
require(delegate.addr == msg.sender);
delegate.addr = newAddr;
delegate.name = newName;
delegate.commitTime = newCommitTime;
delegate.plugin = newPlugin;
DelegateUpdated(idDelegate);
}
event DelegateUpdated(uint64 indexed idDelegate);
function addProject(string name, address projectManager, uint64 parentProject, uint64 commitTime) {
function addProject(string name, address projectManager, uint64 parentProject, uint64 commitTime, ILiquidPledgingPlugin plugin) {
if (parentProject != 0) {
NoteManager storage pm = findManager(parentProject);
require(pm.managerType == NoteManagerType.Project);
@ -138,20 +172,22 @@ contract LiquidPledgingBase {
name,
commitTime,
parentProject,
false));
false,
plugin));
ProjectAdded(uint64(managers.length-1));
}
event ProjectAdded(uint64 indexed idProject);
function updateProject(uint64 idProject, address newAddr, string newName, uint64 newCommitTime) {
function updateProject(uint64 idProject, address newAddr, string newName, uint64 newCommitTime, ILiquidPledgingPlugin newPlugin) {
NoteManager storage project = findManager(idProject);
require(project.managerType == NoteManagerType.Project);
require(project.addr == msg.sender);
project.addr = newAddr;
project.name = newName;
project.commitTime = newCommitTime;
project.plugin = newPlugin;
ProjectUpdated(idProject);
}
@ -274,6 +310,17 @@ contract LiquidPledgingBase {
return getNoteLevel(oldN) + 1;
}
// helper function that returns the max commit time of the owner and all the
// delegates
function maxCommitTime(Note n) internal returns(uint commitTime) {
NoteManager storage m = findManager(n.owner);
commitTime = m.commitTime;
for (uint i=0; i<n.delegationChain.length; i++) {
m = findManager(n.delegationChain[i]);
if (m.commitTime > commitTime) commitTime = m.commitTime;
}
}
// helper function that returns the project level solely to check that there
// are not too many Projects that violate MAX_SUBPROJECT_LEVEL

16
build/LiquidPledgingMock.sol.js
View File

File diff suppressed because one or more lines are too long

110
build/LiquidPledgingMock_all.sol
View File

@ -1,7 +1,29 @@
//File: contracts/ILiquidPledgingPlugin.sol
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
/// ...
/// 255 -> proposedProject from
///
/// 256 -> owner to
/// 257 -> First delegate to
/// 258 -> Second delegate to
/// ...
/// 511 -> proposedProject to
function onTransfer(uint64 noteManager, uint64 noteFrom, uint64 noteTo, uint64 context, uint amount) returns (uint maxAllowed);
}
//File: contracts/LiquidPledgingBase.sol
pragma solidity ^0.4.11;
contract Vault {
function authorizePayment(bytes32 _ref, address _dest, uint _amount);
function () payable;
@ -24,6 +46,7 @@ contract LiquidPledgingBase {
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.
}
struct Note {
@ -69,14 +92,15 @@ contract LiquidPledgingBase {
// Managers functions
//////
function addDonor(string name, uint64 commitTime) {//Todo return idManager
function addDonor(string name, uint64 commitTime, ILiquidPledgingPlugin plugin) {//Todo return idManager
managers.push(NoteManager(
NoteManagerType.Donor,
msg.sender,
name,
commitTime,
0,
false));
false,
plugin));
DonorAdded(uint64(managers.length-1));
}
@ -87,7 +111,8 @@ contract LiquidPledgingBase {
uint64 idDonor,
address newAddr,
string newName,
uint64 newCommitTime)
uint64 newCommitTime,
ILiquidPledgingPlugin newPlugin)
{
NoteManager storage donor = findManager(idDonor);
require(donor.managerType == NoteManagerType.Donor);
@ -95,37 +120,46 @@ contract LiquidPledgingBase {
donor.addr = newAddr;
donor.name = newName;
donor.commitTime = newCommitTime;
donor.plugin = newPlugin;
DonorUpdated(idDonor);
}
event DonorUpdated(uint64 indexed idDonor);
function addDelegate(string name) { //TODO return index number
function addDelegate(string name, uint64 commitTime, ILiquidPledgingPlugin plugin) { //TODO return index number
managers.push(NoteManager(
NoteManagerType.Delegate,
msg.sender,
name,
commitTime,
0,
0,
false));
false,
plugin));
DeegateAdded(uint64(managers.length-1));
}
event DeegateAdded(uint64 indexed idDelegate);
function updateDelegate(uint64 idDelegate, address newAddr, string newName) {
function updateDelegate(
uint64 idDelegate,
address newAddr,
string newName,
uint64 newCommitTime,
ILiquidPledgingPlugin newPlugin) {
NoteManager storage delegate = findManager(idDelegate);
require(delegate.managerType == NoteManagerType.Delegate);
require(delegate.addr == msg.sender);
delegate.addr = newAddr;
delegate.name = newName;
delegate.commitTime = newCommitTime;
delegate.plugin = newPlugin;
DelegateUpdated(idDelegate);
}
event DelegateUpdated(uint64 indexed idDelegate);
function addProject(string name, address projectManager, uint64 parentProject, uint64 commitTime) {
function addProject(string name, address projectManager, uint64 parentProject, uint64 commitTime, ILiquidPledgingPlugin plugin) {
if (parentProject != 0) {
NoteManager storage pm = findManager(parentProject);
require(pm.managerType == NoteManagerType.Project);
@ -138,20 +172,22 @@ contract LiquidPledgingBase {
name,
commitTime,
parentProject,
false));
false,
plugin));
ProjectAdded(uint64(managers.length-1));
}
event ProjectAdded(uint64 indexed idProject);
function updateProject(uint64 idProject, address newAddr, string newName, uint64 newCommitTime) {
function updateProject(uint64 idProject, address newAddr, string newName, uint64 newCommitTime, ILiquidPledgingPlugin newPlugin) {
NoteManager storage project = findManager(idProject);
require(project.managerType == NoteManagerType.Project);
require(project.addr == msg.sender);
project.addr = newAddr;
project.name = newName;
project.commitTime = newCommitTime;
project.plugin = newPlugin;
ProjectUpdated(idProject);
}
@ -274,6 +310,17 @@ contract LiquidPledgingBase {
return getNoteLevel(oldN) + 1;
}
// helper function that returns the max commit time of the owner and all the
// delegates
function maxCommitTime(Note n) internal returns(uint commitTime) {
NoteManager storage m = findManager(n.owner);
commitTime = m.commitTime;
for (uint i=0; i<n.delegationChain.length; i++) {
m = findManager(n.delegationChain[i]);
if (m.commitTime > commitTime) commitTime = m.commitTime;
}
}
// helper function that returns the project level solely to check that there
// are not too many Projects that violate MAX_SUBPROJECT_LEVEL
@ -670,18 +717,18 @@ contract LiquidPledging is LiquidPledgingBase {
require(getNoteLevel(n) < MAX_SUBPROJECT_LEVEL);
NoteManager storage owner = findManager(n.owner);
uint64 toNote = findNote(
n.owner,
n.delegationChain,
idReceiver,
uint64(getTime() + owner.commitTime),
uint64(getTime() + maxCommitTime(n)),
n.oldNote,
PaymentState.NotPaid);
doTransfer(idNote, toNote, amount);
}
function doTransfer(uint64 from, uint64 to, uint amount) internal {
function doTransfer(uint64 from, uint64 to, uint _amount) internal {
uint amount = callPlugins(from, to, _amount);
if (from == to) return;
if (amount == 0) return;
Note storage nFrom = findNote(from);
@ -734,6 +781,43 @@ contract LiquidPledging is LiquidPledgingBase {
return toNote;
}
/////////////
// Plugins
/////////////
function callPlugin(uint64 managerId, uint64 fromNote, uint64 toNote, uint64 context, uint amount) internal returns (uint allowedAmount) {
allowedAmount = amount;
NoteManager storage manager = findManager(managerId);
if ((address(manager.plugin) != 0) && (allowedAmount > 0)) {
uint newAmount = manager.plugin.onTransfer(managerId, fromNote, toNote, context, amount);
require(newAmount <= allowedAmount);
allowedAmount = newAmount;
}
}
function callPluginsNote(uint64 idNote, uint64 fromNote, uint64 toNote, uint amount) internal returns (uint allowedAmount) {
uint64 offset = idNote == fromNote ? 0 : 256;
allowedAmount = amount;
Note storage n = findNote(idNote);
allowedAmount = callPlugin(n.owner, fromNote, toNote, offset, allowedAmount);
for (uint64 i=0; i<n.delegationChain.length; i++) {
allowedAmount = callPlugin(n.delegationChain[i], fromNote, toNote, offset + i+1, allowedAmount);
}
if (n.proposedProject > 0) {
allowedAmount = callPlugin(n.proposedProject, fromNote, toNote, offset + 255, allowedAmount);
}
}
function callPlugins(uint64 fromNote, uint64 toNote, uint amount) internal returns (uint allowedAmount) {
allowedAmount = amount;
allowedAmount = callPluginsNote(fromNote, fromNote, toNote, allowedAmount);
allowedAmount = callPluginsNote(toNote, fromNote, toNote, allowedAmount);
}
/////////////
// Test functions
/////////////

110
build/LiquidPledging_all.sol
View File

@ -1,7 +1,29 @@
//File: contracts/ILiquidPledgingPlugin.sol
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
/// ...
/// 255 -> proposedProject from
///
/// 256 -> owner to
/// 257 -> First delegate to
/// 258 -> Second delegate to
/// ...
/// 511 -> proposedProject to
function onTransfer(uint64 noteManager, uint64 noteFrom, uint64 noteTo, uint64 context, uint amount) returns (uint maxAllowed);
}
//File: contracts/LiquidPledgingBase.sol
pragma solidity ^0.4.11;
contract Vault {
function authorizePayment(bytes32 _ref, address _dest, uint _amount);
function () payable;
@ -24,6 +46,7 @@ contract LiquidPledgingBase {
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.
}
struct Note {
@ -69,14 +92,15 @@ contract LiquidPledgingBase {
// Managers functions
//////
function addDonor(string name, uint64 commitTime) {//Todo return idManager
function addDonor(string name, uint64 commitTime, ILiquidPledgingPlugin plugin) {//Todo return idManager
managers.push(NoteManager(
NoteManagerType.Donor,
msg.sender,
name,
commitTime,
0,
false));
false,
plugin));
DonorAdded(uint64(managers.length-1));
}
@ -87,7 +111,8 @@ contract LiquidPledgingBase {
uint64 idDonor,
address newAddr,
string newName,
uint64 newCommitTime)
uint64 newCommitTime,
ILiquidPledgingPlugin newPlugin)
{
NoteManager storage donor = findManager(idDonor);
require(donor.managerType == NoteManagerType.Donor);
@ -95,37 +120,46 @@ contract LiquidPledgingBase {
donor.addr = newAddr;
donor.name = newName;
donor.commitTime = newCommitTime;
donor.plugin = newPlugin;
DonorUpdated(idDonor);
}
event DonorUpdated(uint64 indexed idDonor);
function addDelegate(string name) { //TODO return index number
function addDelegate(string name, uint64 commitTime, ILiquidPledgingPlugin plugin) { //TODO return index number
managers.push(NoteManager(
NoteManagerType.Delegate,
msg.sender,
name,
commitTime,
0,
0,
false));
false,
plugin));
DeegateAdded(uint64(managers.length-1));
}
event DeegateAdded(uint64 indexed idDelegate);
function updateDelegate(uint64 idDelegate, address newAddr, string newName) {
function updateDelegate(
uint64 idDelegate,
address newAddr,
string newName,
uint64 newCommitTime,
ILiquidPledgingPlugin newPlugin) {
NoteManager storage delegate = findManager(idDelegate);
require(delegate.managerType == NoteManagerType.Delegate);
require(delegate.addr == msg.sender);
delegate.addr = newAddr;
delegate.name = newName;
delegate.commitTime = newCommitTime;
delegate.plugin = newPlugin;
DelegateUpdated(idDelegate);
}
event DelegateUpdated(uint64 indexed idDelegate);
function addProject(string name, address projectManager, uint64 parentProject, uint64 commitTime) {
function addProject(string name, address projectManager, uint64 parentProject, uint64 commitTime, ILiquidPledgingPlugin plugin) {
if (parentProject != 0) {
NoteManager storage pm = findManager(parentProject);
require(pm.managerType == NoteManagerType.Project);
@ -138,20 +172,22 @@ contract LiquidPledgingBase {
name,
commitTime,
parentProject,
false));
false,
plugin));
ProjectAdded(uint64(managers.length-1));
}
event ProjectAdded(uint64 indexed idProject);
function updateProject(uint64 idProject, address newAddr, string newName, uint64 newCommitTime) {
function updateProject(uint64 idProject, address newAddr, string newName, uint64 newCommitTime, ILiquidPledgingPlugin newPlugin) {
NoteManager storage project = findManager(idProject);
require(project.managerType == NoteManagerType.Project);
require(project.addr == msg.sender);
project.addr = newAddr;
project.name = newName;
project.commitTime = newCommitTime;
project.plugin = newPlugin;
ProjectUpdated(idProject);
}
@ -274,6 +310,17 @@ contract LiquidPledgingBase {
return getNoteLevel(oldN) + 1;
}
// helper function that returns the max commit time of the owner and all the
// delegates
function maxCommitTime(Note n) internal returns(uint commitTime) {
NoteManager storage m = findManager(n.owner);
commitTime = m.commitTime;
for (uint i=0; i<n.delegationChain.length; i++) {
m = findManager(n.delegationChain[i]);
if (m.commitTime > commitTime) commitTime = m.commitTime;
}
}
// helper function that returns the project level solely to check that there
// are not too many Projects that violate MAX_SUBPROJECT_LEVEL
@ -670,18 +717,18 @@ contract LiquidPledging is LiquidPledgingBase {
require(getNoteLevel(n) < MAX_SUBPROJECT_LEVEL);
NoteManager storage owner = findManager(n.owner);
uint64 toNote = findNote(
n.owner,
n.delegationChain,
idReceiver,
uint64(getTime() + owner.commitTime),
uint64(getTime() + maxCommitTime(n)),
n.oldNote,
PaymentState.NotPaid);
doTransfer(idNote, toNote, amount);
}
function doTransfer(uint64 from, uint64 to, uint amount) internal {
function doTransfer(uint64 from, uint64 to, uint _amount) internal {
uint amount = callPlugins(from, to, _amount);
if (from == to) return;
if (amount == 0) return;
Note storage nFrom = findNote(from);
@ -734,6 +781,43 @@ contract LiquidPledging is LiquidPledgingBase {
return toNote;
}
/////////////
// Plugins
/////////////
function callPlugin(uint64 managerId, uint64 fromNote, uint64 toNote, uint64 context, uint amount) internal returns (uint allowedAmount) {
allowedAmount = amount;
NoteManager storage manager = findManager(managerId);
if ((address(manager.plugin) != 0) && (allowedAmount > 0)) {
uint newAmount = manager.plugin.onTransfer(managerId, fromNote, toNote, context, amount);
require(newAmount <= allowedAmount);
allowedAmount = newAmount;
}
}
function callPluginsNote(uint64 idNote, uint64 fromNote, uint64 toNote, uint amount) internal returns (uint allowedAmount) {
uint64 offset = idNote == fromNote ? 0 : 256;
allowedAmount = amount;
Note storage n = findNote(idNote);
allowedAmount = callPlugin(n.owner, fromNote, toNote, offset, allowedAmount);
for (uint64 i=0; i<n.delegationChain.length; i++) {
allowedAmount = callPlugin(n.delegationChain[i], fromNote, toNote, offset + i+1, allowedAmount);
}
if (n.proposedProject > 0) {
allowedAmount = callPlugin(n.proposedProject, fromNote, toNote, offset + 255, allowedAmount);
}
}
function callPlugins(uint64 fromNote, uint64 toNote, uint amount) internal returns (uint allowedAmount) {
allowedAmount = amount;
allowedAmount = callPluginsNote(fromNote, fromNote, toNote, allowedAmount);
allowedAmount = callPluginsNote(toNote, fromNote, toNote, allowedAmount);
}
/////////////
// Test functions
/////////////

18
contracts/ILiquidPledgingPlugin.sol Normal file
View File

@ -0,0 +1,18 @@
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
/// ...
/// 255 -> proposedProject from
///
/// 256 -> owner to
/// 257 -> First delegate to
/// 258 -> Second delegate to
/// ...
/// 511 -> proposedProject to
function onTransfer(uint64 noteManager, uint64 noteFrom, uint64 noteTo, uint64 context, uint amount) returns (uint maxAllowed);
}

43
contracts/LiquidPledging.sol
View File

@ -347,18 +347,18 @@ contract LiquidPledging is LiquidPledgingBase {
require(getNoteLevel(n) < MAX_SUBPROJECT_LEVEL);
NoteManager storage owner = findManager(n.owner);
uint64 toNote = findNote(
n.owner,
n.delegationChain,
idReceiver,
uint64(getTime() + owner.commitTime),
uint64(getTime() + maxCommitTime(n)),
n.oldNote,
PaymentState.NotPaid);
doTransfer(idNote, toNote, amount);
}
function doTransfer(uint64 from, uint64 to, uint amount) internal {
function doTransfer(uint64 from, uint64 to, uint _amount) internal {
uint amount = callPlugins(from, to, _amount);
if (from == to) return;
if (amount == 0) return;
Note storage nFrom = findNote(from);
@ -411,6 +411,43 @@ contract LiquidPledging is LiquidPledgingBase {
return toNote;
}
/////////////
// Plugins
/////////////
function callPlugin(uint64 managerId, uint64 fromNote, uint64 toNote, uint64 context, uint amount) internal returns (uint allowedAmount) {
allowedAmount = amount;
NoteManager storage manager = findManager(managerId);
if ((address(manager.plugin) != 0) && (allowedAmount > 0)) {
uint newAmount = manager.plugin.onTransfer(managerId, fromNote, toNote, context, amount);
require(newAmount <= allowedAmount);
allowedAmount = newAmount;
}
}
function callPluginsNote(uint64 idNote, uint64 fromNote, uint64 toNote, uint amount) internal returns (uint allowedAmount) {
uint64 offset = idNote == fromNote ? 0 : 256;
allowedAmount = amount;
Note storage n = findNote(idNote);
allowedAmount = callPlugin(n.owner, fromNote, toNote, offset, allowedAmount);
for (uint64 i=0; i<n.delegationChain.length; i++) {
allowedAmount = callPlugin(n.delegationChain[i], fromNote, toNote, offset + i+1, allowedAmount);
}
if (n.proposedProject > 0) {
allowedAmount = callPlugin(n.proposedProject, fromNote, toNote, offset + 255, allowedAmount);
}
}
function callPlugins(uint64 fromNote, uint64 toNote, uint amount) internal returns (uint allowedAmount) {
allowedAmount = amount;
allowedAmount = callPluginsNote(fromNote, fromNote, toNote, allowedAmount);
allowedAmount = callPluginsNote(toNote, fromNote, toNote, allowedAmount);
}
/////////////
// Test functions
/////////////

47
contracts/LiquidPledgingBase.sol
View File

@ -1,5 +1,7 @@
pragma solidity ^0.4.11;
import "./ILiquidPledgingPlugin.sol";
contract Vault {
function authorizePayment(bytes32 _ref, address _dest, uint _amount);
function () payable;
@ -22,6 +24,7 @@ contract LiquidPledgingBase {
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.
}
struct Note {
@ -67,14 +70,15 @@ contract LiquidPledgingBase {
// Managers functions
//////
function addDonor(string name, uint64 commitTime) {//Todo return idManager
function addDonor(string name, uint64 commitTime, ILiquidPledgingPlugin plugin) {//Todo return idManager
managers.push(NoteManager(
NoteManagerType.Donor,
msg.sender,
name,
commitTime,
0,
false));
false,
plugin));
DonorAdded(uint64(managers.length-1));
}
@ -85,7 +89,8 @@ contract LiquidPledgingBase {
uint64 idDonor,
address newAddr,
string newName,
uint64 newCommitTime)
uint64 newCommitTime,
ILiquidPledgingPlugin newPlugin)
{
NoteManager storage donor = findManager(idDonor);
require(donor.managerType == NoteManagerType.Donor);
@ -93,37 +98,46 @@ contract LiquidPledgingBase {
donor.addr = newAddr;
donor.name = newName;
donor.commitTime = newCommitTime;
donor.plugin = newPlugin;
DonorUpdated(idDonor);
}
event DonorUpdated(uint64 indexed idDonor);
function addDelegate(string name) { //TODO return index number
function addDelegate(string name, uint64 commitTime, ILiquidPledgingPlugin plugin) { //TODO return index number
managers.push(NoteManager(
NoteManagerType.Delegate,
msg.sender,
name,
commitTime,
0,
0,
false));
false,
plugin));
DeegateAdded(uint64(managers.length-1));
}
event DeegateAdded(uint64 indexed idDelegate);
function updateDelegate(uint64 idDelegate, address newAddr, string newName) {
function updateDelegate(
uint64 idDelegate,
address newAddr,
string newName,
uint64 newCommitTime,
ILiquidPledgingPlugin newPlugin) {
NoteManager storage delegate = findManager(idDelegate);
require(delegate.managerType == NoteManagerType.Delegate);
require(delegate.addr == msg.sender);
delegate.addr = newAddr;
delegate.name = newName;
delegate.commitTime = newCommitTime;
delegate.plugin = newPlugin;
DelegateUpdated(idDelegate);
}
event DelegateUpdated(uint64 indexed idDelegate);
function addProject(string name, address projectManager, uint64 parentProject, uint64 commitTime) {
function addProject(string name, address projectManager, uint64 parentProject, uint64 commitTime, ILiquidPledgingPlugin plugin) {
if (parentProject != 0) {
NoteManager storage pm = findManager(parentProject);
require(pm.managerType == NoteManagerType.Project);
@ -136,20 +150,22 @@ contract LiquidPledgingBase {
name,
commitTime,
parentProject,
false));
false,
plugin));
ProjectAdded(uint64(managers.length-1));
}
event ProjectAdded(uint64 indexed idProject);
function updateProject(uint64 idProject, address newAddr, string newName, uint64 newCommitTime) {
function updateProject(uint64 idProject, address newAddr, string newName, uint64 newCommitTime, ILiquidPledgingPlugin newPlugin) {
NoteManager storage project = findManager(idProject);
require(project.managerType == NoteManagerType.Project);
require(project.addr == msg.sender);
project.addr = newAddr;
project.name = newName;
project.commitTime = newCommitTime;
project.plugin = newPlugin;
ProjectUpdated(idProject);
}
@ -272,6 +288,17 @@ contract LiquidPledgingBase {
return getNoteLevel(oldN) + 1;
}
// helper function that returns the max commit time of the owner and all the
// delegates
function maxCommitTime(Note n) internal returns(uint commitTime) {
NoteManager storage m = findManager(n.owner);
commitTime = m.commitTime;
for (uint i=0; i<n.delegationChain.length; i++) {
m = findManager(n.delegationChain[i]);
if (m.commitTime > commitTime) commitTime = m.commitTime;
}
}
// helper function that returns the project level solely to check that there
// are not too many Projects that violate MAX_SUBPROJECT_LEVEL

12
test/NormalOperation.js
View File

@ -66,7 +66,7 @@ describe('LiquidPledging test', () => {
await vault.setLiquidPledging(liquidPledging.$address);
}).timeout(6000);
it('Should create a donor', async () => {
await liquidPledging.addDonor('Donor1', 86400, { from: donor1 });
await liquidPledging.addDonor('Donor1', 86400, 0, { from: donor1 });
const nManagers = await liquidPledging.numberOfNoteManagers();
assert.equal(nManagers, 1);
const res = await liquidPledging.getNoteManager(1);
@ -82,7 +82,7 @@ describe('LiquidPledging test', () => {
await liquidPledging.getNote(1);
}).timeout(6000);
it('Should create a delegate', async () => {
await liquidPledging.addDelegate('Delegate1', { from: delegate1 });
await liquidPledging.addDelegate('Delegate1', 0, 0, { from: delegate1 });
const nManagers = await liquidPledging.numberOfNoteManagers();
assert.equal(nManagers, 2);
const res = await liquidPledging.getNoteManager(2);
@ -106,7 +106,7 @@ describe('LiquidPledging test', () => {
assert.equal(d[2], 'Delegate1');
}).timeout(6000);
it('Should create a 2 projects', async () => {
await liquidPledging.addProject('Project1', adminProject1, 0, 86400, { from: adminProject1 });
await liquidPledging.addProject('Project1', adminProject1, 0, 86400, 0, { from: adminProject1 });
const nManagers = await liquidPledging.numberOfNoteManagers();
assert.equal(nManagers, 3);
@ -118,7 +118,7 @@ describe('LiquidPledging test', () => {
assert.equal(res[4], 0);
assert.equal(res[5], false);
await liquidPledging.addProject('Project2', adminProject2, 0, 86400, { from: adminProject2 });
await liquidPledging.addProject('Project2', adminProject2, 0, 86400, 0, { from: adminProject2 });
const nManagers2 = await liquidPledging.numberOfNoteManagers();
assert.equal(nManagers2, 4);
@ -234,8 +234,8 @@ describe('LiquidPledging test', () => {
assert.equal(web3.fromWei(st.notes[4].amount).toNumber(), 0.12);
}).timeout(6000);
it('A subproject 2a and a delegate2 is created', async () => {
await liquidPledging.addProject('Project2a', adminProject2a, 4, 86400, { from: adminProject2 });
await liquidPledging.addDelegate('Delegate2', { from: delegate2 });
await liquidPledging.addProject('Project2a', adminProject2a, 4, 86400, 0, { from: adminProject2 });
await liquidPledging.addDelegate('Delegate2', 0, 0, { from: delegate2 });
const nManagers = await liquidPledging.numberOfNoteManagers();
assert.equal(nManagers, 6);
}).timeout(6000);