fix: add non-zero check of nextTokenID.Id for genesis (backport #1276) (

#1282) * fix: add non-zero check of nextTokenID.Id for genesis (#1276) * fix: add non-zero check of nextTokenID.Id for genesis * chore: add testcase * chore: update changelog * chore: move validation logic to validate function * chore: add testcase (cherry picked from commit 47a5e9f) # Conflicts: # CHANGELOG.md * Update CHANGELOG.md Co-authored-by: 170210 <[email protected]> * chore: update changelog --------- Co-authored-by: jaeseung-bae <[email protected]> Co-authored-by: jaeseung.bae <[email protected]> Co-authored-by: 170210 <[email protected]>
Finschia · Mar 19, 2024 · 8b312a6 · 8b312a6
1 parent 6efd17d
commit 8b312a6
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -45,6 +45,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 ### Bug Fixes
 * (x/auth) [#1281](https://github.com/Finschia/finschia-sdk/pull/1281) `ModuleAccount.Validate` now reports a nil `.BaseAccount` instead of panicking. (backport #1274)
 * (x/foundation) [\#1283](https://github.com/Finschia/finschia-sdk/pull/1283) add init logic of foundation module accounts to InitGenesis in order to eliminate potential panic (backport #1277)
+* (x/collection) [\#1282](https://github.com/Finschia/finschia-sdk/pull/1282) eliminates potential risk for Insufficient Sanity Check of tokenID in Genesis (backport #1276)
 
 ### Removed
 

diff --git a/x/collection/genesis.go b/x/collection/genesis.go
@@ -65,8 +65,11 @@ func ValidateGenesis(data GenesisState) error {
 		if len(contractNextTokenIDs.TokenIds) == 0 {
 			return sdkerrors.ErrInvalidRequest.Wrap("next token ids cannot be empty")
 		}
-		for _, nextTokenIDs := range contractNextTokenIDs.TokenIds {
-			if err := ValidateClassID(nextTokenIDs.ClassId); err != nil {
+		for _, nextTokenID := range contractNextTokenIDs.TokenIds {
+			if nextTokenID.Id.IsZero() {
+				return sdkerrors.ErrInvalidRequest.Wrap("nextTokenID.Id is not supposed to be zero")
+			}
+			if err := ValidateClassID(nextTokenID.ClassId); err != nil {
 				return err
 			}
 		}

diff --git a/x/collection/genesis_test.go b/x/collection/genesis_test.go
@@ -445,6 +445,17 @@ func TestValidateGenesis(t *testing.T) {
 			},
 			false,
 		},
+		"should throw error when next token id is zero in genesis": {
+			&collection.GenesisState{
+				Params: collection.Params{},
+				NextTokenIds: []collection.ContractNextTokenIDs{
+					{ContractId: "deadbeef", TokenIds: []collection.NextTokenID{
+						{ClassId: "deadbeef", Id: sdk.NewUint(0)},
+					}},
+				},
+			},
+			false,
+		},
 	}
 
 	for name, tc := range testCases {