Skip to content

Commit a8d769c

Browse files
committed
[FA] no withdraw event for burn
1 parent 5d87d94 commit a8d769c

10 files changed

+275
-70
lines changed

aptos-move/framework/aptos-framework/doc/aptos_account.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -707,7 +707,7 @@ to transfer APT) - if we want to allow APT PFS without account itself
707707
// <b>as</b> APT cannot be frozen or have dispatch, and PFS cannot be transfered
708708
// (PFS could potentially be burned. regular transfer would permanently unburn the store.
709709
// Ignoring the check here <b>has</b> the equivalent of unburning, transfers, and then burning again)
710-
<a href="fungible_asset.md#0x1_fungible_asset_deposit_internal">fungible_asset::deposit_internal</a>(recipient_store, <a href="fungible_asset.md#0x1_fungible_asset_withdraw_internal">fungible_asset::withdraw_internal</a>(sender_store, amount));
710+
<a href="fungible_asset.md#0x1_fungible_asset_raw_deposit">fungible_asset::raw_deposit</a>(recipient_store, <a href="fungible_asset.md#0x1_fungible_asset_raw_withdraw">fungible_asset::raw_withdraw</a>(sender_store, amount));
711711
}
712712
</code></pre>
713713

@@ -765,7 +765,7 @@ Burn from APT Primary FungibleStore
765765
// Skip burning <b>if</b> amount is zero. This shouldn't <a href="../../aptos-stdlib/../move-stdlib/doc/error.md#0x1_error">error</a> out <b>as</b> it's called <b>as</b> part of transaction fee burning.
766766
<b>if</b> (amount != 0) {
767767
<b>let</b> store_addr = <a href="aptos_account.md#0x1_aptos_account_primary_fungible_store_address">primary_fungible_store_address</a>(<a href="account.md#0x1_account">account</a>);
768-
<a href="fungible_asset.md#0x1_fungible_asset_address_burn_from">fungible_asset::address_burn_from</a>(ref, store_addr, amount);
768+
<a href="fungible_asset.md#0x1_fungible_asset_address_burn_from_for_gas">fungible_asset::address_burn_from_for_gas</a>(ref, store_addr, amount);
769769
};
770770
}
771771
</code></pre>

aptos-move/framework/aptos-framework/doc/coin.md

+6-3
Original file line numberDiff line numberDiff line change
@@ -2538,9 +2538,12 @@ Note: This bypasses CoinStore::frozen -- coins within a frozen CoinStore can be
25382538
<a href="coin.md#0x1_coin_burn">burn</a>(coin_to_burn, burn_cap);
25392539
};
25402540
<b>if</b> (fa_amount_to_burn &gt; 0) {
2541-
<a href="fungible_asset.md#0x1_fungible_asset_burn_from">fungible_asset::burn_from</a>(
2541+
<a href="fungible_asset.md#0x1_fungible_asset_address_burn_from_for_gas">fungible_asset::address_burn_from_for_gas</a>(
25422542
<a href="coin.md#0x1_coin_borrow_paired_burn_ref">borrow_paired_burn_ref</a>(burn_cap),
2543-
<a href="primary_fungible_store.md#0x1_primary_fungible_store_primary_store">primary_fungible_store::primary_store</a>(account_addr, <a href="../../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_destroy_some">option::destroy_some</a>(<a href="coin.md#0x1_coin_paired_metadata">paired_metadata</a>&lt;CoinType&gt;())),
2543+
<a href="primary_fungible_store.md#0x1_primary_fungible_store_primary_store_address">primary_fungible_store::primary_store_address</a>(
2544+
account_addr,
2545+
<a href="../../aptos-stdlib/../move-stdlib/doc/option.md#0x1_option_destroy_some">option::destroy_some</a>(<a href="coin.md#0x1_coin_paired_metadata">paired_metadata</a>&lt;CoinType&gt;())
2546+
),
25442547
fa_amount_to_burn
25452548
);
25462549
};
@@ -2670,7 +2673,7 @@ This is for internal use only and doesn't emit an DepositEvent.
26702673
<b>let</b> fa = <a href="coin.md#0x1_coin_coin_to_fungible_asset">coin_to_fungible_asset</a>(<a href="coin.md#0x1_coin">coin</a>);
26712674
<b>let</b> metadata = <a href="fungible_asset.md#0x1_fungible_asset_asset_metadata">fungible_asset::asset_metadata</a>(&fa);
26722675
<b>let</b> store = <a href="primary_fungible_store.md#0x1_primary_fungible_store_primary_store">primary_fungible_store::primary_store</a>(account_addr, metadata);
2673-
<a href="fungible_asset.md#0x1_fungible_asset_deposit_internal">fungible_asset::deposit_internal</a>(<a href="object.md#0x1_object_object_address">object::object_address</a>(&store), fa);
2676+
<a href="fungible_asset.md#0x1_fungible_asset_deposit_to_for_gas">fungible_asset::deposit_to_for_gas</a>(<a href="object.md#0x1_object_object_address">object::object_address</a>(&store), fa);
26742677
} <b>else</b> {
26752678
<b>abort</b> <a href="../../aptos-stdlib/../move-stdlib/doc/error.md#0x1_error_not_found">error::not_found</a>(<a href="coin.md#0x1_coin_ECOIN_STORE_NOT_PUBLISHED">ECOIN_STORE_NOT_PUBLISHED</a>)
26762679
}

aptos-move/framework/aptos-framework/doc/dispatchable_fungible_asset.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ The semantics of deposit will be governed by the function specified in DispatchF
239239
<b>assert</b>!(amount &lt;= start_balance - end_balance, <a href="../../aptos-stdlib/../move-stdlib/doc/error.md#0x1_error_aborted">error::aborted</a>(<a href="dispatchable_fungible_asset.md#0x1_dispatchable_fungible_asset_EAMOUNT_MISMATCH">EAMOUNT_MISMATCH</a>));
240240
fa
241241
} <b>else</b> {
242-
<a href="fungible_asset.md#0x1_fungible_asset_withdraw_internal">fungible_asset::withdraw_internal</a>(<a href="object.md#0x1_object_object_address">object::object_address</a>(&store), amount)
242+
<a href="fungible_asset.md#0x1_fungible_asset_raw_withdraw">fungible_asset::raw_withdraw</a>(<a href="object.md#0x1_object_object_address">object::object_address</a>(&store), amount)
243243
}
244244
}
245245
</code></pre>
@@ -283,7 +283,7 @@ The semantics of deposit will be governed by the function specified in DispatchF
283283
func
284284
)
285285
} <b>else</b> {
286-
<a href="fungible_asset.md#0x1_fungible_asset_deposit_internal">fungible_asset::deposit_internal</a>(<a href="object.md#0x1_object_object_address">object::object_address</a>(&store), fa)
286+
<a href="fungible_asset.md#0x1_fungible_asset_raw_deposit">fungible_asset::raw_deposit</a>(<a href="object.md#0x1_object_object_address">object::object_address</a>(&store), fa)
287287
}
288288
}
289289
</code></pre>

0 commit comments

Comments
 (0)