Make withdraw_funds_from_object public

lxfind · lxfind · commit 1f5d267bc170 · 2025-11-17T09:15:21.000-08:00
diff --git a/crates/sui-core/src/authority/shared_object_version_manager.rs b/crates/sui-core/src/authority/shared_object_version_manager.rs
@@ -1014,7 +1014,7 @@ mod tests {
             // Create a shared object for testing
             let shared_objects = vec![Object::shared_for_testing()];
             let mut config = ProtocolConfig::get_for_max_version_UNSAFE();
-            config.enable_accumulators_for_testing();
+            config.set_enable_accumulators_for_testing(true);
             let authority = TestAuthorityBuilder::new()
                 .with_starting_objects(&shared_objects)
                 .with_protocol_config(config)
diff --git a/crates/sui-core/src/execution_scheduler/balance_withdraw_scheduler/e2e_tests.rs b/crates/sui-core/src/execution_scheduler/balance_withdraw_scheduler/e2e_tests.rs
@@ -62,7 +62,7 @@ async fn create_test_env(init_balances: BTreeMap<TypeTag, u64>) -> TestEnv {
     let account_objects = starting_objects.iter().map(|o| o.id()).collect();
     starting_objects.push(gas_object.clone());
     let mut protocol_config = ProtocolConfig::get_for_max_version_UNSAFE();
-    protocol_config.enable_accumulators_for_testing();
+    protocol_config.set_enable_accumulators_for_testing(true);
     let state = TestAuthorityBuilder::new()
         .with_protocol_config(protocol_config)
         .with_starting_objects(&starting_objects)
diff --git a/crates/sui-core/src/unit_tests/coin_deny_list_tests.rs b/crates/sui-core/src/unit_tests/coin_deny_list_tests.rs
@@ -418,7 +418,7 @@ async fn new_authority_and_publish(path: &str) -> TestEnv {
 
     let mut protocol_config =
         ProtocolConfig::get_for_version(ProtocolVersion::max(), Chain::Unknown);
-    protocol_config.enable_accumulators_for_testing();
+    protocol_config.set_enable_accumulators_for_testing(true);
     protocol_config
         .set_per_object_congestion_control_mode_for_testing(PerObjectCongestionControlMode::None);
 
diff --git a/crates/sui-e2e-tests/tests/address_balance_tests.rs b/crates/sui-e2e-tests/tests/address_balance_tests.rs
@@ -105,7 +105,7 @@ async fn test_accumulators_root_created() {
             cfg.set_buffer_stake_for_protocol_upgrade_bps_for_testing(0);
         }
         if version == ProtocolVersion::MAX_ALLOWED {
-            cfg.enable_accumulators_for_testing();
+            cfg.set_enable_accumulators_for_testing(true);
         }
         cfg
     });
@@ -176,7 +176,7 @@ async fn test_accumulators_disabled() {
             cfg.set_buffer_stake_for_protocol_upgrade_bps_for_testing(0);
         }
         if version == ProtocolVersion::MAX_ALLOWED {
-            cfg.enable_accumulators_for_testing();
+            cfg.set_enable_accumulators_for_testing(true);
         }
         cfg
     });
@@ -293,7 +293,7 @@ async fn test_accumulators_disabled() {
 async fn test_deposits() {
     let _guard = ProtocolConfig::apply_overrides_for_testing(|_, mut cfg| {
         cfg.create_root_accumulator_object_for_testing();
-        cfg.enable_accumulators_for_testing();
+        cfg.set_enable_accumulators_for_testing(true);
         cfg
     });
 
@@ -347,7 +347,7 @@ async fn test_deposits() {
 #[sim_test]
 async fn test_multiple_settlement_txns() {
     let _guard = ProtocolConfig::apply_overrides_for_testing(|_, mut cfg| {
-        cfg.enable_accumulators_for_testing();
+        cfg.set_enable_accumulators_for_testing(true);
         cfg.set_max_updates_per_settlement_txn_for_testing(3);
         cfg
     });
@@ -463,7 +463,7 @@ fn verify_accumulator_exists(
 async fn test_deposit_and_withdraw() {
     let _guard = ProtocolConfig::apply_overrides_for_testing(|_, mut cfg| {
         cfg.create_root_accumulator_object_for_testing();
-        cfg.enable_accumulators_for_testing();
+        cfg.set_enable_accumulators_for_testing(true);
         cfg
     });
 
@@ -510,7 +510,7 @@ async fn test_deposit_and_withdraw() {
 async fn test_deposit_and_withdraw_with_larger_reservation() {
     let _guard = ProtocolConfig::apply_overrides_for_testing(|_, mut cfg| {
         cfg.create_root_accumulator_object_for_testing();
-        cfg.enable_accumulators_for_testing();
+        cfg.set_enable_accumulators_for_testing(true);
         cfg
     });
 
@@ -543,7 +543,7 @@ async fn test_deposit_and_withdraw_with_larger_reservation() {
 async fn test_withdraw_non_existent_balance() {
     let _guard = ProtocolConfig::apply_overrides_for_testing(|_, mut cfg| {
         cfg.create_root_accumulator_object_for_testing();
-        cfg.enable_accumulators_for_testing();
+        cfg.set_enable_accumulators_for_testing(true);
         cfg
     });
 
@@ -572,7 +572,7 @@ async fn test_withdraw_non_existent_balance() {
 async fn test_withdraw_insufficient_balance() {
     let _guard = ProtocolConfig::apply_overrides_for_testing(|_, mut cfg| {
         cfg.create_root_accumulator_object_for_testing();
-        cfg.enable_accumulators_for_testing();
+        cfg.set_enable_accumulators_for_testing(true);
         cfg
     });
 
diff --git a/crates/sui-framework/docs/sui/balance.md b/crates/sui-framework/docs/sui/balance.md
@@ -489,7 +489,7 @@ accumulator.
 Create a <code>Withdrawal&lt;<a href="../sui/balance.md#sui_balance_Balance">Balance</a>&lt;T&gt;&gt;</code> from an object to withdraw funds from it.
 
 
-<pre><code><b>public</b>(<a href="../sui/package.md#sui_package">package</a>) <b>fun</b> <a href="../sui/balance.md#sui_balance_withdraw_funds_from_object">withdraw_funds_from_object</a>&lt;T&gt;(obj: &<b>mut</b> <a href="../sui/object.md#sui_object_UID">sui::object::UID</a>, <a href="../sui/balance.md#sui_balance_value">value</a>: u64): <a href="../sui/funds_accumulator.md#sui_funds_accumulator_Withdrawal">sui::funds_accumulator::Withdrawal</a>&lt;<a href="../sui/balance.md#sui_balance_Balance">sui::balance::Balance</a>&lt;T&gt;&gt;
+<pre><code><b>public</b> <b>fun</b> <a href="../sui/balance.md#sui_balance_withdraw_funds_from_object">withdraw_funds_from_object</a>&lt;T&gt;(obj: &<b>mut</b> <a href="../sui/object.md#sui_object_UID">sui::object::UID</a>, <a href="../sui/balance.md#sui_balance_value">value</a>: u64): <a href="../sui/funds_accumulator.md#sui_funds_accumulator_Withdrawal">sui::funds_accumulator::Withdrawal</a>&lt;<a href="../sui/balance.md#sui_balance_Balance">sui::balance::Balance</a>&lt;T&gt;&gt;
 </code></pre>
 
 
@@ -498,7 +498,7 @@ Create a <code>Withdrawal&lt;<a href="../sui/balance.md#sui_balance_Balance">Bal
 <summary>Implementation</summary>
 
 
-<pre><code><b>public</b>(<a href="../sui/package.md#sui_package">package</a>) <b>fun</b> <a href="../sui/balance.md#sui_balance_withdraw_funds_from_object">withdraw_funds_from_object</a>&lt;T&gt;(
+<pre><code><b>public</b> <b>fun</b> <a href="../sui/balance.md#sui_balance_withdraw_funds_from_object">withdraw_funds_from_object</a>&lt;T&gt;(
     obj: &<b>mut</b> UID,
     <a href="../sui/balance.md#sui_balance_value">value</a>: u64,
 ): Withdrawal&lt;<a href="../sui/balance.md#sui_balance_Balance">Balance</a>&lt;T&gt;&gt; {
diff --git a/crates/sui-framework/docs/sui/funds_accumulator.md b/crates/sui-framework/docs/sui/funds_accumulator.md
@@ -227,7 +227,7 @@ Aborts with <code><a href="../sui/funds_accumulator.md#sui_funds_accumulator_EOv
 
 
 
-<pre><code><b>public</b>(<a href="../sui/package.md#sui_package">package</a>) <b>fun</b> <a href="../sui/funds_accumulator.md#sui_funds_accumulator_redeem">redeem</a>&lt;T: store&gt;(withdrawal: <a href="../sui/funds_accumulator.md#sui_funds_accumulator_Withdrawal">sui::funds_accumulator::Withdrawal</a>&lt;T&gt;): T
+<pre><code><b>public</b> <b>fun</b> <a href="../sui/funds_accumulator.md#sui_funds_accumulator_redeem">redeem</a>&lt;T: store&gt;(withdrawal: <a href="../sui/funds_accumulator.md#sui_funds_accumulator_Withdrawal">sui::funds_accumulator::Withdrawal</a>&lt;T&gt;): T
 </code></pre>
 
 
@@ -236,7 +236,7 @@ Aborts with <code><a href="../sui/funds_accumulator.md#sui_funds_accumulator_EOv
 <summary>Implementation</summary>
 
 
-<pre><code><b>public</b>(<a href="../sui/package.md#sui_package">package</a>) <b>fun</b> <a href="../sui/funds_accumulator.md#sui_funds_accumulator_redeem">redeem</a>&lt;/* internal */ T: store&gt;(withdrawal: <a href="../sui/funds_accumulator.md#sui_funds_accumulator_Withdrawal">Withdrawal</a>&lt;T&gt;): T {
+<pre><code><b>public</b> <b>fun</b> <a href="../sui/funds_accumulator.md#sui_funds_accumulator_redeem">redeem</a>&lt;/* internal */ T: store&gt;(withdrawal: <a href="../sui/funds_accumulator.md#sui_funds_accumulator_Withdrawal">Withdrawal</a>&lt;T&gt;): T {
     <b>let</b> <a href="../sui/funds_accumulator.md#sui_funds_accumulator_Withdrawal">Withdrawal</a> { owner, limit: value } = withdrawal;
     <a href="../sui/funds_accumulator.md#sui_funds_accumulator_withdraw_impl">withdraw_impl</a>(owner, value)
 }
diff --git a/crates/sui-framework/packages/sui-framework/sources/balance.move b/crates/sui-framework/packages/sui-framework/sources/balance.move
@@ -110,7 +110,7 @@ public fun redeem_funds<T>(withdrawal: sui::funds_accumulator::Withdrawal<Balanc
 }
 
 /// Create a `Withdrawal<Balance<T>>` from an object to withdraw funds from it.
-public(package) fun withdraw_funds_from_object<T>(
+public fun withdraw_funds_from_object<T>(
     obj: &mut UID,
     value: u64,
 ): Withdrawal<Balance<T>> {
diff --git a/crates/sui-framework/packages/sui-framework/sources/funds_accumulator.move b/crates/sui-framework/packages/sui-framework/sources/funds_accumulator.move
@@ -71,7 +71,7 @@ public fun withdrawal_join<T: store>(withdrawal: &mut Withdrawal<T>, other: With
 // TODO When this becomes `public` we need
 // - custom verifier rules for `T`
 // - private generic rules for `T`
-public(package) fun redeem</* internal */ T: store>(withdrawal: Withdrawal<T>): T {
+public fun redeem</* internal */ T: store>(withdrawal: Withdrawal<T>): T {
     let Withdrawal { owner, limit: value } = withdrawal;
     withdraw_impl(owner, value)
 }
diff --git a/crates/sui-framework/packages_compiled/sui-framework b/crates/sui-framework/packages_compiled/sui-framework
diff --git a/crates/sui-framework/published_api.txt b/crates/sui-framework/published_api.txt
@@ -1817,7 +1817,7 @@ withdrawal_join
 	public fun
 	0x2::funds_accumulator
 redeem
-	public(package) fun
+	public fun
 	0x2::funds_accumulator
 withdraw_from_object
 	public(package) fun
@@ -1880,7 +1880,7 @@ redeem_funds
 	public fun
 	0x2::balance
 withdraw_funds_from_object
-	public(package) fun
+	public fun
 	0x2::balance
 create_supply_internal
 	public(package) fun
diff --git a/crates/sui-protocol-config/src/lib.rs b/crates/sui-protocol-config/src/lib.rs
@@ -4206,7 +4206,7 @@ impl ProtocolConfig {
                 95 => {
                     cfg.type_name_id_base_cost = Some(52);
 
-                    // Reudce the frequency of checkpoint splitting under high TPS.
+                    // Reduce the frequency of checkpoint splitting under high TPS.
                     cfg.max_transactions_per_checkpoint = Some(20_000);
                 }
                 96 => {
@@ -4581,8 +4581,8 @@ impl ProtocolConfig {
             .prepend_prologue_tx_in_consensus_commit_in_checkpoints = val;
     }
 
-    pub fn enable_accumulators_for_testing(&mut self) {
-        self.feature_flags.enable_accumulators = true;
+    pub fn set_enable_accumulators_for_testing(&mut self, val: bool) {
+        self.feature_flags.enable_accumulators = val;
     }
 
     pub fn create_root_accumulator_object_for_testing(&mut self) {
@@ -4596,7 +4596,7 @@ impl ProtocolConfig {
     }
 
     pub fn enable_authenticated_event_streams_for_testing(&mut self) {
-        self.enable_accumulators_for_testing();
+        self.set_enable_accumulators_for_testing(true);
         self.feature_flags.enable_authenticated_event_streams = true;
         self.feature_flags
             .include_checkpoint_artifacts_digest_in_summary = true;
diff --git a/crates/sui-transactional-test-runner/src/simulator_persisted_store.rs b/crates/sui-transactional-test-runner/src/simulator_persisted_store.rs
@@ -135,7 +135,7 @@ impl PersistedStore {
                 move |_, cfg| {
                     let mut c = cfg;
                     if enable_accumulators {
-                        c.enable_accumulators_for_testing();
+                        c.set_enable_accumulators_for_testing(true);
                     }
                     if enable_authenticated_event_streams {
                         c.enable_authenticated_event_streams_for_testing();
diff --git a/crates/sui-transactional-test-runner/src/test_adapter.rs b/crates/sui-transactional-test-runner/src/test_adapter.rs
@@ -269,7 +269,7 @@ impl AdapterInitConfig {
             ProtocolConfig::get_for_max_version_UNSAFE()
         };
         if enable_accumulators {
-            protocol_config.enable_accumulators_for_testing();
+            protocol_config.set_enable_accumulators_for_testing(true);
         }
         if enable_authenticated_event_streams {
             protocol_config.enable_authenticated_event_streams_for_testing();
diff --git a/crates/sui-types/src/balance.rs b/crates/sui-types/src/balance.rs
@@ -21,6 +21,7 @@ pub const BALANCE_DESTROY_REBATES_FUNCTION_NAME: &IdentStr = ident_str!("destroy
 
 pub const BALANCE_REDEEM_FUNDS_FUNCTION_NAME: &IdentStr = ident_str!("redeem_funds");
 pub const BALANCE_SEND_FUNDS_FUNCTION_NAME: &IdentStr = ident_str!("send_funds");
+
 #[serde_as]
 #[derive(Debug, Serialize, Deserialize, Clone, Eq, PartialEq, JsonSchema)]
 pub struct Supply {
diff --git a/crates/sui-types/src/unit_tests/address_balance_gas_tests.rs b/crates/sui-types/src/unit_tests/address_balance_gas_tests.rs
@@ -66,7 +66,7 @@ fn test_address_balance_payment_requires_accumulators_enabled() {
 #[test]
 fn test_address_balance_payment_requires_feature_flag() {
     let mut config = ProtocolConfig::get_for_max_version_UNSAFE();
-    config.enable_accumulators_for_testing();
+    config.set_enable_accumulators_for_testing(true);
 
     let tx_data = create_test_transaction_data(
         vec![],
diff --git a/crates/sui-types/src/unit_tests/balance_withdraw_tests.rs b/crates/sui-types/src/unit_tests/balance_withdraw_tests.rs
@@ -16,7 +16,7 @@ use crate::{
 
 fn protocol_config() -> ProtocolConfig {
     let mut cfg = ProtocolConfig::get_for_max_version_UNSAFE();
-    cfg.enable_accumulators_for_testing();
+    cfg.set_enable_accumulators_for_testing(true);
     cfg
 }
 
diff --git a/sui-execution/latest/sui-move-natives/src/funds_accumulator.rs b/sui-execution/latest/sui-move-natives/src/funds_accumulator.rs
@@ -138,7 +138,14 @@ pub fn withdraw_from_accumulator_address(
         return Ok(NativeResult::err(context.gas_used(), E_OVERFLOW));
     };
 
+    let cost = context.gas_used();
+
     let obj_runtime: &mut ObjectRuntime = context.extensions_mut().get_mut()?;
+
+    if !obj_runtime.protocol_config.enable_accumulators() {
+        return Ok(NativeResult::err(cost, E_ADDRESS_BALANCE_NOT_ENABLED));
+    }
+
     obj_runtime.emit_accumulator_event(
         accumulator,
         MoveAccumulatorAction::Split,

Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ public fun redeem_funds<T>(withdrawal: sui::funds_accumulator::Withdrawal<Balanc`
`110`	`110`	`}`
`111`	`111`
`112`	`112`	/// Create a `Withdrawal<Balance<T>>` from an object to withdraw funds from it.
`113`		`-public(package) fun withdraw_funds_from_object<T>(`
	`113`	`+public fun withdraw_funds_from_object<T>(`
`114`	`114`	`obj: &mut UID,`
`115`	`115`	`value: u64,`
`116`	`116`	`): Withdrawal<Balance<T>> {`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ public fun withdrawal_join<T: store>(withdrawal: &mut Withdrawal<T>, other: With`
`71`	`71`	// TODO When this becomes `public` we need
`72`	`72`	// - custom verifier rules for `T`
`73`	`73`	// - private generic rules for `T`
`74`		`-public(package) fun redeem</* internal */ T: store>(withdrawal: Withdrawal<T>): T {`
	`74`	`+public fun redeem</* internal */ T: store>(withdrawal: Withdrawal<T>): T {`
`75`	`75`	`let Withdrawal { owner, limit: value } = withdrawal;`
`76`	`76`	`withdraw_impl(owner, value)`
`77`	`77`	`}`