diff --git a/src/main/java/DNA/Core/RegisterTransaction.java b/src/main/java/DNA/Core/RegisterTransaction.java index 9952a49..fa48530 100644 --- a/src/main/java/DNA/Core/RegisterTransaction.java +++ b/src/main/java/DNA/Core/RegisterTransaction.java @@ -29,6 +29,10 @@ public class RegisterTransaction extends Transaction { * 资产名称 */ public String name; // 资产名称 + /** + * 资产描述 + */ + public String description; // 资产描述 /** * 精度 */ @@ -62,6 +66,7 @@ public RegisterTransaction() { protected void deserializeExclusiveData(BinaryReader reader) throws IOException { try { name = reader.readVarString(); + description = reader.readVarString(); precision = reader.readByte(); assetType = AssetType.valueOf(reader.readByte()); recordType = RecordType.valueOf(reader.readByte()); @@ -78,6 +83,7 @@ protected void deserializeExclusiveData(BinaryReader reader) throws IOException @Override protected void serializeExclusiveData(BinaryWriter writer) throws IOException { writer.writeVarString(name); + writer.writeVarString(description); writer.writeByte(precision); writer.writeByte(assetType.value()); writer.writeByte(recordType.value()); diff --git a/src/main/java/DNA/Websocket/Utils/GetBlockTransactionUtils.java b/src/main/java/DNA/Websocket/Utils/GetBlockTransactionUtils.java index 9e3a2fb..e2a1d6b 100644 --- a/src/main/java/DNA/Websocket/Utils/GetBlockTransactionUtils.java +++ b/src/main/java/DNA/Websocket/Utils/GetBlockTransactionUtils.java @@ -19,10 +19,11 @@ public class GetBlockTransactionUtils { * @return transaction list */ public static Block from(String ss) { - try { - return JsonSerializable.from(JObject.parse(ss), Block.class); - } catch (InstantiationException | IllegalAccessException e) { - throw new RuntimeException("Block Parsing exception"); - } +// try { +// return JsonSerializable.from(JObject.parse(ss), Block.class); +// } catch (InstantiationException | IllegalAccessException e) { +// throw new RuntimeException("Block Parsing exception"); +// } + return null; } } \ No newline at end of file diff --git a/src/main/java/DNA/sdk/wallet/AccountManager.java b/src/main/java/DNA/sdk/wallet/AccountManager.java index 77c466d..d2f2068 100644 --- a/src/main/java/DNA/sdk/wallet/AccountManager.java +++ b/src/main/java/DNA/sdk/wallet/AccountManager.java @@ -546,6 +546,7 @@ private RegisterTransaction getRegTx(Account acc, String assetName, long assetAm tx.assetType = assetType ; tx.name = assetName; + tx.description = txDesc; tx.amount = Fixed8.parse(String.valueOf(assetAmount)); tx.issuer = acc.publicKey; tx.admin = Wallet.toScriptHash(controller); diff --git a/src/main/java/TestMain4CLI.java b/src/main/java/TestMain4CLI.java index c394918..5c49d47 100644 --- a/src/main/java/TestMain4CLI.java +++ b/src/main/java/TestMain4CLI.java @@ -248,7 +248,7 @@ public static AccountManager getAccountManager() { // v1.1 String dnaUrl = "http://127.0.0.1:20334"; String dnaToken = ""; - String path = "./dat/3.db3"; + String path = "./4.db3"; AccountManager wm = AccountManager.getWallet(path, dnaUrl, dnaToken); print(String.format("[param=%s,%s]", dnaUrl, path)); print(String.format("start to test....hh:%s", wm.getBlockHeight()));