Merge pull request #9 from immutable/features/DATA-1681

DATA-1681 Add sighash to blockchain tables
immutable · Aug 19, 2024 · e05d9fd · e05d9fd
2 parents 5c679d5 + 6986922
commit e05d9fd
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 4 deletions.
diff --git a/src/main/java/io/blockchainetl/ethereum/domain/Log.java b/src/main/java/io/blockchainetl/ethereum/domain/Log.java
@@ -32,6 +32,9 @@ public class Log {
     @Nullable
     private String address;
 
+    @Nullable
+    private String sighash;
+
     @Nullable
     private String data;
 
@@ -96,6 +99,14 @@ public void setAddress(String address) {
         this.address = address;
     }
 
+    public String getSighash() {
+        return sighash;
+    }
+
+    public void setSighash(String sighash) {
+        this.sighash = sighash;
+    }
+
     public String getData() {
         return data;
     }
@@ -158,6 +169,7 @@ public boolean equals(Object o) {
             Objects.equal(transactionHash, log.transactionHash) &&
             Objects.equal(transactionIndex, log.transactionIndex) &&
             Objects.equal(address, log.address) &&
+            Objects.equal(sighash, log.sighash) &&
             Objects.equal(data, log.data) &&
             Objects.equal(topics, log.topics) &&
             Objects.equal(blockTimestamp, log.blockTimestamp) &&
@@ -168,7 +180,7 @@ public boolean equals(Object o) {
 
     @Override
     public int hashCode() {
-        return Objects.hashCode(type, logIndex, transactionHash, transactionIndex, address, data, topics,
+        return Objects.hashCode(type, logIndex, transactionHash, transactionIndex, address, sighash, data, topics,
             blockTimestamp,
             blockNumber, blockHash, chainId);
     }
@@ -181,6 +193,7 @@ public String toString() {
             .add("transactionHash", transactionHash)
             .add("transactionIndex", transactionIndex)
             .add("address", address)
+            .add("sighash", sighash)
             .add("data", data)
             .add("topics", topics)
             .add("blockTimestamp", blockTimestamp)

diff --git a/src/main/java/io/blockchainetl/ethereum/domain/Trace.java b/src/main/java/io/blockchainetl/ethereum/domain/Trace.java
@@ -38,6 +38,9 @@ public class Trace {
     @Nullable
     private BigInteger value;
 
+    @Nullable
+    private String sighash;
+
     @Nullable
     private String input;
 
@@ -142,6 +145,14 @@ public void setValue(BigInteger value) {
         this.value = value;
     }
 
+    public String getSighash() {
+        return sighash;
+    }
+
+    public void setSighash(String sighash) {
+        this.sighash = sighash;
+    }
+
     public String getInput() {
         return input;
     }
@@ -277,6 +288,7 @@ public boolean equals(Object o) {
             Objects.equal(chainId, trace.chainId) &&
             Objects.equal(toAddress, trace.toAddress) &&
             Objects.equal(value, trace.value) &&
+            Objects.equal(sighash,trace.sighash) &&
             Objects.equal(input, trace.input) &&
             Objects.equal(output, trace.output) &&
             Objects.equal(traceType, trace.traceType) &&
@@ -297,8 +309,8 @@ public boolean equals(Object o) {
     @Override
     public int hashCode() {
         return Objects.hashCode(transactionHash, transactionIndex, fromAddress, toAddress, value,
-            input, output, traceType, callType, rewardType, gas, gasUsed, subtraces, traceAddress, error, status,
-            traceId,blockTimestamp, blockNumber, blockHash, chainId);
+            sighash, input, output, traceType, callType, rewardType, gas, gasUsed, subtraces, traceAddress, error,
+            status, traceId,blockTimestamp, blockNumber, blockHash, chainId);
     }
 
     @Override
@@ -310,6 +322,7 @@ public String toString() {
             .add("fromAddress", fromAddress)
             .add("toAddress", toAddress)
             .add("value", value)
+            .add("sighash", sighash)
             .add("input", input)
             .add("output", output)
             .add("traceType", traceType)

diff --git a/src/main/java/io/blockchainetl/ethereum/domain/Transaction.java b/src/main/java/io/blockchainetl/ethereum/domain/Transaction.java
@@ -45,6 +45,9 @@ public class Transaction {
     @JsonProperty("gas_price")
     private Long gasPrice;
 
+    @Nullable
+    private String sighash;
+
     @Nullable
     private String input;
 
@@ -174,6 +177,14 @@ public void setGasPrice(Long gasPrice) {
         this.gasPrice = gasPrice;
     }
 
+    public String getSighash() {
+        return sighash;
+    }
+
+    public void setSighash(String sighash) {
+        this.sighash = sighash;
+    }
+
     public String getInput() {
         return input;
     }
@@ -288,6 +299,7 @@ public boolean equals(Object o) {
             Objects.equal(value, that.value) &&
             Objects.equal(gas, that.gas) &&
             Objects.equal(gasPrice, that.gasPrice) &&
+            Objects.equal(sighash, that.sighash) &&
             Objects.equal(input, that.input) &&
             Objects.equal(receiptCumulativeGasUsed, that.receiptCumulativeGasUsed) &&
             Objects.equal(receiptGasUsed, that.receiptGasUsed) &&
@@ -307,7 +319,7 @@ public boolean equals(Object o) {
     @Override
     public int hashCode() {
         return Objects.hashCode(type, hash, nonce, transactionIndex, fromAddress, toAddress, value, gas, gasPrice,
-            input,
+            sighash, input,
             receiptCumulativeGasUsed, receiptGasUsed, receiptContractAddress, receiptRoot, receiptStatus, blockNumber,
             blockHash, blockTimestamp, maxFeePerGas, maxPriorityFeePerGas, transactionType, chainId, receiptEffectiveGasPrice);
     }
@@ -324,6 +336,7 @@ public String toString() {
             .add("value", value)
             .add("gas", gas)
             .add("gasPrice", gasPrice)
+            .add("sighash", sighash)
             .add("input", input)
             .add("receiptCumulativeGasUsed", receiptCumulativeGasUsed)
             .add("receiptGasUsed", receiptGasUsed)

diff --git a/src/main/java/io/blockchainetl/ethereum/fns/ConvertLogsToTableRowsFn.java b/src/main/java/io/blockchainetl/ethereum/fns/ConvertLogsToTableRowsFn.java
@@ -23,6 +23,7 @@ protected void populateTableRowFields(TableRow row, String element) {
         row.set("transaction_hash", log.getTransactionHash());
         row.set("transaction_index", log.getTransactionIndex());
         row.set("address", log.getAddress());
+        row.set("sighash", log.getSighash());
         row.set("data", log.getData());
         row.set("topics", log.getTopics());
         row.set("block_number", log.getBlockNumber());

diff --git a/src/main/java/io/blockchainetl/ethereum/fns/ConvertTracesToTableRowsFn.java b/src/main/java/io/blockchainetl/ethereum/fns/ConvertTracesToTableRowsFn.java
@@ -28,6 +28,7 @@ protected void populateTableRowFields(TableRow row, String element) {
         row.set("from_address", trace.getFromAddress());
         row.set("to_address", trace.getToAddress());
         row.set("value", trace.getValue() != null ? trace.getValue().toString() : null);
+        row.set("sighash", trace.getSighash());
         row.set("input", trace.getInput());
         row.set("output", trace.getOutput());
         row.set("trace_type", trace.getTraceType());

diff --git a/src/main/java/io/blockchainetl/ethereum/fns/ConvertTransactionsToTableRowsFn.java b/src/main/java/io/blockchainetl/ethereum/fns/ConvertTransactionsToTableRowsFn.java
@@ -27,6 +27,7 @@ protected void populateTableRowFields(TableRow row, String element) {
         row.set("value", transaction.getValue() != null ? transaction.getValue().toString() : null);
         row.set("gas", transaction.getGas());
         row.set("gas_price", transaction.getGasPrice());
+        row.set("sighash", transaction.getSighash());
         row.set("input", transaction.getInput());
         row.set("receipt_cumulative_gas_used", transaction.getReceiptCumulativeGasUsed());
         row.set("receipt_gas_used", transaction.getReceiptGasUsed());