Do gas estimate before tx

hyperschwartz · Feb 3, 2022 · 38cd0fb · 38cd0fb
1 parent 2c9b77b
commit 38cd0fb
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 27 deletions.
diff --git a/server/src/main/kotlin/io/provenance/invoice/services/EventHandlerService.kt b/server/src/main/kotlin/io/provenance/invoice/services/EventHandlerService.kt
@@ -8,7 +8,6 @@ import cosmwasm.wasm.v1.Tx
 import io.provenance.client.PbClient
 import io.provenance.client.grpc.BaseReq
 import io.provenance.client.grpc.BaseReqSigner
-import io.provenance.client.grpc.GasEstimate
 import io.provenance.invoice.AssetProtos.Asset
 import io.provenance.invoice.config.provenance.ObjectStore
 import io.provenance.invoice.config.provenance.ProvenanceProperties
@@ -98,29 +97,31 @@ class EventHandlerService(
                         // TODO: Resolve this somehow
                         val oracleAddress = "tp15e6l9dv8s2rdshjfn34k8a2nju55tr4z42phrt"
                         val accountInfo = pbClient.getBaseAccount(oracleAddress)
+                        val baseReq = BaseReq(
+                            signers = BaseReqSigner(
+                                signer = KeySigner(
+                                    address = oracleAddress,
+                                    privateKey = provenanceProperties.oraclePrivateKey,
+                                ),
+                                sequenceOffset = 0,
+                                account = accountInfo,
+                            ).wrapList(),
+                            body = TxOuterClass.TxBody.newBuilder().addMessages(
+                                Tx.MsgExecuteContract.newBuilder()
+                                    .setMsg(OracleApproval.forUuid(invoiceUuid).toBase64Msg())
+                                    .setContract(contractInfo.address)
+                                    .setSender(oracleAddress)
+                                    .build()
+                                    .toProtoAny()
+                            ).setMemo("Oracle signature").build(),
+                            chainId = provenanceProperties.chainId,
+                            gasAdjustment = 2.0,
+                        )
+                        val gasEstimate = pbClient.estimateTx(baseReq)
                         val response = try {
                             pbClient.broadcastTx(
-                                baseReq = BaseReq(
-                                    signers = BaseReqSigner(
-                                        signer = KeySigner(
-                                            address = oracleAddress,
-                                            privateKey = provenanceProperties.oraclePrivateKey,
-                                        ),
-                                        sequenceOffset = 0,
-                                        account = accountInfo,
-                                    ).wrapList(),
-                                    body = TxOuterClass.TxBody.newBuilder().addMessages(
-                                        Tx.MsgExecuteContract.newBuilder()
-                                            .setMsg(OracleApproval.forUuid(invoiceUuid).toBase64Msg())
-                                            .setContract(contractInfo.address)
-                                            .setSender(oracleAddress)
-                                            .build()
-                                            .toProtoAny()
-                                    ).setMemo("Oracle signature").build(),
-                                    chainId = provenanceProperties.chainId,
-                                    gasAdjustment = 2.0,
-                                ),
-                                gasEstimate = GasEstimate(1905),
+                                baseReq = baseReq,
+                                gasEstimate = gasEstimate,
                                 mode = BroadcastMode.BROADCAST_MODE_BLOCK
                             )
                         } catch (e: Exception) {

diff --git a/server/src/main/kotlin/io/provenance/invoice/util/provenance/KeySigner.kt b/server/src/main/kotlin/io/provenance/invoice/util/provenance/KeySigner.kt
@@ -9,11 +9,7 @@ import io.provenance.hdwallet.signer.BCECSigner
 import io.provenance.scope.util.sha256
 import java.security.PrivateKey
 
-
-class KeySigner(
-    private val address: String,
-    privateKey: PrivateKey
-): Signer {
+class KeySigner(private val address: String, privateKey: PrivateKey): Signer {
     private val keyPair = privateKey.toECPrivateKey().toECKeyPair()
 
     override fun address(): String = address