Merge pull request #83 from mikeluxue/0.6.0

0.6.0
tronprotocol · Jun 14, 2023 · 7dbffc0 · 7dbffc0
2 parents 8661820 + 2a45ffe
commit 7dbffc0
Show file tree

Hide file tree

Showing 10 changed files with 5,372 additions and 223 deletions.
diff --git a/trident-java/README.md b/trident-java/README.md
@@ -51,21 +51,21 @@ dependencies {
 <dependency>
   <groupId>org.tron.trident</groupId>
   <artifactId>abi</artifactId>
-  <version>0.5.0</version>
+  <version>0.6.0</version>
   <scope>system</scope>
   <systemPath>your path</systemPath>
 </dependency>
 <dependency>
   <groupId>org.tron.trident</groupId>
   <artifactId>utils</artifactId>
-  <version>0.5.0</version>
+  <version>0.6.0</version>
   <scope>system</scope>
   <systemPath>your path</systemPath>
 </dependency>
 <dependency>
   <groupId>org.tron.trident</groupId>
   <artifactId>core</artifactId>
-  <version>0.5.0</version>
+  <version>0.6.0</version>
   <scope>system</scope>
   <systemPath>your path</systemPath>
 </dependency>

diff --git a/trident-java/build.gradle b/trident-java/build.gradle
@@ -8,7 +8,7 @@ ext {
 }
 
 allprojects {
-    version '0.5.0'
+    version '0.6.0'
     group = 'org.tron.trident'
 
     repositories {

diff --git a/trident-java/core/src/main/grpc/org/tron/trident/api/WalletGrpc.java b/trident-java/core/src/main/grpc/org/tron/trident/api/WalletGrpc.java
diff --git a/trident-java/core/src/main/grpc/org/tron/trident/api/WalletSolidityGrpc.java b/trident-java/core/src/main/grpc/org/tron/trident/api/WalletSolidityGrpc.java
@@ -154,6 +154,37 @@ org.tron.trident.api.GrpcAPI.NumberMessage> getGetRewardInfoMethod() {
     return getGetRewardInfoMethod;
   }
 
+  private static volatile io.grpc.MethodDescriptor<org.tron.trident.api.GrpcAPI.BytesMessage,
+      org.tron.trident.proto.Chain.Transaction> getGetTransactionFromPendingMethod;
+
+  @io.grpc.stub.annotations.RpcMethod(
+      fullMethodName = SERVICE_NAME + '/' + "GetTransactionFromPending",
+      requestType = org.tron.trident.api.GrpcAPI.BytesMessage.class,
+      responseType = org.tron.trident.proto.Chain.Transaction.class,
+      methodType = io.grpc.MethodDescriptor.MethodType.UNARY)
+  public static io.grpc.MethodDescriptor<org.tron.trident.api.GrpcAPI.BytesMessage,
+      org.tron.trident.proto.Chain.Transaction> getGetTransactionFromPendingMethod() {
+    io.grpc.MethodDescriptor<org.tron.trident.api.GrpcAPI.BytesMessage, org.tron.trident.proto.Chain.Transaction> getGetTransactionFromPendingMethod;
+    if ((getGetTransactionFromPendingMethod = WalletSolidityGrpc.getGetTransactionFromPendingMethod) == null) {
+      synchronized (WalletSolidityGrpc.class) {
+        if ((getGetTransactionFromPendingMethod = WalletSolidityGrpc.getGetTransactionFromPendingMethod) == null) {
+          WalletSolidityGrpc.getGetTransactionFromPendingMethod = getGetTransactionFromPendingMethod =
+              io.grpc.MethodDescriptor.<org.tron.trident.api.GrpcAPI.BytesMessage, org.tron.trident.proto.Chain.Transaction>newBuilder()
+              .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
+              .setFullMethodName(generateFullMethodName(SERVICE_NAME, "GetTransactionFromPending"))
+              .setSampledToLocalTracing(true)
+              .setRequestMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
+                  org.tron.trident.api.GrpcAPI.BytesMessage.getDefaultInstance()))
+              .setResponseMarshaller(io.grpc.protobuf.ProtoUtils.marshaller(
+                  org.tron.trident.proto.Chain.Transaction.getDefaultInstance()))
+              .setSchemaDescriptor(new WalletSolidityMethodDescriptorSupplier("GetTransactionFromPending"))
+              .build();
+        }
+      }
+    }
+    return getGetTransactionFromPendingMethod;
+  }
+
   /**
    * Creates a new async stub that supports all call types for the service
    */
@@ -236,6 +267,13 @@ public void getRewardInfo(org.tron.trident.api.GrpcAPI.BytesMessage request,
       asyncUnimplementedUnaryCall(getGetRewardInfoMethod(), responseObserver);
     }
 
+    /**
+     */
+    public void getTransactionFromPending(org.tron.trident.api.GrpcAPI.BytesMessage request,
+        io.grpc.stub.StreamObserver<org.tron.trident.proto.Chain.Transaction> responseObserver) {
+      asyncUnimplementedUnaryCall(getGetTransactionFromPendingMethod(), responseObserver);
+    }
+
     @java.lang.Override public final io.grpc.ServerServiceDefinition bindService() {
       return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor())
           .addMethod(
@@ -266,6 +304,13 @@ public void getRewardInfo(org.tron.trident.api.GrpcAPI.BytesMessage request,
                 org.tron.trident.api.GrpcAPI.BytesMessage,
                 org.tron.trident.api.GrpcAPI.NumberMessage>(
                   this, METHODID_GET_REWARD_INFO)))
+          .addMethod(
+            getGetTransactionFromPendingMethod(),
+            asyncUnaryCall(
+              new MethodHandlers<
+                org.tron.trident.api.GrpcAPI.BytesMessage,
+                org.tron.trident.proto.Chain.Transaction>(
+                  this, METHODID_GET_TRANSACTION_FROM_PENDING)))
           .build();
     }
   }
@@ -321,6 +366,14 @@ public void getRewardInfo(org.tron.trident.api.GrpcAPI.BytesMessage request,
       asyncUnaryCall(
           getChannel().newCall(getGetRewardInfoMethod(), getCallOptions()), request, responseObserver);
     }
+
+    /**
+     */
+    public void getTransactionFromPending(org.tron.trident.api.GrpcAPI.BytesMessage request,
+        io.grpc.stub.StreamObserver<org.tron.trident.proto.Chain.Transaction> responseObserver) {
+      asyncUnaryCall(
+          getChannel().newCall(getGetTransactionFromPendingMethod(), getCallOptions()), request, responseObserver);
+    }
   }
 
   /**
@@ -370,6 +423,13 @@ public org.tron.trident.api.GrpcAPI.NumberMessage getRewardInfo(org.tron.trident
       return blockingUnaryCall(
           getChannel(), getGetRewardInfoMethod(), getCallOptions(), request);
     }
+
+    /**
+     */
+    public org.tron.trident.proto.Chain.Transaction getTransactionFromPending(org.tron.trident.api.GrpcAPI.BytesMessage request) {
+      return blockingUnaryCall(
+          getChannel(), getGetTransactionFromPendingMethod(), getCallOptions(), request);
+    }
   }
 
   /**
@@ -423,12 +483,21 @@ public com.google.common.util.concurrent.ListenableFuture<org.tron.trident.api.G
       return futureUnaryCall(
           getChannel().newCall(getGetRewardInfoMethod(), getCallOptions()), request);
     }
+
+    /**
+     */
+    public com.google.common.util.concurrent.ListenableFuture<org.tron.trident.proto.Chain.Transaction> getTransactionFromPending(
+        org.tron.trident.api.GrpcAPI.BytesMessage request) {
+      return futureUnaryCall(
+          getChannel().newCall(getGetTransactionFromPendingMethod(), getCallOptions()), request);
+    }
   }
 
   private static final int METHODID_GET_ACCOUNT = 0;
   private static final int METHODID_GET_NOW_BLOCK2 = 1;
   private static final int METHODID_GET_TRANSACTION_BY_ID = 2;
   private static final int METHODID_GET_REWARD_INFO = 3;
+  private static final int METHODID_GET_TRANSACTION_FROM_PENDING = 4;
 
   private static final class MethodHandlers<Req, Resp> implements
       io.grpc.stub.ServerCalls.UnaryMethod<Req, Resp>,
@@ -463,6 +532,10 @@ public void invoke(Req request, io.grpc.stub.StreamObserver<Resp> responseObserv
           serviceImpl.getRewardInfo((org.tron.trident.api.GrpcAPI.BytesMessage) request,
               (io.grpc.stub.StreamObserver<org.tron.trident.api.GrpcAPI.NumberMessage>) responseObserver);
           break;
+        case METHODID_GET_TRANSACTION_FROM_PENDING:
+          serviceImpl.getTransactionFromPending((org.tron.trident.api.GrpcAPI.BytesMessage) request,
+              (io.grpc.stub.StreamObserver<org.tron.trident.proto.Chain.Transaction>) responseObserver);
+          break;
         default:
           throw new AssertionError();
       }
@@ -528,6 +601,7 @@ public static io.grpc.ServiceDescriptor getServiceDescriptor() {
               .addMethod(getGetNowBlock2Method())
               .addMethod(getGetTransactionByIdMethod())
               .addMethod(getGetRewardInfoMethod())
+              .addMethod(getGetTransactionFromPendingMethod())
               .build();
         }
       }