laconic as account prefix

.golangci.yml

@@ -8,6 +8,7 @@ linters:
     - bodyclose
 #    - depguard # 20231120 disable until https://github.com/golangci/golangci-lint/issues/3906 is released
     - dogsled
+    - dupl
     - errcheck
     - goconst
     - gocritic

Makefile

@@ -337,7 +337,7 @@ test-import:
 	go test -run TestImporterTestSuite -timeout=20m -v --vet=off github.com/cerc-io/laconicd/tests/importer
 
 test-rpc:
-	./scripts/integration-test-all.sh -t "rpc" -q 1 -z 1 -s 10 -m "rpc" -r "true"
+	./scripts/integration-test-all.sh -t "rpc" -q 1 -z 1 -s 2 -m "rpc" -r "true"
 
 run-integration-tests:
 	@nix-shell ./tests/integration_tests/shell.nix --run ./scripts/run-integration-tests.sh
@@ -389,7 +389,7 @@ format-fix:
 ###############################################################################
 
 # ------
-# NOTE: Link to the tendermintdev/sdk-proto-gen docker images:
+# NOTE: Link to the tendermintdev/sdk-proto-gen docker images: 
 #       https://hub.docker.com/r/tendermintdev/sdk-proto-gen/tags
 #
 protoVer=v0.7

cmd/config/config.go

@@ -8,7 +8,7 @@ import (
 
 const (
 	// Bech32Prefix defines the Bech32 prefix used for EthAccounts
-	Bech32Prefix = "ethm"
+	Bech32Prefix = "laconic"
 
 	// Bech32PrefixAccAddr defines the Bech32 prefix of an account's address
 	Bech32PrefixAccAddr = Bech32Prefix

init.sh

@@ -100,17 +100,6 @@ if [ "$1" == "clean" ] || [ ! -d "$HOME/.laconicd/data/blockstore.db" ]; then
       $HOME/.laconicd/config/config.toml
   fi
 
-  # Enable telemetry (prometheus metrics: http://localhost:1317/metrics?format=prometheus)
-  if [[ "$OSTYPE" == "darwin"* ]]; then
-    sed -i '' 's/enabled = false/enabled = true/g' $HOME/.laconicd/config/app.toml
-    sed -i '' 's/prometheus-retention-time = 0/prometheus-retention-time = 60/g' $HOME/.laconicd/config/app.toml
-    sed -i '' 's/prometheus = false/prometheus = true/g' $HOME/.laconicd/config/config.toml
-  else
-    sed -i 's/enabled = false/enabled = true/g' $HOME/.laconicd/config/app.toml
-    sed -i 's/prometheus-retention-time = 0/prometheus-retention-time = 60/g' $HOME/.laconicd/config/app.toml
-    sed -i 's/prometheus = false/prometheus = true/g' $HOME/.laconicd/config/config.toml
-  fi
-
   # Allocate genesis accounts (cosmos formatted addresses)
   laconicd add-genesis-account $KEY 100000000000000000000000000aphoton --keyring-backend $KEYRING
 

rpc/websockets.go

@@ -94,10 +94,11 @@ func (s *websocketsServer) Start() {
 
 	go func() {
 		var err error
+		/* #nosec G114 -- http functions have no support for timeouts */
 		if s.certFile == "" || s.keyFile == "" {
-			err = http.ListenAndServe(s.wsAddr, ws) /* #nosec G114 -- http functions have no support for timeouts */
+			err = http.ListenAndServe(s.wsAddr, ws)
 		} else {
-			err = http.ListenAndServeTLS(s.wsAddr, s.certFile, s.keyFile, ws) // #nosec G114
+			err = http.ListenAndServeTLS(s.wsAddr, s.certFile, s.keyFile, ws)
 		}
 
 		if err != nil {

scripts/create-and-fund-account.sh

@@ -1,48 +1,48 @@
-#!/bin/bash
-
-##
-## This script generates a new account keypair, transfers funds to it, and creates
-## a bond with those funds.  The amount of can be optionally specified, else a
-## default value estimated to be sufficient for about 5000 records.
-##
-## The `laconic` CLI and a valid config file for it are required.  The default location
-## for the config file is `~/.laconic/config.yml`, but this can be controlled with
-## the environment variable LACONIC_CONFIG.  A `userKey` for a source account with
-## sufficient funds available must be present in this file for the funds transfer
-## to succeed.
-##
-## Example:
-##
-## $ scripts/create-and-fund-account.sh 1000000000
-## {
-##   "name": "68334d7175fd4f86befa4902657e5270",
-##   "type": "local",
-##   "address": "ethm15r5x94km0swq55aszwd7hnr9wksq7wmr38xes7",
-##   "pubkey": "AuKqlSldJJXj4gYMFt2HeX9DJ3aUosYA7n6zBz9Tg7/i",
-##   "mnemonic": "umbrella bean special unaware accident giant distance mix ghost feel possible cost road grant endless man maple derive rebuild learn mask water attract resist",
-##   "bond": "3d3a73f09115d289d330781455e6eac217305dc4a20e19bde808011fe3775a93",
-##   "balance": 1000000000,
-##   "privkey": "480880fde7aff1461da584b436cb3a84692413c84623fda78e127bb4e704ce76"
-## }
-##
-
-AVG_RECORD_PHOTON=1000000
-NUM_RECORDS=5000
-BOND_OVERHEAD=200000
-KEYNAME=`uuidgen | tr -d '-'`
-KEYRING_DIR=`mktemp -d`
-KEYRING=test
-LACONIC_CONFIG=${LACONIC_CONFIG:-$HOME/.laconic/config.yml}
-BOND_AMOUNT=${1:-$((AVG_RECORD_PHOTON * NUM_RECORDS))}
-
-ACCOUNT_JSON=$(laconicd keys add $KEYNAME --keyring-backend $KEYRING --algo eth_secp256k1 --keyring-dir $KEYRING_DIR --output json)
-PRIVATE_KEY=$(yes | laconicd keys export $KEYNAME --keyring-backend $KEYRING --keyring-dir $KEYRING_DIR --unarmored-hex --unsafe)
-PUB_KEY=$(echo $ACCOUNT_JSON | jq -r ".pubkey | fromjson | .key")
-
-laconicd keys delete $KEYNAME --keyring-backend $KEYRING --keyring-dir $KEYRING_DIR -y 2> /dev/null
-rm -rf $KEYRING_DIR
-
-laconic -c $LACONIC_CONFIG cns tokens send --address $(echo $ACCOUNT_JSON | jq -r '.address') --type aphoton --quantity $((BOND_AMOUNT + BOND_OVERHEAD)) > /dev/null
-BOND_ID=$(laconic -c $LACONIC_CONFIG cns bond create --user-key $PRIVATE_KEY --type aphoton --quantity $BOND_AMOUNT | jq -r '.bondId')
-
-echo $ACCOUNT_JSON | jq ".bond = \"$BOND_ID\"" | jq ".balance = $BOND_AMOUNT" | jq ".privkey = \"$PRIVATE_KEY\"" | jq ".pubkey = \"$PUB_KEY\""
+#!/bin/bash
+
+##
+## This script generates a new account keypair, transfers funds to it, and creates
+## a bond with those funds.  The amount of can be optionally specified, else a
+## default value estimated to be sufficient for about 5000 records.
+##
+## The `laconic` CLI and a valid config file for it are required.  The default location
+## for the config file is `~/.laconic/config.yml`, but this can be controlled with
+## the environment variable LACONIC_CONFIG.  A `userKey` for a source account with
+## sufficient funds available must be present in this file for the funds transfer
+## to succeed.
+##
+## Example:
+##
+## ❯ scripts/create-and-fund-account.sh 1000000000
+## {
+##   "name": "68334d7175fd4f86befa4902657e5270",
+##   "type": "local",
+##   "address": "ethm15r5x94km0swq55aszwd7hnr9wksq7wmr38xes7",
+##   "pubkey": "AuKqlSldJJXj4gYMFt2HeX9DJ3aUosYA7n6zBz9Tg7/i",
+##   "mnemonic": "umbrella bean special unaware accident giant distance mix ghost feel possible cost road grant endless man maple derive rebuild learn mask water attract resist",
+##   "bond": "3d3a73f09115d289d330781455e6eac217305dc4a20e19bde808011fe3775a93",
+##   "balance": 1000000000,
+##   "privkey": "480880fde7aff1461da584b436cb3a84692413c84623fda78e127bb4e704ce76"
+## }
+##
+
+AVG_RECORD_PHOTON=1000000
+NUM_RECORDS=5000
+BOND_OVERHEAD=200000
+KEYNAME=`uuidgen | tr -d '-'`
+KEYRING_DIR=`mktemp -d`
+KEYRING=test
+LACONIC_CONFIG=${LACONIC_CONFIG:-$HOME/.laconic/config.yml}
+BOND_AMOUNT=${1:-$((AVG_RECORD_PHOTON * NUM_RECORDS))}
+
+ACCOUNT_JSON=$(laconicd keys add $KEYNAME --keyring-backend $KEYRING --algo eth_secp256k1 --keyring-dir $KEYRING_DIR --output json)
+PRIVATE_KEY=$(yes | laconicd keys export $KEYNAME --keyring-backend $KEYRING --keyring-dir $KEYRING_DIR --unarmored-hex --unsafe)
+PUB_KEY=$(echo $ACCOUNT_JSON | jq -r ".pubkey | fromjson | .key")
+
+laconicd keys delete $KEYNAME --keyring-backend $KEYRING --keyring-dir $KEYRING_DIR -y 2> /dev/null
+rm -rf $KEYRING_DIR
+
+laconic -c $LACONIC_CONFIG cns tokens send --address $(echo $ACCOUNT_JSON | jq -r '.address') --type aphoton --quantity $((BOND_AMOUNT + BOND_OVERHEAD)) > /dev/null
+BOND_ID=$(laconic -c $LACONIC_CONFIG cns bond create --user-key $PRIVATE_KEY --type aphoton --quantity $BOND_AMOUNT | jq -r '.bondId')
+
+echo $ACCOUNT_JSON | jq ".bond = \"$BOND_ID\"" | jq ".balance = $BOND_AMOUNT" | jq ".privkey = \"$PRIVATE_KEY\"" | jq ".pubkey = \"$PUB_KEY\""

utils/context.go

@@ -1,20 +0,0 @@
-package utils
-
-import (
-	storetypes "github.com/cosmos/cosmos-sdk/store/types"
-	sdk "github.com/cosmos/cosmos-sdk/types"
-)
-
-func CtxWithCustomKVGasConfig(ctx *sdk.Context) *sdk.Context {
-	updatedCtx := ctx.WithKVGasConfig(storetypes.GasConfig{
-		HasCost:          0,
-		DeleteCost:       0,
-		ReadCostFlat:     0,
-		ReadCostPerByte:  0,
-		WriteCostFlat:    0,
-		WriteCostPerByte: 0,
-		IterNextCostFlat: 0,
-	})
-
-	return &updatedCtx
-}

x/auction/keeper/keeper.go

@@ -15,7 +15,6 @@ import (
 	auth "github.com/cosmos/cosmos-sdk/x/auth/keeper"
 	bank "github.com/cosmos/cosmos-sdk/x/bank/keeper"
 	params "github.com/cosmos/cosmos-sdk/x/params/types"
-	"github.com/tendermint/tendermint/libs/log"
 
 	wnsUtils "github.com/cerc-io/laconicd/utils"
 )
@@ -79,11 +78,6 @@ func NewKeeper(accountKeeper auth.AccountKeeper,
 	}
 }
 
-// Logger returns a module-specific logger.
-func (k Keeper) Logger(ctx sdk.Context) log.Logger {
-	return ctx.Logger().With("module", types.ModuleName)
-}
-
 func (k *Keeper) SetUsageKeepers(usageKeepers []types.AuctionUsageKeeper) {
 	k.usageKeepers = usageKeepers
 }

x/auction/keeper/msg_server.go

@@ -2,11 +2,9 @@ package keeper
 
 import (
 	"context"
-	"fmt"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
-	"github.com/cerc-io/laconicd/utils"
 	"github.com/cerc-io/laconicd/x/auction/types"
 )
 
@@ -22,7 +20,6 @@ var _ types.MsgServer = msgServer{}
 
 func (s msgServer) CreateAuction(c context.Context, msg *types.MsgCreateAuction) (*types.MsgCreateAuctionResponse, error) {
 	ctx := sdk.UnwrapSDKContext(c)
-	ctx = *utils.CtxWithCustomKVGasConfig(&ctx)
 
 	signerAddress, err := sdk.AccAddressFromBech32(msg.Signer)
 	if err != nil {
@@ -49,15 +46,13 @@ func (s msgServer) CreateAuction(c context.Context, msg *types.MsgCreateAuction)
 		),
 	})
 
-	s.logTxGasConsumed(ctx, "CreateAuction")
-
 	return &types.MsgCreateAuctionResponse{Auction: resp}, nil
 }
 
 // CommitBid is the command for committing a bid
+//nolint: all
 func (s msgServer) CommitBid(c context.Context, msg *types.MsgCommitBid) (*types.MsgCommitBidResponse, error) {
 	ctx := sdk.UnwrapSDKContext(c)
-	ctx = *utils.CtxWithCustomKVGasConfig(&ctx)
 
 	signerAddress, err := sdk.AccAddressFromBech32(msg.Signer)
 	if err != nil {
@@ -82,15 +77,13 @@ func (s msgServer) CommitBid(c context.Context, msg *types.MsgCommitBid) (*types
 		),
 	})
 
-	s.logTxGasConsumed(ctx, "CommitBid")
-
 	return &types.MsgCommitBidResponse{Bid: resp}, nil
 }
 
-// RevealBid is the command for revealing a bid
+//RevealBid is the command for revealing a bid
+//nolint: all
 func (s msgServer) RevealBid(c context.Context, msg *types.MsgRevealBid) (*types.MsgRevealBidResponse, error) {
 	ctx := sdk.UnwrapSDKContext(c)
-	ctx = *utils.CtxWithCustomKVGasConfig(&ctx)
 
 	signerAddress, err := sdk.AccAddressFromBech32(msg.Signer)
 	if err != nil {
@@ -115,12 +108,5 @@ func (s msgServer) RevealBid(c context.Context, msg *types.MsgRevealBid) (*types
 		),
 	})
 
-	s.logTxGasConsumed(ctx, "RevealBid")
-
 	return &types.MsgRevealBidResponse{Auction: resp}, nil
 }
-
-func (s msgServer) logTxGasConsumed(ctx sdk.Context, tx string) {
-	gasConsumed := ctx.GasMeter().GasConsumed()
-	s.Keeper.Logger(ctx).Info("tx executed", "method", tx, "gas_consumed", fmt.Sprintf("%d", gasConsumed))
-}

x/bond/keeper/keeper.go

@@ -14,7 +14,6 @@ import (
 	auth "github.com/cosmos/cosmos-sdk/x/auth/keeper"
 	bank "github.com/cosmos/cosmos-sdk/x/bank/keeper"
 	paramtypes "github.com/cosmos/cosmos-sdk/x/params/types"
-	"github.com/tendermint/tendermint/libs/log"
 )
 
 // prefixIDToBondIndex is the prefix for ID -> Bond index in the KVStore.
@@ -63,11 +62,6 @@ func NewKeeper(cdc codec.BinaryCodec,
 	}
 }
 
-// Logger returns a module-specific logger.
-func (k Keeper) Logger(ctx sdk.Context) log.Logger {
-	return ctx.Logger().With("module", types.ModuleName)
-}
-
 // Generates Bond ID -> Bond index key.
 func getBondIndexKey(id string) []byte {
 	return append(prefixIDToBondIndex, []byte(id)...)

x/bond/keeper/msg_server.go

@@ -2,12 +2,9 @@ package keeper
 
 import (
 	"context"
-	"fmt"
 
-	sdk "github.com/cosmos/cosmos-sdk/types"
-
-	"github.com/cerc-io/laconicd/utils"
 	"github.com/cerc-io/laconicd/x/bond/types"
+	sdk "github.com/cosmos/cosmos-sdk/types"
 )
 
 type msgServer struct {
@@ -23,8 +20,6 @@ var _ types.MsgServer = msgServer{}
 
 func (k msgServer) CreateBond(c context.Context, msg *types.MsgCreateBond) (*types.MsgCreateBondResponse, error) {
 	ctx := sdk.UnwrapSDKContext(c)
-	ctx = *utils.CtxWithCustomKVGasConfig(&ctx)
-
 	signerAddress, err := sdk.AccAddressFromBech32(msg.Signer)
 	if err != nil {
 		return nil, err
@@ -47,15 +42,12 @@ func (k msgServer) CreateBond(c context.Context, msg *types.MsgCreateBond) (*typ
 		),
 	})
 
-	k.logTxGasConsumed(ctx, "CreateBond")
-
 	return &types.MsgCreateBondResponse{}, nil
 }
 
+//nolint: all
 func (k msgServer) RefillBond(c context.Context, msg *types.MsgRefillBond) (*types.MsgRefillBondResponse, error) {
 	ctx := sdk.UnwrapSDKContext(c)
-	ctx = *utils.CtxWithCustomKVGasConfig(&ctx)
-
 	signerAddress, err := sdk.AccAddressFromBech32(msg.Signer)
 	if err != nil {
 		return nil, err
@@ -80,15 +72,12 @@ func (k msgServer) RefillBond(c context.Context, msg *types.MsgRefillBond) (*typ
 		),
 	})
 
-	k.logTxGasConsumed(ctx, "RefillBond")
-
 	return &types.MsgRefillBondResponse{}, nil
 }
 
+//nolint: all
 func (k msgServer) WithdrawBond(c context.Context, msg *types.MsgWithdrawBond) (*types.MsgWithdrawBondResponse, error) {
 	ctx := sdk.UnwrapSDKContext(c)
-	ctx = *utils.CtxWithCustomKVGasConfig(&ctx)
-
 	signerAddress, err := sdk.AccAddressFromBech32(msg.Signer)
 	if err != nil {
 		return nil, err
@@ -113,15 +102,11 @@ func (k msgServer) WithdrawBond(c context.Context, msg *types.MsgWithdrawBond) (
 		),
 	})
 
-	k.logTxGasConsumed(ctx, "WithdrawBond")
-
 	return &types.MsgWithdrawBondResponse{}, nil
 }
 
 func (k msgServer) CancelBond(c context.Context, msg *types.MsgCancelBond) (*types.MsgCancelBondResponse, error) {
 	ctx := sdk.UnwrapSDKContext(c)
-	ctx = *utils.CtxWithCustomKVGasConfig(&ctx)
-
 	signerAddress, err := sdk.AccAddressFromBech32(msg.Signer)
 	if err != nil {
 		return nil, err
@@ -144,12 +129,5 @@ func (k msgServer) CancelBond(c context.Context, msg *types.MsgCancelBond) (*typ
 		),
 	})
 
-	k.logTxGasConsumed(ctx, "CancelBond")
-
 	return &types.MsgCancelBondResponse{}, nil
 }
-
-func (k msgServer) logTxGasConsumed(ctx sdk.Context, tx string) {
-	gasConsumed := ctx.GasMeter().GasConsumed()
-	k.Keeper.Logger(ctx).Info("tx executed", "method", tx, "gas_consumed", fmt.Sprintf("%d", gasConsumed))
-}

x/evm/simulation/operations.go

@@ -32,10 +32,11 @@ import (
 	"github.com/ethereum/go-ethereum/crypto"
 )
 
+// #nosec 101
 const (
-	OpWeightMsgEthSimpleTransfer = "op_weight_msg_eth_simple_transfer" // #nosec G101
-	OpWeightMsgEthCreateContract = "op_weight_msg_eth_create_contract" // #nosec G101
-	OpWeightMsgEthCallContract   = "op_weight_msg_eth_call_contract"   // #nosec G101
+	OpWeightMsgEthSimpleTransfer = "op_weight_msg_eth_simple_transfer"
+	OpWeightMsgEthCreateContract = "op_weight_msg_eth_create_contract"
+	OpWeightMsgEthCallContract   = "op_weight_msg_eth_call_contract"
 )
 
 const (

x/registry/keeper/msg_server.go

@@ -2,12 +2,9 @@ package keeper
 
 import (
 	"context"
-	"fmt"
 
-	sdk "github.com/cosmos/cosmos-sdk/types"
-
-	"github.com/cerc-io/laconicd/utils"
 	"github.com/cerc-io/laconicd/x/registry/types"
+	sdk "github.com/cosmos/cosmos-sdk/types"
 )
 
 type msgServer struct {
@@ -23,8 +20,6 @@ var _ types.MsgServer = msgServer{}
 
 func (m msgServer) SetRecord(c context.Context, msg *types.MsgSetRecord) (*types.MsgSetRecordResponse, error) {
 	ctx := sdk.UnwrapSDKContext(c)
-	ctx = *utils.CtxWithCustomKVGasConfig(&ctx)
-
 	_, err := sdk.AccAddressFromBech32(msg.Signer)
 	if err != nil {
 		return nil, err
@@ -49,15 +44,12 @@ func (m msgServer) SetRecord(c context.Context, msg *types.MsgSetRecord) (*types
 		),
 	})
 
-	m.logTxGasConsumed(ctx, "SetRecord")
-
 	return &types.MsgSetRecordResponse{Id: record.ID}, nil
 }
 
+//nolint: all
 func (m msgServer) SetName(c context.Context, msg *types.MsgSetName) (*types.MsgSetNameResponse, error) {
 	ctx := sdk.UnwrapSDKContext(c)
-	ctx = *utils.CtxWithCustomKVGasConfig(&ctx)
-
 	_, err := sdk.AccAddressFromBech32(msg.Signer)
 	if err != nil {
 		return nil, err
@@ -79,16 +71,11 @@ func (m msgServer) SetName(c context.Context, msg *types.MsgSetName) (*types.Msg
 			sdk.NewAttribute(types.AttributeKeySigner, msg.Signer),
 		),
 	})
-
-	m.logTxGasConsumed(ctx, "SetName")
-
 	return &types.MsgSetNameResponse{}, nil
 }
 
 func (m msgServer) ReserveName(c context.Context, msg *types.MsgReserveAuthority) (*types.MsgReserveAuthorityResponse, error) {
 	ctx := sdk.UnwrapSDKContext(c)
-	ctx = *utils.CtxWithCustomKVGasConfig(&ctx)
-
 	_, err := sdk.AccAddressFromBech32(msg.Signer)
 	if err != nil {
 		return nil, err
@@ -114,16 +101,12 @@ func (m msgServer) ReserveName(c context.Context, msg *types.MsgReserveAuthority
 			sdk.NewAttribute(types.AttributeKeySigner, msg.Signer),
 		),
 	})
-
-	m.logTxGasConsumed(ctx, "ReserveName")
-
 	return &types.MsgReserveAuthorityResponse{}, nil
 }
 
+//nolint: all
 func (m msgServer) SetAuthorityBond(c context.Context, msg *types.MsgSetAuthorityBond) (*types.MsgSetAuthorityBondResponse, error) {
 	ctx := sdk.UnwrapSDKContext(c)
-	ctx = *utils.CtxWithCustomKVGasConfig(&ctx)
-
 	_, err := sdk.AccAddressFromBech32(msg.Signer)
 	if err != nil {
 		return nil, err
@@ -145,16 +128,11 @@ func (m msgServer) SetAuthorityBond(c context.Context, msg *types.MsgSetAuthorit
 			sdk.NewAttribute(types.AttributeKeySigner, msg.Signer),
 		),
 	})
-
-	m.logTxGasConsumed(ctx, "SetAuthorityBond")
-
 	return &types.MsgSetAuthorityBondResponse{}, nil
 }
 
 func (m msgServer) DeleteName(c context.Context, msg *types.MsgDeleteNameAuthority) (*types.MsgDeleteNameAuthorityResponse, error) {
 	ctx := sdk.UnwrapSDKContext(c)
-	ctx = *utils.CtxWithCustomKVGasConfig(&ctx)
-
 	_, err := sdk.AccAddressFromBech32(msg.Signer)
 	if err != nil {
 		return nil, err
@@ -175,16 +153,11 @@ func (m msgServer) DeleteName(c context.Context, msg *types.MsgDeleteNameAuthori
 			sdk.NewAttribute(types.AttributeKeySigner, msg.Signer),
 		),
 	})
-
-	m.logTxGasConsumed(ctx, "DeleteName")
-
 	return &types.MsgDeleteNameAuthorityResponse{}, nil
 }
 
 func (m msgServer) RenewRecord(c context.Context, msg *types.MsgRenewRecord) (*types.MsgRenewRecordResponse, error) {
 	ctx := sdk.UnwrapSDKContext(c)
-	ctx = *utils.CtxWithCustomKVGasConfig(&ctx)
-
 	_, err := sdk.AccAddressFromBech32(msg.Signer)
 	if err != nil {
 		return nil, err
@@ -205,16 +178,12 @@ func (m msgServer) RenewRecord(c context.Context, msg *types.MsgRenewRecord) (*t
 			sdk.NewAttribute(types.AttributeKeySigner, msg.Signer),
 		),
 	})
-
-	m.logTxGasConsumed(ctx, "RenewRecord")
-
 	return &types.MsgRenewRecordResponse{}, nil
 }
 
+//nolint: all
 func (m msgServer) AssociateBond(c context.Context, msg *types.MsgAssociateBond) (*types.MsgAssociateBondResponse, error) {
 	ctx := sdk.UnwrapSDKContext(c)
-	ctx = *utils.CtxWithCustomKVGasConfig(&ctx)
-
 	_, err := sdk.AccAddressFromBech32(msg.Signer)
 	if err != nil {
 		return nil, err
@@ -237,16 +206,11 @@ func (m msgServer) AssociateBond(c context.Context, msg *types.MsgAssociateBond)
 			sdk.NewAttribute(types.AttributeKeySigner, msg.Signer),
 		),
 	})
-
-	m.logTxGasConsumed(ctx, "AssociateBond")
-
 	return &types.MsgAssociateBondResponse{}, nil
 }
 
 func (m msgServer) DissociateBond(c context.Context, msg *types.MsgDissociateBond) (*types.MsgDissociateBondResponse, error) {
 	ctx := sdk.UnwrapSDKContext(c)
-	ctx = *utils.CtxWithCustomKVGasConfig(&ctx)
-
 	_, err := sdk.AccAddressFromBech32(msg.Signer)
 	if err != nil {
 		return nil, err
@@ -267,16 +231,11 @@ func (m msgServer) DissociateBond(c context.Context, msg *types.MsgDissociateBon
 			sdk.NewAttribute(types.AttributeKeySigner, msg.Signer),
 		),
 	})
-
-	m.logTxGasConsumed(ctx, "DissociateBond")
-
 	return &types.MsgDissociateBondResponse{}, nil
 }
 
 func (m msgServer) DissociateRecords(c context.Context, msg *types.MsgDissociateRecords) (*types.MsgDissociateRecordsResponse, error) {
 	ctx := sdk.UnwrapSDKContext(c)
-	ctx = *utils.CtxWithCustomKVGasConfig(&ctx)
-
 	_, err := sdk.AccAddressFromBech32(msg.Signer)
 	if err != nil {
 		return nil, err
@@ -297,16 +256,11 @@ func (m msgServer) DissociateRecords(c context.Context, msg *types.MsgDissociate
 			sdk.NewAttribute(types.AttributeKeySigner, msg.Signer),
 		),
 	})
-
-	m.logTxGasConsumed(ctx, "DissociateRecords")
-
 	return &types.MsgDissociateRecordsResponse{}, nil
 }
 
 func (m msgServer) ReAssociateRecords(c context.Context, msg *types.MsgReAssociateRecords) (*types.MsgReAssociateRecordsResponse, error) { //nolint: all
 	ctx := sdk.UnwrapSDKContext(c)
-	ctx = *utils.CtxWithCustomKVGasConfig(&ctx)
-
 	_, err := sdk.AccAddressFromBech32(msg.Signer)
 	if err != nil {
 		return nil, err
@@ -328,13 +282,5 @@ func (m msgServer) ReAssociateRecords(c context.Context, msg *types.MsgReAssocia
 			sdk.NewAttribute(types.AttributeKeySigner, msg.Signer),
 		),
 	})
-
-	m.logTxGasConsumed(ctx, "ReAssociateRecords")
-
 	return &types.MsgReAssociateRecordsResponse{}, nil
 }
-
-func (m msgServer) logTxGasConsumed(ctx sdk.Context, tx string) {
-	gasConsumed := ctx.GasMeter().GasConsumed()
-	m.Keeper.Logger(ctx).Info("tx executed", "method", tx, "gas_consumed", fmt.Sprintf("%d", gasConsumed))
-}