From 98ff897049fee1547b9d8717edff52dac0d4870b Mon Sep 17 00:00:00 2001 From: Mohammed Sohail Date: Thu, 8 Jun 2023 12:08:58 +0800 Subject: [PATCH] fix: tune gas params (celoutils v1.4.0) --- go.mod | 2 +- go.sum | 2 ++ internal/custodial/custodial.go | 5 +++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 4b0f726..4997ba3 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.3.0 + github.com/grassrootseconomics/celoutils v1.4.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 0820801..4b6a51e 100644 --- a/go.sum +++ b/go.sum @@ -279,6 +279,8 @@ github.com/grassrootseconomics/celoutils v1.2.1 h1:ndM4h7Df0d57m2kdRXRStrnunqOL6 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/celoutils v1.4.0 h1:AJNKiOpfnQqZ3kRxeUlhWH/zlDDjhtbs/OzAMb5zU4A= +github.com/grassrootseconomics/celoutils v1.4.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/custodial/custodial.go b/internal/custodial/custodial.go index 7d335e4..887d9f8 100644 --- a/internal/custodial/custodial.go +++ b/internal/custodial/custodial.go @@ -13,7 +13,6 @@ import ( "github.com/grassrootseconomics/cic-custodial/internal/tasker" "github.com/grassrootseconomics/cic-custodial/pkg/util" "github.com/grassrootseconomics/w3-celo-patch" - "github.com/labstack/gommon/log" "github.com/redis/go-redis/v9" "github.com/zerodha/logf" ) @@ -36,6 +35,7 @@ type ( Abis map[string]*w3.Func CeloProvider *celoutils.Provider LockProvider *redislock.Client + Logg logf.Logger Noncestore nonce.Noncestore Store store.Store RedisClient *redis.Client @@ -52,7 +52,7 @@ func NewCustodial(o Opts) (*Custodial, error) { registryMap, err := o.CeloProvider.RegistryMap(ctx, celoutils.HexToAddress(o.RegistryAddress)) if err != nil { - log.Errorf("err: %v", err) + o.Logg.Error("custodial: critical error loading contracts from registry: %v", err) return nil, err } @@ -72,6 +72,7 @@ func NewCustodial(o Opts) (*Custodial, error) { Abis: initAbis(), CeloProvider: o.CeloProvider, LockProvider: o.LockProvider, + Logg: o.Logg, Noncestore: o.Noncestore, Store: o.Store, RedisClient: o.RedisClient,