henlo

Makefile

@@ -286,7 +286,7 @@ test-localnet-no-build:
 ###############################################################################
 
 format:
-	@$(MAKE) license-fix buf-lint-fix forge-lint-fix golines golangci-fix
+	@$(MAKE) license-fix buf-lint-fix forge-lint-fix golangci-fix
 
 lint:
 	@$(MAKE) license buf-lint forge-lint golangci gosec
@@ -325,20 +325,6 @@ golangci-fix:
 	@go list -f '{{.Dir}}/...' -m | xargs golangci-lint run  --timeout=10m --fix --concurrency 8 -v 
 
 
-#################
-#    golines    #
-#################
-
-golines-install:
-	@echo "--> Installing golines"
-	@go install github.com/segmentio/golines
-
-golines:
-	@$(MAKE) golines-install
-	@echo "--> Running golines"
-	@golines --reformat-tags --shorten-comments --write-output --max-len=99 -l ./.
-
-
 #################
 #    license    #
 #################
@@ -432,5 +418,5 @@ repo-rinse: |
 	test-e2e test-e2e-no-build hive-setup hive-view test-hive \
 	test-hive-v test-localnet test-localnet-no-build format lint \
 	forge-lint-fix forge-lint golangci-install golangci golangci-fix \
-	golines-install golines license-install license license-fix \
+	license-install license license-fix \
 	gosec-install gosec buf-install buf-lint-fix buf-lint sync tidy repo-rinse

cosmos/lib/conversions.go

@@ -242,7 +242,7 @@ func SdkProposalToGovProposal(
 		return governance.IGovernanceModuleProposal{}, err
 	}
 
-	return governance.IGovernanceModuleProposal{
+	output := governance.IGovernanceModuleProposal{
 		Id:       proposal.Id,
 		Messages: messages,
 		Status:   int32(proposal.Status), // Status is an alias for int32.
@@ -252,16 +252,31 @@ func SdkProposalToGovProposal(
 			NoCount:         proposal.FinalTallyResult.NoCount,
 			NoWithVetoCount: proposal.FinalTallyResult.NoWithVetoCount,
 		},
-		SubmitTime:      uint64(proposal.SubmitTime.Unix()),
-		DepositEndTime:  uint64(proposal.DepositEndTime.Unix()),
-		VotingStartTime: uint64(proposal.VotingStartTime.Unix()),
-		VotingEndTime:   uint64(proposal.VotingEndTime.Unix()),
-		TotalDeposit:    totalDeposit,
-		Metadata:        proposal.Metadata,
-		Title:           proposal.Title,
-		Summary:         proposal.Summary,
-		Proposer:        proposerAddr,
-	}, nil
+
+		TotalDeposit: totalDeposit,
+		Metadata:     proposal.Metadata,
+		Title:        proposal.Title,
+		Summary:      proposal.Summary,
+		Proposer:     proposerAddr,
+	}
+
+	if proposal.SubmitTime != nil {
+		output.DepositEndTime = uint64(proposal.DepositEndTime.Unix())
+	}
+
+	if proposal.DepositEndTime != nil {
+		output.DepositEndTime = uint64(proposal.DepositEndTime.Unix())
+	}
+
+	if proposal.VotingStartTime != nil {
+		output.VotingStartTime = uint64(proposal.VotingStartTime.Unix())
+	}
+
+	if proposal.VotingEndTime != nil {
+		output.VotingEndTime = uint64(proposal.VotingEndTime.Unix())
+	}
+
+	return output, nil
 }
 
 // ConvertMsgSubmitProposalToSdk is a helper function to convert a `MsgSubmitProposal` to the gov

cosmos/precompile/bank/bank_test.go

@@ -475,36 +475,6 @@ func FundAccount(
 	}
 	return bk.SendCoinsFromModuleToAccount(ctx, evmtypes.ModuleName, account, coins)
 }
-
-func getTestMetadata() []banktypes.Metadata {
-	return []banktypes.Metadata{
-		{
-			Name:        "Berachain bera",
-			Symbol:      "BERA",
-			Description: "The Bera.",
-			DenomUnits: []*banktypes.DenomUnit{
-				{Denom: "bera", Exponent: uint32(0), Aliases: []string{"bera"}},
-				{Denom: "nbera", Exponent: uint32(9), Aliases: []string{"nanobera"}},
-				{Denom: "abera", Exponent: uint32(18), Aliases: []string{"attobera"}},
-			},
-			Base:    "abera",
-			Display: "bera",
-		},
-		{
-			Name:        "Token",
-			Symbol:      "TOKEN",
-			Description: "The native staking token of the Token Hub.",
-			DenomUnits: []*banktypes.DenomUnit{
-				{Denom: "1token", Exponent: uint32(5), Aliases: []string{"decitoken"}},
-				{Denom: "2token", Exponent: uint32(4), Aliases: []string{"centitoken"}},
-				{Denom: "3token", Exponent: uint32(7), Aliases: []string{"dekatoken"}},
-			},
-			Base:    "utoken",
-			Display: "token",
-		},
-	}
-}
-
 func sdkCoinsToEvmCoins(sdkCoins sdk.Coins) []struct {
 	Amount *big.Int `json:"amount"`
 	Denom  string   `json:"denom"`

cosmos/precompile/governance/governance_test.go

@@ -505,7 +505,11 @@ var _ = Describe("Governance Precompile", func() {
 
 		// Embed the send msg into a proposal.
 		proposal := v1.MsgSubmitProposal{
-			Messages: []*codectypes.Any{msgAny},
+			InitialDeposit: sdk.NewCoins(sdk.NewCoin("abera", sdkmath.NewInt(100))),
+			Messages:       []*codectypes.Any{msgAny},
+			Proposer:       sdk.AccAddress([]byte("proposer")).String(),
+			Metadata:       "metadata",
+			Title:          "title",
 		}
 
 		// Marshal the proposal.

cosmos/precompile/governance/testutil.go

@@ -80,7 +80,7 @@ func setupGovTest(ctrl *gomock.Controller, caller sdk.AccAddress) (
 	msr := baseapp.NewMsgServiceRouter()
 
 	stakingParams := stakingtypes.DefaultParams()
-	stakingParams.BondDenom = "abgt"
+	stakingParams.BondDenom = "abera"
 	err := sk.SetParams(ctx, stakingParams)
 	if err != nil {
 		panic(err)

e2e/precompile/contracts/gov/governance_test.go

@@ -98,7 +98,7 @@ var _ = Describe("Call the Precompile Directly", func() {
 		// Send coins to the wrapper.
 		coins := []bbindings.CosmosCoin{
 			{
-				Denom:  "abgt",
+				Denom:  "abera",
 				Amount: amt,
 			},
 		}
@@ -110,7 +110,7 @@ var _ = Describe("Call the Precompile Directly", func() {
 		// Wrapper submits a proposal.
 		prop = getProposal(wrapperAddr, amt)
 		txr = tf.GenerateTransactOpts("alice")
-		tx, err = wrapper.Submit(txr, getTestProposal(prop), "abgt", amt)
+		tx, err = wrapper.Submit(txr, getTestProposal(prop), "abera", amt)
 		Expect(err).ToNot(HaveOccurred())
 		ExpectSuccessReceipt(tf.EthClient(), tx)
 
@@ -222,7 +222,7 @@ func getProposal(
 		},
 		InitialDeposit: []bindings.CosmosCoin{
 			{
-				Denom:  "abgt",
+				Denom:  "abera",
 				Amount: amount,
 			},
 		},