Merge pull request #94 from FigureTechnologies/jschwartz/upgrade-event-stream-to-0.8.0

Bugfix: Upgrade event stream libs to 0.8.0 to fix fee explosions

Author: hyperschwartz

gradle/libs.versions.toml

@@ -4,7 +4,7 @@ asset-specs = "1.0.0"
 blockapi = "0.1.9"
 bouncycastle = "1.70"
 feign = "12.1"
-figure-eventstream = "0.7.1"
+figure-eventstream = "0.8.0"
 grpc = "1.51.1"
 jackson = "2.14.1"
 jackson-protobuf = "0.9.13"

verifier/src/main/kotlin/tech/figure/classification/asset/verifier/provenance/AssetClassificationEvent.kt

@@ -63,7 +63,7 @@ class AssetClassificationEvent(
                                     value = attribute.value,
                                 )
                             },
-                            fee = sourceTx.tx.authInfo.fee.amountList.firstOrNull()?.amount?.toLongOrNull(),
+                            fee = sourceTx.tx.authInfo.fee.amountList.firstOrNull()?.amount?.toBigIntegerOrNull(),
                             denom = sourceTx.tx.authInfo.fee.amountList.firstOrNull()?.denom,
                             note = null,
                         ),

verifier/src/main/kotlin/tech/figure/classification/asset/verifier/util/eventstream/providers/DefaultEventStreamProvider.kt

@@ -11,7 +11,7 @@ import tech.figure.classification.asset.verifier.provenance.AssetClassificationE
 import tech.figure.classification.asset.verifier.provenance.WASM_EVENT_TYPE
 import tech.figure.classification.asset.verifier.util.eventstream.verifierBlockDataFlow
 import tech.figure.eventstream.decoder.moshiDecoderAdapter
-import tech.figure.eventstream.net.defaultOkHttpClient
+import tech.figure.eventstream.net.defaultOkHttpClientBuilderFn
 import tech.figure.eventstream.net.okHttpNetAdapter
 import tech.figure.eventstream.stream.clients.BlockData
 import tech.figure.eventstream.stream.models.dateTime
@@ -21,7 +21,7 @@ import java.net.URI
 
 class DefaultEventStreamProvider(
     eventStreamNode: URI = URI("ws://localhost:26657"),
-    httpClient: OkHttpClient = defaultOkHttpClient()
+    httpClient: OkHttpClient = defaultOkHttpClientBuilderFn().run { OkHttpClient.Builder().this() }.build(),
 ) : EventStreamProvider {
 
     private val netAdapter = okHttpNetAdapter(

verifier/src/test/kotlin/tech/figure/classification/asset/verifier/testhelpers/MockTxEvent.kt

@@ -5,6 +5,7 @@ import tech.figure.classification.asset.verifier.provenance.AssetClassificationE
 import tech.figure.eventstream.stream.models.Event
 import tech.figure.eventstream.stream.models.TxEvent
 import tech.figure.eventstream.stream.models.toHexString
+import java.math.BigInteger
 import java.time.OffsetDateTime
 import java.util.UUID
 
@@ -15,7 +16,7 @@ object MockTxEvent {
         private companion object {
             private const val DEFAULT_BLOCK_HEIGHT: Long = 1L
             private const val DEFAULT_EVENT_TYPE: String = "wasm"
-            private const val DEFAULT_FEE_AMOUNT: Long = 0L
+            private val DEFAULT_FEE_AMOUNT: BigInteger = BigInteger.ZERO
             private const val DEFAULT_DENOM: String = "nhash"
             private const val DEFAULT_NOTE: String = "MOCKED TX"
         }
@@ -25,7 +26,7 @@ object MockTxEvent {
         private var txHash: String? = null
         private var eventType: String? = null
         private var attributes: MutableList<Event> = mutableListOf()
-        private var fee: Long? = null
+        private var fee: BigInteger? = null
         private var denom: String? = null
         private var note: String? = null
 
@@ -36,7 +37,7 @@ object MockTxEvent {
         fun setACEventType(eventType: ACContractEvent) = apply { this.eventType = eventType.contractName }
         fun addAttribute(attribute: Event) = apply { this.attributes.add(attribute) }
         fun addACAttribute(attribute: MockACAttribute) = apply { this.attributes.add(attribute.toAttribute()) }
-        fun setFee(fee: Long) = apply { this.fee = fee }
+        fun setFee(fee: BigInteger) = apply { this.fee = fee }
         fun setDenom(denom: String) = apply { this.denom = denom }
         fun setNote(note: String) = apply { this.note = note }