From 8dc0dcf12d95f35a1e7fc8db5293a664ea316fe2 Mon Sep 17 00:00:00 2001 From: Mohammed Sohail Date: Sun, 28 May 2023 20:43:43 +0800 Subject: [PATCH] fix: use celoutils.SafeGasLimit in place * Gas limit is now 1M for all custodial related txs * Precise value to be determined after testing phase is over --- go.mod | 2 +- go.sum | 2 ++ internal/tasker/task/account_refill_gas.go | 2 +- internal/tasker/task/account_register.go | 2 +- internal/tasker/task/sign_transfer.go | 2 +- internal/tasker/task/utils.go | 2 -- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 0af3975..4b0f726 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/georgysavva/scany/v2 v2.0.0 github.com/go-playground/validator/v10 v10.13.0 github.com/google/uuid v1.3.0 - github.com/grassrootseconomics/celoutils v1.2.1 + github.com/grassrootseconomics/celoutils v1.3.0 github.com/grassrootseconomics/w3-celo-patch v0.2.0 github.com/hibiken/asynq v0.24.0 github.com/jackc/pgx/v5 v5.3.1 diff --git a/go.sum b/go.sum index dcd5c9b..0820801 100644 --- a/go.sum +++ b/go.sum @@ -277,6 +277,8 @@ github.com/grassrootseconomics/asynq v0.25.0 h1:2zSz5YwNLu/oCTm/xfNixn86i9aw4zth github.com/grassrootseconomics/asynq v0.25.0/go.mod h1:pe2XOdK1eIbTgTmRFHIYl75lvVuTPJxZq2T9Ocz/+2s= github.com/grassrootseconomics/celoutils v1.2.1 h1:ndM4h7Df0d57m2kdRXRStrnunqOL61wQ51rnOanX1KI= github.com/grassrootseconomics/celoutils v1.2.1/go.mod h1:Uo5YRy6AGLAHDZj9jaOI+AWoQ1H3L0v79728pPMkm9Q= +github.com/grassrootseconomics/celoutils v1.3.0 h1:0NTdYh0jboGlVnfML7fbgWLjrC0jA+F1J/Ze01IkNlY= +github.com/grassrootseconomics/celoutils v1.3.0/go.mod h1:Uo5YRy6AGLAHDZj9jaOI+AWoQ1H3L0v79728pPMkm9Q= github.com/grassrootseconomics/w3-celo-patch v0.2.0 h1:YqibbPzX0tQKmxU1nUGzThPKk/fiYeYZY6Aif3eyu8U= github.com/grassrootseconomics/w3-celo-patch v0.2.0/go.mod h1:WhBXNzNIvHmS6B2hAeShs56oa9Azb4jQSrOMKuMdBWw= github.com/hashicorp/go-bexpr v0.1.10/go.mod h1:oxlubA2vC/gFVfX1A6JGp7ls7uCDlfJn732ehYYg+g0= diff --git a/internal/tasker/task/account_refill_gas.go b/internal/tasker/task/account_refill_gas.go index 53f32b5..1f4cff6 100644 --- a/internal/tasker/task/account_refill_gas.go +++ b/internal/tasker/task/account_refill_gas.go @@ -120,7 +120,7 @@ func AccountRefillGasProcessor(cu *custodial.Custodial) func(context.Context, *a InputData: input, GasFeeCap: celoutils.SafeGasFeeCap, GasTipCap: celoutils.SafeGasTipCap, - GasLimit: gasLimit, + GasLimit: uint64(celoutils.SafeGasLimit), Nonce: nonce, }, ) diff --git a/internal/tasker/task/account_register.go b/internal/tasker/task/account_register.go index 6b77898..668e265 100644 --- a/internal/tasker/task/account_register.go +++ b/internal/tasker/task/account_register.go @@ -69,7 +69,7 @@ func AccountRegisterOnChainProcessor(cu *custodial.Custodial) func(context.Conte InputData: input, GasFeeCap: celoutils.SafeGasFeeCap, GasTipCap: celoutils.SafeGasTipCap, - GasLimit: gasLimit, + GasLimit: uint64(celoutils.SafeGasLimit), Nonce: nonce, }, ) diff --git a/internal/tasker/task/sign_transfer.go b/internal/tasker/task/sign_transfer.go index 151c693..33deaac 100644 --- a/internal/tasker/task/sign_transfer.go +++ b/internal/tasker/task/sign_transfer.go @@ -78,7 +78,7 @@ func SignTransfer(cu *custodial.Custodial) func(context.Context, *asynq.Task) er InputData: input, GasFeeCap: celoutils.SafeGasFeeCap, GasTipCap: celoutils.SafeGasTipCap, - GasLimit: gasLimit, + GasLimit: uint64(celoutils.SafeGasLimit), Nonce: nonce, }, ) diff --git a/internal/tasker/task/utils.go b/internal/tasker/task/utils.go index b4ea683..649ecd0 100644 --- a/internal/tasker/task/utils.go +++ b/internal/tasker/task/utils.go @@ -8,8 +8,6 @@ import ( ) const ( - gasLimit = 250000 - lockPrefix = "lock:" lockRetryDelay = 25 * time.Millisecond lockTimeout = 1 * time.Second