Merge pull request #639 from tronprotocol/release_v4.7.1.1

feat(merge)release v4.7.1.1 merge into master
tronprotocol · Apr 17, 2023 · 2c60edc · 2c60edc
2 parents 52eb6b0 + 784cb26
commit 2c60edc
Show file tree

Hide file tree

Showing 13 changed files with 19 additions and 648 deletions.
diff --git a/src/main/java/org/tron/common/utils/HttpSelfFormatFieldName.java b/src/main/java/org/tron/common/utils/HttpSelfFormatFieldName.java
@@ -13,14 +13,6 @@ public class HttpSelfFormatFieldName {
     //DelegatedResourceMessage
     AddressFieldNameMap.put("protocol.DelegatedResourceMessage.fromAddress", 1);
     AddressFieldNameMap.put("protocol.DelegatedResourceMessage.toAddress", 1);
-    //EasyTransferMessage
-    AddressFieldNameMap.put("protocol.EasyTransferMessage.toAddress", 1);
-    //EasyTransferAssetMessage
-    AddressFieldNameMap.put("protocol.EasyTransferAssetMessage.toAddress", 1);
-    //EasyTransferByPrivateMessage
-    AddressFieldNameMap.put("protocol.EasyTransferByPrivateMessage.toAddress", 1);
-    //EasyTransferAssetByPrivateMessage
-    AddressFieldNameMap.put("protocol.EasyTransferAssetByPrivateMessage.toAddress", 1);
     //TransactionSignWeight
     AddressFieldNameMap.put("protocol.TransactionSignWeight.approved_list", 1);
     //TransactionApprovedList
@@ -176,10 +168,6 @@ public class HttpSelfFormatFieldName {
     NameFieldNameMap.put("protocol.Return.message", 1);
     //Address
     NameFieldNameMap.put("protocol.Address.host", 1);
-    //EasyTransferMessage
-    NameFieldNameMap.put("protocol.EasyTransferMessage.passPhrase", 1);
-    //EasyTransferAssetMessage
-    NameFieldNameMap.put("protocol.EasyTransferAssetMessage.passPhrase", 1);
     //Note
     NameFieldNameMap.put("protocol.Note.memo", 1);
 

diff --git a/src/main/java/org/tron/demo/EasyTransferAssetByPrivateDemo.java b/src/main/java/org/tron/demo/EasyTransferAssetByPrivateDemo.java
diff --git a/src/main/java/org/tron/demo/EasyTransferAssetDemo.java b/src/main/java/org/tron/demo/EasyTransferAssetDemo.java
diff --git a/src/main/java/org/tron/demo/EasyTransferByPrivateDemo.java b/src/main/java/org/tron/demo/EasyTransferByPrivateDemo.java
diff --git a/src/main/java/org/tron/demo/EasyTransferDemo.java b/src/main/java/org/tron/demo/EasyTransferDemo.java
diff --git a/src/main/java/org/tron/demo/MultiSignDemo.java b/src/main/java/org/tron/demo/MultiSignDemo.java
diff --git a/src/main/java/org/tron/demo/TransactionSignDemo.java b/src/main/java/org/tron/demo/TransactionSignDemo.java