find to findOrCreate name refactor
This commit is contained in:
parent
b4d5e5657c
commit
2af64a9e60
|
@ -1,6 +1,6 @@
|
||||||
/* This is an autogenerated file. DO NOT EDIT MANUALLY */
|
/* 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":"afterTransfer","outputs":[],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"noteManager","type":"uint64"},{"name":"noteFrom","type":"uint64"},{"name":"noteTo","type":"uint64"},{"name":"context","type":"uint64"},{"name":"amount","type":"uint256"}],"name":"beforeTransfer","outputs":[{"name":"maxAllowed","type":"uint256"}],"payable":false,"type":"function"}]
|
exports.ILiquidPledgingPluginAbi = [{"constant":false,"inputs":[{"name":"pledgeManager","type":"uint64"},{"name":"pledgeFrom","type":"uint64"},{"name":"pledgeTo","type":"uint64"},{"name":"context","type":"uint64"},{"name":"amount","type":"uint256"}],"name":"afterTransfer","outputs":[],"payable":false,"type":"function"},{"constant":false,"inputs":[{"name":"pledgeManager","type":"uint64"},{"name":"pledgeFrom","type":"uint64"},{"name":"pledgeTo","type":"uint64"},{"name":"context","type":"uint64"},{"name":"amount","type":"uint256"}],"name":"beforeTransfer","outputs":[{"name":"maxAllowed","type":"uint256"}],"payable":false,"type":"function"}]
|
||||||
exports.ILiquidPledgingPluginByteCode = "0x"
|
exports.ILiquidPledgingPluginByteCode = "0x"
|
||||||
exports._solcVersion = "0.4.15+commit.bbb8e64f.Emscripten.clang"
|
exports._solcVersion = "0.4.15+commit.bbb8e64f.Emscripten.clang"
|
||||||
exports._sha256 = "0xef8854fe0982df3dec97b6aec02e2d850ad86c960ca5b3545346b7ca4c5e8c48"
|
exports._sha256 = "0x459746b8fd9702f2cc9d65c3f59f37610e76e6ec5739d5bd5ba1c694dba94edd"
|
||||||
|
|
|
@ -19,16 +19,16 @@ contract ILiquidPledgingPlugin {
|
||||||
/// ...
|
/// ...
|
||||||
/// 511 -> Plugin for the intendedCampaign receiving pledge to another party
|
/// 511 -> Plugin for the intendedCampaign receiving pledge to another party
|
||||||
function beforeTransfer(
|
function beforeTransfer(
|
||||||
uint64 noteManager,
|
uint64 pledgeManager,
|
||||||
uint64 noteFrom,
|
uint64 pledgeFrom,
|
||||||
uint64 noteTo,
|
uint64 pledgeTo,
|
||||||
uint64 context,
|
uint64 context,
|
||||||
uint amount
|
uint amount
|
||||||
) returns (uint maxAllowed);
|
) returns (uint maxAllowed);
|
||||||
function afterTransfer(
|
function afterTransfer(
|
||||||
uint64 noteManager,
|
uint64 pledgeManager,
|
||||||
uint64 noteFrom,
|
uint64 pledgeFrom,
|
||||||
uint64 noteTo,
|
uint64 pledgeTo,
|
||||||
uint64 context,
|
uint64 context,
|
||||||
uint amount);
|
uint amount);
|
||||||
}
|
}
|
||||||
|
|
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
@ -19,16 +19,16 @@ contract ILiquidPledgingPlugin {
|
||||||
/// ...
|
/// ...
|
||||||
/// 511 -> Plugin for the intendedCampaign receiving pledge to another party
|
/// 511 -> Plugin for the intendedCampaign receiving pledge to another party
|
||||||
function beforeTransfer(
|
function beforeTransfer(
|
||||||
uint64 noteManager,
|
uint64 pledgeManager,
|
||||||
uint64 noteFrom,
|
uint64 pledgeFrom,
|
||||||
uint64 noteTo,
|
uint64 pledgeTo,
|
||||||
uint64 context,
|
uint64 context,
|
||||||
uint amount
|
uint amount
|
||||||
) returns (uint maxAllowed);
|
) returns (uint maxAllowed);
|
||||||
function afterTransfer(
|
function afterTransfer(
|
||||||
uint64 noteManager,
|
uint64 pledgeManager,
|
||||||
uint64 noteFrom,
|
uint64 pledgeFrom,
|
||||||
uint64 noteTo,
|
uint64 pledgeTo,
|
||||||
uint64 context,
|
uint64 context,
|
||||||
uint amount);
|
uint amount);
|
||||||
}
|
}
|
||||||
|
@ -314,7 +314,7 @@ contract LiquidPledgingBase {
|
||||||
/// created in this system yet then it wouldn't be in the hash array
|
/// created in this system yet then it wouldn't be in the hash array
|
||||||
/// hPledge2idx[]; this creates a Pledge with and amount of 0 if one is not
|
/// hPledge2idx[]; this creates a Pledge with and amount of 0 if one is not
|
||||||
/// created already...
|
/// created already...
|
||||||
function findPledge(
|
function findOrCreatePledge(
|
||||||
uint64 owner,
|
uint64 owner,
|
||||||
uint64[] delegationChain,
|
uint64[] delegationChain,
|
||||||
uint64 intendedCampaign,
|
uint64 intendedCampaign,
|
||||||
|
|
File diff suppressed because one or more lines are too long
|
@ -19,16 +19,16 @@ contract ILiquidPledgingPlugin {
|
||||||
/// ...
|
/// ...
|
||||||
/// 511 -> Plugin for the intendedCampaign receiving pledge to another party
|
/// 511 -> Plugin for the intendedCampaign receiving pledge to another party
|
||||||
function beforeTransfer(
|
function beforeTransfer(
|
||||||
uint64 noteManager,
|
uint64 pledgeManager,
|
||||||
uint64 noteFrom,
|
uint64 pledgeFrom,
|
||||||
uint64 noteTo,
|
uint64 pledgeTo,
|
||||||
uint64 context,
|
uint64 context,
|
||||||
uint amount
|
uint amount
|
||||||
) returns (uint maxAllowed);
|
) returns (uint maxAllowed);
|
||||||
function afterTransfer(
|
function afterTransfer(
|
||||||
uint64 noteManager,
|
uint64 pledgeManager,
|
||||||
uint64 noteFrom,
|
uint64 pledgeFrom,
|
||||||
uint64 noteTo,
|
uint64 pledgeTo,
|
||||||
uint64 context,
|
uint64 context,
|
||||||
uint amount);
|
uint amount);
|
||||||
}
|
}
|
||||||
|
@ -314,7 +314,7 @@ contract LiquidPledgingBase {
|
||||||
/// created in this system yet then it wouldn't be in the hash array
|
/// created in this system yet then it wouldn't be in the hash array
|
||||||
/// hPledge2idx[]; this creates a Pledge with and amount of 0 if one is not
|
/// hPledge2idx[]; this creates a Pledge with and amount of 0 if one is not
|
||||||
/// created already...
|
/// created already...
|
||||||
function findPledge(
|
function findOrCreatePledge(
|
||||||
uint64 owner,
|
uint64 owner,
|
||||||
uint64[] delegationChain,
|
uint64[] delegationChain,
|
||||||
uint64 intendedCampaign,
|
uint64 intendedCampaign,
|
||||||
|
@ -453,7 +453,7 @@ function donate(uint64 idGiver, uint64 idReceiver) payable {
|
||||||
require(amount > 0);
|
require(amount > 0);
|
||||||
|
|
||||||
vault.transfer(amount); // transfers the baseToken to the Vault
|
vault.transfer(amount); // transfers the baseToken to the Vault
|
||||||
uint64 idPledge = findPledge(
|
uint64 idPledge = findOrCreatePledge(
|
||||||
idGiver,
|
idGiver,
|
||||||
new uint64[](0), //what is new?
|
new uint64[](0), //what is new?
|
||||||
0,
|
0,
|
||||||
|
@ -571,7 +571,7 @@ function donate(uint64 idGiver, uint64 idReceiver) payable {
|
||||||
|
|
||||||
checkAdminOwner(owner);
|
checkAdminOwner(owner);
|
||||||
|
|
||||||
uint64 idNewPledge = findPledge(
|
uint64 idNewPledge = findOrCreatePledge(
|
||||||
n.owner,
|
n.owner,
|
||||||
n.delegationChain,
|
n.delegationChain,
|
||||||
0,
|
0,
|
||||||
|
@ -596,7 +596,7 @@ function donate(uint64 idGiver, uint64 idReceiver) payable {
|
||||||
// Check the campaign is not canceled in the while.
|
// Check the campaign is not canceled in the while.
|
||||||
require(getOldestPledgeNotCanceled(idPledge) == idPledge);
|
require(getOldestPledgeNotCanceled(idPledge) == idPledge);
|
||||||
|
|
||||||
uint64 idNewPledge = findPledge(
|
uint64 idNewPledge = findOrCreatePledge(
|
||||||
n.owner,
|
n.owner,
|
||||||
n.delegationChain,
|
n.delegationChain,
|
||||||
0,
|
0,
|
||||||
|
@ -617,7 +617,7 @@ function donate(uint64 idGiver, uint64 idReceiver) payable {
|
||||||
require(n.paymentState == PaymentState.Paying); //TODO change to revert
|
require(n.paymentState == PaymentState.Paying); //TODO change to revert
|
||||||
|
|
||||||
// When a payment is canceled, never is assigned to a campaign.
|
// When a payment is canceled, never is assigned to a campaign.
|
||||||
uint64 oldPledge = findPledge(
|
uint64 oldPledge = findOrCreatePledge(
|
||||||
n.owner,
|
n.owner,
|
||||||
n.delegationChain,
|
n.delegationChain,
|
||||||
0,
|
0,
|
||||||
|
@ -715,14 +715,14 @@ function donate(uint64 idGiver, uint64 idReceiver) payable {
|
||||||
Pledge storage n = findPledge(idPledge);
|
Pledge storage n = findPledge(idPledge);
|
||||||
|
|
||||||
require(getPledgeLevel(n) < MAX_INTERCAMPAIGN_LEVEL);
|
require(getPledgeLevel(n) < MAX_INTERCAMPAIGN_LEVEL);
|
||||||
uint64 oldPledge = findPledge(
|
uint64 oldPledge = findOrCreatePledge(
|
||||||
n.owner,
|
n.owner,
|
||||||
n.delegationChain,
|
n.delegationChain,
|
||||||
0,
|
0,
|
||||||
0,
|
0,
|
||||||
n.oldPledge,
|
n.oldPledge,
|
||||||
PaymentState.Pledged);
|
PaymentState.Pledged);
|
||||||
uint64 toPledge = findPledge(
|
uint64 toPledge = findOrCreatePledge(
|
||||||
idReceiver,
|
idReceiver,
|
||||||
new uint64[](0),
|
new uint64[](0),
|
||||||
0,
|
0,
|
||||||
|
@ -733,7 +733,7 @@ function donate(uint64 idGiver, uint64 idReceiver) payable {
|
||||||
}
|
}
|
||||||
|
|
||||||
function transferOwnershipToGiver(uint64 idPledge, uint amount, uint64 idReceiver) internal {
|
function transferOwnershipToGiver(uint64 idPledge, uint amount, uint64 idReceiver) internal {
|
||||||
uint64 toPledge = findPledge(
|
uint64 toPledge = findOrCreatePledge(
|
||||||
idReceiver,
|
idReceiver,
|
||||||
new uint64[](0),
|
new uint64[](0),
|
||||||
0,
|
0,
|
||||||
|
@ -755,7 +755,7 @@ function donate(uint64 idGiver, uint64 idReceiver) payable {
|
||||||
// Make the last item in the array the idReceiver
|
// Make the last item in the array the idReceiver
|
||||||
newDelegationChain[n.delegationChain.length] = idReceiver;
|
newDelegationChain[n.delegationChain.length] = idReceiver;
|
||||||
|
|
||||||
uint64 toPledge = findPledge(
|
uint64 toPledge = findOrCreatePledge(
|
||||||
n.owner,
|
n.owner,
|
||||||
newDelegationChain,
|
newDelegationChain,
|
||||||
0,
|
0,
|
||||||
|
@ -772,7 +772,7 @@ function donate(uint64 idGiver, uint64 idReceiver) payable {
|
||||||
for (uint i=0; i<n.delegationChain.length - q; i++) {
|
for (uint i=0; i<n.delegationChain.length - q; i++) {
|
||||||
newDelegationChain[i] = n.delegationChain[i];
|
newDelegationChain[i] = n.delegationChain[i];
|
||||||
}
|
}
|
||||||
uint64 toPledge = findPledge(
|
uint64 toPledge = findOrCreatePledge(
|
||||||
n.owner,
|
n.owner,
|
||||||
newDelegationChain,
|
newDelegationChain,
|
||||||
0,
|
0,
|
||||||
|
@ -788,7 +788,7 @@ function donate(uint64 idGiver, uint64 idReceiver) payable {
|
||||||
|
|
||||||
require(getPledgeLevel(n) < MAX_SUBCAMPAIGN_LEVEL);
|
require(getPledgeLevel(n) < MAX_SUBCAMPAIGN_LEVEL);
|
||||||
|
|
||||||
uint64 toPledge = findPledge(
|
uint64 toPledge = findOrCreatePledge(
|
||||||
n.owner,
|
n.owner,
|
||||||
n.delegationChain,
|
n.delegationChain,
|
||||||
idReceiver,
|
idReceiver,
|
||||||
|
@ -828,14 +828,14 @@ function donate(uint64 idGiver, uint64 idReceiver) payable {
|
||||||
|
|
||||||
// First send to a campaign if it's proposed and commited
|
// First send to a campaign if it's proposed and commited
|
||||||
if ((n.intendedCampaign > 0) && ( getTime() > n.commitTime)) {
|
if ((n.intendedCampaign > 0) && ( getTime() > n.commitTime)) {
|
||||||
uint64 oldPledge = findPledge(
|
uint64 oldPledge = findOrCreatePledge(
|
||||||
n.owner,
|
n.owner,
|
||||||
n.delegationChain,
|
n.delegationChain,
|
||||||
0,
|
0,
|
||||||
0,
|
0,
|
||||||
n.oldPledge,
|
n.oldPledge,
|
||||||
PaymentState.Pledged);
|
PaymentState.Pledged);
|
||||||
uint64 toPledge = findPledge(
|
uint64 toPledge = findOrCreatePledge(
|
||||||
n.intendedCampaign,
|
n.intendedCampaign,
|
||||||
new uint64[](0),
|
new uint64[](0),
|
||||||
0,
|
0,
|
||||||
|
|
|
@ -19,16 +19,16 @@ contract ILiquidPledgingPlugin {
|
||||||
/// ...
|
/// ...
|
||||||
/// 511 -> Plugin for the intendedCampaign receiving pledge to another party
|
/// 511 -> Plugin for the intendedCampaign receiving pledge to another party
|
||||||
function beforeTransfer(
|
function beforeTransfer(
|
||||||
uint64 noteManager,
|
uint64 pledgeManager,
|
||||||
uint64 noteFrom,
|
uint64 pledgeFrom,
|
||||||
uint64 noteTo,
|
uint64 pledgeTo,
|
||||||
uint64 context,
|
uint64 context,
|
||||||
uint amount
|
uint amount
|
||||||
) returns (uint maxAllowed);
|
) returns (uint maxAllowed);
|
||||||
function afterTransfer(
|
function afterTransfer(
|
||||||
uint64 noteManager,
|
uint64 pledgeManager,
|
||||||
uint64 noteFrom,
|
uint64 pledgeFrom,
|
||||||
uint64 noteTo,
|
uint64 pledgeTo,
|
||||||
uint64 context,
|
uint64 context,
|
||||||
uint amount);
|
uint amount);
|
||||||
}
|
}
|
||||||
|
@ -314,7 +314,7 @@ contract LiquidPledgingBase {
|
||||||
/// created in this system yet then it wouldn't be in the hash array
|
/// created in this system yet then it wouldn't be in the hash array
|
||||||
/// hPledge2idx[]; this creates a Pledge with and amount of 0 if one is not
|
/// hPledge2idx[]; this creates a Pledge with and amount of 0 if one is not
|
||||||
/// created already...
|
/// created already...
|
||||||
function findPledge(
|
function findOrCreatePledge(
|
||||||
uint64 owner,
|
uint64 owner,
|
||||||
uint64[] delegationChain,
|
uint64[] delegationChain,
|
||||||
uint64 intendedCampaign,
|
uint64 intendedCampaign,
|
||||||
|
@ -453,7 +453,7 @@ function donate(uint64 idGiver, uint64 idReceiver) payable {
|
||||||
require(amount > 0);
|
require(amount > 0);
|
||||||
|
|
||||||
vault.transfer(amount); // transfers the baseToken to the Vault
|
vault.transfer(amount); // transfers the baseToken to the Vault
|
||||||
uint64 idPledge = findPledge(
|
uint64 idPledge = findOrCreatePledge(
|
||||||
idGiver,
|
idGiver,
|
||||||
new uint64[](0), //what is new?
|
new uint64[](0), //what is new?
|
||||||
0,
|
0,
|
||||||
|
@ -571,7 +571,7 @@ function donate(uint64 idGiver, uint64 idReceiver) payable {
|
||||||
|
|
||||||
checkAdminOwner(owner);
|
checkAdminOwner(owner);
|
||||||
|
|
||||||
uint64 idNewPledge = findPledge(
|
uint64 idNewPledge = findOrCreatePledge(
|
||||||
n.owner,
|
n.owner,
|
||||||
n.delegationChain,
|
n.delegationChain,
|
||||||
0,
|
0,
|
||||||
|
@ -596,7 +596,7 @@ function donate(uint64 idGiver, uint64 idReceiver) payable {
|
||||||
// Check the campaign is not canceled in the while.
|
// Check the campaign is not canceled in the while.
|
||||||
require(getOldestPledgeNotCanceled(idPledge) == idPledge);
|
require(getOldestPledgeNotCanceled(idPledge) == idPledge);
|
||||||
|
|
||||||
uint64 idNewPledge = findPledge(
|
uint64 idNewPledge = findOrCreatePledge(
|
||||||
n.owner,
|
n.owner,
|
||||||
n.delegationChain,
|
n.delegationChain,
|
||||||
0,
|
0,
|
||||||
|
@ -617,7 +617,7 @@ function donate(uint64 idGiver, uint64 idReceiver) payable {
|
||||||
require(n.paymentState == PaymentState.Paying); //TODO change to revert
|
require(n.paymentState == PaymentState.Paying); //TODO change to revert
|
||||||
|
|
||||||
// When a payment is canceled, never is assigned to a campaign.
|
// When a payment is canceled, never is assigned to a campaign.
|
||||||
uint64 oldPledge = findPledge(
|
uint64 oldPledge = findOrCreatePledge(
|
||||||
n.owner,
|
n.owner,
|
||||||
n.delegationChain,
|
n.delegationChain,
|
||||||
0,
|
0,
|
||||||
|
@ -715,14 +715,14 @@ function donate(uint64 idGiver, uint64 idReceiver) payable {
|
||||||
Pledge storage n = findPledge(idPledge);
|
Pledge storage n = findPledge(idPledge);
|
||||||
|
|
||||||
require(getPledgeLevel(n) < MAX_INTERCAMPAIGN_LEVEL);
|
require(getPledgeLevel(n) < MAX_INTERCAMPAIGN_LEVEL);
|
||||||
uint64 oldPledge = findPledge(
|
uint64 oldPledge = findOrCreatePledge(
|
||||||
n.owner,
|
n.owner,
|
||||||
n.delegationChain,
|
n.delegationChain,
|
||||||
0,
|
0,
|
||||||
0,
|
0,
|
||||||
n.oldPledge,
|
n.oldPledge,
|
||||||
PaymentState.Pledged);
|
PaymentState.Pledged);
|
||||||
uint64 toPledge = findPledge(
|
uint64 toPledge = findOrCreatePledge(
|
||||||
idReceiver,
|
idReceiver,
|
||||||
new uint64[](0),
|
new uint64[](0),
|
||||||
0,
|
0,
|
||||||
|
@ -733,7 +733,7 @@ function donate(uint64 idGiver, uint64 idReceiver) payable {
|
||||||
}
|
}
|
||||||
|
|
||||||
function transferOwnershipToGiver(uint64 idPledge, uint amount, uint64 idReceiver) internal {
|
function transferOwnershipToGiver(uint64 idPledge, uint amount, uint64 idReceiver) internal {
|
||||||
uint64 toPledge = findPledge(
|
uint64 toPledge = findOrCreatePledge(
|
||||||
idReceiver,
|
idReceiver,
|
||||||
new uint64[](0),
|
new uint64[](0),
|
||||||
0,
|
0,
|
||||||
|
@ -755,7 +755,7 @@ function donate(uint64 idGiver, uint64 idReceiver) payable {
|
||||||
// Make the last item in the array the idReceiver
|
// Make the last item in the array the idReceiver
|
||||||
newDelegationChain[n.delegationChain.length] = idReceiver;
|
newDelegationChain[n.delegationChain.length] = idReceiver;
|
||||||
|
|
||||||
uint64 toPledge = findPledge(
|
uint64 toPledge = findOrCreatePledge(
|
||||||
n.owner,
|
n.owner,
|
||||||
newDelegationChain,
|
newDelegationChain,
|
||||||
0,
|
0,
|
||||||
|
@ -772,7 +772,7 @@ function donate(uint64 idGiver, uint64 idReceiver) payable {
|
||||||
for (uint i=0; i<n.delegationChain.length - q; i++) {
|
for (uint i=0; i<n.delegationChain.length - q; i++) {
|
||||||
newDelegationChain[i] = n.delegationChain[i];
|
newDelegationChain[i] = n.delegationChain[i];
|
||||||
}
|
}
|
||||||
uint64 toPledge = findPledge(
|
uint64 toPledge = findOrCreatePledge(
|
||||||
n.owner,
|
n.owner,
|
||||||
newDelegationChain,
|
newDelegationChain,
|
||||||
0,
|
0,
|
||||||
|
@ -788,7 +788,7 @@ function donate(uint64 idGiver, uint64 idReceiver) payable {
|
||||||
|
|
||||||
require(getPledgeLevel(n) < MAX_SUBCAMPAIGN_LEVEL);
|
require(getPledgeLevel(n) < MAX_SUBCAMPAIGN_LEVEL);
|
||||||
|
|
||||||
uint64 toPledge = findPledge(
|
uint64 toPledge = findOrCreatePledge(
|
||||||
n.owner,
|
n.owner,
|
||||||
n.delegationChain,
|
n.delegationChain,
|
||||||
idReceiver,
|
idReceiver,
|
||||||
|
@ -828,14 +828,14 @@ function donate(uint64 idGiver, uint64 idReceiver) payable {
|
||||||
|
|
||||||
// First send to a campaign if it's proposed and commited
|
// First send to a campaign if it's proposed and commited
|
||||||
if ((n.intendedCampaign > 0) && ( getTime() > n.commitTime)) {
|
if ((n.intendedCampaign > 0) && ( getTime() > n.commitTime)) {
|
||||||
uint64 oldPledge = findPledge(
|
uint64 oldPledge = findOrCreatePledge(
|
||||||
n.owner,
|
n.owner,
|
||||||
n.delegationChain,
|
n.delegationChain,
|
||||||
0,
|
0,
|
||||||
0,
|
0,
|
||||||
n.oldPledge,
|
n.oldPledge,
|
||||||
PaymentState.Pledged);
|
PaymentState.Pledged);
|
||||||
uint64 toPledge = findPledge(
|
uint64 toPledge = findOrCreatePledge(
|
||||||
n.intendedCampaign,
|
n.intendedCampaign,
|
||||||
new uint64[](0),
|
new uint64[](0),
|
||||||
0,
|
0,
|
||||||
|
|
|
@ -17,16 +17,16 @@ contract ILiquidPledgingPlugin {
|
||||||
/// ...
|
/// ...
|
||||||
/// 511 -> Plugin for the intendedCampaign receiving pledge to another party
|
/// 511 -> Plugin for the intendedCampaign receiving pledge to another party
|
||||||
function beforeTransfer(
|
function beforeTransfer(
|
||||||
uint64 noteManager,
|
uint64 pledgeManager,
|
||||||
uint64 noteFrom,
|
uint64 pledgeFrom,
|
||||||
uint64 noteTo,
|
uint64 pledgeTo,
|
||||||
uint64 context,
|
uint64 context,
|
||||||
uint amount
|
uint amount
|
||||||
) returns (uint maxAllowed);
|
) returns (uint maxAllowed);
|
||||||
function afterTransfer(
|
function afterTransfer(
|
||||||
uint64 noteManager,
|
uint64 pledgeManager,
|
||||||
uint64 noteFrom,
|
uint64 pledgeFrom,
|
||||||
uint64 noteTo,
|
uint64 pledgeTo,
|
||||||
uint64 context,
|
uint64 context,
|
||||||
uint amount);
|
uint amount);
|
||||||
}
|
}
|
||||||
|
|
|
@ -38,7 +38,7 @@ function donate(uint64 idGiver, uint64 idReceiver) payable {
|
||||||
require(amount > 0);
|
require(amount > 0);
|
||||||
|
|
||||||
vault.transfer(amount); // transfers the baseToken to the Vault
|
vault.transfer(amount); // transfers the baseToken to the Vault
|
||||||
uint64 idPledge = findPledge(
|
uint64 idPledge = findOrCreatePledge(
|
||||||
idGiver,
|
idGiver,
|
||||||
new uint64[](0), //what is new?
|
new uint64[](0), //what is new?
|
||||||
0,
|
0,
|
||||||
|
@ -156,7 +156,7 @@ function donate(uint64 idGiver, uint64 idReceiver) payable {
|
||||||
|
|
||||||
checkAdminOwner(owner);
|
checkAdminOwner(owner);
|
||||||
|
|
||||||
uint64 idNewPledge = findPledge(
|
uint64 idNewPledge = findOrCreatePledge(
|
||||||
n.owner,
|
n.owner,
|
||||||
n.delegationChain,
|
n.delegationChain,
|
||||||
0,
|
0,
|
||||||
|
@ -181,7 +181,7 @@ function donate(uint64 idGiver, uint64 idReceiver) payable {
|
||||||
// Check the campaign is not canceled in the while.
|
// Check the campaign is not canceled in the while.
|
||||||
require(getOldestPledgeNotCanceled(idPledge) == idPledge);
|
require(getOldestPledgeNotCanceled(idPledge) == idPledge);
|
||||||
|
|
||||||
uint64 idNewPledge = findPledge(
|
uint64 idNewPledge = findOrCreatePledge(
|
||||||
n.owner,
|
n.owner,
|
||||||
n.delegationChain,
|
n.delegationChain,
|
||||||
0,
|
0,
|
||||||
|
@ -202,7 +202,7 @@ function donate(uint64 idGiver, uint64 idReceiver) payable {
|
||||||
require(n.paymentState == PaymentState.Paying); //TODO change to revert
|
require(n.paymentState == PaymentState.Paying); //TODO change to revert
|
||||||
|
|
||||||
// When a payment is canceled, never is assigned to a campaign.
|
// When a payment is canceled, never is assigned to a campaign.
|
||||||
uint64 oldPledge = findPledge(
|
uint64 oldPledge = findOrCreatePledge(
|
||||||
n.owner,
|
n.owner,
|
||||||
n.delegationChain,
|
n.delegationChain,
|
||||||
0,
|
0,
|
||||||
|
@ -300,14 +300,14 @@ function donate(uint64 idGiver, uint64 idReceiver) payable {
|
||||||
Pledge storage n = findPledge(idPledge);
|
Pledge storage n = findPledge(idPledge);
|
||||||
|
|
||||||
require(getPledgeLevel(n) < MAX_INTERCAMPAIGN_LEVEL);
|
require(getPledgeLevel(n) < MAX_INTERCAMPAIGN_LEVEL);
|
||||||
uint64 oldPledge = findPledge(
|
uint64 oldPledge = findOrCreatePledge(
|
||||||
n.owner,
|
n.owner,
|
||||||
n.delegationChain,
|
n.delegationChain,
|
||||||
0,
|
0,
|
||||||
0,
|
0,
|
||||||
n.oldPledge,
|
n.oldPledge,
|
||||||
PaymentState.Pledged);
|
PaymentState.Pledged);
|
||||||
uint64 toPledge = findPledge(
|
uint64 toPledge = findOrCreatePledge(
|
||||||
idReceiver,
|
idReceiver,
|
||||||
new uint64[](0),
|
new uint64[](0),
|
||||||
0,
|
0,
|
||||||
|
@ -318,7 +318,7 @@ function donate(uint64 idGiver, uint64 idReceiver) payable {
|
||||||
}
|
}
|
||||||
|
|
||||||
function transferOwnershipToGiver(uint64 idPledge, uint amount, uint64 idReceiver) internal {
|
function transferOwnershipToGiver(uint64 idPledge, uint amount, uint64 idReceiver) internal {
|
||||||
uint64 toPledge = findPledge(
|
uint64 toPledge = findOrCreatePledge(
|
||||||
idReceiver,
|
idReceiver,
|
||||||
new uint64[](0),
|
new uint64[](0),
|
||||||
0,
|
0,
|
||||||
|
@ -340,7 +340,7 @@ function donate(uint64 idGiver, uint64 idReceiver) payable {
|
||||||
// Make the last item in the array the idReceiver
|
// Make the last item in the array the idReceiver
|
||||||
newDelegationChain[n.delegationChain.length] = idReceiver;
|
newDelegationChain[n.delegationChain.length] = idReceiver;
|
||||||
|
|
||||||
uint64 toPledge = findPledge(
|
uint64 toPledge = findOrCreatePledge(
|
||||||
n.owner,
|
n.owner,
|
||||||
newDelegationChain,
|
newDelegationChain,
|
||||||
0,
|
0,
|
||||||
|
@ -357,7 +357,7 @@ function donate(uint64 idGiver, uint64 idReceiver) payable {
|
||||||
for (uint i=0; i<n.delegationChain.length - q; i++) {
|
for (uint i=0; i<n.delegationChain.length - q; i++) {
|
||||||
newDelegationChain[i] = n.delegationChain[i];
|
newDelegationChain[i] = n.delegationChain[i];
|
||||||
}
|
}
|
||||||
uint64 toPledge = findPledge(
|
uint64 toPledge = findOrCreatePledge(
|
||||||
n.owner,
|
n.owner,
|
||||||
newDelegationChain,
|
newDelegationChain,
|
||||||
0,
|
0,
|
||||||
|
@ -373,7 +373,7 @@ function donate(uint64 idGiver, uint64 idReceiver) payable {
|
||||||
|
|
||||||
require(getPledgeLevel(n) < MAX_SUBCAMPAIGN_LEVEL);
|
require(getPledgeLevel(n) < MAX_SUBCAMPAIGN_LEVEL);
|
||||||
|
|
||||||
uint64 toPledge = findPledge(
|
uint64 toPledge = findOrCreatePledge(
|
||||||
n.owner,
|
n.owner,
|
||||||
n.delegationChain,
|
n.delegationChain,
|
||||||
idReceiver,
|
idReceiver,
|
||||||
|
@ -413,14 +413,14 @@ function donate(uint64 idGiver, uint64 idReceiver) payable {
|
||||||
|
|
||||||
// First send to a campaign if it's proposed and commited
|
// First send to a campaign if it's proposed and commited
|
||||||
if ((n.intendedCampaign > 0) && ( getTime() > n.commitTime)) {
|
if ((n.intendedCampaign > 0) && ( getTime() > n.commitTime)) {
|
||||||
uint64 oldPledge = findPledge(
|
uint64 oldPledge = findOrCreatePledge(
|
||||||
n.owner,
|
n.owner,
|
||||||
n.delegationChain,
|
n.delegationChain,
|
||||||
0,
|
0,
|
||||||
0,
|
0,
|
||||||
n.oldPledge,
|
n.oldPledge,
|
||||||
PaymentState.Pledged);
|
PaymentState.Pledged);
|
||||||
uint64 toPledge = findPledge(
|
uint64 toPledge = findOrCreatePledge(
|
||||||
n.intendedCampaign,
|
n.intendedCampaign,
|
||||||
new uint64[](0),
|
new uint64[](0),
|
||||||
0,
|
0,
|
||||||
|
|
|
@ -278,7 +278,7 @@ contract LiquidPledgingBase {
|
||||||
/// created in this system yet then it wouldn't be in the hash array
|
/// created in this system yet then it wouldn't be in the hash array
|
||||||
/// hPledge2idx[]; this creates a Pledge with and amount of 0 if one is not
|
/// hPledge2idx[]; this creates a Pledge with and amount of 0 if one is not
|
||||||
/// created already...
|
/// created already...
|
||||||
function findPledge(
|
function findOrCreatePledge(
|
||||||
uint64 owner,
|
uint64 owner,
|
||||||
uint64[] delegationChain,
|
uint64[] delegationChain,
|
||||||
uint64 intendedCampaign,
|
uint64 intendedCampaign,
|
||||||
|
|
Loading…
Reference in New Issue