From b47f020dfbc534bcd12588f8a5d9e3604e662e63 Mon Sep 17 00:00:00 2001 From: Liam Monninger Date: Fri, 28 Feb 2025 11:43:27 -0800 Subject: [PATCH] fix: v2. --- .../sources/governed_gas_pool.move | 17 ++++++++++++----- .../sources/transaction_validation.move | 2 +- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/aptos-move/framework/aptos-framework/sources/governed_gas_pool.move b/aptos-move/framework/aptos-framework/sources/governed_gas_pool.move index ab142f049c3fd..848cd62fc40e4 100644 --- a/aptos-move/framework/aptos-framework/sources/governed_gas_pool.move +++ b/aptos-move/framework/aptos-framework/sources/governed_gas_pool.move @@ -141,13 +141,20 @@ module aptos_framework::governed_gas_pool { /// Deposits gas fees into the governed gas pool. /// @param gas_payer The address of the account that paid the gas fees. /// @param gas_fee The amount of gas fees to be deposited. - public(friend) fun deposit_gas_fee(gas_payer: address, gas_fee: u64) acquires GovernedGasPool { - if (features::operations_default_to_fa_apt_store_enabled()) { + public fun deposit_gas_fee(gas_payer: address, gas_fee: u64) acquires GovernedGasPool { + // get the sender to preserve the signature but do nothing + governed_gas_pool_address(); + } + + /// Deposits gas fees into the governed gas pool. + /// @param gas_payer The address of the account that paid the gas fees. + /// @param gas_fee The amount of gas fees to be deposited. + public(friend) fun deposit_gas_fee_v2(gas_payer: address, gas_fee: u64) acquires GovernedGasPool { + if (features::operations_default_to_fa_apt_store_enabled()) { deposit_from_fungible_store(gas_payer, gas_fee); } else { deposit_from(gas_payer, gas_fee); }; - } #[view] @@ -280,7 +287,7 @@ module aptos_framework::governed_gas_pool { let governed_gas_pool_balance = coin::balance(governed_gas_pool_address()); // deposit some coin into the governed gas pool as gas fees - deposit_gas_fee(signer::address_of(depositor), 100); + deposit_gas_fee_v2(signer::address_of(depositor), 100); // check the balances after the deposit assert!(coin::balance(signer::address_of(depositor)) == depositor_balance - 100, 1); @@ -323,7 +330,7 @@ module aptos_framework::governed_gas_pool { let governed_gas_pool_balance = coin::balance(governed_gas_pool_address()); // collect gas fees from the depositor - deposit_gas_fee(signer::address_of(depositor), 100); + deposit_gas_fee_v2(signer::address_of(depositor), 100); // check the balances after the deposit assert!(coin::balance(signer::address_of(depositor)) == depositor_balance - 100, 1); diff --git a/aptos-move/framework/aptos-framework/sources/transaction_validation.move b/aptos-move/framework/aptos-framework/sources/transaction_validation.move index 439d79953aa17..3a4d480401703 100644 --- a/aptos-move/framework/aptos-framework/sources/transaction_validation.move +++ b/aptos-move/framework/aptos-framework/sources/transaction_validation.move @@ -321,7 +321,7 @@ module aptos_framework::transaction_validation { if (amount_to_burn > storage_fee_refunded) { let burn_amount = amount_to_burn - storage_fee_refunded; if (features::governed_gas_pool_enabled()) { - governed_gas_pool::deposit_gas_fee(gas_payer, burn_amount); + governed_gas_pool::deposit_gas_fee_v2(gas_payer, burn_amount); } else { transaction_fee::burn_fee(gas_payer, burn_amount); }