diff --git a/api/gateway/chain/internal/keymanager/vault/manager.go b/api/gateway/chain/internal/keymanager/vault/manager.go index dfe5d8b..6d47f83 100644 --- a/api/gateway/chain/internal/keymanager/vault/manager.go +++ b/api/gateway/chain/internal/keymanager/vault/manager.go @@ -45,22 +45,22 @@ func New(logger mlogger.Logger, cfg Config) (*Manager, error) { } address := strings.TrimSpace(cfg.Address) if address == "" { - logger.Error("vault address missing") + logger.Error("Vault address missing") return nil, merrors.InvalidArgument("vault key manager: address is required") } tokenEnv := strings.TrimSpace(cfg.TokenEnv) if tokenEnv == "" { - logger.Error("vault token env missing") + logger.Error("Vault token env missing") return nil, merrors.InvalidArgument("vault key manager: token_env is required") } token := strings.TrimSpace(os.Getenv(tokenEnv)) if token == "" { - logger.Error("vault token missing; expected Vault Agent to export token", zap.String("env", tokenEnv)) + logger.Error("Vault token missing; expected Vault Agent to export token", zap.String("env", tokenEnv)) return nil, merrors.InvalidArgument("vault key manager: token env " + tokenEnv + " is not set (expected Vault Agent sink to populate it)") } mountPath := strings.Trim(strings.TrimSpace(cfg.MountPath), "/") if mountPath == "" { - logger.Error("vault mount path missing") + logger.Error("Vault mount path missing") return nil, merrors.InvalidArgument("vault key manager: mount_path is required") } keyPrefix := strings.Trim(strings.TrimSpace(cfg.KeyPrefix), "/") @@ -73,7 +73,7 @@ func New(logger mlogger.Logger, cfg Config) (*Manager, error) { client, err := api.NewClient(clientCfg) if err != nil { - logger.Error("failed to create vault client", zap.Error(err)) + logger.Error("Failed to create vault client", zap.Error(err)) return nil, merrors.Internal("vault key manager: failed to create client: " + err.Error()) } client.SetToken(token) @@ -94,17 +94,17 @@ func New(logger mlogger.Logger, cfg Config) (*Manager, error) { // CreateManagedWalletKey creates a new managed wallet key and stores it in Vault. func (m *Manager) CreateManagedWalletKey(ctx context.Context, walletRef string, network string) (*keymanager.ManagedWalletKey, error) { if strings.TrimSpace(walletRef) == "" { - m.logger.Warn("walletRef missing for managed key creation", zap.String("network", network)) + m.logger.Warn("WalletRef missing for managed key creation", zap.String("network", network)) return nil, merrors.InvalidArgument("vault key manager: walletRef is required") } if strings.TrimSpace(network) == "" { - m.logger.Warn("network missing for managed key creation", zap.String("wallet_ref", walletRef)) + m.logger.Warn("Network missing for managed key creation", zap.String("wallet_ref", walletRef)) return nil, merrors.InvalidArgument("vault key manager: network is required") } privateKey, err := ecdsa.GenerateKey(secp256k1.S256(), rand.Reader) if err != nil { - m.logger.Warn("failed to generate managed wallet key", zap.String("wallet_ref", walletRef), zap.String("network", network), zap.Error(err)) + m.logger.Warn("Failed to generate managed wallet key", zap.String("wallet_ref", walletRef), zap.String("network", network), zap.Error(err)) return nil, merrors.Internal("vault key manager: failed to generate key: " + err.Error()) } privateKeyBytes := crypto.FromECDSA(privateKey) @@ -115,7 +115,7 @@ func (m *Manager) CreateManagedWalletKey(ctx context.Context, walletRef string, err = m.persistKey(ctx, walletRef, network, privateKeyBytes, publicKeyBytes, address) if err != nil { - m.logger.Warn("failed to persist managed wallet key", zap.String("wallet_ref", walletRef), zap.String("network", network), zap.Error(err)) + m.logger.Warn("Failed to persist managed wallet key", zap.String("wallet_ref", walletRef), zap.String("network", network), zap.Error(err)) zeroBytes(privateKeyBytes) zeroBytes(publicKeyBytes) return nil, err @@ -123,7 +123,7 @@ func (m *Manager) CreateManagedWalletKey(ctx context.Context, walletRef string, zeroBytes(privateKeyBytes) zeroBytes(publicKeyBytes) - m.logger.Info("managed wallet key created", + m.logger.Info("Managed wallet key created", zap.String("wallet_ref", walletRef), zap.String("network", network), zap.String("address", strings.ToLower(address)), @@ -158,43 +158,43 @@ func (m *Manager) buildKeyID(network, walletRef string) string { // SignTransaction loads the key material from Vault and signs the transaction. func (m *Manager) SignTransaction(ctx context.Context, keyID string, tx *types.Transaction, chainID *big.Int) (*types.Transaction, error) { if strings.TrimSpace(keyID) == "" { - m.logger.Warn("signing failed: empty key id") + m.logger.Warn("Signing failed: empty key id") return nil, merrors.InvalidArgument("vault key manager: keyID is required") } if tx == nil { - m.logger.Warn("signing failed: nil transaction", zap.String("key_id", keyID)) + m.logger.Warn("Signing failed: nil transaction", zap.String("key_id", keyID)) return nil, merrors.InvalidArgument("vault key manager: transaction is nil") } if chainID == nil { - m.logger.Warn("signing failed: nil chain id", zap.String("key_id", keyID)) + m.logger.Warn("Signing failed: nil chain id", zap.String("key_id", keyID)) return nil, merrors.InvalidArgument("vault key manager: chainID is nil") } material, err := m.loadKey(ctx, keyID) if err != nil { - m.logger.Warn("failed to load key material", zap.String("key_id", keyID), zap.Error(err)) + m.logger.Warn("Failed to load key material", zap.String("key_id", keyID), zap.Error(err)) return nil, err } keyBytes, err := hex.DecodeString(material.PrivateKey) if err != nil { - m.logger.Warn("invalid key material", zap.String("key_id", keyID), zap.Error(err)) + m.logger.Warn("Invalid key material", zap.String("key_id", keyID), zap.Error(err)) return nil, merrors.Internal("vault key manager: invalid key material: " + err.Error()) } defer zeroBytes(keyBytes) privateKey, err := crypto.ToECDSA(keyBytes) if err != nil { - m.logger.Warn("failed to construct private key", zap.String("key_id", keyID), zap.Error(err)) + m.logger.Warn("Failed to construct private key", zap.String("key_id", keyID), zap.Error(err)) return nil, merrors.Internal("vault key manager: failed to construct private key: " + err.Error()) } signed, err := types.SignTx(tx, types.LatestSignerForChainID(chainID), privateKey) if err != nil { - m.logger.Warn("failed to sign transaction", zap.String("key_id", keyID), zap.Error(err)) + m.logger.Warn("Failed to sign transaction", zap.String("key_id", keyID), zap.Error(err)) return nil, merrors.Internal("vault key manager: failed to sign transaction: " + err.Error()) } - m.logger.Info("transaction signed with managed key", + m.logger.Info("Transaction signed with managed key", zap.String("key_id", keyID), zap.String("network", material.Network), zap.String("tx_hash", signed.Hash().Hex()), @@ -213,23 +213,23 @@ func (m *Manager) loadKey(ctx context.Context, keyID string) (*keyMaterial, erro secretPath := strings.Trim(strings.TrimPrefix(keyID, "/"), "/") secret, err := m.store.Get(ctx, secretPath) if err != nil { - m.logger.Warn("failed to read secret", zap.String("path", secretPath), zap.Error(err)) + m.logger.Warn("Failed to read secret", zap.String("path", secretPath), zap.Error(err)) return nil, merrors.Internal("vault key manager: failed to read secret at " + secretPath + ": " + err.Error()) } if secret == nil || secret.Data == nil { - m.logger.Warn("secret not found", zap.String("path", secretPath)) + m.logger.Warn("Secret not found", zap.String("path", secretPath)) return nil, merrors.NoData("vault key manager: secret " + secretPath + " not found") } getString := func(key string) (string, error) { val, ok := secret.Data[key] if !ok { - m.logger.Warn("secret missing field", zap.String("path", secretPath), zap.String("field", key)) + m.logger.Warn("Secret missing field", zap.String("path", secretPath), zap.String("field", key)) return "", merrors.Internal("vault key manager: secret " + secretPath + " missing " + key) } str, ok := val.(string) if !ok || strings.TrimSpace(str) == "" { - m.logger.Warn("secret field invalid", zap.String("path", secretPath), zap.String("field", key)) + m.logger.Warn("Secret field invalid", zap.String("path", secretPath), zap.String("field", key)) return "", merrors.Internal("vault key manager: secret " + secretPath + " invalid " + key) } return str, nil diff --git a/api/gateway/chain/internal/server/internal/serverimp.go b/api/gateway/chain/internal/server/internal/serverimp.go index 5fc02a3..04be1c6 100644 --- a/api/gateway/chain/internal/server/internal/serverimp.go +++ b/api/gateway/chain/internal/server/internal/serverimp.go @@ -123,12 +123,12 @@ func (i *Imp) Start() error { cl := i.logger.Named("config") networkConfigs, err := resolveNetworkConfigs(cl.Named("network"), cfg.Chains) if err != nil { - i.logger.Error("invalid chain network configuration", zap.Error(err)) + i.logger.Error("Invalid chain network configuration", zap.Error(err)) return err } rpcClients, err := rpcclient.Prepare(context.Background(), i.logger.Named("rpc"), networkConfigs) if err != nil { - i.logger.Error("failed to prepare rpc clients", zap.Error(err)) + i.logger.Error("Failed to prepare rpc clients", zap.Error(err)) return err } i.rpcClients = rpcClients @@ -166,7 +166,7 @@ func (i *Imp) Start() error { func (i *Imp) loadConfig() (*config, error) { data, err := os.ReadFile(i.file) if err != nil { - i.logger.Error("could not read configuration file", zap.String("config_file", i.file), zap.Error(err)) + i.logger.Error("Could not read configuration file", zap.String("config_file", i.file), zap.Error(err)) return nil, err } @@ -174,7 +174,7 @@ func (i *Imp) loadConfig() (*config, error) { Config: &grpcapp.Config{}, } if err := yaml.Unmarshal(data, cfg); err != nil { - i.logger.Error("failed to parse configuration", zap.Error(err)) + i.logger.Error("Failed to parse configuration", zap.Error(err)) return nil, err } @@ -198,7 +198,7 @@ func resolveNetworkConfigs(logger mlogger.Logger, chains []chainConfig) ([]gatew result := make([]gatewayshared.Network, 0, len(chains)) for _, chain := range chains { if strings.TrimSpace(chain.Name) == "" { - logger.Warn("skipping unnamed chain configuration") + logger.Warn("Skipping unnamed chain configuration") continue } rpcURL := strings.TrimSpace(os.Getenv(chain.RPCURLEnv)) @@ -210,7 +210,7 @@ func resolveNetworkConfigs(logger mlogger.Logger, chains []chainConfig) ([]gatew for _, token := range chain.Tokens { symbol := strings.TrimSpace(token.Symbol) if symbol == "" { - logger.Warn("skipping token with empty symbol", zap.String("chain", chain.Name)) + logger.Warn("Skipping token with empty symbol", zap.String("chain", chain.Name)) continue } addr := strings.TrimSpace(token.Contract) @@ -220,9 +220,9 @@ func resolveNetworkConfigs(logger mlogger.Logger, chains []chainConfig) ([]gatew } if addr == "" { if env != "" { - logger.Warn("token contract not configured", zap.String("token", symbol), zap.String("env", env), zap.String("chain", chain.Name)) + logger.Warn("Token contract not configured", zap.String("token", symbol), zap.String("env", env), zap.String("chain", chain.Name)) } else { - logger.Warn("token contract not configured", zap.String("token", symbol), zap.String("chain", chain.Name)) + logger.Warn("Token contract not configured", zap.String("token", symbol), zap.String("chain", chain.Name)) } continue } @@ -234,7 +234,7 @@ func resolveNetworkConfigs(logger mlogger.Logger, chains []chainConfig) ([]gatew gasPolicy, err := buildGasTopUpPolicy(chain.Name, chain.GasTopUpPolicy) if err != nil { - logger.Error("invalid gas top-up policy", zap.String("chain", chain.Name), zap.Error(err)) + logger.Error("Invalid gas top-up policy", zap.String("chain", chain.Name), zap.Error(err)) return nil, err } @@ -322,13 +322,13 @@ func resolveServiceWallet(logger mlogger.Logger, cfg serviceWalletConfig) gatewa if address == "" { if cfg.AddressEnv != "" { - logger.Warn("service wallet address not configured", zap.String("env", cfg.AddressEnv)) + logger.Warn("Service wallet address not configured", zap.String("env", cfg.AddressEnv)) } else { - logger.Warn("service wallet address not configured", zap.String("chain", cfg.Chain)) + logger.Warn("Service wallet address not configured", zap.String("chain", cfg.Chain)) } } if privateKey == "" { - logger.Warn("service wallet private key not configured", zap.String("env", cfg.PrivateKeyEnv)) + logger.Warn("Service wallet private key not configured", zap.String("env", cfg.PrivateKeyEnv)) } return gatewayshared.ServiceWallet{ @@ -342,7 +342,7 @@ func resolveKeyManager(logger mlogger.Logger, cfg keymanager.Config) (keymanager driver := strings.ToLower(strings.TrimSpace(string(cfg.Driver))) if driver == "" { err := merrors.InvalidArgument("key management driver is not configured") - logger.Error("key management driver missing") + logger.Error("Key management driver missing") return nil, err } @@ -351,19 +351,19 @@ func resolveKeyManager(logger mlogger.Logger, cfg keymanager.Config) (keymanager settings := vaultmanager.Config{} if len(cfg.Settings) > 0 { if err := mapstructure.Decode(cfg.Settings, &settings); err != nil { - logger.Error("failed to decode vault key manager settings", zap.Error(err), zap.Any("settings", cfg.Settings)) + logger.Error("Failed to decode vault key manager settings", zap.Error(err), zap.Any("settings", cfg.Settings)) return nil, merrors.InvalidArgument("invalid vault key manager settings: " + err.Error()) } } manager, err := vaultmanager.New(logger, settings) if err != nil { - logger.Error("failed to initialise vault key manager", zap.Error(err)) + logger.Error("Failed to initialise vault key manager", zap.Error(err)) return nil, err } return manager, nil default: err := merrors.InvalidArgument("unsupported key management driver: " + driver) - logger.Error("unsupported key management driver", zap.String("driver", driver)) + logger.Error("Unsupported key management driver", zap.String("driver", driver)) return nil, err } } diff --git a/api/gateway/chain/internal/service/gateway/commands/transfer/fee.go b/api/gateway/chain/internal/service/gateway/commands/transfer/fee.go index 52dac2b..2d1c711 100644 --- a/api/gateway/chain/internal/service/gateway/commands/transfer/fee.go +++ b/api/gateway/chain/internal/service/gateway/commands/transfer/fee.go @@ -34,12 +34,12 @@ func (c *estimateTransferFeeCommand) Execute(ctx context.Context, req *chainv1.E sourceWalletRef := strings.TrimSpace(req.GetSourceWalletRef()) if sourceWalletRef == "" { - c.deps.Logger.Warn("source wallet ref missing") + c.deps.Logger.Warn("Source wallet ref missing") return gsresponse.InvalidArgument[chainv1.EstimateTransferFeeResponse](c.deps.Logger, mservice.ChainGateway, merrors.InvalidArgument("source_wallet_ref is required")) } amount := req.GetAmount() if amount == nil || strings.TrimSpace(amount.GetAmount()) == "" || strings.TrimSpace(amount.GetCurrency()) == "" { - c.deps.Logger.Warn("amount missing or incomplete") + c.deps.Logger.Warn("Amount missing or incomplete") return gsresponse.InvalidArgument[chainv1.EstimateTransferFeeResponse](c.deps.Logger, mservice.ChainGateway, merrors.InvalidArgument("amount is required")) } diff --git a/api/gateway/chain/internal/service/gateway/commands/transfer/gas_topup.go b/api/gateway/chain/internal/service/gateway/commands/transfer/gas_topup.go index 2b5f4a5..767854f 100644 --- a/api/gateway/chain/internal/service/gateway/commands/transfer/gas_topup.go +++ b/api/gateway/chain/internal/service/gateway/commands/transfer/gas_topup.go @@ -29,22 +29,22 @@ func NewComputeGasTopUp(deps Deps) *computeGasTopUpCommand { func (c *computeGasTopUpCommand) Execute(ctx context.Context, req *chainv1.ComputeGasTopUpRequest) gsresponse.Responder[chainv1.ComputeGasTopUpResponse] { if err := c.deps.EnsureRepository(ctx); err != nil { - c.deps.Logger.Warn("repository unavailable", zap.Error(err)) + c.deps.Logger.Warn("Repository unavailable", zap.Error(err)) return gsresponse.Unavailable[chainv1.ComputeGasTopUpResponse](c.deps.Logger, mservice.ChainGateway, err) } if req == nil { - c.deps.Logger.Warn("nil request") + c.deps.Logger.Warn("Nil request") return gsresponse.InvalidArgument[chainv1.ComputeGasTopUpResponse](c.deps.Logger, mservice.ChainGateway, merrors.InvalidArgument("request is required")) } walletRef := strings.TrimSpace(req.GetWalletRef()) if walletRef == "" { - c.deps.Logger.Warn("wallet ref missing") + c.deps.Logger.Warn("Wallet ref missing") return gsresponse.InvalidArgument[chainv1.ComputeGasTopUpResponse](c.deps.Logger, mservice.ChainGateway, merrors.InvalidArgument("wallet_ref is required")) } estimatedFee := req.GetEstimatedTotalFee() if estimatedFee == nil || strings.TrimSpace(estimatedFee.GetAmount()) == "" || strings.TrimSpace(estimatedFee.GetCurrency()) == "" { - c.deps.Logger.Warn("estimated fee missing") + c.deps.Logger.Warn("Estimated fee missing") return gsresponse.InvalidArgument[chainv1.ComputeGasTopUpResponse](c.deps.Logger, mservice.ChainGateway, merrors.InvalidArgument("estimated_total_fee is required")) } @@ -71,37 +71,37 @@ func NewEnsureGasTopUp(deps Deps) *ensureGasTopUpCommand { func (c *ensureGasTopUpCommand) Execute(ctx context.Context, req *chainv1.EnsureGasTopUpRequest) gsresponse.Responder[chainv1.EnsureGasTopUpResponse] { if err := c.deps.EnsureRepository(ctx); err != nil { - c.deps.Logger.Warn("repository unavailable", zap.Error(err)) + c.deps.Logger.Warn("Repository unavailable", zap.Error(err)) return gsresponse.Unavailable[chainv1.EnsureGasTopUpResponse](c.deps.Logger, mservice.ChainGateway, err) } if req == nil { - c.deps.Logger.Warn("nil request") + c.deps.Logger.Warn("Nil request") return gsresponse.InvalidArgument[chainv1.EnsureGasTopUpResponse](c.deps.Logger, mservice.ChainGateway, merrors.InvalidArgument("request is required")) } idempotencyKey := strings.TrimSpace(req.GetIdempotencyKey()) if idempotencyKey == "" { - c.deps.Logger.Warn("idempotency key missing") + c.deps.Logger.Warn("Idempotency key missing") return gsresponse.InvalidArgument[chainv1.EnsureGasTopUpResponse](c.deps.Logger, mservice.ChainGateway, merrors.InvalidArgument("idempotency_key is required")) } organizationRef := strings.TrimSpace(req.GetOrganizationRef()) if organizationRef == "" { - c.deps.Logger.Warn("organization ref missing") + c.deps.Logger.Warn("Organization ref missing") return gsresponse.InvalidArgument[chainv1.EnsureGasTopUpResponse](c.deps.Logger, mservice.ChainGateway, merrors.InvalidArgument("organization_ref is required")) } sourceWalletRef := strings.TrimSpace(req.GetSourceWalletRef()) if sourceWalletRef == "" { - c.deps.Logger.Warn("source wallet ref missing") + c.deps.Logger.Warn("Source wallet ref missing") return gsresponse.InvalidArgument[chainv1.EnsureGasTopUpResponse](c.deps.Logger, mservice.ChainGateway, merrors.InvalidArgument("source_wallet_ref is required")) } targetWalletRef := strings.TrimSpace(req.GetTargetWalletRef()) if targetWalletRef == "" { - c.deps.Logger.Warn("target wallet ref missing") + c.deps.Logger.Warn("Target wallet ref missing") return gsresponse.InvalidArgument[chainv1.EnsureGasTopUpResponse](c.deps.Logger, mservice.ChainGateway, merrors.InvalidArgument("target_wallet_ref is required")) } estimatedFee := req.GetEstimatedTotalFee() if estimatedFee == nil || strings.TrimSpace(estimatedFee.GetAmount()) == "" || strings.TrimSpace(estimatedFee.GetCurrency()) == "" { - c.deps.Logger.Warn("estimated fee missing") + c.deps.Logger.Warn("Estimated fee missing") return gsresponse.InvalidArgument[chainv1.EnsureGasTopUpResponse](c.deps.Logger, mservice.ChainGateway, merrors.InvalidArgument("estimated_total_fee is required")) } @@ -268,7 +268,7 @@ func logDecision(logger mlogger.Logger, walletRef string, estimatedFee *moneyv1. zap.String("operation_type", decision.OperationType), ) } - logger.Info("gas top-up decision", fields...) + logger.Info("Gas top-up decision", fields...) } func amountString(m *moneyv1.Money) string { diff --git a/api/gateway/chain/internal/service/gateway/commands/transfer/get.go b/api/gateway/chain/internal/service/gateway/commands/transfer/get.go index da47451..940cbeb 100644 --- a/api/gateway/chain/internal/service/gateway/commands/transfer/get.go +++ b/api/gateway/chain/internal/service/gateway/commands/transfer/get.go @@ -22,25 +22,25 @@ func NewGetTransfer(deps Deps) *getTransferCommand { func (c *getTransferCommand) Execute(ctx context.Context, req *chainv1.GetTransferRequest) gsresponse.Responder[chainv1.GetTransferResponse] { if err := c.deps.EnsureRepository(ctx); err != nil { - c.deps.Logger.Warn("repository unavailable", zap.Error(err)) + c.deps.Logger.Warn("Repository unavailable", zap.Error(err)) return gsresponse.Unavailable[chainv1.GetTransferResponse](c.deps.Logger, mservice.ChainGateway, err) } if req == nil { - c.deps.Logger.Warn("nil request") + c.deps.Logger.Warn("Nil request") return gsresponse.InvalidArgument[chainv1.GetTransferResponse](c.deps.Logger, mservice.ChainGateway, merrors.InvalidArgument("nil request")) } transferRef := strings.TrimSpace(req.GetTransferRef()) if transferRef == "" { - c.deps.Logger.Warn("transfer_ref missing") + c.deps.Logger.Warn("Transfer_ref missing") return gsresponse.InvalidArgument[chainv1.GetTransferResponse](c.deps.Logger, mservice.ChainGateway, merrors.InvalidArgument("transfer_ref is required")) } transfer, err := c.deps.Storage.Transfers().Get(ctx, transferRef) if err != nil { if errors.Is(err, merrors.ErrNoData) { - c.deps.Logger.Warn("not found", zap.String("transfer_ref", transferRef)) + c.deps.Logger.Warn("Not found", zap.String("transfer_ref", transferRef)) return gsresponse.NotFound[chainv1.GetTransferResponse](c.deps.Logger, mservice.ChainGateway, err) } - c.deps.Logger.Warn("storage get failed", zap.Error(err), zap.String("transfer_ref", transferRef)) + c.deps.Logger.Warn("Storage get failed", zap.Error(err), zap.String("transfer_ref", transferRef)) return gsresponse.Auto[chainv1.GetTransferResponse](c.deps.Logger, mservice.ChainGateway, err) } return gsresponse.Success(&chainv1.GetTransferResponse{Transfer: toProtoTransfer(transfer)}) diff --git a/api/gateway/chain/internal/service/gateway/commands/transfer/list.go b/api/gateway/chain/internal/service/gateway/commands/transfer/list.go index f88be23..e8709cd 100644 --- a/api/gateway/chain/internal/service/gateway/commands/transfer/list.go +++ b/api/gateway/chain/internal/service/gateway/commands/transfer/list.go @@ -23,7 +23,7 @@ func NewListTransfers(deps Deps) *listTransfersCommand { func (c *listTransfersCommand) Execute(ctx context.Context, req *chainv1.ListTransfersRequest) gsresponse.Responder[chainv1.ListTransfersResponse] { if err := c.deps.EnsureRepository(ctx); err != nil { - c.deps.Logger.Warn("repository unavailable", zap.Error(err)) + c.deps.Logger.Warn("Repository unavailable", zap.Error(err)) return gsresponse.Unavailable[chainv1.ListTransfersResponse](c.deps.Logger, mservice.ChainGateway, err) } filter := model.TransferFilter{} @@ -41,7 +41,7 @@ func (c *listTransfersCommand) Execute(ctx context.Context, req *chainv1.ListTra result, err := c.deps.Storage.Transfers().List(ctx, filter) if err != nil { - c.deps.Logger.Warn("storage list failed", zap.Error(err)) + c.deps.Logger.Warn("Storage list failed", zap.Error(err)) return gsresponse.Auto[chainv1.ListTransfersResponse](c.deps.Logger, mservice.ChainGateway, err) } diff --git a/api/gateway/chain/internal/service/gateway/commands/transfer/submit.go b/api/gateway/chain/internal/service/gateway/commands/transfer/submit.go index 8652c97..54ad268 100644 --- a/api/gateway/chain/internal/service/gateway/commands/transfer/submit.go +++ b/api/gateway/chain/internal/service/gateway/commands/transfer/submit.go @@ -29,7 +29,7 @@ func (c *submitTransferCommand) Execute(ctx context.Context, req *chainv1.Submit return gsresponse.Unavailable[chainv1.SubmitTransferResponse](c.deps.Logger, mservice.ChainGateway, err) } if req == nil { - c.deps.Logger.Warn("nil request") + c.deps.Logger.Warn("Nil request") return gsresponse.InvalidArgument[chainv1.SubmitTransferResponse](c.deps.Logger, mservice.ChainGateway, merrors.InvalidArgument("nil request")) } @@ -40,7 +40,7 @@ func (c *submitTransferCommand) Execute(ctx context.Context, req *chainv1.Submit } organizationRef := strings.TrimSpace(req.GetOrganizationRef()) if organizationRef == "" { - c.deps.Logger.Warn("mMssing organization ref") + c.deps.Logger.Warn("Missing organization ref") return gsresponse.InvalidArgument[chainv1.SubmitTransferResponse](c.deps.Logger, mservice.ChainGateway, merrors.InvalidArgument("organization_ref is required")) } sourceWalletRef := strings.TrimSpace(req.GetSourceWalletRef()) diff --git a/api/gateway/chain/internal/service/gateway/commands/wallet/balance.go b/api/gateway/chain/internal/service/gateway/commands/wallet/balance.go index 6305e21..93123d6 100644 --- a/api/gateway/chain/internal/service/gateway/commands/wallet/balance.go +++ b/api/gateway/chain/internal/service/gateway/commands/wallet/balance.go @@ -29,41 +29,41 @@ func NewGetWalletBalance(deps Deps) *getWalletBalanceCommand { func (c *getWalletBalanceCommand) Execute(ctx context.Context, req *chainv1.GetWalletBalanceRequest) gsresponse.Responder[chainv1.GetWalletBalanceResponse] { if err := c.deps.EnsureRepository(ctx); err != nil { - c.deps.Logger.Warn("repository unavailable", zap.Error(err)) + c.deps.Logger.Warn("Repository unavailable", zap.Error(err)) return gsresponse.Unavailable[chainv1.GetWalletBalanceResponse](c.deps.Logger, mservice.ChainGateway, err) } if req == nil { - c.deps.Logger.Warn("nil request") + c.deps.Logger.Warn("Nil request") return gsresponse.InvalidArgument[chainv1.GetWalletBalanceResponse](c.deps.Logger, mservice.ChainGateway, merrors.InvalidArgument("nil request")) } walletRef := strings.TrimSpace(req.GetWalletRef()) if walletRef == "" { - c.deps.Logger.Warn("wallet_ref missing") + c.deps.Logger.Warn("Wallet_ref missing") return gsresponse.InvalidArgument[chainv1.GetWalletBalanceResponse](c.deps.Logger, mservice.ChainGateway, merrors.InvalidArgument("wallet_ref is required")) } wallet, err := c.deps.Storage.Wallets().Get(ctx, walletRef) if err != nil { if errors.Is(err, merrors.ErrNoData) { - c.deps.Logger.Warn("not found", zap.String("wallet_ref", walletRef)) + c.deps.Logger.Warn("Not found", zap.String("wallet_ref", walletRef)) return gsresponse.NotFound[chainv1.GetWalletBalanceResponse](c.deps.Logger, mservice.ChainGateway, err) } - c.deps.Logger.Warn("storage get failed", zap.Error(err), zap.String("wallet_ref", walletRef)) + c.deps.Logger.Warn("Storage get failed", zap.Error(err), zap.String("wallet_ref", walletRef)) return gsresponse.Auto[chainv1.GetWalletBalanceResponse](c.deps.Logger, mservice.ChainGateway, err) } tokenBalance, nativeBalance, chainErr := OnChainWalletBalances(ctx, c.deps, wallet) if chainErr != nil { - c.deps.Logger.Warn("on-chain balance fetch failed, attempting cached balance", zap.Error(chainErr), zap.String("wallet_ref", walletRef)) + c.deps.Logger.Warn("On-chain balance fetch failed, attempting cached balance", zap.Error(chainErr), zap.String("wallet_ref", walletRef)) stored, err := c.deps.Storage.Wallets().GetBalance(ctx, walletRef) if err != nil { if errors.Is(err, merrors.ErrNoData) { - c.deps.Logger.Warn("cached balance not found", zap.String("wallet_ref", walletRef)) + c.deps.Logger.Warn("Cached balance not found", zap.String("wallet_ref", walletRef)) return gsresponse.Auto[chainv1.GetWalletBalanceResponse](c.deps.Logger, mservice.ChainGateway, chainErr) } return gsresponse.Auto[chainv1.GetWalletBalanceResponse](c.deps.Logger, mservice.ChainGateway, err) } if c.isCachedBalanceStale(stored) { - c.deps.Logger.Warn("cached balance is stale", + c.deps.Logger.Info("Cached balance is stale", zap.String("wallet_ref", walletRef), zap.Time("calculated_at", stored.CalculatedAt), zap.Duration("ttl", c.cacheTTL()), @@ -116,7 +116,7 @@ func (c *getWalletBalanceCommand) persistCachedBalance(ctx context.Context, wall record.PendingInbound = zeroMoney(currency) record.PendingOutbound = zeroMoney(currency) if err := c.deps.Storage.Wallets().SaveBalance(ctx, record); err != nil { - c.deps.Logger.Warn("failed to cache wallet balance", zap.String("wallet_ref", walletRef), zap.Error(err)) + c.deps.Logger.Warn("Failed to cache wallet balance", zap.String("wallet_ref", walletRef), zap.Error(err)) } } diff --git a/api/gateway/chain/internal/service/gateway/commands/wallet/create.go b/api/gateway/chain/internal/service/gateway/commands/wallet/create.go index 73adb1a..1371448 100644 --- a/api/gateway/chain/internal/service/gateway/commands/wallet/create.go +++ b/api/gateway/chain/internal/service/gateway/commands/wallet/create.go @@ -25,59 +25,59 @@ func NewCreateManagedWallet(deps Deps) *createManagedWalletCommand { func (c *createManagedWalletCommand) Execute(ctx context.Context, req *chainv1.CreateManagedWalletRequest) gsresponse.Responder[chainv1.CreateManagedWalletResponse] { if err := c.deps.EnsureRepository(ctx); err != nil { - c.deps.Logger.Warn("repository unavailable", zap.Error(err)) + c.deps.Logger.Warn("Repository unavailable", zap.Error(err)) return gsresponse.Unavailable[chainv1.CreateManagedWalletResponse](c.deps.Logger, mservice.ChainGateway, err) } if req == nil { - c.deps.Logger.Warn("nil request") + c.deps.Logger.Warn("Nil request") return gsresponse.InvalidArgument[chainv1.CreateManagedWalletResponse](c.deps.Logger, mservice.ChainGateway, merrors.InvalidArgument("nil request")) } idempotencyKey := strings.TrimSpace(req.GetIdempotencyKey()) if idempotencyKey == "" { - c.deps.Logger.Warn("missing idempotency key") + c.deps.Logger.Warn("Missing idempotency key") return gsresponse.InvalidArgument[chainv1.CreateManagedWalletResponse](c.deps.Logger, mservice.ChainGateway, merrors.InvalidArgument("idempotency_key is required")) } organizationRef := strings.TrimSpace(req.GetOrganizationRef()) if organizationRef == "" { - c.deps.Logger.Warn("missing organization ref") + c.deps.Logger.Warn("Missing organization ref") return gsresponse.InvalidArgument[chainv1.CreateManagedWalletResponse](c.deps.Logger, mservice.ChainGateway, merrors.InvalidArgument("organization_ref is required")) } ownerRef := strings.TrimSpace(req.GetOwnerRef()) if ownerRef == "" { - c.deps.Logger.Warn("missing owner ref") + c.deps.Logger.Warn("Missing owner ref") return gsresponse.InvalidArgument[chainv1.CreateManagedWalletResponse](c.deps.Logger, mservice.ChainGateway, merrors.InvalidArgument("owner_ref is required")) } asset := req.GetAsset() if asset == nil { - c.deps.Logger.Warn("missing asset") + c.deps.Logger.Warn("Missing asset") return gsresponse.InvalidArgument[chainv1.CreateManagedWalletResponse](c.deps.Logger, mservice.ChainGateway, merrors.InvalidArgument("asset is required")) } chainKey, _ := shared.ChainKeyFromEnum(asset.GetChain()) if chainKey == "" { - c.deps.Logger.Warn("unsupported chain", zap.Any("chain", asset.GetChain())) + c.deps.Logger.Warn("Unsupported chain", zap.Any("chain", asset.GetChain())) return gsresponse.InvalidArgument[chainv1.CreateManagedWalletResponse](c.deps.Logger, mservice.ChainGateway, merrors.InvalidArgument("unsupported chain")) } networkCfg, ok := c.deps.Networks.Network(chainKey) if !ok { - c.deps.Logger.Warn("unsupported chain in config", zap.String("chain", chainKey)) + c.deps.Logger.Warn("Unsupported chain in config", zap.String("chain", chainKey)) return gsresponse.InvalidArgument[chainv1.CreateManagedWalletResponse](c.deps.Logger, mservice.ChainGateway, merrors.InvalidArgument("unsupported chain")) } if c.deps.Drivers == nil { - c.deps.Logger.Warn("chain drivers missing", zap.String("chain", chainKey)) + c.deps.Logger.Warn("Chain drivers missing", zap.String("chain", chainKey)) return gsresponse.Internal[chainv1.CreateManagedWalletResponse](c.deps.Logger, mservice.ChainGateway, merrors.Internal("chain drivers not configured")) } chainDriver, err := c.deps.Drivers.Driver(chainKey) if err != nil { - c.deps.Logger.Warn("unsupported chain driver", zap.String("chain", chainKey), zap.Error(err)) + c.deps.Logger.Warn("Unsupported chain driver", zap.String("chain", chainKey), zap.Error(err)) return gsresponse.InvalidArgument[chainv1.CreateManagedWalletResponse](c.deps.Logger, mservice.ChainGateway, merrors.InvalidArgument("unsupported chain")) } tokenSymbol := strings.ToUpper(strings.TrimSpace(asset.GetTokenSymbol())) if tokenSymbol == "" { - c.deps.Logger.Warn("missing token symbol") + c.deps.Logger.Warn("Missing token symbol") return gsresponse.InvalidArgument[chainv1.CreateManagedWalletResponse](c.deps.Logger, mservice.ChainGateway, merrors.InvalidArgument("asset.token_symbol is required")) } contractAddress := strings.ToLower(strings.TrimSpace(asset.GetContractAddress())) @@ -85,7 +85,7 @@ func (c *createManagedWalletCommand) Execute(ctx context.Context, req *chainv1.C if !strings.EqualFold(tokenSymbol, networkCfg.NativeToken) { contractAddress = shared.ResolveContractAddress(networkCfg.TokenConfigs, tokenSymbol) if contractAddress == "" { - c.deps.Logger.Warn("unsupported token", zap.String("token", tokenSymbol), zap.String("chain", chainKey)) + c.deps.Logger.Warn("Unsupported token", zap.String("token", tokenSymbol), zap.String("chain", chainKey)) return gsresponse.InvalidArgument[chainv1.CreateManagedWalletResponse](c.deps.Logger, mservice.ChainGateway, merrors.InvalidArgument("unsupported token for chain")) } } @@ -93,22 +93,22 @@ func (c *createManagedWalletCommand) Execute(ctx context.Context, req *chainv1.C walletRef := shared.GenerateWalletRef() if c.deps.KeyManager == nil { - c.deps.Logger.Warn("key manager missing") + c.deps.Logger.Warn("Key manager missing") return gsresponse.Internal[chainv1.CreateManagedWalletResponse](c.deps.Logger, mservice.ChainGateway, merrors.Internal("key manager not configured")) } keyInfo, err := c.deps.KeyManager.CreateManagedWalletKey(ctx, walletRef, chainKey) if err != nil { - c.deps.Logger.Warn("key manager error", zap.Error(err)) + c.deps.Logger.Warn("Key manager error", zap.Error(err)) return gsresponse.Auto[chainv1.CreateManagedWalletResponse](c.deps.Logger, mservice.ChainGateway, err) } if keyInfo == nil || strings.TrimSpace(keyInfo.Address) == "" { - c.deps.Logger.Warn("key manager returned empty address") + c.deps.Logger.Warn("Key manager returned empty address") return gsresponse.Internal[chainv1.CreateManagedWalletResponse](c.deps.Logger, mservice.ChainGateway, merrors.Internal("key manager returned empty address")) } depositAddress, err := chainDriver.FormatAddress(keyInfo.Address) if err != nil { - c.deps.Logger.Warn("invalid derived deposit address", zap.String("wallet_ref", walletRef), zap.Error(err)) + c.deps.Logger.Warn("Invalid derived deposit address", zap.String("wallet_ref", walletRef), zap.Error(err)) return gsresponse.InvalidArgument[chainv1.CreateManagedWalletResponse](c.deps.Logger, mservice.ChainGateway, err) } @@ -156,10 +156,10 @@ func (c *createManagedWalletCommand) Execute(ctx context.Context, req *chainv1.C created, err := c.deps.Storage.Wallets().Create(ctx, wallet) if err != nil { if errors.Is(err, merrors.ErrDataConflict) { - c.deps.Logger.Debug("wallet already exists", zap.String("wallet_ref", walletRef), zap.String("idempotency_key", idempotencyKey)) + c.deps.Logger.Debug("Wallet already exists", zap.String("wallet_ref", walletRef), zap.String("idempotency_key", idempotencyKey)) return gsresponse.Success(&chainv1.CreateManagedWalletResponse{Wallet: toProtoManagedWallet(created)}) } - c.deps.Logger.Warn("storage create failed", zap.Error(err), zap.String("wallet_ref", walletRef)) + c.deps.Logger.Warn("Storage create failed", zap.Error(err), zap.String("wallet_ref", walletRef)) return gsresponse.Auto[chainv1.CreateManagedWalletResponse](c.deps.Logger, mservice.ChainGateway, err) } diff --git a/api/gateway/chain/internal/service/gateway/commands/wallet/get.go b/api/gateway/chain/internal/service/gateway/commands/wallet/get.go index c4d9106..11ab552 100644 --- a/api/gateway/chain/internal/service/gateway/commands/wallet/get.go +++ b/api/gateway/chain/internal/service/gateway/commands/wallet/get.go @@ -22,25 +22,25 @@ func NewGetManagedWallet(deps Deps) *getManagedWalletCommand { func (c *getManagedWalletCommand) Execute(ctx context.Context, req *chainv1.GetManagedWalletRequest) gsresponse.Responder[chainv1.GetManagedWalletResponse] { if err := c.deps.EnsureRepository(ctx); err != nil { - c.deps.Logger.Warn("repository unavailable", zap.Error(err)) + c.deps.Logger.Warn("Repository unavailable", zap.Error(err)) return gsresponse.Unavailable[chainv1.GetManagedWalletResponse](c.deps.Logger, mservice.ChainGateway, err) } if req == nil { - c.deps.Logger.Warn("nil request") + c.deps.Logger.Warn("Nil request") return gsresponse.InvalidArgument[chainv1.GetManagedWalletResponse](c.deps.Logger, mservice.ChainGateway, merrors.InvalidArgument("nil request")) } walletRef := strings.TrimSpace(req.GetWalletRef()) if walletRef == "" { - c.deps.Logger.Warn("wallet_ref missing") + c.deps.Logger.Warn("Wallet_ref missing") return gsresponse.InvalidArgument[chainv1.GetManagedWalletResponse](c.deps.Logger, mservice.ChainGateway, merrors.InvalidArgument("wallet_ref is required")) } wallet, err := c.deps.Storage.Wallets().Get(ctx, walletRef) if err != nil { if errors.Is(err, merrors.ErrNoData) { - c.deps.Logger.Warn("not found", zap.String("wallet_ref", walletRef)) + c.deps.Logger.Warn("Not found", zap.String("wallet_ref", walletRef)) return gsresponse.NotFound[chainv1.GetManagedWalletResponse](c.deps.Logger, mservice.ChainGateway, err) } - c.deps.Logger.Warn("storage get failed", zap.Error(err), zap.String("wallet_ref", walletRef)) + c.deps.Logger.Warn("Storage get failed", zap.Error(err), zap.String("wallet_ref", walletRef)) return gsresponse.Auto[chainv1.GetManagedWalletResponse](c.deps.Logger, mservice.ChainGateway, err) } return gsresponse.Success(&chainv1.GetManagedWalletResponse{Wallet: toProtoManagedWallet(wallet)}) diff --git a/api/gateway/chain/internal/service/gateway/commands/wallet/list.go b/api/gateway/chain/internal/service/gateway/commands/wallet/list.go index 04ceca8..a0033f5 100644 --- a/api/gateway/chain/internal/service/gateway/commands/wallet/list.go +++ b/api/gateway/chain/internal/service/gateway/commands/wallet/list.go @@ -23,7 +23,7 @@ func NewListManagedWallets(deps Deps) *listManagedWalletsCommand { func (c *listManagedWalletsCommand) Execute(ctx context.Context, req *chainv1.ListManagedWalletsRequest) gsresponse.Responder[chainv1.ListManagedWalletsResponse] { if err := c.deps.EnsureRepository(ctx); err != nil { - c.deps.Logger.Warn("repository unavailable", zap.Error(err)) + c.deps.Logger.Warn("Repository unavailable", zap.Error(err)) return gsresponse.Unavailable[chainv1.ListManagedWalletsResponse](c.deps.Logger, mservice.ChainGateway, err) } filter := model.ManagedWalletFilter{} @@ -42,7 +42,7 @@ func (c *listManagedWalletsCommand) Execute(ctx context.Context, req *chainv1.Li result, err := c.deps.Storage.Wallets().List(ctx, filter) if err != nil { - c.deps.Logger.Warn("storage list failed", zap.Error(err)) + c.deps.Logger.Warn("Storage list failed", zap.Error(err)) return gsresponse.Auto[chainv1.ListManagedWalletsResponse](c.deps.Logger, mservice.ChainGateway, err) } diff --git a/api/gateway/chain/internal/service/gateway/driver/arbitrum/driver.go b/api/gateway/chain/internal/service/gateway/driver/arbitrum/driver.go index e7e16ca..e895da8 100644 --- a/api/gateway/chain/internal/service/gateway/driver/arbitrum/driver.go +++ b/api/gateway/chain/internal/service/gateway/driver/arbitrum/driver.go @@ -27,25 +27,25 @@ func (d *Driver) Name() string { } func (d *Driver) FormatAddress(address string) (string, error) { - d.logger.Debug("format address", zap.String("address", address)) + d.logger.Debug("Format address", zap.String("address", address)) normalized, err := evm.NormalizeAddress(address) if err != nil { - d.logger.Warn("format address failed", zap.String("address", address), zap.Error(err)) + d.logger.Warn("Format address failed", zap.String("address", address), zap.Error(err)) } return normalized, err } func (d *Driver) NormalizeAddress(address string) (string, error) { - d.logger.Debug("normalize address", zap.String("address", address)) + d.logger.Debug("Normalize address", zap.String("address", address)) normalized, err := evm.NormalizeAddress(address) if err != nil { - d.logger.Warn("normalize address failed", zap.String("address", address), zap.Error(err)) + d.logger.Warn("Normalize address failed", zap.String("address", address), zap.Error(err)) } return normalized, err } func (d *Driver) Balance(ctx context.Context, deps driver.Deps, network shared.Network, wallet *model.ManagedWallet) (*moneyv1.Money, error) { - d.logger.Debug("balance request", + d.logger.Debug("Balance request", zap.String("wallet_ref", wallet.WalletRef), zap.String("network", network.Name), ) @@ -53,13 +53,13 @@ func (d *Driver) Balance(ctx context.Context, deps driver.Deps, network shared.N driverDeps.Logger = d.logger result, err := evm.Balance(ctx, driverDeps, network, wallet, wallet.DepositAddress) if err != nil { - d.logger.Warn("balance failed", + d.logger.Warn("Balance failed", zap.String("wallet_ref", wallet.WalletRef), zap.String("network", network.Name), zap.Error(err), ) } else if result != nil { - d.logger.Debug("balance result", + d.logger.Debug("Balance result", zap.String("wallet_ref", wallet.WalletRef), zap.String("network", network.Name), zap.String("amount", result.Amount), @@ -70,7 +70,7 @@ func (d *Driver) Balance(ctx context.Context, deps driver.Deps, network shared.N } func (d *Driver) NativeBalance(ctx context.Context, deps driver.Deps, network shared.Network, wallet *model.ManagedWallet) (*moneyv1.Money, error) { - d.logger.Debug("native balance request", + d.logger.Debug("Native balance request", zap.String("wallet_ref", wallet.WalletRef), zap.String("network", network.Name), ) @@ -78,13 +78,13 @@ func (d *Driver) NativeBalance(ctx context.Context, deps driver.Deps, network sh driverDeps.Logger = d.logger result, err := evm.NativeBalance(ctx, driverDeps, network, wallet, wallet.DepositAddress) if err != nil { - d.logger.Warn("native balance failed", + d.logger.Warn("Native balance failed", zap.String("wallet_ref", wallet.WalletRef), zap.String("network", network.Name), zap.Error(err), ) } else if result != nil { - d.logger.Debug("native balance result", + d.logger.Debug("Native balance result", zap.String("wallet_ref", wallet.WalletRef), zap.String("network", network.Name), zap.String("amount", result.Amount), @@ -121,7 +121,7 @@ func (d *Driver) EstimateFee(ctx context.Context, deps driver.Deps, network shar } func (d *Driver) SubmitTransfer(ctx context.Context, deps driver.Deps, network shared.Network, transfer *model.Transfer, source *model.ManagedWallet, destination string) (string, error) { - d.logger.Debug("submit transfer request", + d.logger.Debug("Submit transfer request", zap.String("transfer_ref", transfer.TransferRef), zap.String("network", network.Name), zap.String("destination", destination), @@ -130,13 +130,13 @@ func (d *Driver) SubmitTransfer(ctx context.Context, deps driver.Deps, network s driverDeps.Logger = d.logger txHash, err := evm.SubmitTransfer(ctx, driverDeps, network, transfer, source, source.DepositAddress, destination) if err != nil { - d.logger.Warn("submit transfer failed", + d.logger.Warn("Submit transfer failed", zap.String("transfer_ref", transfer.TransferRef), zap.String("network", network.Name), zap.Error(err), ) } else { - d.logger.Debug("submit transfer result", + d.logger.Debug("Submit transfer result", zap.String("transfer_ref", transfer.TransferRef), zap.String("network", network.Name), zap.String("tx_hash", txHash), @@ -146,7 +146,7 @@ func (d *Driver) SubmitTransfer(ctx context.Context, deps driver.Deps, network s } func (d *Driver) AwaitConfirmation(ctx context.Context, deps driver.Deps, network shared.Network, txHash string) (*types.Receipt, error) { - d.logger.Debug("await confirmation", + d.logger.Debug("Await confirmation", zap.String("tx_hash", txHash), zap.String("network", network.Name), ) @@ -154,13 +154,13 @@ func (d *Driver) AwaitConfirmation(ctx context.Context, deps driver.Deps, networ driverDeps.Logger = d.logger receipt, err := evm.AwaitConfirmation(ctx, driverDeps, network, txHash) if err != nil { - d.logger.Warn("await confirmation failed", + d.logger.Warn("Await confirmation failed", zap.String("tx_hash", txHash), zap.String("network", network.Name), zap.Error(err), ) } else if receipt != nil { - d.logger.Debug("await confirmation result", + d.logger.Debug("Await confirmation result", zap.String("tx_hash", txHash), zap.String("network", network.Name), zap.Uint64("block_number", receipt.BlockNumber.Uint64()), diff --git a/api/gateway/chain/internal/service/gateway/driver/ethereum/driver.go b/api/gateway/chain/internal/service/gateway/driver/ethereum/driver.go index bf21e19..0f1ed98 100644 --- a/api/gateway/chain/internal/service/gateway/driver/ethereum/driver.go +++ b/api/gateway/chain/internal/service/gateway/driver/ethereum/driver.go @@ -27,25 +27,25 @@ func (d *Driver) Name() string { } func (d *Driver) FormatAddress(address string) (string, error) { - d.logger.Debug("format address", zap.String("address", address)) + d.logger.Debug("Format address", zap.String("address", address)) normalized, err := evm.NormalizeAddress(address) if err != nil { - d.logger.Warn("format address failed", zap.String("address", address), zap.Error(err)) + d.logger.Warn("Format address failed", zap.String("address", address), zap.Error(err)) } return normalized, err } func (d *Driver) NormalizeAddress(address string) (string, error) { - d.logger.Debug("normalize address", zap.String("address", address)) + d.logger.Debug("Normalize address", zap.String("address", address)) normalized, err := evm.NormalizeAddress(address) if err != nil { - d.logger.Warn("normalize address failed", zap.String("address", address), zap.Error(err)) + d.logger.Warn("Normalize address failed", zap.String("address", address), zap.Error(err)) } return normalized, err } func (d *Driver) Balance(ctx context.Context, deps driver.Deps, network shared.Network, wallet *model.ManagedWallet) (*moneyv1.Money, error) { - d.logger.Debug("balance request", + d.logger.Debug("Balance request", zap.String("wallet_ref", wallet.WalletRef), zap.String("network", network.Name), ) @@ -53,13 +53,13 @@ func (d *Driver) Balance(ctx context.Context, deps driver.Deps, network shared.N driverDeps.Logger = d.logger result, err := evm.Balance(ctx, driverDeps, network, wallet, wallet.DepositAddress) if err != nil { - d.logger.Warn("balance failed", + d.logger.Warn("Balance failed", zap.String("wallet_ref", wallet.WalletRef), zap.String("network", network.Name), zap.Error(err), ) } else if result != nil { - d.logger.Debug("balance result", + d.logger.Debug("Balance result", zap.String("wallet_ref", wallet.WalletRef), zap.String("network", network.Name), zap.String("amount", result.Amount), @@ -70,7 +70,7 @@ func (d *Driver) Balance(ctx context.Context, deps driver.Deps, network shared.N } func (d *Driver) NativeBalance(ctx context.Context, deps driver.Deps, network shared.Network, wallet *model.ManagedWallet) (*moneyv1.Money, error) { - d.logger.Debug("native balance request", + d.logger.Debug("Native balance request", zap.String("wallet_ref", wallet.WalletRef), zap.String("network", network.Name), ) @@ -78,13 +78,13 @@ func (d *Driver) NativeBalance(ctx context.Context, deps driver.Deps, network sh driverDeps.Logger = d.logger result, err := evm.NativeBalance(ctx, driverDeps, network, wallet, wallet.DepositAddress) if err != nil { - d.logger.Warn("native balance failed", + d.logger.Warn("Native balance failed", zap.String("wallet_ref", wallet.WalletRef), zap.String("network", network.Name), zap.Error(err), ) } else if result != nil { - d.logger.Debug("native balance result", + d.logger.Debug("Native balance result", zap.String("wallet_ref", wallet.WalletRef), zap.String("network", network.Name), zap.String("amount", result.Amount), @@ -121,7 +121,7 @@ func (d *Driver) EstimateFee(ctx context.Context, deps driver.Deps, network shar } func (d *Driver) SubmitTransfer(ctx context.Context, deps driver.Deps, network shared.Network, transfer *model.Transfer, source *model.ManagedWallet, destination string) (string, error) { - d.logger.Debug("submit transfer request", + d.logger.Debug("Submit transfer request", zap.String("transfer_ref", transfer.TransferRef), zap.String("network", network.Name), zap.String("destination", destination), @@ -130,13 +130,13 @@ func (d *Driver) SubmitTransfer(ctx context.Context, deps driver.Deps, network s driverDeps.Logger = d.logger txHash, err := evm.SubmitTransfer(ctx, driverDeps, network, transfer, source, source.DepositAddress, destination) if err != nil { - d.logger.Warn("submit transfer failed", + d.logger.Warn("Submit transfer failed", zap.String("transfer_ref", transfer.TransferRef), zap.String("network", network.Name), zap.Error(err), ) } else { - d.logger.Debug("submit transfer result", + d.logger.Debug("Submit transfer result", zap.String("transfer_ref", transfer.TransferRef), zap.String("network", network.Name), zap.String("tx_hash", txHash), @@ -146,7 +146,7 @@ func (d *Driver) SubmitTransfer(ctx context.Context, deps driver.Deps, network s } func (d *Driver) AwaitConfirmation(ctx context.Context, deps driver.Deps, network shared.Network, txHash string) (*types.Receipt, error) { - d.logger.Debug("await confirmation", + d.logger.Debug("Await confirmation", zap.String("tx_hash", txHash), zap.String("network", network.Name), ) @@ -154,13 +154,13 @@ func (d *Driver) AwaitConfirmation(ctx context.Context, deps driver.Deps, networ driverDeps.Logger = d.logger receipt, err := evm.AwaitConfirmation(ctx, driverDeps, network, txHash) if err != nil { - d.logger.Warn("await confirmation failed", + d.logger.Warn("Await confirmation failed", zap.String("tx_hash", txHash), zap.String("network", network.Name), zap.Error(err), ) } else if receipt != nil { - d.logger.Debug("await confirmation result", + d.logger.Debug("Await confirmation result", zap.String("tx_hash", txHash), zap.String("network", network.Name), zap.Uint64("block_number", receipt.BlockNumber.Uint64()), diff --git a/api/gateway/chain/internal/service/gateway/driver/tron/driver.go b/api/gateway/chain/internal/service/gateway/driver/tron/driver.go index be7d759..470e7a8 100644 --- a/api/gateway/chain/internal/service/gateway/driver/tron/driver.go +++ b/api/gateway/chain/internal/service/gateway/driver/tron/driver.go @@ -41,7 +41,7 @@ func (d *Driver) NormalizeAddress(address string) (string, error) { d.logger.Debug("Normalize address", zap.String("address", address)) normalized, err := normalizeAddress(address) if err != nil { - d.logger.Warn("normalize address failed", zap.String("address", address), zap.Error(err)) + d.logger.Warn("Normalize address failed", zap.String("address", address), zap.Error(err)) } return normalized, err } @@ -68,7 +68,7 @@ func (d *Driver) Balance(ctx context.Context, deps driver.Deps, network shared.N zap.String("network", network.Name), ) } else if result != nil { - d.logger.Debug("balance result", + d.logger.Debug("Balance result", zap.String("wallet_ref", wallet.WalletRef), zap.String("network", network.Name), zap.String("amount", result.Amount), @@ -100,7 +100,7 @@ func (d *Driver) NativeBalance(ctx context.Context, deps driver.Deps, network sh zap.String("network", network.Name), ) } else if result != nil { - d.logger.Debug("native balance result", + d.logger.Debug("Native balance result", zap.String("wallet_ref", wallet.WalletRef), zap.String("network", network.Name), zap.String("amount", result.Amount), @@ -196,7 +196,7 @@ func (d *Driver) SubmitTransfer(ctx context.Context, deps driver.Deps, network s driverDeps.Logger = d.logger txHash, err := evm.SubmitTransfer(ctx, driverDeps, network, transfer, source, rpcFrom, rpcTo) if err != nil { - d.logger.Warn("submit transfer failed", zap.Error(err), + d.logger.Warn("Submit transfer failed", zap.Error(err), zap.String("transfer_ref", transfer.TransferRef), zap.String("network", network.Name), ) diff --git a/api/gateway/chain/internal/service/gateway/drivers/registry.go b/api/gateway/chain/internal/service/gateway/drivers/registry.go index 5b338b9..858ad84 100644 --- a/api/gateway/chain/internal/service/gateway/drivers/registry.go +++ b/api/gateway/chain/internal/service/gateway/drivers/registry.go @@ -32,7 +32,7 @@ func NewRegistry(logger mlogger.Logger, networks []shared.Network) (*Registry, e } chainDriver, err := resolveDriver(logger, name) if err != nil { - logger.Error("unsupported chain driver", zap.String("network", name), zap.Error(err)) + logger.Error("Unsupported chain driver", zap.String("network", name), zap.Error(err)) return nil, err } result.byNetwork[name] = chainDriver @@ -40,7 +40,7 @@ func NewRegistry(logger mlogger.Logger, networks []shared.Network) (*Registry, e if len(result.byNetwork) == 0 { return nil, merrors.InvalidArgument("driver registry: no supported networks configured") } - logger.Info("chain drivers configured", zap.Int("count", len(result.byNetwork))) + logger.Info("Chain drivers configured", zap.Int("count", len(result.byNetwork))) return result, nil } diff --git a/api/gateway/chain/internal/service/gateway/executor.go b/api/gateway/chain/internal/service/gateway/executor.go index 8100659..ab23194 100644 --- a/api/gateway/chain/internal/service/gateway/executor.go +++ b/api/gateway/chain/internal/service/gateway/executor.go @@ -47,32 +47,32 @@ type onChainExecutor struct { func (o *onChainExecutor) SubmitTransfer(ctx context.Context, transfer *model.Transfer, source *model.ManagedWallet, destinationAddress string, network shared.Network) (string, error) { if o.keyManager == nil { - o.logger.Warn("key manager not configured") + o.logger.Warn("Key manager not configured") return "", executorInternal("key manager is not configured", nil) } rpcURL := strings.TrimSpace(network.RPCURL) if rpcURL == "" { - o.logger.Warn("network rpc url missing", zap.String("network", network.Name)) + o.logger.Warn("Network rpc url missing", zap.String("network", network.Name)) return "", executorInvalid("network rpc url is not configured") } if source == nil || transfer == nil { - o.logger.Warn("transfer context missing") + o.logger.Warn("Transfer context missing") return "", executorInvalid("transfer context missing") } if strings.TrimSpace(source.KeyReference) == "" { - o.logger.Warn("source wallet missing key reference", zap.String("wallet_ref", source.WalletRef)) + o.logger.Warn("Source wallet missing key reference", zap.String("wallet_ref", source.WalletRef)) return "", executorInvalid("source wallet missing key reference") } if strings.TrimSpace(source.DepositAddress) == "" { - o.logger.Warn("source wallet missing deposit address", zap.String("wallet_ref", source.WalletRef)) + o.logger.Warn("Source wallet missing deposit address", zap.String("wallet_ref", source.WalletRef)) return "", executorInvalid("source wallet missing deposit address") } if !common.IsHexAddress(destinationAddress) { - o.logger.Warn("invalid destination address", zap.String("transfer_ref", transfer.TransferRef), zap.String("address", destinationAddress)) + o.logger.Warn("Invalid destination address", zap.String("transfer_ref", transfer.TransferRef), zap.String("address", destinationAddress)) return "", executorInvalid("invalid destination address " + destinationAddress) } - o.logger.Info("submitting transfer", + o.logger.Info("Submitting transfer", zap.String("transfer_ref", transfer.TransferRef), zap.String("source_wallet_ref", source.WalletRef), zap.String("network", network.Name), @@ -162,7 +162,7 @@ func (o *onChainExecutor) SubmitTransfer(ctx context.Context, transfer *model.Tr input, err := erc20ABI.Pack("transfer", destination, amountInt) if err != nil { - o.logger.Warn("failed to encode transfer call", + o.logger.Warn("Failed to encode transfer call", zap.String("transfer_ref", transfer.TransferRef), zap.Error(err), ) diff --git a/api/gateway/chain/internal/service/gateway/rpcclient/clients.go b/api/gateway/chain/internal/service/gateway/rpcclient/clients.go index 06bc659..009c8af 100644 --- a/api/gateway/chain/internal/service/gateway/rpcclient/clients.go +++ b/api/gateway/chain/internal/service/gateway/rpcclient/clients.go @@ -49,14 +49,14 @@ func Prepare(ctx context.Context, logger mlogger.Logger, networks []shared.Netwo if rpcURL == "" { result.Close() err := merrors.InvalidArgument(fmt.Sprintf("rpc url not configured for network %s", name)) - clientLogger.Warn("rpc url missing", zap.String("network", name)) + clientLogger.Warn("Rpc url missing", zap.String("network", name)) return nil, err } fields := []zap.Field{ zap.String("network", name), } - clientLogger.Info("initialising rpc client", fields...) + clientLogger.Info("Initialising rpc client", fields...) dialCtx, cancel := context.WithTimeout(ctx, 15*time.Second) httpClient := &http.Client{ diff --git a/api/gateway/chain/internal/service/gateway/transfer_execution.go b/api/gateway/chain/internal/service/gateway/transfer_execution.go index 7ffd410..6c694f0 100644 --- a/api/gateway/chain/internal/service/gateway/transfer_execution.go +++ b/api/gateway/chain/internal/service/gateway/transfer_execution.go @@ -41,7 +41,7 @@ func (s *Service) executeTransfer(ctx context.Context, transferRef, sourceWallet } if _, err := s.storage.Transfers().UpdateStatus(ctx, transferRef, model.TransferStatusSigning, "", ""); err != nil { - s.logger.Warn("failed to update transfer status to signing", zap.String("transfer_ref", transferRef), zap.Error(err)) + s.logger.Warn("Failed to update transfer status to signing", zap.String("transfer_ref", transferRef), zap.Error(err)) } driverDeps := s.driverDeps() @@ -81,7 +81,7 @@ func (s *Service) executeTransfer(ctx context.Context, transferRef, sourceWallet } if _, err := s.storage.Transfers().UpdateStatus(ctx, transferRef, model.TransferStatusSubmitted, "", txHash); err != nil { - s.logger.Warn("failed to update transfer status to submitted", zap.String("transfer_ref", transferRef), zap.Error(err)) + s.logger.Warn("Failed to update transfer status to submitted", zap.String("transfer_ref", transferRef), zap.Error(err)) } receiptCtx, cancel := context.WithTimeout(ctx, 10*time.Minute) @@ -89,20 +89,20 @@ func (s *Service) executeTransfer(ctx context.Context, transferRef, sourceWallet receipt, err := chainDriver.AwaitConfirmation(receiptCtx, driverDeps, network, txHash) if err != nil { if !errors.Is(err, context.DeadlineExceeded) && !errors.Is(err, context.Canceled) { - s.logger.Warn("failed to await transfer confirmation", zap.String("transfer_ref", transferRef), zap.Error(err)) + s.logger.Warn("Failed to await transfer confirmation", zap.String("transfer_ref", transferRef), zap.Error(err)) } return err } if receipt != nil && receipt.Status == types.ReceiptStatusSuccessful { if _, err := s.storage.Transfers().UpdateStatus(ctx, transferRef, model.TransferStatusConfirmed, "", txHash); err != nil { - s.logger.Warn("failed to update transfer status to confirmed", zap.String("transfer_ref", transferRef), zap.Error(err)) + s.logger.Warn("Failed to update transfer status to confirmed", zap.String("transfer_ref", transferRef), zap.Error(err)) } return nil } if _, err := s.storage.Transfers().UpdateStatus(ctx, transferRef, model.TransferStatusFailed, "transaction reverted", txHash); err != nil { - s.logger.Warn("failed to update transfer status to failed", zap.String("transfer_ref", transferRef), zap.Error(err)) + s.logger.Warn("Failed to update transfer status to failed", zap.String("transfer_ref", transferRef), zap.Error(err)) } return nil } diff --git a/api/gateway/chain/storage/mongo/repository.go b/api/gateway/chain/storage/mongo/repository.go index 659973d..65927ef 100644 --- a/api/gateway/chain/storage/mongo/repository.go +++ b/api/gateway/chain/storage/mongo/repository.go @@ -44,23 +44,23 @@ func New(logger mlogger.Logger, conn *db.MongoConnection) (*Store, error) { defer cancel() if err := result.Ping(ctx); err != nil { - result.logger.Error("mongo ping failed during repository initialisation", zap.Error(err)) + result.logger.Error("Mongo ping failed during repository initialisation", zap.Error(err)) return nil, err } walletsStore, err := store.NewWallets(result.logger, result.db) if err != nil { - result.logger.Error("failed to initialise wallets store", zap.Error(err)) + result.logger.Error("Failed to initialise wallets store", zap.Error(err)) return nil, err } transfersStore, err := store.NewTransfers(result.logger, result.db) if err != nil { - result.logger.Error("failed to initialise transfers store", zap.Error(err)) + result.logger.Error("Failed to initialise transfers store", zap.Error(err)) return nil, err } depositsStore, err := store.NewDeposits(result.logger, result.db) if err != nil { - result.logger.Error("failed to initialise deposits store", zap.Error(err)) + result.logger.Error("Failed to initialise deposits store", zap.Error(err)) return nil, err } diff --git a/api/gateway/chain/storage/mongo/store/deposits.go b/api/gateway/chain/storage/mongo/store/deposits.go index fe4951d..60d8b4d 100644 --- a/api/gateway/chain/storage/mongo/store/deposits.go +++ b/api/gateway/chain/storage/mongo/store/deposits.go @@ -48,13 +48,13 @@ func NewDeposits(logger mlogger.Logger, db *mongo.Database) (*Deposits, error) { } for _, def := range indexes { if err := repo.CreateIndex(def); err != nil { - logger.Error("failed to ensure deposit index", zap.Error(err), zap.String("collection", repo.Collection())) + logger.Error("Failed to ensure deposit index", zap.Error(err), zap.String("collection", repo.Collection())) return nil, err } } childLogger := logger.Named("deposits") - childLogger.Debug("deposits store initialised") + childLogger.Debug("Deposits store initialised") return &Deposits{logger: childLogger, repo: repo}, nil } diff --git a/api/gateway/chain/storage/mongo/store/transfers.go b/api/gateway/chain/storage/mongo/store/transfers.go index 5c685d2..ead1eb5 100644 --- a/api/gateway/chain/storage/mongo/store/transfers.go +++ b/api/gateway/chain/storage/mongo/store/transfers.go @@ -53,13 +53,13 @@ func NewTransfers(logger mlogger.Logger, db *mongo.Database) (*Transfers, error) } for _, def := range indexes { if err := repo.CreateIndex(def); err != nil { - logger.Error("failed to ensure transfer index", zap.Error(err), zap.String("collection", repo.Collection())) + logger.Error("Failed to ensure transfer index", zap.Error(err), zap.String("collection", repo.Collection())) return nil, err } } childLogger := logger.Named("transfers") - childLogger.Debug("transfers store initialised") + childLogger.Debug("Transfers store initialised") return &Transfers{ logger: childLogger, @@ -89,12 +89,12 @@ func (t *Transfers) Create(ctx context.Context, transfer *model.Transfer) (*mode } if err := t.repo.Insert(ctx, transfer, repository.Filter("idempotencyKey", transfer.IdempotencyKey)); err != nil { if errors.Is(err, merrors.ErrDataConflict) { - t.logger.Debug("transfer already exists", zap.String("transfer_ref", transfer.TransferRef), zap.String("idempotency_key", transfer.IdempotencyKey)) + t.logger.Debug("Transfer already exists", zap.String("transfer_ref", transfer.TransferRef), zap.String("idempotency_key", transfer.IdempotencyKey)) return transfer, nil } return nil, err } - t.logger.Debug("transfer created", zap.String("transfer_ref", transfer.TransferRef)) + t.logger.Debug("Transfer created", zap.String("transfer_ref", transfer.TransferRef)) return transfer, nil } @@ -126,7 +126,7 @@ func (t *Transfers) List(ctx context.Context, filter model.TransferFilter) (*mod if oid, err := primitive.ObjectIDFromHex(cursor); err == nil { query = query.Comparison(repository.IDField(), builder.Gt, oid) } else { - t.logger.Warn("ignoring invalid transfer cursor", zap.String("cursor", cursor), zap.Error(err)) + t.logger.Warn("Ignoring invalid transfer cursor", zap.String("cursor", cursor), zap.Error(err)) } } diff --git a/api/gateway/chain/storage/mongo/store/wallets.go b/api/gateway/chain/storage/mongo/store/wallets.go index 71ad765..d3242c8 100644 --- a/api/gateway/chain/storage/mongo/store/wallets.go +++ b/api/gateway/chain/storage/mongo/store/wallets.go @@ -56,7 +56,7 @@ func NewWallets(logger mlogger.Logger, db *mongo.Database) (*Wallets, error) { } for _, def := range walletIndexes { if err := walletRepo.CreateIndex(def); err != nil { - logger.Error("failed to ensure wallet index", zap.String("collection", walletRepo.Collection()), zap.Error(err)) + logger.Error("Failed to ensure wallet index", zap.String("collection", walletRepo.Collection()), zap.Error(err)) return nil, err } } @@ -70,13 +70,13 @@ func NewWallets(logger mlogger.Logger, db *mongo.Database) (*Wallets, error) { } for _, def := range balanceIndexes { if err := balanceRepo.CreateIndex(def); err != nil { - logger.Error("failed to ensure wallet balance index", zap.String("collection", balanceRepo.Collection()), zap.Error(err)) + logger.Error("Failed to ensure wallet balance index", zap.String("collection", balanceRepo.Collection()), zap.Error(err)) return nil, err } } childLogger := logger.Named("wallets") - childLogger.Debug("wallet stores initialised") + childLogger.Debug("Wallet stores initialised") return &Wallets{ logger: childLogger, @@ -117,13 +117,13 @@ func (w *Wallets) Create(ctx context.Context, wallet *model.ManagedWallet) (*mod } if err := w.walletRepo.Insert(ctx, wallet, repository.Filter("idempotencyKey", wallet.IdempotencyKey)); err != nil { if errors.Is(err, merrors.ErrDataConflict) { - w.logger.Debug("wallet already exists", fields...) + w.logger.Debug("Wallet already exists", fields...) return wallet, nil } - w.logger.Warn("wallet create failed", append(fields, zap.Error(err))...) + w.logger.Warn("Wallet create failed", append(fields, zap.Error(err))...) return nil, err } - w.logger.Debug("wallet created", fields...) + w.logger.Debug("Wallet created", fields...) return wallet, nil } @@ -136,11 +136,11 @@ func (w *Wallets) Get(ctx context.Context, walletID string) (*model.ManagedWalle zap.String("wallet_id", walletID), } wallet := &model.ManagedWallet{} - if err := w.balanceRepo.FindOneByFilter(ctx, repository.Filter("walletRef", walletID), wallet); err != nil { + if err := w.walletRepo.FindOneByFilter(ctx, repository.Filter("walletRef", walletID), wallet); err != nil { if errors.Is(err, merrors.ErrNoData) { - w.logger.Debug("wallet not found", fields...) + w.logger.Debug("Wallet not found", fields...) } else { - w.logger.Warn("wallet lookup failed", append(fields, zap.Error(err))...) + w.logger.Warn("Wallet lookup failed", append(fields, zap.Error(err))...) } return nil, err } @@ -175,7 +175,7 @@ func (w *Wallets) List(ctx context.Context, filter model.ManagedWalletFilter) (* query = query.Comparison(repository.IDField(), builder.Gt, oid) fields = append(fields, zap.String("cursor", cursor)) } else { - w.logger.Warn("ignoring invalid wallet cursor", zap.String("cursor", cursor), zap.Error(err)) + w.logger.Warn("Ignoring invalid wallet cursor", zap.String("cursor", cursor), zap.Error(err)) } } @@ -196,7 +196,7 @@ func (w *Wallets) List(ctx context.Context, filter model.ManagedWalletFilter) (* listErr := w.walletRepo.FindManyByFilter(ctx, query, decoder) if listErr != nil && !errors.Is(listErr, merrors.ErrNoData) { - w.logger.Warn("wallet list failed", append(fields, zap.Error(listErr))...) + w.logger.Warn("Wallet list failed", append(fields, zap.Error(listErr))...) return nil, listErr } @@ -217,9 +217,9 @@ func (w *Wallets) List(ctx context.Context, filter model.ManagedWalletFilter) (* zap.String("next_cursor", result.NextCursor), ) if errors.Is(listErr, merrors.ErrNoData) { - w.logger.Debug("wallet list empty", fields...) + w.logger.Debug("Wallet list empty", fields...) } else { - w.logger.Debug("wallet list fetched", fields...) + w.logger.Debug("Wallet list fetched", fields...) } return result, nil } @@ -246,20 +246,20 @@ func (w *Wallets) SaveBalance(ctx context.Context, balance *model.WalletBalance) existing.PendingOutbound = balance.PendingOutbound existing.CalculatedAt = balance.CalculatedAt if err := w.balanceRepo.Update(ctx, existing); err != nil { - w.logger.Warn("wallet balance update failed", append(fields, zap.Error(err))...) + w.logger.Warn("Wallet balance update failed", append(fields, zap.Error(err))...) return err } - w.logger.Debug("wallet balance updated", fields...) + w.logger.Debug("Wallet balance updated", fields...) return nil case errors.Is(err, merrors.ErrNoData): if err := w.balanceRepo.Insert(ctx, balance, repository.Filter("walletRef", balance.WalletRef)); err != nil { - w.logger.Warn("wallet balance create failed", append(fields, zap.Error(err))...) + w.logger.Warn("Wallet balance create failed", append(fields, zap.Error(err))...) return err } - w.logger.Debug("wallet balance created", fields...) + w.logger.Debug("Wallet balance created", fields...) return nil default: - w.logger.Warn("wallet balance lookup failed", append(fields, zap.Error(err))...) + w.logger.Warn("Wallet balance lookup failed", append(fields, zap.Error(err))...) return err } } @@ -273,13 +273,13 @@ func (w *Wallets) GetBalance(ctx context.Context, walletID string) (*model.Walle balance := &model.WalletBalance{} if err := w.balanceRepo.FindOneByFilter(ctx, repository.Filter("walletRef", walletID), balance); err != nil { if errors.Is(err, merrors.ErrNoData) { - w.logger.Debug("wallet balance not found", fields...) + w.logger.Debug("Wallet balance not found", fields...) } else { - w.logger.Warn("wallet balance lookup failed", append(fields, zap.Error(err))...) + w.logger.Warn("Wallet balance lookup failed", append(fields, zap.Error(err))...) } return nil, err } - w.logger.Debug("wallet balance fetched", fields...) + w.logger.Debug("Wallet balance fetched", fields...) return balance, nil } diff --git a/api/gateway/mntx/internal/service/gateway/metrics.go b/api/gateway/mntx/internal/service/gateway/metrics.go index 9b14c4d..d34e004 100644 --- a/api/gateway/mntx/internal/service/gateway/metrics.go +++ b/api/gateway/mntx/internal/service/gateway/metrics.go @@ -164,11 +164,3 @@ func statusLabel(err error) string { return "error" } } - -func normalizeCallbackStatus(status string) string { - status = strings.TrimSpace(status) - if status == "" { - return "unknown" - } - return strings.ToLower(status) -}