Merge branch 'develop'

Author: jeffyanta

api/src/main/java/com/getcode/model/intents/IntentDeposit.kt

@@ -37,9 +37,9 @@ class IntentDeposit(
         ): IntentDeposit {
             val intentId = PublicKey.generate()
             val currentTray = organizer.tray.copy()
-            val startBalance = currentTray.availableBalance
+            val startSlotBalance = currentTray.slotsBalance
 
-            // 1. Move all funds from the incoming
+            // 1. Move all funds from the primary
             // account to appropriate slots
 
             val transfers = currentTray.receive(receivingAccount = source, amount = amount).map { transfer ->
@@ -48,8 +48,7 @@ class IntentDeposit(
                     intentId = intentId,
                     amount = transfer.kin,
                     source = currentTray.cluster(transfer.from),
-                    destination =
-                    currentTray.cluster(transfer.to!!).vaultPublicKey
+                    destination = currentTray.cluster(transfer.to!!).vaultPublicKey
                 )
             }
 
@@ -62,18 +61,15 @@ class IntentDeposit(
                     intentId = intentId,
                     amount = exchange.kin,
                     source = currentTray.cluster(exchange.from),
-                    destination =
-                    currentTray.cluster(exchange.to!!).vaultPublicKey
-                    // Exchanges always provide destination accounts
+                    destination = currentTray.cluster(exchange.to!!).vaultPublicKey // Exchanges always provide destination accounts
                 )
             }
 
-            val endBalance = currentTray.availableBalance
+            val endSlotBalance = currentTray.slotsBalance
 
-            // We're just moving funds from incoming
-            // account to buckets, the balance
-            // shouldn't change
-            if (endBalance != startBalance) {
+            // Ensure that balances are consistent
+            // with what we expect these action to do
+            if (endSlotBalance - startSlotBalance != amount) {
                 throw IntentReceive.Companion.IntentReceiveException.BalanceMismatchException()
             }
 

api/src/main/java/com/getcode/network/client/Client_Transaction.kt

@@ -554,17 +554,20 @@ fun Client.getTransferPreflightAction(amount: Kin): Completable {
         // 1. Receive funds from incoming accounts as those
         // will rotate more frequently than other types of accounts
         val receivedKin = transactionReceiver.receiveFromIncoming(organizer)
-
+        Timber.d("received ${receivedKin.quarks} from incoming")
         // 2. Pull funds from relationships if there's still funds
         // missing in buckets after the receiving from primary
         if (receivedKin < neededKin) {
-            transactionReceiver.receiveFromRelationship(organizer, limit = neededKin - receivedKin)
+            Timber.d("attempt to pull funds from relationship to get to ${neededKin.quarks}")
+            val result = transactionReceiver.receiveFromRelationship(organizer, limit = neededKin - receivedKin)
+            Timber.d("received ${result.quarks} from relationships")
         }
 
         // 3. If the amount is still larger than what's available
         // in the slots, we'll need to move funds from primary
         // deposits into slots after receiving
         if (amount > organizer.slotsBalance) {
+            Timber.d("receive from primary")
             receiveFromPrimaryIfWithinLimits(organizer)
         } else {
             Completable.complete()

api/src/main/java/com/getcode/network/client/TransactionReceiver.kt

@@ -3,6 +3,7 @@ package com.getcode.network.client
 import android.content.Context
 import com.getcode.model.Kin
 import com.getcode.model.intents.IntentDeposit
+import com.getcode.model.intents.IntentPublicTransfer
 import com.getcode.model.intents.IntentReceive
 import com.getcode.model.intents.IntentRemoteReceive
 import com.getcode.network.repository.BalanceRepository
@@ -76,7 +77,7 @@ class TransactionReceiver @Inject constructor(
 
                     receivedTotal += relationship.partialBalance
 
-                    if (intent is IntentDeposit) {
+                    if (intent is IntentPublicTransfer) {
                         setTray(organizer, intent.resultTray)
                     }
 

api/src/main/java/com/getcode/solana/organizer/Tray.kt

@@ -34,7 +34,7 @@ class Tray(
         get() = incoming.partialBalance
 
     var relationships = RelationshipBox()
-        private set
+        internal set
 
     var availableRelationshipBalance: Kin = Kin.fromKin(0)
         get() = relationships.publicKeys.values.map { it.partialBalance }