fix import/export tokenfactory hooks

neutron-org · Jun 20, 2024 · 688e7f1 · 688e7f1
1 parent 28b1d2c
commit 688e7f1
Show file tree

Hide file tree

Showing 4 changed files with 102 additions and 28 deletions.
diff --git a/proto/osmosis/tokenfactory/v1beta1/genesis.proto b/proto/osmosis/tokenfactory/v1beta1/genesis.proto
@@ -29,4 +29,6 @@ message GenesisDenom {
     (gogoproto.moretags) = "yaml:\"authority_metadata\"",
     (gogoproto.nullable) = false
   ];
+
+  string hook_contract_address = 3 [(gogoproto.nullable) = true];
 }
diff --git a/x/tokenfactory/keeper/genesis.go b/x/tokenfactory/keeper/genesis.go
@@ -24,14 +24,24 @@ func (k Keeper) InitGenesis(ctx sdk.Context, genState types.GenesisState) {
 		if err != nil {
 			panic(err)
 		}
+
 		err = k.createDenomAfterValidation(ctx, creator, genDenom.GetDenom())
 		if err != nil {
 			panic(err)
 		}
+
 		err = k.setAuthorityMetadata(ctx, genDenom.GetDenom(), genDenom.GetAuthorityMetadata())
 		if err != nil {
 			panic(err)
 		}
+
+		if _, err := sdk.AccAddressFromBech32(genDenom.HookContractAddress); genDenom.HookContractAddress != "" && err != nil {
+			panic(err)
+		}
+
+		if err := k.setBeforeSendHook(ctx, genDenom.Denom, genDenom.HookContractAddress); err != nil {
+			panic(err)
+		}
 	}
 }
 
@@ -43,14 +53,17 @@ func (k Keeper) ExportGenesis(ctx sdk.Context) *types.GenesisState {
 	for ; iterator.Valid(); iterator.Next() {
 		denom := string(iterator.Value())
 
+		contractHook := k.GetBeforeSendHook(ctx, denom)
+
 		authorityMetadata, err := k.GetAuthorityMetadata(ctx, denom)
 		if err != nil {
 			panic(err)
 		}
 
 		genDenoms = append(genDenoms, types.GenesisDenom{
-			Denom:             denom,
-			AuthorityMetadata: authorityMetadata,
+			Denom:               denom,
+			AuthorityMetadata:   authorityMetadata,
+			HookContractAddress: contractHook,
 		})
 	}
 

diff --git a/x/tokenfactory/keeper/genesis_test.go b/x/tokenfactory/keeper/genesis_test.go
@@ -14,6 +14,7 @@ func (suite *KeeperTestSuite) TestGenesis() {
 				AuthorityMetadata: types.DenomAuthorityMetadata{
 					Admin: "neutron1m9l358xunhhwds0568za49mzhvuxx9ux8xafx2",
 				},
+				HookContractAddress: "",
 			},
 			{
 				Denom: "factory/neutron1m9l358xunhhwds0568za49mzhvuxx9ux8xafx2/diff-admin",
@@ -26,6 +27,7 @@ func (suite *KeeperTestSuite) TestGenesis() {
 				AuthorityMetadata: types.DenomAuthorityMetadata{
 					Admin: "neutron1m9l358xunhhwds0568za49mzhvuxx9ux8xafx2",
 				},
+				HookContractAddress: "neutron1m9l358xunhhwds0568za49mzhvuxx9ux8xafx2",
 			},
 		},
 	}

diff --git a/x/tokenfactory/types/genesis.pb.go b/x/tokenfactory/types/genesis.pb.go