Dev

README.md

@@ -1,2 +1,71 @@
 # wallet-cli [![Build Status](https://travis-ci.org/tronprotocol/wallet-cli.svg?branch=master)](https://travis-ci.org/tronprotocol/wallet-cli)
 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
+
+./gradlew build      
+./gradlew run
+
+
+Build and run wallet-cli  
+Create a new command line terminal window.
+
+cd wallet-cli
+
+./gradlew build      
+./gradlew run -Pcmd
+
+You can enter the following command: 
+RegisterWallet
+
+ImportWallet
+
+ChangePassword
+
+Login
+
+Logout
+
+BackupWallet
+
+Getaddress
+
+GetBalance
+
+GetAccount
+
+GetAssetissueByAccount
+
+SendCoin
+
+TransferAsset
+
+ParticipateAssetissue
+
+Assetissue
+
+CreateWitness
+
+VoteWitness
+
+Listaccounts
+
+Listwitnesses
+
+Listassetissue
+
+Getblock
+
+Exit or Quit
+
+Input any one of then, you will get more tips.

Wallet

@@ -1 +1 @@
-ff7f73b854845fc02aa13b777ac090fb049a3d37cfc4802a0d759382f7e1618db3085ee5e59233343a3fe15af5c698ef9e20894b18c60e779c81b74ec830ff375c12e59e3a98c61fe205035a671c71e84c5c143dc4e7eeb4d5a02eb8c2b78d8df0fa0b1ce79e780695db5a372a42b76156
+ff7f73b854845fc02aa13b777ac090fb040b43ee3ce90861785dc83f851ff21b1014d72fc698ca34ea67e0ad53de77974d6218fd35e93df0245aaf1c14ed4be11d2bd6f6d2979f54f3329ffcc8d660822cabdc916c63827e6e02d74585ca766dbaa7628eb995fd2a26a7a43837ab3ca665

build.gradle

@@ -6,6 +6,7 @@ apply plugin: 'idea'
 apply plugin: 'com.google.protobuf'
 apply plugin: 'org.springframework.boot'
 apply plugin: "io.spring.dependency-management"
+apply plugin: 'application'
 
 sourceCompatibility = 1.8
 targetCompatibility = JavaVersion.VERSION_1_8
@@ -28,10 +29,10 @@ sourceSets {
         proto {
             srcDir 'src/main/protos'
         }
-	java {
-	     srcDir 'src/main/gen'
-	     srcDir 'src/main/java'
-	}
+        java {
+            srcDir 'src/main/gen'
+            srcDir 'src/main/java'
+        }
     }
 
 }
@@ -59,7 +60,7 @@ buildscript {
         classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.3'
 
         classpath "io.spring.gradle:dependency-management-plugin:0.6.1.RELEASE"
-        classpath"org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}"
+        classpath "org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}"
 
 
     }
@@ -94,13 +95,13 @@ dependencies {
     compile group: 'com.typesafe', name: 'config', version: '1.3.2'
 
     //explorer
-    compile'org.projectlombok:lombok:1.16.6'
-    compile"org.springframework.boot:spring-boot-configuration-processor:${springBootVersion}"
-    compile"org.springframework.boot:spring-boot-starter:${springBootVersion}"
+    compile 'org.projectlombok:lombok:1.16.6'
+    compile "org.springframework.boot:spring-boot-configuration-processor:${springBootVersion}"
+    compile "org.springframework.boot:spring-boot-starter:${springBootVersion}"
 
-    compile"org.springframework.cloud:spring-cloud-starter-sleuth:${springSleuthVersion}"
-    compile"org.springframework.cloud:spring-cloud-starter-consul-discovery:${springCloudConsulVersion}"
-    compile"org.springframework.cloud:spring-cloud-starter-eureka:${springCloudEurekaVersion}"
+    compile "org.springframework.cloud:spring-cloud-starter-sleuth:${springSleuthVersion}"
+    compile "org.springframework.cloud:spring-cloud-starter-consul-discovery:${springCloudConsulVersion}"
+    compile "org.springframework.cloud:spring-cloud-starter-eureka:${springCloudEurekaVersion}"
 
     compile "org.apache.commons:commons-collections4:4.0"
     compile "org.apache.commons:commons-lang3:3.4"
@@ -109,7 +110,14 @@ dependencies {
     compile group: 'io.springfox', name: 'springfox-swagger2', version: '2.7.0'
     compile group: 'io.springfox', name: 'springfox-swagger-ui', version: '2.7.0'
 
+    //thymeleaf
     compile group: 'org.springframework.boot', name: 'spring-boot-starter-thymeleaf', version: '1.5.6.RELEASE'
+    compile group: 'net.sourceforge.nekohtml', name: 'nekohtml', version: '1.9.22'
+
+    //spring-boot-devtools
+    compile group: 'org.springframework.boot', name: 'spring-boot-devtools', version: '1.5.6.RELEASE'
+
+
 }
 
 protobuf {
@@ -135,4 +143,15 @@ protobuf {
             }
         }
     }
+}
+
+run {
+    if (project.hasProperty('cmd')) {
+        standardInput = System.in
+        mainClassName = 'org.tron.walletcli.TestClient'
+    }
+}
+
+bootRun {
+    addResources = true
 }

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

@@ -59,8 +59,8 @@ public static byte[] getOwner(Transaction.Contract contract) {
         case TransferContract:
           owner = contract.getParameter().unpack(org.tron.protos.Contract.TransferContract.class).getOwnerAddress();
           break;
-        case TransferAssertContract:
-          owner = contract.getParameter().unpack(org.tron.protos.Contract.TransferAssertContract.class).getOwnerAddress();
+        case TransferAssetContract:
+          owner = contract.getParameter().unpack(org.tron.protos.Contract.TransferAssetContract.class).getOwnerAddress();
           break;
         case VoteAssetContract:
           owner = contract.getParameter().unpack(org.tron.protos.Contract.VoteAssetContract.class).getOwnerAddress();
@@ -237,4 +237,14 @@ public static Transaction sign(Transaction transaction, ECKey myKey) {
     transaction = transactionBuilderSigned.build();
     return transaction;
   }
+
+  public static Transaction setTimestamp(Transaction transaction){
+    long currenTime = System.nanoTime();
+    Transaction.Builder builder = transaction.toBuilder();
+    org.tron.protos.Protocol.Transaction.raw.Builder rowBuilder = transaction.getRawData()
+        .toBuilder();
+    rowBuilder.setTimestamp(currenTime);
+    builder.setRawData(rowBuilder.build());
+    return builder.build();
+  }
 }

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

@@ -4,6 +4,7 @@
 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;
@@ -22,13 +23,13 @@
 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,40 +45,36 @@ public ObjectMapper objectMapper() {
     ObjectMapper objectMapper;
 
 
-    @Bean
-    ProtobufHttpMessageConverter protobufHttpMessageConverter() {
-        return new ProtobufHttpMessageConverter();
-    }
+//    @Bean
+//    ProtobufHttpMessageConverter protobufHttpMessageConverter() {
+//        return new ProtobufHttpMessageConverter();
+//    }
 
     @Bean
     public WebMvcConfigurer webMvcConfigurer() {
 
 
         return new WebMvcConfigurerAdapter() {
-            /**
-             * Keep "/static/**" prefix.
-             */
-            @Override
-            public void addResourceHandlers(ResourceHandlerRegistry registry) {
-                super.addResourceHandlers(registry);
-                registry.addResourceHandler("/static/**")
-                        .addResourceLocations("classpath:/static/");
-            }
+
 
             /**
              * Add Java8 time support for Jackson.
              */
             @Override
             public void configureMessageConverters(List<HttpMessageConverter<?>> converters) {
-                // final ProtobufHttpMessageConverter converter = new ProtobufHttpMessageConverter();
+                 final ProtobufHttpMessageConverter protobufconverter = new ProtobufHttpMessageConverter();
                 final MappingJackson2HttpMessageConverter converter = new MappingJackson2HttpMessageConverter();
                 converter.setObjectMapper(objectMapper);
                 converters.add(converter);
+                converters.add(protobufconverter);
                 super.configureMessageConverters(converters);
             }
         };
     }
 
+
+
+    //fix cors
     @Configuration
     public class CorsConfig {
         private CorsConfiguration buildConfig() {

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

@@ -0,0 +1,58 @@
+package org.tron.explorer.controller;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.tron.api.GrpcAPI.AccountList;
+import org.tron.common.utils.ByteArray;
+import org.tron.explorer.domain.AccountVo;
+import org.tron.protos.Protocol.Account;
+import org.tron.walletserver.WalletClient;
+
+import java.util.Optional;
+
+
+@RestController
+public class AccountController {
+
+  protected final Log log = LogFactory.getLog(getClass());
+
+  @ModelAttribute
+  AccountVo setAccountVo() {
+    return new AccountVo();
+  }
+
+  @PostMapping("/queryAccount")
+  public byte[] queryAccount(String address) {
+    try {
+      if (address == null) {
+        return null;
+      }
+      if (!WalletClient.addressValid(address)) {
+        return null;
+      }
+      Account account = WalletClient.queryAccount(ByteArray.fromHexString(address));
+      return account.toByteArray();
+    } catch (Exception e) {
+      e.printStackTrace();
+      return null;
+    }
+  }
+
+  @GetMapping("/accountList")
+  public byte[] getAcountList() {
+    try {
+      Optional<AccountList> result = WalletClient.listAccounts();
+      if (result.isPresent()) {
+        AccountList accountList = result.get();
+        return accountList.toByteArray();
+      }
+    } catch (Exception e) {
+      e.printStackTrace();
+    }
+    return null;
+  }
+}