Merge pull request #305 from onflow/gregor/small-improvements-1

General improvements tech-debt
onflow · Jun 14, 2024 · e412885 · e412885
2 parents 1a81274 + 15b73f5
commit e412885
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/api/api.go b/api/api.go
@@ -288,8 +288,7 @@ func (b *BlockChainAPI) GetTransactionByBlockNumberAndIndex(
 		return handleError[*Transaction](b.logger, err)
 	}
 
-	highestIndex := len(block.TransactionHashes) - 1
-	if index > hexutil.Uint(highestIndex) {
+	if int(index) >= len(block.TransactionHashes) {
 		return nil, nil
 	}
 

diff --git a/services/requester/kms_key_rotation_signer.go b/services/requester/kms_key_rotation_signer.go
@@ -42,6 +42,8 @@ func NewKMSKeyRotationSigner(
 	keys []cloudkms.Key,
 	logger zerolog.Logger,
 ) (*KMSKeyRotationSigner, error) {
+	logger = logger.With().Str("component", "cloud_kms_signer").Logger()
+
 	if len(keys) == 0 {
 		return nil, fmt.Errorf(
 			"could not create KMS key rotation signer, no KMS keys provided",
@@ -63,11 +65,11 @@ func NewKMSKeyRotationSigner(
 				err,
 			)
 		}
+		logger.Info().Str("public-key", kmsSigner.PublicKey().String()).Msg("KMS signer added")
+
 		kmsSigners[i] = kmsSigner
 	}
 
-	logger = logger.With().Str("component", "cloud_kms_signer").Logger()
-
 	return &KMSKeyRotationSigner{
 		kmsSigners: kmsSigners,
 		signersLen: len(kmsSigners),

diff --git a/services/requester/requester.go b/services/requester/requester.go
@@ -165,7 +165,7 @@ func (e *EVM) SendRawTransaction(ctx context.Context, data []byte) (common.Hash,
 	script := e.replaceAddresses(runTxScript)
 	flowID, err := e.signAndSend(ctx, script, hexEncodedTx)
 	if err != nil {
-		e.logger.Error().Err(err).Str("data", string(data)).Msg("failed to send transaction")
+		e.logger.Error().Err(err).Str("data", string(hexEncodedTx)).Msg("failed to send transaction")
 		return common.Hash{}, err
 	}