Added the currentBalance counter

src/blockchain/delegates.js

@@ -25,6 +25,7 @@ const delegates = (app, liquidPledging) => {
           title: delegate.name,
           txHash,
           totalDonated: '0',
+          currentBalance: '0',
           donationCount: 0,
           description: 'Missing Description... Added outside of UI',
         });

src/blockchain/projects.js

@@ -125,6 +125,7 @@ const projects = (app, liquidPledging) => {
           txHash: tx.transactionHash,
           pluginAddress: project.plugin,
           totalDonated: '0',
+          currentBalance: '0',
           donationCount: 0,
           mined: true,
         },
@@ -178,6 +179,7 @@ const projects = (app, liquidPledging) => {
         description: 'Missing Description... Added outside of UI',
         txHash,
         totalDonated: '0',
+        currentBalance: '0',
         donationCount: 0,
         status: canceled ? CampaignStatus.CANCELED : CampaignStatus.ACTIVE,
         mined: true,

src/models/campaigns.model.js

@@ -19,7 +19,8 @@ function createModel(app) {
       projectId: { type: Schema.Types.Long, index: true, unique: true }, // we can use Long here b/c lp only stores adminId in pledges as uint64
       image: { type: String, required: true },
       txHash: { type: String },
-      totalDonated: { type: Schema.Types.BN },
+      totalDonated: { type: Schema.Types.BN, min: 0 },
+      currentBalance: { type: Schema.Types.BN, min: 0 },
       donationCount: { type: Number },
       peopleCount: { type: Number },
       dacs: { type: [String] },

src/models/dacs.model.js

@@ -28,9 +28,10 @@ function createModel(app) {
         enum: Object.values(DacStatus),
         default: DacStatus.PENDING,
       },
-      image: { type: String }, // required: true },
+      image: { type: String },
       txHash: { type: String, required: true },
       totalDonated: { type: Schema.Types.BN, min: 0 },
+      currentBalance: { type: Schema.Types.BN, min: 0 },
       donationCount: { type: Number },
       peopleCount: { type: Number },
       ownerAddress: { type: String, required: true, index: true },

src/models/milestones.model.js

@@ -46,7 +46,7 @@ function Milestone(app) {
       conversionRate: { type: Number, required: true },
       txHash: { type: String },
       pluginAddress: { type: String },
-      totalDonated: { type: Schema.Types.BN },
+      currentBalance: { type: Schema.Types.BN, min: 0 },
       fullyFunded: { tupe: Boolean },
       donationCount: { type: Number },
       peopleCount: { type: Number },

src/services/donations/updateEntityCounters.js

@@ -71,29 +71,29 @@ const updateEntity = async (context, donation) => {
       .service('donations')
       .find({ paginate: false, query: donationQuery });
 
-    const { totalDonated, amountRemaining } = donations.reduce(
+    const { totalDonated, currentBalance } = donations.reduce(
       (accumulator, d) => ({
         totalDonated: accumulator.totalDonated.add(toBN(d.amount)),
-        amountRemaining: accumulator.amountRemaining.add(toBN(d.amountRemaining)),
+        currentBalance: accumulator.currentBalance.add(toBN(d.amountRemaining)),
       }),
       {
         totalDonated: toBN(0),
-        amountRemaining: toBN(0),
+        currentBalance: toBN(0),
       },
     );
 
     // NOTE: Using === to compare as both of these are strings and amounts in wei
     const fullyFunded =
-      donation.ownerType === AdminTypes.MILESTONE && entity.maxAmount === totalDonated;
+      donation.ownerType === AdminTypes.MILESTONE && entity.maxAmount === currentBalance.toString();
     const peopleCount = new Set(donations.map(d => d.giverAddress)).size;
     const donationCount = donations.filter(
       d => ![DonationStatus.PAYING, DonationStatus.PAID].includes(d.status),
     ).length;
 
     await service.patch(entity._id, {
       donationCount,
-      totalDonated: totalDonated.toString(),
-      amountRemaining: amountRemaining.toString(),
+      totalDonated,
+      currentBalance,
       peopleCount,
       fullyFunded,
     });