upgrade to token 1.2

Author: ashutoshmeher-r3

Tokens/fungiblehousetoken/build.gradle

@@ -14,7 +14,10 @@ buildscript {
         corda_platform_version = constants.getProperty("platformVersion")
         guava_version = constants.getProperty("guavaVersion")
         tokens_release_group = 'com.r3.corda.lib.tokens'
-        tokens_release_version = '1.0'
+        tokens_release_version = '1.2'
+
+        confidential_id_release_group = "com.r3.corda.lib.ci"
+        confidential_id_release_version = "1.0"
     }
 
     repositories {
@@ -103,7 +106,8 @@ dependencies {
     // Token SDK dependencies.
     cordapp "$tokens_release_group:tokens-contracts:$tokens_release_version"
     cordapp "$tokens_release_group:tokens-workflows:$tokens_release_version"
-    cordapp "$tokens_release_group:tokens-money:$tokens_release_version"
+
+    cordapp "$confidential_id_release_group:ci-workflows:$confidential_id_release_version"
 }
 
 task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
@@ -113,7 +117,7 @@ task deployNodes(type: net.corda.plugins.Cordform, dependsOn: ['jar']) {
         }
         cordapp("$tokens_release_group:tokens-contracts:$tokens_release_version")
         cordapp("$tokens_release_group:tokens-workflows:$tokens_release_version")
-        cordapp("$tokens_release_group:tokens-money:$tokens_release_version")
+        cordapp("$confidential_id_release_group:ci-workflows:$confidential_id_release_version")
         cordapp project(':contracts')
         cordapp project(':workflows')
     }

Tokens/fungiblehousetoken/workflows/build.gradle

@@ -41,6 +41,8 @@ configurations {
 dependencies {
     // Corda dependencies.
     cordaCompile "$corda_release_group:corda-core:$corda_release_version"
+    cordaCompile "$confidential_id_release_group:ci-workflows:$confidential_id_release_version"
+
     cordaRuntime "$corda_release_group:corda:$corda_release_version"
 
     // For testing.
@@ -51,7 +53,6 @@ dependencies {
     cordapp project(":contracts")
 
     // Token SDK dependencies.
-    cordaCompile "$tokens_release_group:tokens-money:$tokens_release_version"
     cordaCompile "$tokens_release_group:tokens-workflows:$tokens_release_version"
 }
 

Tokens/fungiblehousetoken/workflows/src/main/java/net/corda/examples/tokenizedhouse/flows/QueryTokens.java

@@ -3,7 +3,7 @@
 import co.paralleluniverse.fibers.Suspendable;
 import com.r3.corda.lib.tokens.contracts.types.TokenPointer;
 import com.r3.corda.lib.tokens.contracts.types.TokenType;
-import com.r3.corda.lib.tokens.workflows.utilities.QueryUtilitiesKt;
+import com.r3.corda.lib.tokens.workflows.utilities.QueryUtilities;
 import net.corda.examples.tokenizedhouse.states.FungibleHouseTokenState;
 import net.corda.core.contracts.Amount;
 import net.corda.core.contracts.StateAndRef;
@@ -46,7 +46,7 @@ public String call() throws FlowException {
             //get the pointer pointer to the house
             TokenPointer<FungibleHouseTokenState> tokenPointer = evolvableTokenType.toPointer(FungibleHouseTokenState.class);
 
-            Amount<TokenType> amount = QueryUtilitiesKt.tokenBalance(getServiceHub().getVaultService(), tokenPointer);
+            Amount<TokenType> amount = QueryUtilities.tokenBalance(getServiceHub().getVaultService(), tokenPointer);
             return "\n You currently have "+ amount.getQuantity()+ " " +symbol + " Tokens\n";
         }
     }

Tokens/fungiblehousetoken/workflows/src/main/java/net/corda/examples/tokenizedhouse/flows/RealEstateEvolvableFungibleTokenFlow.java

@@ -8,6 +8,7 @@
 import com.r3.corda.lib.tokens.contracts.types.TokenType;
 import com.r3.corda.lib.tokens.contracts.utilities.TransactionUtilitiesKt;
 import com.r3.corda.lib.tokens.workflows.flows.rpc.*;
+import com.r3.corda.lib.tokens.workflows.utilities.FungibleTokenBuilder;
 import net.corda.examples.tokenizedhouse.states.FungibleHouseTokenState;
 import kotlin.Unit;
 import net.corda.core.contracts.*;
@@ -52,7 +53,7 @@ public SignedTransaction call() throws FlowException {
                     new UniqueIdentifier(), 0, this.symbol);
 
             //wrap it with transaction state specifying the notary
-            TransactionState transactionState = new TransactionState(evolvableTokenType, notary);
+            TransactionState<FungibleHouseTokenState> transactionState = new TransactionState<>(evolvableTokenType, notary);
 
             //call built in sub flow CreateEvolvableTokens. This can be called via rpc or in unit testing
             return subFlow(new CreateEvolvableTokens(transactionState));
@@ -86,17 +87,13 @@ public SignedTransaction call() throws FlowException {
             //get the RealEstateEvolvableTokenType object
             FungibleHouseTokenState evolvableTokenType = stateAndRef.getState().getData();
 
-            //get the pointer pointer to the house
-            TokenPointer tokenPointer = evolvableTokenType.toPointer(evolvableTokenType.getClass());
-
-            //assign the issuer to the house type who will be issuing the tokens
-            IssuedTokenType issuedTokenType = new IssuedTokenType(getOurIdentity(), tokenPointer);
-
-            //specify how much amount to issue to holder
-            Amount<IssuedTokenType> amount = new Amount(quantity, issuedTokenType);
-
-            //create fungible amount specifying the new owner
-            FungibleToken fungibleToken  = new FungibleToken(amount, holder, TransactionUtilitiesKt.getAttachmentIdForGenericParam(tokenPointer));
+            //create fungible token for the house token type
+            FungibleToken fungibleToken = new FungibleTokenBuilder()
+                    .ofTokenType(evolvableTokenType.toPointer(FungibleHouseTokenState.class)) // get the token pointer
+                    .issuedBy(getOurIdentity())
+                    .heldBy(holder)
+                    .withAmount(quantity)
+                    .buildFungibleToken();
 
             //use built in flow for issuing tokens on ledger
             return subFlow(new IssueTokens(ImmutableList.of(fungibleToken)));
@@ -131,11 +128,8 @@ public SignedTransaction call() throws FlowException {
             //get the RealEstateEvolvableTokenType object
             FungibleHouseTokenState tokenstate = stateAndRef.getState().getData();
 
-            //get the pointer pointer to the house
-            TokenPointer<FungibleHouseTokenState> tokenPointer = tokenstate.toPointer(FungibleHouseTokenState.class);
-
             //specify how much amount to transfer to which holder
-            Amount<TokenType> amount = new Amount(quantity, tokenPointer);
+            Amount<TokenType> amount = new Amount<>(quantity, tokenstate.toPointer(FungibleHouseTokenState.class));
             //PartyAndAmount partyAndAmount = new PartyAndAmount(holder, amount);
 
             //use built in flow to move fungible tokens to holder
@@ -191,11 +185,9 @@ public Unit call() throws FlowException {
 //            //get the RealEstateEvolvableTokenType object
 //            FungibleHouseTokenState evolvableTokenType = stateAndRef.getState().getData();
 //
-//            //get the pointer pointer to the house
-//            TokenPointer tokenPointer = evolvableTokenType.toPointer(evolvableTokenType.getClass());
-//
 //            //specify how much amount quantity of tokens of type token parameter
-//            Amount amount = new Amount(quantity, tokenPointer);
+//            Amount<TokenType> amount =
+//                    new Amount<>(quantity, evolvableTokenType.toPointer(FungibleHouseTokenState.class));
 //
 //            //call built in redeem flow to redeem tokens with issuer
 //            return subFlow(new RedeemFungibleTokens(amount, issuer));