feat: Allow specifying timeout height for any transaction (#135)

provenance-io · Dec 8, 2023 · 6c01bd4 · 6c01bd4
1 parent e50babb
commit 6c01bd4
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,7 +1,7 @@
 [versions]
 kotlin = "1.8.22"
 kotlin_coroutines = "1.6.4"
-assetClassification = "3.8.1"
+assetClassification = "3.9.0"
 bouncyCastle = "1.70"
 detekt = "1.18.1"
 grpc = "1.51.3"

diff --git a/models/src/main/kotlin/io/provenance/api/models/p8e/ProvenanceConfig.kt b/models/src/main/kotlin/io/provenance/api/models/p8e/ProvenanceConfig.kt
@@ -8,4 +8,5 @@ data class ProvenanceConfig(
     val gasAdjustment: Double? = 1.5,
     val broadcastMode: ServiceOuterClass.BroadcastMode = ServiceOuterClass.BroadcastMode.BROADCAST_MODE_BLOCK,
     val feeGranter: String? = null,
+    val timeoutHeight: Long? = null,
 )
diff --git a/service/src/main/kotlin/io/provenance/api/frameworks/provenance/ProvenanceService.kt b/service/src/main/kotlin/io/provenance/api/frameworks/provenance/ProvenanceService.kt
@@ -79,7 +79,7 @@ class ProvenanceService : Provenance {
                 sequenceOffset = offset,
             )
 
-            val tx = messages.toTxBody(pbClient)
+            val tx = config.timeoutHeight?.let { messages.toTxBody(timeoutHeight = it) } ?: messages.toTxBody(pbClient)
 
             val result = pbClient.estimateAndBroadcastTx(
                 txBody = tx,
@@ -123,7 +123,8 @@ class ProvenanceService : Provenance {
                 options = BroadcastOptions(
                     broadcastMode = config.broadcastMode,
                     sequenceOffset = offset,
-                    baseAccount = account
+                    baseAccount = account,
+                    timeoutHeight = config.timeoutHeight,
                 )
             )
         }.txResponse.toTxResponse()
@@ -142,7 +143,8 @@ class ProvenanceService : Provenance {
                 options = BroadcastOptions(
                     broadcastMode = config.broadcastMode,
                     sequenceOffset = offset,
-                    baseAccount = account
+                    baseAccount = account,
+                    timeoutHeight = config.timeoutHeight,
                 )
             )
         }.txResponse.toTxResponse()

diff --git a/...rc/main/kotlin/io/provenance/api/frameworks/provenance/extensions/ProvenanceExtensions.kt b/...rc/main/kotlin/io/provenance/api/frameworks/provenance/extensions/ProvenanceExtensions.kt
@@ -54,6 +54,12 @@ fun Iterable<Any>.toTxBody(pbClient: PbClient) =
         .addAllMessages(this)
         .build()
 
+internal fun Iterable<Any>.toTxBody(timeoutHeight: Long): TxOuterClass.TxBody =
+    TxOuterClass.TxBody.newBuilder()
+        .setTimeoutHeight(timeoutHeight)
+        .addAllMessages(this)
+        .build()
+
 fun Any.toTxBody(pbClient: PbClient) =
     TxOuterClass.TxBody.newBuilder()
         .setTimeoutHeight(getCurrentHeight(pbClient) + 12L)