log_index should be int

Cryptonomic · Apr 7, 2021 · 9884c54 · 9884c54
1 parent e593c27
commit 9884c54
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/...ch/cryptonomic/conseil/api/routes/platform/data/ethereum/EthereumDataOperationsTest.scala b/...ch/cryptonomic/conseil/api/routes/platform/data/ethereum/EthereumDataOperationsTest.scala
@@ -600,7 +600,7 @@ object EthereumDataOperationsTest {
           blockNumber = block.level,
           timestamp = Some(block.timestamp),
           transactionHash = transaction.hash,
-          logIndex = "0x1",
+          logIndex = 0,
           fromAddress = "0x0",
           toAddress = "0x0",
           value = 1.0

diff --git a/...-common/src/main/scala/tech/cryptonomic/conseil/common/ethereum/EthereumPersistence.scala b/...-common/src/main/scala/tech/cryptonomic/conseil/common/ethereum/EthereumPersistence.scala
@@ -249,7 +249,7 @@ object EthereumPersistence {
           blockHash = from.blockHash,
           blockNumber = Integer.decode(from.blockNumber),
           transactionHash = from.transactionHash,
-          logIndex = from.logIndex,
+          logIndex = Integer.decode(from.logIndex),
           fromAddress = from.topics(1),
           toAddress = from.topics(2),
           value = Utils.hexStringToBigDecimal(from.data)
@@ -270,7 +270,7 @@ object EthereumPersistence {
           blockNumber = from.blockNumber,
           timestamp = Some(Timestamp.from(Instant.ofEpochSecond(Integer.decode(from.timestamp).toLong))),
           transactionHash = from.transactionHash,
-          logIndex = from.logIndex,
+          logIndex = Integer.decode(from.logIndex),
           fromAddress = from.fromAddress,
           toAddress = from.toAddress,
           value = from.value

diff --git a/conseil-common/src/main/scala/tech/cryptonomic/conseil/common/ethereum/Tables.scala b/conseil-common/src/main/scala/tech/cryptonomic/conseil/common/ethereum/Tables.scala
@@ -788,7 +788,7 @@ trait Tables {
     *  @param blockNumber Database column block_number SqlType(int4)
     *  @param timestamp Database column timestamp SqlType(timestamp), Default(None)
     *  @param transactionHash Database column transaction_hash SqlType(text)
-    *  @param logIndex Database column log_index SqlType(text)
+    *  @param logIndex Database column log_index SqlType(int4)
     *  @param fromAddress Database column from_address SqlType(text)
     *  @param toAddress Database column to_address SqlType(text)
     *  @param value Database column value SqlType(numeric) */
@@ -798,7 +798,7 @@ trait Tables {
       blockNumber: Int,
       timestamp: Option[java.sql.Timestamp] = None,
       transactionHash: String,
-      logIndex: String,
+      logIndex: Int,
       fromAddress: String,
       toAddress: String,
       value: scala.math.BigDecimal
@@ -819,7 +819,7 @@ trait Tables {
         <<[Int],
         <<?[java.sql.Timestamp],
         <<[String],
-        <<[String],
+        <<[Int],
         <<[String],
         <<[String],
         <<[scala.math.BigDecimal]
@@ -870,8 +870,8 @@ trait Tables {
     /** Database column transaction_hash SqlType(text) */
     val transactionHash: Rep[String] = column[String]("transaction_hash")
 
-    /** Database column log_index SqlType(text) */
-    val logIndex: Rep[String] = column[String]("log_index")
+    /** Database column log_index SqlType(int4) */
+    val logIndex: Rep[Int] = column[Int]("log_index")
 
     /** Database column from_address SqlType(text) */
     val fromAddress: Rep[String] = column[String]("from_address")

diff --git a/...eil-common/src/test/scala/tech/cryptonomic/conseil/common/ethereum/EthereumFixtures.scala b/...eil-common/src/test/scala/tech/cryptonomic/conseil/common/ethereum/EthereumFixtures.scala
@@ -450,7 +450,7 @@ trait EthereumFixtures {
       blockNumber = 102000,
       timestamp = Some(Timestamp.from(Instant.parse("2015-08-17T17:06:09.00Z"))),
       transactionHash = "0x808dc2cefe4e26c7bac2262930497cfcc20c37729cb3eaa8517fbf76b08a52c7",
-      logIndex = "0x0",
+      logIndex = 0,
       fromAddress = "0x000000000000000000000000fdb16996831753d5331ff813c29a93c76834a0ad",
       toAddress = "0x0000000000000000000000000f4a253ee5a63bb4b23a360ad52d69c86bc9fe97",
       value = BigDecimal("1000000000.0")

diff --git a/sql/conseil.sql b/sql/conseil.sql
@@ -957,7 +957,7 @@ CREATE TABLE ethereum.token_transfers (
   block_number integer NOT NULL,
   timestamp timestamp without time zone,
   transaction_hash text NOT NULL,
-  log_index text NOT NULL,
+  log_index integer NOT NULL,
   from_address text NOT NULL,
   to_address text NOT NULL,
   value numeric NOT NULL