diff --git a/prdoc/pr_7164.prdoc b/prdoc/pr_7164.prdoc
new file mode 100644
index 0000000000000000000000000000000000000000..cb0410a9de79954bab775de09629610ba420b2b4
--- /dev/null
+++ b/prdoc/pr_7164.prdoc
@@ -0,0 +1,8 @@
+title: '[pallet-revive] Remove revive events'
+doc:
+- audience: Runtime Dev
+ description: Remove all pallet::events except for the `ContractEmitted` event that
+ is emitted by contracts
+crates:
+- name: pallet-revive
+ bump: major
diff --git a/substrate/frame/revive/src/exec.rs b/substrate/frame/revive/src/exec.rs
index e20c5dd7786eed5bfa60b09d572b7d60a689f4f4..1c6ca435aefb02a5c57eef7d92a4f31016c65cc6 100644
--- a/substrate/frame/revive/src/exec.rs
+++ b/substrate/frame/revive/src/exec.rs
@@ -1092,34 +1092,11 @@ where
.enforce_limit(contract)
.map_err(|e| ExecError { error: e, origin: ErrorOrigin::Callee })?;
- let account_id = T::AddressMapper::to_address(&frame.account_id);
- match (entry_point, delegated_code_hash) {
- (ExportedFunction::Constructor, _) => {
- // It is not allowed to terminate a contract inside its constructor.
- if matches!(frame.contract_info, CachedContract::Terminated) {
- return Err(Error::<T>::TerminatedInConstructor.into());
- }
-
- let caller = T::AddressMapper::to_address(self.caller().account_id()?);
- // Deposit an instantiation event.
- Contracts::<T>::deposit_event(Event::Instantiated {
- deployer: caller,
- contract: account_id,
- });
- },
- (ExportedFunction::Call, Some(code_hash)) => {
- Contracts::<T>::deposit_event(Event::DelegateCalled {
- contract: account_id,
- code_hash,
- });
- },
- (ExportedFunction::Call, None) => {
- let caller = self.caller();
- Contracts::<T>::deposit_event(Event::Called {
- caller: caller.clone(),
- contract: account_id,
- });
- },
+ // It is not allowed to terminate a contract inside its constructor.
+ if entry_point == ExportedFunction::Constructor &&
+ matches!(frame.contract_info, CachedContract::Terminated)
+ {
+ return Err(Error::<T>::TerminatedInConstructor.into());
}
Ok(output)
@@ -1526,10 +1503,6 @@ where
.charge_deposit(frame.account_id.clone(), StorageDeposit::Refund(*deposit));
}
- Contracts::<T>::deposit_event(Event::Terminated {
- contract: account_address,
- beneficiary: *beneficiary,
- });
Ok(())
}
@@ -1782,11 +1755,6 @@ where
Self::increment_refcount(hash)?;
Self::decrement_refcount(prev_hash);
- Contracts::<Self::T>::deposit_event(Event::ContractCodeUpdated {
- contract: T::AddressMapper::to_address(&frame.account_id),
- new_code_hash: hash,
- old_code_hash: prev_hash,
- });
Ok(())
}
@@ -2933,13 +2901,6 @@ mod tests {
ContractInfo::<Test>::load_code_hash(&instantiated_contract_id).unwrap(),
dummy_ch
);
- assert_eq!(
- &events(),
- &[Event::Instantiated {
- deployer: ALICE_ADDR,
- contract: instantiated_contract_address
- }]
- );
});
}
@@ -3055,19 +3016,6 @@ mod tests {
ContractInfo::<Test>::load_code_hash(&instantiated_contract_id).unwrap(),
dummy_ch
);
- assert_eq!(
- &events(),
- &[
- Event::Instantiated {
- deployer: BOB_ADDR,
- contract: instantiated_contract_address
- },
- Event::Called {
- caller: Origin::from_account_id(ALICE),
- contract: BOB_ADDR
- },
- ]
- );
});
}
@@ -3119,13 +3067,6 @@ mod tests {
),
Ok(_)
);
-
- // The contract wasn't instantiated so we don't expect to see an instantiation
- // event here.
- assert_eq!(
- &events(),
- &[Event::Called { caller: Origin::from_account_id(ALICE), contract: BOB_ADDR },]
- );
});
}
@@ -3465,24 +3406,14 @@ mod tests {
let remark_hash = <Test as frame_system::Config>::Hashing::hash(b"Hello World");
assert_eq!(
System::events(),
- vec![
- EventRecord {
- phase: Phase::Initialization,
- event: MetaEvent::System(frame_system::Event::Remarked {
- sender: BOB_FALLBACK,
- hash: remark_hash
- }),
- topics: vec![],
- },
- EventRecord {
- phase: Phase::Initialization,
- event: MetaEvent::Contracts(crate::Event::Called {
- caller: Origin::from_account_id(ALICE),
- contract: BOB_ADDR,
- }),
- topics: vec![],
- },
- ]
+ vec![EventRecord {
+ phase: Phase::Initialization,
+ event: MetaEvent::System(frame_system::Event::Remarked {
+ sender: BOB_FALLBACK,
+ hash: remark_hash
+ }),
+ topics: vec![],
+ },]
);
});
}
@@ -3571,14 +3502,6 @@ mod tests {
},),
topics: vec![],
},
- EventRecord {
- phase: Phase::Initialization,
- event: MetaEvent::Contracts(crate::Event::Called {
- caller: Origin::from_account_id(ALICE),
- contract: BOB_ADDR,
- }),
- topics: vec![],
- },
]
);
});
diff --git a/substrate/frame/revive/src/lib.rs b/substrate/frame/revive/src/lib.rs
index 403598ae136e0f43a2b3f518d793734800178c22..a9f2842c35f6a2fc3fe151879f70f99993865a14 100644
--- a/substrate/frame/revive/src/lib.rs
+++ b/substrate/frame/revive/src/lib.rs
@@ -379,25 +379,6 @@ pub mod pallet {
#[pallet::event]
pub enum Event<T: Config> {
- /// Contract deployed by address at the specified address.
- Instantiated { deployer: H160, contract: H160 },
-
- /// Contract has been removed.
- ///
- /// # Note
- ///
- /// The only way for a contract to be removed and emitting this event is by calling
- /// `seal_terminate`.
- Terminated {
- /// The contract that was terminated.
- contract: H160,
- /// The account that received the contracts remaining balance
- beneficiary: H160,
- },
-
- /// Code with the specified hash has been stored.
- CodeStored { code_hash: H256, deposit_held: BalanceOf<T>, uploader: H160 },
-
/// A custom event emitted by the contract.
ContractEmitted {
/// The contract that emitted the event.
@@ -409,54 +390,6 @@ pub mod pallet {
/// Number of topics is capped by [`limits::NUM_EVENT_TOPICS`].
topics: Vec<H256>,
},
-
- /// A code with the specified hash was removed.
- CodeRemoved { code_hash: H256, deposit_released: BalanceOf<T>, remover: H160 },
-
- /// A contract's code was updated.
- ContractCodeUpdated {
- /// The contract that has been updated.
- contract: H160,
- /// New code hash that was set for the contract.
- new_code_hash: H256,
- /// Previous code hash of the contract.
- old_code_hash: H256,
- },
-
- /// A contract was called either by a plain account or another contract.
- ///
- /// # Note
- ///
- /// Please keep in mind that like all events this is only emitted for successful
- /// calls. This is because on failure all storage changes including events are
- /// rolled back.
- Called {
- /// The caller of the `contract`.
- caller: Origin<T>,
- /// The contract that was called.
- contract: H160,
- },
-
- /// A contract delegate called a code hash.
- ///
- /// # Note
- ///
- /// Please keep in mind that like all events this is only emitted for successful
- /// calls. This is because on failure all storage changes including events are
- /// rolled back.
- DelegateCalled {
- /// The contract that performed the delegate call and hence in whose context
- /// the `code_hash` is executed.
- contract: H160,
- /// The code hash that was delegate called.
- code_hash: H256,
- },
-
- /// Some funds have been transferred and held as storage deposit.
- StorageDepositTransferredAndHeld { from: H160, to: H160, amount: BalanceOf<T> },
-
- /// Some storage deposit funds have been transferred and released.
- StorageDepositTransferredAndReleased { from: H160, to: H160, amount: BalanceOf<T> },
}
#[pallet::error]
@@ -985,11 +918,6 @@ pub mod pallet {
};
<ExecStack<T, WasmBlob<T>>>::increment_refcount(code_hash)?;
<ExecStack<T, WasmBlob<T>>>::decrement_refcount(contract.code_hash);
- Self::deposit_event(Event::ContractCodeUpdated {
- contract: dest,
- new_code_hash: code_hash,
- old_code_hash: contract.code_hash,
- });
contract.code_hash = code_hash;
Ok(())
})
diff --git a/substrate/frame/revive/src/storage/meter.rs b/substrate/frame/revive/src/storage/meter.rs
index 4febcb0c4066c418b1b7189c12a4cc8403601f72..cd390c86f63ae94a30d065def82e628a0091b653 100644
--- a/substrate/frame/revive/src/storage/meter.rs
+++ b/substrate/frame/revive/src/storage/meter.rs
@@ -18,8 +18,8 @@
//! This module contains functions to meter the storage deposit.
use crate::{
- address::AddressMapper, storage::ContractInfo, AccountIdOf, BalanceOf, CodeInfo, Config, Error,
- Event, HoldReason, Inspect, Origin, Pallet, StorageDeposit as Deposit, System, LOG_TARGET,
+ storage::ContractInfo, AccountIdOf, BalanceOf, CodeInfo, Config, Error, HoldReason, Inspect,
+ Origin, Pallet, StorageDeposit as Deposit, System, LOG_TARGET,
};
use alloc::vec::Vec;
use core::{fmt::Debug, marker::PhantomData};
@@ -516,12 +516,6 @@ impl<T: Config> Ext<T> for ReservingExt {
Preservation::Preserve,
Fortitude::Polite,
)?;
-
- Pallet::<T>::deposit_event(Event::StorageDepositTransferredAndHeld {
- from: T::AddressMapper::to_address(origin),
- to: T::AddressMapper::to_address(contract),
- amount: *amount,
- });
},
Deposit::Refund(amount) => {
let transferred = T::Currency::transfer_on_hold(
@@ -534,12 +528,6 @@ impl<T: Config> Ext<T> for ReservingExt {
Fortitude::Polite,
)?;
- Pallet::<T>::deposit_event(Event::StorageDepositTransferredAndReleased {
- from: T::AddressMapper::to_address(contract),
- to: T::AddressMapper::to_address(origin),
- amount: transferred,
- });
-
if transferred < *amount {
// This should never happen, if it does it means that there is a bug in the
// runtime logic. In the rare case this happens we try to refund as much as we
diff --git a/substrate/frame/revive/src/tests.rs b/substrate/frame/revive/src/tests.rs
index e2b30cf07c8d935afd76eeb0695000e114f4a590..35940f544d00a8e555f77f90ace74789b4b4e884 100644
--- a/substrate/frame/revive/src/tests.rs
+++ b/substrate/frame/revive/src/tests.rs
@@ -713,25 +713,6 @@ fn instantiate_and_call_and_deposit_event() {
}),
topics: vec![],
},
- EventRecord {
- phase: Phase::Initialization,
- event: RuntimeEvent::Contracts(crate::Event::Instantiated {
- deployer: ALICE_ADDR,
- contract: addr
- }),
- topics: vec![],
- },
- EventRecord {
- phase: Phase::Initialization,
- event: RuntimeEvent::Contracts(
- pallet_revive::Event::StorageDepositTransferredAndHeld {
- from: ALICE_ADDR,
- to: addr,
- amount: test_utils::contract_info_storage_deposit(&addr),
- }
- ),
- topics: vec![],
- },
]
);
});
@@ -1078,14 +1059,6 @@ fn deploy_and_call_other_contract() {
}),
topics: vec![],
},
- EventRecord {
- phase: Phase::Initialization,
- event: RuntimeEvent::Contracts(crate::Event::Instantiated {
- deployer: caller_addr,
- contract: callee_addr,
- }),
- topics: vec![],
- },
EventRecord {
phase: Phase::Initialization,
event: RuntimeEvent::Balances(pallet_balances::Event::Transfer {
@@ -1095,33 +1068,6 @@ fn deploy_and_call_other_contract() {
}),
topics: vec![],
},
- EventRecord {
- phase: Phase::Initialization,
- event: RuntimeEvent::Contracts(crate::Event::Called {
- caller: Origin::from_account_id(caller_account.clone()),
- contract: callee_addr,
- }),
- topics: vec![],
- },
- EventRecord {
- phase: Phase::Initialization,
- event: RuntimeEvent::Contracts(crate::Event::Called {
- caller: Origin::from_account_id(ALICE),
- contract: caller_addr,
- }),
- topics: vec![],
- },
- EventRecord {
- phase: Phase::Initialization,
- event: RuntimeEvent::Contracts(
- pallet_revive::Event::StorageDepositTransferredAndHeld {
- from: ALICE_ADDR,
- to: callee_addr,
- amount: test_utils::contract_info_storage_deposit(&callee_addr),
- }
- ),
- topics: vec![],
- },
]
);
});
@@ -1373,8 +1319,6 @@ fn self_destruct_works() {
// Check that the BOB contract has been instantiated.
let _ = get_contract(&contract.addr);
- let info_deposit = test_utils::contract_info_storage_deposit(&contract.addr);
-
// Drop all previous events
initialize_block(2);
@@ -1404,33 +1348,6 @@ fn self_destruct_works() {
pretty_assertions::assert_eq!(
System::events(),
vec![
- EventRecord {
- phase: Phase::Initialization,
- event: RuntimeEvent::Contracts(crate::Event::Terminated {
- contract: contract.addr,
- beneficiary: DJANGO_ADDR,
- }),
- topics: vec![],
- },
- EventRecord {
- phase: Phase::Initialization,
- event: RuntimeEvent::Contracts(crate::Event::Called {
- caller: Origin::from_account_id(ALICE),
- contract: contract.addr,
- }),
- topics: vec![],
- },
- EventRecord {
- phase: Phase::Initialization,
- event: RuntimeEvent::Contracts(
- pallet_revive::Event::StorageDepositTransferredAndReleased {
- from: contract.addr,
- to: ALICE_ADDR,
- amount: info_deposit,
- }
- ),
- topics: vec![],
- },
EventRecord {
phase: Phase::Initialization,
event: RuntimeEvent::System(frame_system::Event::KilledAccount {
@@ -2512,23 +2429,9 @@ fn upload_code_works() {
initialize_block(2);
assert!(!PristineCode::<Test>::contains_key(&code_hash));
-
assert_ok!(Contracts::upload_code(RuntimeOrigin::signed(ALICE), wasm, 1_000,));
// Ensure the contract was stored and get expected deposit amount to be reserved.
- let deposit_expected = expected_deposit(ensure_stored(code_hash));
-
- assert_eq!(
- System::events(),
- vec![EventRecord {
- phase: Phase::Initialization,
- event: RuntimeEvent::Contracts(crate::Event::CodeStored {
- code_hash,
- deposit_held: deposit_expected,
- uploader: ALICE_ADDR
- }),
- topics: vec![],
- },]
- );
+ expected_deposit(ensure_stored(code_hash));
});
}
@@ -2586,32 +2489,8 @@ fn remove_code_works() {
assert_ok!(Contracts::upload_code(RuntimeOrigin::signed(ALICE), wasm, 1_000,));
// Ensure the contract was stored and get expected deposit amount to be reserved.
- let deposit_expected = expected_deposit(ensure_stored(code_hash));
-
+ expected_deposit(ensure_stored(code_hash));
assert_ok!(Contracts::remove_code(RuntimeOrigin::signed(ALICE), code_hash));
- assert_eq!(
- System::events(),
- vec![
- EventRecord {
- phase: Phase::Initialization,
- event: RuntimeEvent::Contracts(crate::Event::CodeStored {
- code_hash,
- deposit_held: deposit_expected,
- uploader: ALICE_ADDR
- }),
- topics: vec![],
- },
- EventRecord {
- phase: Phase::Initialization,
- event: RuntimeEvent::Contracts(crate::Event::CodeRemoved {
- code_hash,
- deposit_released: deposit_expected,
- remover: ALICE_ADDR
- }),
- topics: vec![],
- },
- ]
- );
});
}
@@ -2627,25 +2506,12 @@ fn remove_code_wrong_origin() {
assert_ok!(Contracts::upload_code(RuntimeOrigin::signed(ALICE), wasm, 1_000,));
// Ensure the contract was stored and get expected deposit amount to be reserved.
- let deposit_expected = expected_deposit(ensure_stored(code_hash));
+ expected_deposit(ensure_stored(code_hash));
assert_noop!(
Contracts::remove_code(RuntimeOrigin::signed(BOB), code_hash),
sp_runtime::traits::BadOrigin,
);
-
- assert_eq!(
- System::events(),
- vec![EventRecord {
- phase: Phase::Initialization,
- event: RuntimeEvent::Contracts(crate::Event::CodeStored {
- code_hash,
- deposit_held: deposit_expected,
- uploader: ALICE_ADDR
- }),
- topics: vec![],
- },]
- );
});
}
@@ -2704,7 +2570,7 @@ fn instantiate_with_zero_balance_works() {
builder::bare_instantiate(Code::Upload(wasm)).build_and_unwrap_contract();
// Ensure the contract was stored and get expected deposit amount to be reserved.
- let deposit_expected = expected_deposit(ensure_stored(code_hash));
+ expected_deposit(ensure_stored(code_hash));
// Make sure the account exists even though no free balance was send
assert_eq!(<Test as Config>::Currency::free_balance(&account_id), min_balance);
@@ -2716,15 +2582,6 @@ fn instantiate_with_zero_balance_works() {
assert_eq!(
System::events(),
vec![
- EventRecord {
- phase: Phase::Initialization,
- event: RuntimeEvent::Contracts(crate::Event::CodeStored {
- code_hash,
- deposit_held: deposit_expected,
- uploader: ALICE_ADDR
- }),
- topics: vec![],
- },
EventRecord {
phase: Phase::Initialization,
event: RuntimeEvent::System(frame_system::Event::NewAccount {
@@ -2749,25 +2606,6 @@ fn instantiate_with_zero_balance_works() {
}),
topics: vec![],
},
- EventRecord {
- phase: Phase::Initialization,
- event: RuntimeEvent::Contracts(crate::Event::Instantiated {
- deployer: ALICE_ADDR,
- contract: addr,
- }),
- topics: vec![],
- },
- EventRecord {
- phase: Phase::Initialization,
- event: RuntimeEvent::Contracts(
- pallet_revive::Event::StorageDepositTransferredAndHeld {
- from: ALICE_ADDR,
- to: addr,
- amount: test_utils::contract_info_storage_deposit(&addr),
- }
- ),
- topics: vec![],
- },
]
);
});
@@ -2790,7 +2628,7 @@ fn instantiate_with_below_existential_deposit_works() {
.build_and_unwrap_contract();
// Ensure the contract was stored and get expected deposit amount to be reserved.
- let deposit_expected = expected_deposit(ensure_stored(code_hash));
+ expected_deposit(ensure_stored(code_hash));
// Make sure the account exists even though not enough free balance was send
assert_eq!(<Test as Config>::Currency::free_balance(&account_id), min_balance + value);
assert_eq!(
@@ -2801,15 +2639,6 @@ fn instantiate_with_below_existential_deposit_works() {
assert_eq!(
System::events(),
vec![
- EventRecord {
- phase: Phase::Initialization,
- event: RuntimeEvent::Contracts(crate::Event::CodeStored {
- code_hash,
- deposit_held: deposit_expected,
- uploader: ALICE_ADDR
- }),
- topics: vec![],
- },
EventRecord {
phase: Phase::Initialization,
event: RuntimeEvent::System(frame_system::Event::NewAccount {
@@ -2843,25 +2672,6 @@ fn instantiate_with_below_existential_deposit_works() {
}),
topics: vec![],
},
- EventRecord {
- phase: Phase::Initialization,
- event: RuntimeEvent::Contracts(crate::Event::Instantiated {
- deployer: ALICE_ADDR,
- contract: addr,
- }),
- topics: vec![],
- },
- EventRecord {
- phase: Phase::Initialization,
- event: RuntimeEvent::Contracts(
- pallet_revive::Event::StorageDepositTransferredAndHeld {
- from: ALICE_ADDR,
- to: addr,
- amount: test_utils::contract_info_storage_deposit(&addr),
- }
- ),
- topics: vec![],
- },
]
);
});
@@ -2903,74 +2713,15 @@ fn storage_deposit_works() {
assert_eq!(
System::events(),
- vec![
- EventRecord {
- phase: Phase::Initialization,
- event: RuntimeEvent::Balances(pallet_balances::Event::Transfer {
- from: ALICE,
- to: account_id.clone(),
- amount: 42,
- }),
- topics: vec![],
- },
- EventRecord {
- phase: Phase::Initialization,
- event: RuntimeEvent::Contracts(crate::Event::Called {
- caller: Origin::from_account_id(ALICE),
- contract: addr,
- }),
- topics: vec![],
- },
- EventRecord {
- phase: Phase::Initialization,
- event: RuntimeEvent::Contracts(
- pallet_revive::Event::StorageDepositTransferredAndHeld {
- from: ALICE_ADDR,
- to: addr,
- amount: charged0,
- }
- ),
- topics: vec![],
- },
- EventRecord {
- phase: Phase::Initialization,
- event: RuntimeEvent::Contracts(crate::Event::Called {
- caller: Origin::from_account_id(ALICE),
- contract: addr,
- }),
- topics: vec![],
- },
- EventRecord {
- phase: Phase::Initialization,
- event: RuntimeEvent::Contracts(
- pallet_revive::Event::StorageDepositTransferredAndHeld {
- from: ALICE_ADDR,
- to: addr,
- amount: charged1,
- }
- ),
- topics: vec![],
- },
- EventRecord {
- phase: Phase::Initialization,
- event: RuntimeEvent::Contracts(crate::Event::Called {
- caller: Origin::from_account_id(ALICE),
- contract: addr,
- }),
- topics: vec![],
- },
- EventRecord {
- phase: Phase::Initialization,
- event: RuntimeEvent::Contracts(
- pallet_revive::Event::StorageDepositTransferredAndReleased {
- from: addr,
- to: ALICE_ADDR,
- amount: refunded0,
- }
- ),
- topics: vec![],
- },
- ]
+ vec![EventRecord {
+ phase: Phase::Initialization,
+ event: RuntimeEvent::Balances(pallet_balances::Event::Transfer {
+ from: ALICE,
+ to: account_id.clone(),
+ amount: 42,
+ }),
+ topics: vec![],
+ },]
);
});
}
@@ -3063,18 +2814,6 @@ fn set_code_extrinsic() {
assert_eq!(get_contract(&addr).code_hash, new_code_hash);
assert_refcount!(&code_hash, 0);
assert_refcount!(&new_code_hash, 1);
- assert_eq!(
- System::events(),
- vec![EventRecord {
- phase: Phase::Initialization,
- event: RuntimeEvent::Contracts(pallet_revive::Event::ContractCodeUpdated {
- contract: addr,
- new_code_hash,
- old_code_hash: code_hash,
- }),
- topics: vec![],
- },]
- );
});
}
@@ -3180,7 +2919,7 @@ fn contract_reverted() {
#[test]
fn set_code_hash() {
- let (wasm, code_hash) = compile_module("set_code_hash").unwrap();
+ let (wasm, _) = compile_module("set_code_hash").unwrap();
let (new_wasm, new_code_hash) = compile_module("new_set_code_hash_contract").unwrap();
ExtBuilder::default().existential_deposit(100).build().execute_with(|| {
@@ -3208,38 +2947,6 @@ fn set_code_hash() {
// Second calls new contract code that returns 2
let result = builder::bare_call(contract_addr).build_and_unwrap_result();
assert_return_code!(result, 2);
-
- // Checking for the last event only
- assert_eq!(
- &System::events(),
- &[
- EventRecord {
- phase: Phase::Initialization,
- event: RuntimeEvent::Contracts(crate::Event::ContractCodeUpdated {
- contract: contract_addr,
- new_code_hash,
- old_code_hash: code_hash,
- }),
- topics: vec![],
- },
- EventRecord {
- phase: Phase::Initialization,
- event: RuntimeEvent::Contracts(crate::Event::Called {
- caller: Origin::from_account_id(ALICE),
- contract: contract_addr,
- }),
- topics: vec![],
- },
- EventRecord {
- phase: Phase::Initialization,
- event: RuntimeEvent::Contracts(crate::Event::Called {
- caller: Origin::from_account_id(ALICE),
- contract: contract_addr,
- }),
- topics: vec![],
- },
- ],
- );
});
}
diff --git a/substrate/frame/revive/src/wasm/mod.rs b/substrate/frame/revive/src/wasm/mod.rs
index b45d7026ba9132b0da8f5f8a963c3cebf9ad0751..527cf16309540c3edacf626bb7e222f82677f3d9 100644
--- a/substrate/frame/revive/src/wasm/mod.rs
+++ b/substrate/frame/revive/src/wasm/mod.rs
@@ -29,14 +29,13 @@ pub use crate::wasm::runtime::{ReturnData, TrapReason};
pub use crate::wasm::runtime::{Memory, Runtime, RuntimeCosts};
use crate::{
- address::AddressMapper,
exec::{ExecResult, Executable, ExportedFunction, Ext},
gas::{GasMeter, Token},
limits,
storage::meter::Diff,
weights::WeightInfo,
- AccountIdOf, BadOrigin, BalanceOf, CodeInfoOf, CodeVec, Config, Error, Event, ExecError,
- HoldReason, Pallet, PristineCode, Weight, LOG_TARGET,
+ AccountIdOf, BadOrigin, BalanceOf, CodeInfoOf, CodeVec, Config, Error, ExecError, HoldReason,
+ PristineCode, Weight, LOG_TARGET,
};
use alloc::vec::Vec;
use codec::{Decode, Encode, MaxEncodedLen};
@@ -157,16 +156,9 @@ where
code_info.deposit,
BestEffort,
);
- let deposit_released = code_info.deposit;
- let remover = T::AddressMapper::to_address(&code_info.owner);
*existing = None;
<PristineCode<T>>::remove(&code_hash);
- <Pallet<T>>::deposit_event(Event::CodeRemoved {
- code_hash,
- deposit_released,
- remover,
- });
Ok(())
} else {
Err(<Error<T>>::CodeNotFound.into())
@@ -202,12 +194,6 @@ where
self.code_info.refcount = 0;
<PristineCode<T>>::insert(code_hash, &self.code);
*stored_code_info = Some(self.code_info.clone());
- let uploader = T::AddressMapper::to_address(&self.code_info.owner);
- <Pallet<T>>::deposit_event(Event::CodeStored {
- code_hash,
- deposit_held: deposit,
- uploader,
- });
Ok(deposit)
},
}