Dev

README.md

@@ -3,69 +3,85 @@ Wallet CLI
 
 
 Download java-tron and wallet-cli
-
+---------------------------------
 git clone https://github.com/tronprotocol/java-tron.git
 
 git clone https://github.com/tronprotocol/wallet-cli.git
 
 
 Build and run java-tron
-
-cd java-tron
-
+-------------------------
+cd java-tron  
 ./gradlew build      
-./gradlew run
+./gradlew run -Pwitness
 
 
-Build and run wallet-cli  
+Build and run wallet-cli by command line
+----------------------------------------
 Create a new command line terminal window.
 
-cd wallet-cli
-
+cd wallet-cli  
 ./gradlew build      
 ./gradlew run -Pcmd
-
-You can enter the following command: 
-RegisterWallet
-
-ImportWallet
-
-ChangePassword
-
-Login
-
-Logout
-
-BackupWallet
-
-Getaddress
-
-GetBalance
-
-GetAccount
 
+How wallet-cli connects to java-tron :
+--------------------------------------
+Wallet-cli connect to java-tron by grpc protocol.          
+Java-tron nodes can be deployed locally or remotely.          
+We can set the connected java-tron node IP in config.conf of wallet-cli.
+
+Java-tron provides grpc api list:
+------------------------------------
+
+rpc GetAccount (Account) returns (Account)           
+rpc CreateTransaction (TransferContract) returns (Transaction)        
+rpc BroadcastTransaction (Transaction) returns (Return)        
+rpc ListAccounts (EmptyMessage) returns (AccountList)      
+rpc CreateAccount (AccountCreateContract) returns (Transaction)      
+rpc VoteWitnessAccount (VoteWitnessContract) returns (Transaction)      
+rpc CreateAssetIssue (AssetIssueContract) returns (Transaction)     
+rpc ListWitnesses (EmptyMessage) returns (WitnessList)     
+rpc UpdateWitness (WitnessUpdateContract) returns (Transaction)     
+rpc CreateWitness (WitnessCreateContract) returns (Transaction)    
+rpc TransferAsset (TransferAssetContract) returns (Transaction)      
+rpc ParticipateAssetIssue (ParticipateAssetIssueContract) returns (Transaction)       
+rpc ListNodes (EmptyMessage) returns (NodeList)      
+rpc GetAssetIssueList (EmptyMessage) returns (AssetIssueList)      
+rpc GetAssetIssueByAccount (Account) returns (AssetIssueList)    
+rpc GetAssetIssueByName (BytesMessage) returns (AssetIssueContract)       
+rpc GetNowBlock (EmptyMessage) returns (Block)         
+rpc GetBlockByNum (NumberMessage) returns (Block)       
+
+Wallet-cli supported command list:
+----------------------------------
+
+RegisterWallet  
+ImportWallet  
+ImportwalletByBase64  
+ChangePassword  
+Login  
+Logout  
+BackupWallet  
+BackupWallet2Base64  
+Getaddress  
+GetBalance  
+GetAccount  
 GetAssetissueByAccount
-
-SendCoin
-
-TransferAsset
-
-ParticipateAssetissue
-
-Assetissue
-
-CreateWitness
-
-VoteWitness
-
-Listaccounts
-
-Listwitnesses
-
+GetAssetIssueByName
+SendCoin  
+TransferAsset  
+ParticipateAssetissue  
+Assetissue  
+CreateWitness  
+VoteWitness  
+Listaccounts  
+Listwitnesses  
 Listassetissue
+GetAssetIssueByName   
+Getblock   
+Exit or Quit  
+help  
 
-Getblock
+Input any one of then, you will get more tips.
 
-Exit or Quit
 
-Input any one of then, you will get more tips.

build.gradle

@@ -117,6 +117,10 @@ dependencies {
     //spring-boot-devtools
     compile group: 'org.springframework.boot', name: 'spring-boot-devtools', version: '1.5.6.RELEASE'
 
+    //spring test
+    testCompile group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: '1.5.6.RELEASE'
+    testCompile group: 'org.springframework', name: 'spring-test', version: '4.3.10.RELEASE'
+
 
 }
 

src/main/java/org/tron/common/utils/TransactionUtils.java

@@ -74,6 +74,9 @@ public static byte[] getOwner(Transaction.Contract contract) {
         case AssetIssueContract:
           owner = contract.getParameter().unpack(org.tron.protos.Contract.AssetIssueContract.class).getOwnerAddress();
           break;
+        case ParticipateAssetIssueContract:
+          owner = contract.getParameter().unpack(org.tron.protos.Contract.ParticipateAssetIssueContract.class).getOwnerAddress();
+          break;
         case DeployContract:
           owner = contract.getParameter().unpack(org.tron.protos.Contract.AssetIssueContract.class).getOwnerAddress();
           break;
@@ -184,7 +187,11 @@ public static boolean validTransaction(Transaction signedTransaction) {
           signedTransaction.getRawData().getContractCount());
       List<Transaction.Contract> listContract = signedTransaction.getRawData().getContractList();
       byte[] hash = sha256(signedTransaction.getRawData().toByteArray());
-      for (int i = 0; i < signedTransaction.getSignatureCount(); ++i) {
+      int count = signedTransaction.getSignatureCount();
+      if ( count == 0 ){
+        return false;
+      }
+      for (int i = 0; i < count; ++i) {
         try {
           Transaction.Contract contract = listContract.get(i);
           byte[] owner = getOwner(contract);

src/main/java/org/tron/explorer/GrpcClientApplication.java

@@ -4,7 +4,6 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.PropertyNamingStrategy;
 import com.fasterxml.jackson.databind.SerializationFeature;
-import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -19,17 +18,16 @@
 import org.springframework.web.cors.CorsConfiguration;
 import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
 import org.springframework.web.filter.CorsFilter;
-import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
 
+import java.util.List;
+
 
 @EnableScheduling
 @SpringBootApplication
 public class GrpcClientApplication extends SpringBootServletInitializer {
 
-
-
     @Bean
     public ObjectMapper objectMapper() {
         final ObjectMapper mapper = new ObjectMapper();
@@ -44,16 +42,8 @@ public ObjectMapper objectMapper() {
     @Autowired
     ObjectMapper objectMapper;
 
-
-//    @Bean
-//    ProtobufHttpMessageConverter protobufHttpMessageConverter() {
-//        return new ProtobufHttpMessageConverter();
-//    }
-
     @Bean
     public WebMvcConfigurer webMvcConfigurer() {
-
-
         return new WebMvcConfigurerAdapter() {
 
 
@@ -62,7 +52,7 @@ public WebMvcConfigurer webMvcConfigurer() {
              */
             @Override
             public void configureMessageConverters(List<HttpMessageConverter<?>> converters) {
-                 final ProtobufHttpMessageConverter protobufconverter = new ProtobufHttpMessageConverter();
+                final ProtobufHttpMessageConverter protobufconverter = new ProtobufHttpMessageConverter();
                 final MappingJackson2HttpMessageConverter converter = new MappingJackson2HttpMessageConverter();
                 converter.setObjectMapper(objectMapper);
                 converters.add(converter);
@@ -72,9 +62,6 @@ public void configureMessageConverters(List<HttpMessageConverter<?>> converters)
         };
     }
 
-
-
-    //fix cors
     @Configuration
     public class CorsConfig {
         private CorsConfiguration buildConfig() {
@@ -91,14 +78,12 @@ public CorsFilter corsFilter() {
             source.registerCorsConfiguration("/**", buildConfig()); // 4
             return new CorsFilter(source);
         }
-
     }
 
     protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
         return application.sources(GrpcClientApplication.class);
     }
 
-
     public static void main(String[] args) {
         SpringApplication.run(GrpcClientApplication.class, args);
     }

src/main/java/org/tron/explorer/controller/AssetIssueController.java

@@ -4,7 +4,6 @@
 import java.io.IOException;
 import java.util.Base64;
 import java.util.Base64.Decoder;
-import java.util.List;
 import java.util.Optional;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -30,12 +29,12 @@ public class AssetIssueController {
   protected final Log log = LogFactory.getLog(getClass());
 
   @ModelAttribute
-   AssetIssueVo setAssetIssueVo() {
-    return  new AssetIssueVo();
+  AssetIssueVo setAssetIssueVo() {
+    return new AssetIssueVo();
   }
 
   @ModelAttribute
-   TransferAsset setTransferAsset() {
+  TransferAsset setTransferAsset() {
     return new TransferAsset();
   }
 
@@ -51,7 +50,6 @@ public ModelAndView viewCreateWitness() {
   }
 
 
-
   @PostMapping("/createAssetIssueToView")
   public byte[] getTransactionToView(@ModelAttribute AssetIssueVo assetIssueVo) {
     try {
@@ -78,14 +76,14 @@ public byte[] getTransactionToView(@ModelAttribute AssetIssueVo assetIssueVo) {
       transaction = TransactionUtils.setTimestamp(transaction);
       return transaction.toByteArray();
     } catch (Exception e) {
+      System.out.printf("error=====" + e.getMessage());
       e.printStackTrace();
       return null;
     }
   }
 
   @GetMapping("/getAssetIssueList")
-  public byte[] getAssetIssueList()
-      throws IOException {
+  public byte[] getAssetIssueList() throws IOException {
     try {
       Optional<AssetIssueList> result = WalletClient.getAssetIssueList();
       if (result.isPresent()) {
@@ -99,14 +97,12 @@ public byte[] getAssetIssueList()
   }
 
   @GetMapping("/getAssetIssueByAccount")
-  public byte[] getAssetIssueByAccount(String address)
-      throws IOException {
+  public byte[] getAssetIssueByAccount(String address) throws IOException {
     try {
       if (!WalletClient.addressValid(address)) {
         return null;
       }
-      Decoder decoder = Base64.getDecoder();
-      byte[] owner = decoder.decode(address.getBytes());
+      byte[] owner = ByteArray.fromHexString(address);
 
       Optional<AssetIssueList> result = WalletClient.getAssetIssueByAccount(owner);
       if (result.isPresent()) {
@@ -127,7 +123,7 @@ public byte[] getTransactionToView(@ModelAttribute TransferAsset transferAsset)
       }
       Transaction transaction = WalletClient
           .createTransferAssetTransaction(ByteArray.fromHexString(transferAsset.getToAddress()),
-              ByteArray.fromHexString(transferAsset.getAssetName()),
+              ByteArray.fromString(transferAsset.getAssetName()),
               ByteArray.fromHexString(transferAsset.getAddress()),
               Long.parseLong(transferAsset.getAmount()));
       transaction = TransactionUtils.setTimestamp(transaction);

src/main/java/org/tron/explorer/controller/AssetTransferController.java

@@ -0,0 +1,51 @@
+package org.tron.explorer.controller;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.tron.common.utils.ByteArray;
+import org.tron.common.utils.TransactionUtils;
+import org.tron.explorer.domain.TransferAsset;
+import org.tron.protos.Contract.TransferContract;
+import org.tron.protos.Protocol.Transaction;
+import org.tron.walletserver.WalletClient;
+
+@RestController
+public class AssetTransferController {
+
+  protected final Log log = LogFactory.getLog(getClass());
+
+  @PostMapping("/sendAssetCoinToView")
+  public byte[] getTransactionToView(@ModelAttribute TransferAsset transferAsset) {
+    Transaction transaction;
+    try {
+      if (transferAsset == null) {
+        return null;
+      }
+      if (transferAsset.getAssetName() != "TRX") {
+        transaction = WalletClient
+            .createTransferAssetTransaction(ByteArray.fromHexString(transferAsset.getToAddress()),
+                ByteArray.fromHexString(transferAsset.getAssetName()),
+                ByteArray.fromHexString(transferAsset.getAddress()),
+                Long.parseLong(transferAsset.getAmount()));
+      } else {
+        TransferContract contract = WalletClient
+            .createTransferContract(ByteArray.fromHexString(transferAsset.getToAddress()),
+                ByteArray.fromHexString(transferAsset.getAddress()),
+                Long.parseLong(transferAsset.getAmount()));
+        transaction = WalletClient.createTransaction4Transfer(contract);
+      }
+
+      transaction = TransactionUtils.setTimestamp(transaction);
+      return transaction.toByteArray();
+    } catch (Exception e) {
+      e.printStackTrace();
+      return null;
+    }
+
+
+  }
+
+}

src/main/java/org/tron/explorer/controller/BlockController.java

@@ -15,8 +15,6 @@
 package org.tron.explorer.controller;
 
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 import org.tron.walletserver.WalletClient;
 import org.tron.protos.Protocol.Block;
@@ -26,8 +24,9 @@ public class BlockController {
 
 
   @GetMapping("/getBlockByNumToView")
+  public byte[] getBlockByNumToView( long num) {
+    System.out.println("num is : " +num);
 
-  public byte[] getBlockByNumToView(long num) {
     Block currentBlock = WalletClient.GetBlock(num);
     return currentBlock.toByteArray();