@@ -896,26 +896,16 @@ where
896896 ctx. pre ( ) . read ( & balance_key) ?. unwrap_or_default ( ) ;
897897 let post_balance: token:: Amount =
898898 Self :: force_read ( ctx, & balance_key, ReadType :: Post ) ?;
899+ let min_funds_parameter_key = gov_storage:: get_min_proposal_fund_key ( ) ;
900+ let min_funds_parameter: token:: Amount =
901+ Self :: force_read ( ctx, & min_funds_parameter_key, ReadType :: Pre ) ?;
899902
900903 let is_valid_balance = if is_proposal {
901904 if !native_token_address. eq ( token) {
902905 return Err ( Error :: new_const (
903906 "Governance deposit must be paid in native token" ,
904907 ) ) ;
905908 }
906-
907- let balance_key = TokenKeys :: balance_key ( token, & ADDRESS ) ;
908- let min_funds_parameter_key =
909- gov_storage:: get_min_proposal_fund_key ( ) ;
910-
911- let pre_balance: token:: Amount =
912- ctx. pre ( ) . read ( & balance_key) ?. unwrap_or_default ( ) ;
913-
914- let min_funds_parameter: token:: Amount =
915- Self :: force_read ( ctx, & min_funds_parameter_key, ReadType :: Pre ) ?;
916- let post_balance: token:: Amount =
917- Self :: force_read ( ctx, & balance_key, ReadType :: Post ) ?;
918-
919909 checked ! ( post_balance - pre_balance) ? >= min_funds_parameter
920910 } else {
921911 post_balance >= pre_balance
@@ -1159,7 +1149,7 @@ impl KeyType {
11591149 KeyType :: COUNTER
11601150 } else if gov_storage:: is_parameter_key ( key) {
11611151 KeyType :: PARAMETER
1162- } else if let Some ( [ token, & ADDRESS ] ) =
1152+ } else if let Some ( [ token, _ ] ) =
11631153 TokenKeys :: is_any_token_balance_key ( key)
11641154 {
11651155 KeyType :: BALANCE ( token. clone ( ) )
0 commit comments