From 3e4639279132491aeadf0eb16535e6721931768f Mon Sep 17 00:00:00 2001 From: zhangshuai Date: Wed, 2 Nov 2022 16:11:36 +0800 Subject: [PATCH 1/2] Add property Process.blockNum:after invoking pushTransaction method,can get it. --- .../response/chain/transaction/Processed.java | 102 +++++++++--------- 1 file changed, 51 insertions(+), 51 deletions(-) diff --git a/src/main/java/io/jafka/jeos/core/response/chain/transaction/Processed.java b/src/main/java/io/jafka/jeos/core/response/chain/transaction/Processed.java index 5b87ed9..054d07b 100644 --- a/src/main/java/io/jafka/jeos/core/response/chain/transaction/Processed.java +++ b/src/main/java/io/jafka/jeos/core/response/chain/transaction/Processed.java @@ -1,51 +1,51 @@ -package io.jafka.jeos.core.response.chain.transaction; - -import java.util.List; - -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonProperty; - -import io.jafka.jeos.core.common.ActionTrace; -import lombok.Data; - -@JsonIgnoreProperties(ignoreUnknown = true) -@Data -public class Processed { - - private List actionTraces; - private Integer elapsed; - private String except; - private String id; - private Long netUsage; - private Receipt receipt; - private Boolean scheduled; - -/* - private List deferredTransactionRequests; - - private String cpuUsage; - - private String status; - - private List writeLocks; - - private String regionId; - - private String netUsageWords; - - private String sharedIndex; - - - - private String cycleIndex; - - private String setupProfilingUs; - - private String profilingUs; - - - private String packedTrxDigest; - - private List readLocks;*/ - -} +package io.jafka.jeos.core.response.chain.transaction; + +import java.util.List; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + +import io.jafka.jeos.core.common.ActionTrace; +import lombok.Data; + +@JsonIgnoreProperties(ignoreUnknown = true) +@Data +public class Processed { + + private List actionTraces; + private Integer elapsed; + private String except; + private String id; + private Long netUsage; + private Receipt receipt; + private Boolean scheduled; + private Long blockNum; + +/* + private List deferredTransactionRequests; + + private String cpuUsage; + + private String status; + + private List writeLocks; + + private String regionId; + + private String netUsageWords; + + private String sharedIndex; + + + + private String cycleIndex; + + private String setupProfilingUs; + + private String profilingUs; + + + private String packedTrxDigest; + + private List readLocks;*/ + +} From 06efe70289b9f9123ccf91503701a183dbdb3226 Mon Sep 17 00:00:00 2001 From: zhangshuai Date: Wed, 13 Dec 2023 14:36:44 +0800 Subject: [PATCH 2/2] Starting with EOSIO 2.1 actions can have return values associated with them. --- .../io/jafka/jeos/core/common/ActionTrace.java | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/main/java/io/jafka/jeos/core/common/ActionTrace.java b/src/main/java/io/jafka/jeos/core/common/ActionTrace.java index 8ed0dea..faa624d 100644 --- a/src/main/java/io/jafka/jeos/core/common/ActionTrace.java +++ b/src/main/java/io/jafka/jeos/core/common/ActionTrace.java @@ -1,9 +1,9 @@ package io.jafka.jeos.core.common; -import com.fasterxml.jackson.annotation.JsonProperty; - import java.util.List; +import com.fasterxml.jackson.annotation.JsonProperty; + //TODO public class ActionTrace { @@ -22,6 +22,8 @@ public class ActionTrace { private Integer totalCpuUsage; private String trxId; + + private Object returnValueData; public Action getAct() { return act; @@ -94,5 +96,14 @@ public String getTrxId() { public void setTrxId(String trxId) { this.trxId = trxId; } + + public Object getReturnValueData() { + return returnValueData; + } + + @JsonProperty("return_value_data") + public void setReturnValueData(Object returnValueData) { + this.returnValueData = returnValueData; + } }