fix: apply audit

go.mod

@@ -152,7 +152,7 @@ require (
 	github.com/iancoleman/strcase v0.3.0 // indirect
 	github.com/improbable-eng/grpc-web v0.15.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
-	github.com/initia-labs/OPinit/api v0.3.0 // indirect
+	github.com/initia-labs/OPinit/api v0.3.1 // indirect
 	github.com/jmespath/go-jmespath v0.4.0 // indirect
 	github.com/jmhodges/levigo v1.0.0 // indirect
 	github.com/klauspost/compress v1.17.8 // indirect

go.sum

@@ -729,8 +729,8 @@ github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLf
 github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo=
 github.com/initia-labs/OPinit v0.3.2 h1:TeELD5GeSJJ9meY5b5YIXDdmCZt9kZOA2Chz+IwxUHc=
 github.com/initia-labs/OPinit v0.3.2/go.mod h1:XlYsBFAKOFS6/wRIHB1vVbfonqX8QrC8cWK2GJvmX20=
-github.com/initia-labs/OPinit/api v0.3.0 h1:OY8ijwmgZLoYwtw9LI1mSY3VC8PY+gtxJFitB6ZNFl4=
-github.com/initia-labs/OPinit/api v0.3.0/go.mod h1:Xy/Nt3ubXLQ4zKn0m7RuQOM1sj8TVdlNNyek21TGYR0=
+github.com/initia-labs/OPinit/api v0.3.1 h1:qCCtRZE9yw53FkBxlsOMBozMRGwz2EZVvNoDnZwfz04=
+github.com/initia-labs/OPinit/api v0.3.1/go.mod h1:Xy/Nt3ubXLQ4zKn0m7RuQOM1sj8TVdlNNyek21TGYR0=
 github.com/initia-labs/cometbft v0.0.0-20240704071957-c46468756c01 h1:EGcO68mXypbiO3rmoFsskxLEAeZFcOkJII1PsSK0rRI=
 github.com/initia-labs/cometbft v0.0.0-20240704071957-c46468756c01/go.mod h1:xOoGZrtUT+A5izWfHSJgl0gYZUE7lu7Z2XIS1vWG/QQ=
 github.com/initia-labs/movevm v0.3.4 h1:kzqs6uzTq0f5peZJNzLq/1qgnmAFfC+I9eCyPBducxM=

proto/ibc/applications/nft_transfer/v1/genesis.proto

@@ -15,5 +15,23 @@ message GenesisState {
     (gogoproto.nullable)     = false,
     (gogoproto.moretags)     = "yaml:\"class_traces\""
   ];
-  Params params = 3 [(gogoproto.nullable) = false];
+  repeated ClassData class_data = 3 [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"class_data\""];
+  repeated TokenData token_data = 4 [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"token_data\""];
+
+  Params params = 5 [(gogoproto.nullable) = false];
+}
+
+// ClassData contains the class trace hash and the class data
+// for genesis.
+message ClassData {
+  bytes  trace_hash = 1;
+  string data       = 2;
 }
+
+// TokenData contains the trace hash, token id, and the token data
+// for genesis.
+message TokenData {
+  bytes  trace_hash = 1;
+  string token_id   = 2;
+  string data       = 3;
+}

proto/initia/distribution/v1/tx.proto

@@ -47,7 +47,7 @@ message MsgUpdateParamsResponse {}
 //
 // Since: cosmos-sdk 0.50
 message MsgDepositValidatorRewardsPool {
-  option (amino.name)           = "cosmos-sdk/distr/MsgDepositValRewards";
+  option (amino.name)           = "distr/MsgDepositValidatorRewardsPool";
   option (cosmos.msg.v1.signer) = "depositor";
 
   option (gogoproto.equal)           = false;

x/bank/keeper/grpc_query.go

@@ -2,12 +2,10 @@
 
 import (
 	"context"
-	"errors"
 
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 
-	"cosmossdk.io/collections"
 	"cosmossdk.io/store/prefix"
 	"github.com/cosmos/cosmos-sdk/runtime"
 	sdk "github.com/cosmos/cosmos-sdk/types"
@@ -188,13 +186,7 @@
 
 	metadata, found := k.GetDenomMetaData(ctx, req.Denom)
 	if !found {
-		var err error
-		metadata, err = k.mk.GetMetadata(ctx, req.Denom)
-		if errors.Is(err, collections.ErrNotFound) {
-			return nil, status.Errorf(codes.NotFound, "client metadata for denom %s", req.Denom)
-		} else if err != nil {
-			return nil, status.Errorf(codes.Internal, err.Error())
-		}
+		return nil, status.Errorf(codes.NotFound, "client metadata for denom %s", req.Denom)
 	}
 
 	return &types.QueryDenomMetadataResponse{

x/distribution/keeper/allocation.go

@@ -86,11 +86,23 @@
 		poolDenom := rewardWeight.Denom
 		poolSize := bondedTokensSum[poolDenom]
 
+		// if poolSize is zero, skip allocation and then the poolReward will be allocated to community pool
+		if poolSize.IsZero() {
+			continue
+		}
+
 		for _, bondedTokens := range bondedTokens[poolDenom] {
+			if bondedTokens.Amount.IsZero() {
+				continue
+			}
+
 			validator := validators[bondedTokens.ValAddr]
 
 			amountFraction := math.LegacyNewDecFromInt(bondedTokens.Amount).QuoInt(poolSize)
 			reward := poolReward.MulDecTruncate(amountFraction)
+			if reward.IsZero() {
+				continue
+			}
 
 			err = k.AllocateTokensToValidatorPool(ctx, validator, poolDenom, reward)
 			if err != nil {

x/distribution/types/codec.go

@@ -12,13 +12,16 @@
 // and concrete types on the provided LegacyAmino codec. These types are used
 // for Amino JSON serialization.
 func RegisterLegacyAminoCodec(cdc *codec.LegacyAmino) {
+	// amino is rejecting long type names, so we register under `distr`
+	legacy.RegisterAminoMsg(cdc, &MsgDepositValidatorRewardsPool{}, "distr/MsgDepositValidatorRewardsPool")
 	legacy.RegisterAminoMsg(cdc, &MsgUpdateParams{}, "distribution/MsgUpdateParams")
 	cdc.RegisterConcrete(Params{}, "distribution/Params", nil)
 }
 
 func RegisterInterfaces(registry types.InterfaceRegistry) {
 	registry.RegisterImplementations(
 		(*sdk.Msg)(nil),
+		&MsgDepositValidatorRewardsPool{},
 		&MsgUpdateParams{},
 	)
 

x/gov/abci.go

@@ -130,6 +130,11 @@
 			return false, err
 		}
 
+		// emergency proposals are handled separately
+		if proposal.Emergency {
+			return false, nil
+		}
+
 		_, passed, burnDeposits, tallyResults, err := k.Tally(ctx, params, proposal)
 		if err != nil {
 			return false, err

x/gov/keeper/common_test.go

@@ -432,6 +432,7 @@ func _createTestInput(
 	require.NoError(t, govKeeper.ProposalID.Set(ctx, govtypesv1.DefaultStartingProposalID))
 	govParams := customgovtypes.DefaultParams()
 	govParams.MinDeposit[0].Denom = bondDenom
+	govParams.ExpeditedMinDeposit[0].Denom = bondDenom
 	govParams.EmergencyMinDeposit[0].Denom = bondDenom
 
 	require.NoError(t, govKeeper.Params.Set(ctx, govParams))