From 2bc279fc145a0535b766316299751e464bc0bab6 Mon Sep 17 00:00:00 2001
From: Jayden Lee <41176085+tkxkd0159@users.noreply.github.com>
Date: Fri, 15 Mar 2024 17:07:53 +0900
Subject: [PATCH 1/2] fix(x/auth): ensure nil .BaseAccounts are reported in
 ModuleAccount.Validate (#1274)

(cherry picked from commit d9f1133a71d8de4bf0b26de132fe968d5a29b13c)

# Conflicts:
#	CHANGELOG.md
---
 CHANGELOG.md                 | 6 ++++++
 x/auth/types/account.go      | 4 ++++
 x/auth/types/account_test.go | 7 ++++++-
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 823ccfe24d..6f40ef0ad8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -43,6 +43,12 @@ Ref: https://keepachangelog.com/en/1.0.0/
 ### Improvements
 
 ### Bug Fixes
+<<<<<<< HEAD
+=======
+* chore(deps) [\#1141](https://github.com/Finschia/finschia-sdk/pull/1141) Bump github.com/cosmos/ledger-cosmos-go from 0.12.2 to 0.13.2 to fix ledger signing issue
+* (x/auth, x/slashing) [\#1179](https://github.com/Finschia/finschia-sdk/pull/1179) modify missing changes of converting to tendermint
+* (x/auth) [#1274](https://github.com/Finschia/finschia-sdk/pull/1274) `ModuleAccount.Validate` now reports a nil `.BaseAccount` instead of panicking.
+>>>>>>> d9f1133a7 (fix(x/auth): ensure nil .BaseAccounts are reported in ModuleAccount.Validate (#1274))
 
 ### Removed
 
diff --git a/x/auth/types/account.go b/x/auth/types/account.go
index 3fade5bbcd..ac6f977080 100644
--- a/x/auth/types/account.go
+++ b/x/auth/types/account.go
@@ -225,6 +225,10 @@ func (ma ModuleAccount) Validate() error {
 		return errors.New("module account name cannot be blank")
 	}
 
+	if ma.BaseAccount == nil {
+		return errors.New("uninitialized ModuleAccount: BaseAccount is nil")
+	}
+
 	if ma.Address != sdk.AccAddress(crypto.AddressHash([]byte(ma.Name))).String() {
 		return fmt.Errorf("address %s cannot be derived from the module name '%s'", ma.Address, ma.Name)
 	}
diff --git a/x/auth/types/account_test.go b/x/auth/types/account_test.go
index 0aed16c51c..a90a633051 100644
--- a/x/auth/types/account_test.go
+++ b/x/auth/types/account_test.go
@@ -7,7 +7,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	yaml "gopkg.in/yaml.v2"
+	"gopkg.in/yaml.v2"
 
 	"github.com/Finschia/finschia-sdk/crypto/keys/secp256k1"
 	"github.com/Finschia/finschia-sdk/testutil/testdata"
@@ -207,3 +207,8 @@ func TestGenesisAccountsContains(t *testing.T) {
 	genAccounts = append(genAccounts, acc)
 	require.True(t, genAccounts.Contains(acc.GetAddress()))
 }
+
+func TestModuleAccountValidateNilBaseAccount(t *testing.T) {
+	ma := &types.ModuleAccount{Name: "foo"}
+	_ = ma.Validate()
+}

From 0c789a297132acf5c4c6714a8414dd76b1dd7d45 Mon Sep 17 00:00:00 2001
From: Youngtaek Yoon <noreply@yoon.mailer.me>
Date: Fri, 15 Mar 2024 09:08:47 +0000
Subject: [PATCH 2/2] Update CHANGELOG.md

---
 CHANGELOG.md | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6f40ef0ad8..d7cc8d7f47 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -43,12 +43,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 ### Improvements
 
 ### Bug Fixes
-<<<<<<< HEAD
-=======
-* chore(deps) [\#1141](https://github.com/Finschia/finschia-sdk/pull/1141) Bump github.com/cosmos/ledger-cosmos-go from 0.12.2 to 0.13.2 to fix ledger signing issue
-* (x/auth, x/slashing) [\#1179](https://github.com/Finschia/finschia-sdk/pull/1179) modify missing changes of converting to tendermint
-* (x/auth) [#1274](https://github.com/Finschia/finschia-sdk/pull/1274) `ModuleAccount.Validate` now reports a nil `.BaseAccount` instead of panicking.
->>>>>>> d9f1133a7 (fix(x/auth): ensure nil .BaseAccounts are reported in ModuleAccount.Validate (#1274))
+* (x/auth) [#1281](https://github.com/Finschia/finschia-sdk/pull/1281) `ModuleAccount.Validate` now reports a nil `.BaseAccount` instead of panicking. (backport #1274)
 
 ### Removed