gRPC classes (#33)

* gRPC classes * PB converters WIP * PB converters WIP * PB converters WIP * PB converters WIP * PB converters WIP * Hash fixes * Fixes * Fixes * Fixes * Fixes * Fixes * Fixes
wavesplatform · May 22, 2019 · 44b6413 · 44b6413
1 parent 75f7cb0
commit 44b6413
Show file tree

Hide file tree

Showing 19 changed files with 1,108 additions and 40 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,3 @@
-.gitignore
-.idea/*
-wavesj.iml
+.idea
+target
+*.iml
diff --git a/examples/src/main/java/GRPCTest.java b/examples/src/main/java/GRPCTest.java
@@ -0,0 +1,26 @@
+import com.wavesplatform.api.grpc.TransactionsApiOuterClass.*;
+import com.wavesplatform.api.grpc.TransactionsApiGrpc;
+import com.wavesplatform.protobuf.transaction.RecipientOuterClass;
+import io.grpc.ManagedChannel;
+import io.grpc.ManagedChannelBuilder;
+
+import java.util.Iterator;
+
+public class GRPCTest {
+    public static void main(String[] args) {
+        final ManagedChannel channel = ManagedChannelBuilder.forAddress("mainnet-aws-fr-3.wavesnodes.com", 6870)
+                .usePlaintext()
+                .build();
+
+        final TransactionsApiGrpc.TransactionsApiBlockingStub blockingStub = TransactionsApiGrpc.newBlockingStub(channel);
+        final TransactionsRequest transactionsRequest = TransactionsRequest.newBuilder()
+                .setRecipient(RecipientOuterClass.Recipient.newBuilder().setAlias("test_recipient").build())
+                .build();
+
+        final Iterator<TransactionResponse> transactions = blockingStub.getTransactions(transactionsRequest);
+        for (int i = 0; i < 1000 && transactions.hasNext(); i++) {
+            final TransactionResponse txResponse = transactions.next();
+            System.out.printf("Transaction = %s, height = %d\n", txResponse.getTransaction(), txResponse.getHeight());
+        }
+    }
+}
diff --git a/pom.xml b/pom.xml
@@ -136,7 +136,55 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-toolchains-plugin</artifactId>
+                <version>1.0</version>
+                <executions>
+                    <execution>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>toolchain</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <toolchains>
+                        <protobuf>
+                            <version>[2.4,2.5)</version>
+                        </protobuf>
+                    </toolchains>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.xolstice.maven.plugins</groupId>
+                <artifactId>protobuf-maven-plugin</artifactId>
+                <version>0.6.1</version>
+                <extensions>true</extensions>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>compile</goal>
+                            <goal>test-compile</goal>
+                            <goal>compile-custom</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <protocArtifact>com.google.protobuf:protoc:3.7.1:exe:${os.detected.classifier}</protocArtifact>
+                    <pluginId>grpc-java</pluginId>
+                    <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.20.0:exe:${os.detected.classifier}</pluginArtifact>
+                </configuration>
+            </plugin>
         </plugins>
+
+        <extensions>
+            <extension>
+                <groupId>kr.motd.maven</groupId>
+                <artifactId>os-maven-plugin</artifactId>
+                <version>1.6.0</version>
+            </extension>
+        </extensions>
     </build>
 
     <dependencies>
@@ -177,5 +225,20 @@
             <version>4.12</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>io.grpc</groupId>
+            <artifactId>grpc-netty-shaded</artifactId>
+            <version>1.20.0</version>
+        </dependency>
+        <dependency>
+            <groupId>io.grpc</groupId>
+            <artifactId>grpc-protobuf</artifactId>
+            <version>1.20.0</version>
+        </dependency>
+        <dependency>
+            <groupId>io.grpc</groupId>
+            <artifactId>grpc-stub</artifactId>
+            <version>1.20.0</version>
+        </dependency>
     </dependencies>
 </project>
diff --git a/src/main/java/com/wavesplatform/wavesj/ByteUtils.java b/src/main/java/com/wavesplatform/wavesj/ByteUtils.java
@@ -88,7 +88,7 @@ public static String putRecipient(ByteBuffer buffer, byte chainId, String recipi
     }
 
     public static String hash(byte[] bytes) {
-        return Base58.encode(Hash.hash(bytes, 0, bytes.length, Hash.BLAKE2B256));
+        return Base58.encode(Hash.blake2b(bytes, 0, bytes.length));
     }
 
     public static String sign(PrivateKeyAccount account, ByteBuffer buffer) {

diff --git a/src/main/java/com/wavesplatform/wavesj/Hash.java b/src/main/java/com/wavesplatform/wavesj/Hash.java
@@ -6,35 +6,43 @@
 import org.bouncycastle.crypto.digests.SHA256Digest;
 
 public class Hash {
-    public static final ThreadLocal<Digest> BLAKE2B256 = new ThreadLocal<Digest>();
-    public static final ThreadLocal<Digest> KECCAK256 = new ThreadLocal<Digest>();
-    public static final ThreadLocal<Digest> SHA256 = new ThreadLocal<Digest>();
+    private static final ThreadLocal<Digest> BLAKE2B256 = new ThreadLocal<Digest>();
+    private static final ThreadLocal<Digest> KECCAK256 = new ThreadLocal<Digest>();
+    private static final ThreadLocal<Digest> SHA256 = new ThreadLocal<Digest>();
+
+    public static byte[] secureHash(byte[] message, int ofs, int len) {
+        final byte[] blake2b = hash(message, ofs, len, Hash.BLAKE2B256);
+        return hash(blake2b, 0, blake2b.length, Hash.KECCAK256);
+    }
+
+    public static byte[] blake2b(byte[] message, int ofs, int len) {
+        return hash(message, ofs, len, Hash.BLAKE2B256);
+    }
+
+    public static byte[] sha256(byte[] message, int ofs, int len) {
+        return hash(message, ofs, len, Hash.SHA256);
+    }
 
     private static Digest digest(ThreadLocal<Digest> cache) {
-        Digest d = cache.get();
-        if (d == null) {
+        Digest digest = cache.get();
+        if (digest == null) {
             if (cache == BLAKE2B256) {
-                d = new Blake2bDigest(256);
+                digest = new Blake2bDigest(256);
             } else if (cache == KECCAK256) {
-                d = new KeccakDigest(256);
+                digest = new KeccakDigest(256);
             } else if (cache == SHA256) {
-                d = new SHA256Digest();
+                digest = new SHA256Digest();
             }
-            cache.set(d);
+            cache.set(digest);
         }
-        return d;
-    }
-
-    protected static byte[] hash(byte[] message, int ofs, int len, ThreadLocal<Digest> alg) {
-        Digest d = digest(alg);
-        byte[] res = new byte[d.getDigestSize()];
-        d.update(message, ofs, len);
-        d.doFinal(res, 0);
-        return res;
+        return digest;
     }
 
-    public static byte[] secureHash(byte[] message, int ofs, int len) {
-        byte[] blake2b = hash(message, ofs, len, Hash.BLAKE2B256);
-        return hash(blake2b, 0, blake2b.length, Hash.KECCAK256);
+    private static byte[] hash(byte[] message, int ofs, int len, ThreadLocal<Digest> alg) {
+        final Digest digest = digest(alg);
+        final byte[] result = new byte[digest.getDigestSize()];
+        digest.update(message, ofs, len);
+        digest.doFinal(result, 0);
+        return result;
     }
 }
diff --git a/src/main/java/com/wavesplatform/wavesj/PrivateKeyAccount.java b/src/main/java/com/wavesplatform/wavesj/PrivateKeyAccount.java
@@ -8,8 +8,6 @@
 import java.security.SecureRandom;
 import java.util.Arrays;
 
-import static com.wavesplatform.wavesj.Hash.*;
-
 public class PrivateKeyAccount extends PublicKeyAccount {
 
     private static final Curve25519 cipher = Curve25519.getInstance(Curve25519.BEST);
@@ -250,7 +248,7 @@ public String sign(byte[] bytes) {
     public static String generateSeed() {
         byte[] bytes = new byte[21];
         new SecureRandom().nextBytes(bytes);
-        byte[] rhash = hash(bytes, 0, 20, SHA256);
+        byte[] rhash = Hash.sha256(bytes, 0, 20);
         bytes[20] = rhash[0];
         BigInteger rand = new BigInteger(bytes);
         BigInteger mask = new BigInteger(new byte[]{0, 0, 7, -1}); // 11 lower bits
@@ -267,10 +265,10 @@ private static byte[] privateKey(String seed, int nonce) {
         // account seed from seed & nonce
         ByteBuffer buf = ByteBuffer.allocate(seed.getBytes().length + 4);
         buf.putInt(nonce).put(seed.getBytes());
-        byte[] accountSeed = secureHash(buf.array(), 0, buf.array().length);
+        byte[] accountSeed = Hash.secureHash(buf.array(), 0, buf.array().length);
 
         // private key from account seed & chainId
-        byte[] hashedSeed = hash(accountSeed, 0, accountSeed.length, SHA256);
+        byte[] hashedSeed = Hash.sha256(accountSeed, 0, accountSeed.length);
         byte[] privateKey = Arrays.copyOf(hashedSeed, 32);
         privateKey[0] &= 248;
         privateKey[31] &= 127;

diff --git a/src/main/java/com/wavesplatform/wavesj/PublicKeyAccount.java b/src/main/java/com/wavesplatform/wavesj/PublicKeyAccount.java
@@ -3,8 +3,6 @@
 import java.nio.ByteBuffer;
 import java.util.Arrays;
 
-import static com.wavesplatform.wavesj.Hash.secureHash;
-
 public class PublicKeyAccount implements Account {
 
     private final byte chainId;
@@ -35,9 +33,9 @@ public final byte getChainId() {
 
     private static byte[] address(byte[] publicKey, byte chainId) {
         ByteBuffer buf = ByteBuffer.allocate(26);
-        byte[] hash = secureHash(publicKey, 0, publicKey.length);
+        byte[] hash = Hash.secureHash(publicKey, 0, publicKey.length);
         buf.put((byte) 1).put((byte) chainId).put(hash, 0, 20);
-        byte[] checksum = secureHash(buf.array(), 0, 22);
+        byte[] checksum = Hash.secureHash(buf.array(), 0, 22);
         buf.put(checksum, 0, 4);
         return buf.array();
     }