Handling the list of tokens in BridgingAuthorityBootstrapService.kt

Author: mkitR3

Tokens/stockpaydividend/bridging-flows/src/main/kotlin/com/r3/corda/lib/tokens/bridging/flows/BridgeFungibleTokenFlow.kt

@@ -70,7 +70,8 @@ class BridgeFungibleTokenFlow(
                 additionalCommand = additionalCommand,
                 destination = destination,
                 mint = mint,
-                mintAuthority = mintAuthority
+                mintAuthority = mintAuthority,
+                holder
             )
         )
     }
@@ -106,14 +107,14 @@ constructor(
     val additionalCommand: BridgingContract.BridgingCommand,
     val destination: Pubkey,
     val mint: Pubkey,
-    val mintAuthority: Pubkey
+    val mintAuthority: Pubkey,
+    val holder: AbstractParty
 ) : AbstractMoveTokensFlow() { //TODO move away from this abstract class, it's progress tracker mention only token move
 
     @Suspendable
     override fun addMove(transactionBuilder: TransactionBuilder) {
 
         val amount = token.state.data.amount
-        val holder = ourIdentity //TODO confidential identity
         val output = FungibleToken(amount, holder)
         addMoveTokens(transactionBuilder = transactionBuilder, inputs = listOf(token), outputs = listOf(output))
 

Tokens/stockpaydividend/bridging-flows/src/main/kotlin/com/r3/corda/lib/tokens/bridging/flows/BridgingAuthorityBootstrapService.kt

@@ -57,19 +57,20 @@ class BridgingAuthorityBootstrapService(appServiceHub: AppServiceHub) : Singleto
 
     private fun callFlow(producedStockStates: Collection<StockState>, appServiceHub: AppServiceHub) {
         producedStockStates.forEach { stockState ->
-            val tokens = appServiceHub.vaultService.tokenAmountsByToken(
+            appServiceHub.vaultService.tokenAmountsByToken(
                 stockState.toPointer(
                     stockState.javaClass
                 )
-            ).states
-            appServiceHub.startFlow(
-                BridgeFungibleTokenFlow(
-                    holdingIdentityPartyAndCertificate.party,
-                    emptyList(),
-                    tokens.first(), //TODO handle multiple tokens
-                    bridgeAuthorityParty
+            ).states.forEach { token ->
+                appServiceHub.startFlow(
+                    BridgeFungibleTokenFlow(
+                        holdingIdentityPartyAndCertificate.party,
+                        emptyList(),
+                        token,
+                        bridgeAuthorityParty
+                    )
                 )
-            )
+            }
         }
     }
 

Tokens/stockpaydividend/bridging-flows/src/main/kotlin/com/r3/corda/lib/tokens/bridging/flows/rpc/BridgeTokens.kt

@@ -10,10 +10,11 @@ import com.r3.corda.lib.tokens.contracts.states.FungibleToken
 import net.corda.core.contracts.StateAndRef
 import net.corda.core.utilities.ProgressTracker
 
+// This flow is only for tests. In real life the @BridgingAuthorityBootstrapService.kt would run the BridgeFungibleTokenFlow directly.
 @InitiatingFlow
 @StartableByRPC
 class BridgeToken(
-    val token: StateAndRef<FungibleToken>, //TODO change to a list?
+    val token: StateAndRef<FungibleToken>,
     val bridgeAuthority: Party
 ) : FlowLogic<String>() {
 
@@ -25,7 +26,7 @@ class BridgeToken(
         //Use built-in flow for move tokens to the recipient
         val stx = subFlow(
             BridgeFungibleTokenFlow(
-                ourIdentity, //TODO confidentialIdentity
+                ourIdentity,
                 emptyList(),
                 token,
                 bridgeAuthority