OSDN Git Service

delete control_account in README.md file
authorsuccessli <successli@outlook.com>
Thu, 7 Jun 2018 02:38:13 +0000 (10:38 +0800)
committersuccessli <successli@outlook.com>
Thu, 7 Jun 2018 02:38:13 +0000 (10:38 +0800)
doc/transactions.md
src/test/java/io/bytom/integration/TransactionTest.java

index c355ce0..6e095f3 100644 (file)
@@ -36,20 +36,24 @@ The Chain Core API does not return a response until either the transaction has b
 
 ### Asset issuance
 
-Issue 1000 units of gold to Alice.
+Issue 300000000 units of gold to Alice's address.
 
 #### Within a Chain Core
 
 ```java
-Transaction.Template issuance = new Transaction.Builder()
-  .addAction(new Transaction.Action.Issue()
-    .setAssetAlias("gold")
-    .setAmount(1000)
-  ).addAction(new Transaction.Action.ControlWithAccount()
-    .setAccountAlias("alice")
-    .setAssetAlias("gold")
-    .setAmount(1000)
-  ).build(client);
+Transaction.Template controlAddress = new Transaction.Builder()
+        .addAction(
+                new Transaction.Action.SpendFromAccount()
+                        .setAccountId(senderAccount.id)
+                        .setAssetId(senderAsset.id)
+                        .setAmount(300000000)
+        )
+        .addAction(
+                new Transaction.Action.ControlWithAddress()
+                        .setAddress(receiverAddress.address)
+                        .setAssetId(senderAsset.id)
+                        .setAmount(200000000)
+        ).build(client);
 
 Transaction.Template signedIssuance = new Transaction.SignerBuilder().sign(client,
                 issuance, "123456");
@@ -95,15 +99,15 @@ Alice pays 10 units of gold to Bob.
 
 ```java
 Transaction.Template payment = new Transaction.Builder()
-  .addAction(new Transaction.Action.SpendFromAccount()
-    .setAccountAlias("alice")
-    .setAssetAlias("gold")
-    .setAmount(10)
-  ).addAction(new Transaction.Action.ControlWithAccount()
-    .setAccountAlias("bob")
-    .setAssetAlias("gold")
-    .setAmount(10)
-  ).build(client);
+                .addAction(new Transaction.Action.SpendFromAccount()
+                        .setAccountAlias("alice")
+                        .setAssetAlias("gold")
+                        .setAmount(10)
+                ).addAction(new Transaction.Action.ControlWithAddress()
+                        .setAddress(receiverAddress.address)
+                        .setAssetAlias("gold")
+                        .setAmount(10)
+                ).build(client);
 
 Transaction.Template signedPayment = new Transaction.SignerBuilder().sign(client,
                 payment, "123456");
@@ -150,23 +154,23 @@ Alice pays 10 units of gold and 20 units of silver to Bob.
 
 ```java
 Transaction.Template multiAssetPayment = new Transaction.Builder()
-  .addAction(new Transaction.Action.SpendFromAccount()
-    .setAccountAlias("alice")
-    .setAssetAlias("gold")
-    .setAmount(10)
-  ).addAction(new Transaction.Action.SpendFromAccount()
-    .setAccountAlias("alice")
-    .setAssetAlias("silver")
-    .setAmount(20)
-  ).addAction(new Transaction.Action.ControlWithAccount()
-    .setAccountAlias("bob")
-    .setAssetAlias("gold")
-    .setAmount(10)
-  ).addAction(new Transaction.Action.ControlWithAccount()
-    .setAccountAlias("bob")
-    .setAssetAlias("silver")
-    .setAmount(20)
-  ).build(client);
+                .addAction(new Transaction.Action.SpendFromAccount()
+                        .setAccountAlias("alice")
+                        .setAssetAlias("gold")
+                        .setAmount(10)
+                ).addAction(new Transaction.Action.SpendFromAccount()
+                        .setAccountAlias("alice")
+                        .setAssetAlias("silver")
+                        .setAmount(20)
+                ).addAction(new Transaction.Action.ControlWithAddress()
+                        .setAddress(receiverAddress.address)
+                        .setAssetAlias("gold")
+                        .setAmount(10)
+                ).addAction(new Transaction.Action.ControlWithAddress()
+                        .setAddress(receiverAddress.address)
+                        .setAssetAlias("silver")
+                        .setAmount(20)
+                ).build(client);
 
 Transaction.Template signedMultiAssetPayment = new Transaction.SignerBuilder().sign(client,
                 multiAssetPayment, "123456");
index 90d01b9..180b12d 100644 (file)
@@ -113,14 +113,17 @@ public class TransactionTest {
     @Test
     public void testAssetIssue() throws BytomException {
         Transaction.Template issuance = new Transaction.Builder()
-                .addAction(new Transaction.Action.Issue()
-                        .setAssetAlias("gold")
-                        .setAmount(1000)
-                ).addAction(
-                        new Transaction.Action.ControlWithAccount()
-                                .setAccountAlias("alice")
-                                .setAssetAlias("golad")
-                                .setAmount(1000)
+                .addAction(
+                        new Transaction.Action.SpendFromAccount()
+                                .setAccountId(senderAccount.id)
+                                .setAssetId(senderAsset.id)
+                                .setAmount(300000000)
+                )
+                .addAction(
+                        new Transaction.Action.ControlWithAddress()
+                                .setAddress(receiverAddress.address)
+                                .setAssetId(senderAsset.id)
+                                .setAmount(200000000)
                 ).build(client);
 
         Transaction.Template signedIssuance = new Transaction.SignerBuilder().sign(client,
@@ -163,8 +166,8 @@ public class TransactionTest {
                         .setAccountAlias("alice")
                         .setAssetAlias("gold")
                         .setAmount(10)
-                ).addAction(new Transaction.Action.ControlWithAccount()
-                        .setAccountAlias("bob")
+                ).addAction(new Transaction.Action.ControlWithAddress()
+                        .setAddress(receiverAddress.address)
                         .setAssetAlias("gold")
                         .setAmount(10)
                 ).build(client);
@@ -214,12 +217,12 @@ public class TransactionTest {
                         .setAccountAlias("alice")
                         .setAssetAlias("silver")
                         .setAmount(20)
-                ).addAction(new Transaction.Action.ControlWithAccount()
-                        .setAccountAlias("bob")
+                ).addAction(new Transaction.Action.ControlWithAddress()
+                        .setAddress(receiverAddress.address)
                         .setAssetAlias("gold")
                         .setAmount(10)
-                ).addAction(new Transaction.Action.ControlWithAccount()
-                        .setAccountAlias("bob")
+                ).addAction(new Transaction.Action.ControlWithAddress()
+                        .setAddress(receiverAddress.address)
                         .setAssetAlias("silver")
                         .setAmount(20)
                 ).build(client);