--- a/pallets/evm-contract-helpers/src/eth.rs +++ b/pallets/evm-contract-helpers/src/eth.rs @@ -65,15 +65,15 @@ contract_address: address, sponsor: address, ) -> Result { + self.recorder().consume_sload()?; + self.recorder().consume_sstore()?; + Pallet::::set_sponsor( &T::CrossAccountId::from_eth(caller), contract_address, &T::CrossAccountId::from_eth(sponsor), ) .map_err(dispatch_to_evm::)?; - - self.recorder().consume_sload()?; - self.recorder().consume_sstore()?; Ok(()) } @@ -82,11 +82,11 @@ /// /// @param contract_address Contract for which a self sponsoring is being enabled. fn self_sponsored_enable(&mut self, caller: caller, contract_address: address) -> Result { + self.recorder().consume_sload()?; + self.recorder().consume_sstore()?; + Pallet::::self_sponsored_enable(&T::CrossAccountId::from_eth(caller), contract_address) .map_err(dispatch_to_evm::)?; - - self.recorder().consume_sload()?; - self.recorder().consume_sstore()?; Ok(()) } @@ -95,11 +95,11 @@ /// /// @param contract_address Contract for which a sponsorship is being removed. fn remove_sponsor(&mut self, caller: caller, contract_address: address) -> Result { + self.recorder().consume_sload()?; + self.recorder().consume_sstore()?; + Pallet::::remove_sponsor(&T::CrossAccountId::from_eth(caller), contract_address) .map_err(dispatch_to_evm::)?; - - self.recorder().consume_sload()?; - self.recorder().consume_sstore()?; Ok(()) } @@ -110,11 +110,11 @@ /// /// @param contract_address Сontract for which need to confirm sponsorship. fn confirm_sponsorship(&mut self, caller: caller, contract_address: address) -> Result { + self.recorder().consume_sload()?; + self.recorder().consume_sstore()?; + Pallet::::confirm_sponsorship(&T::CrossAccountId::from_eth(caller), contract_address) .map_err(dispatch_to_evm::)?; - - self.recorder().consume_sload()?; - self.recorder().consume_sstore()?; Ok(()) } @@ -165,12 +165,12 @@ contract_address: address, mode: uint8, ) -> Result { + self.recorder().consume_sload()?; + self.recorder().consume_sstore()?; + >::ensure_owner(contract_address, caller).map_err(dispatch_to_evm::)?; let mode = SponsoringModeT::from_eth(mode).ok_or("unknown mode")?; >::set_sponsoring_mode(contract_address, mode); - - self.recorder().consume_sload()?; - self.recorder().consume_sstore()?; Ok(()) } @@ -185,11 +185,11 @@ contract_address: address, rate_limit: uint32, ) -> Result { + self.recorder().consume_sload()?; + self.recorder().consume_sstore()?; + >::ensure_owner(contract_address, caller).map_err(dispatch_to_evm::)?; >::set_sponsoring_rate_limit(contract_address, rate_limit.into()); - - self.recorder().consume_sload()?; - self.recorder().consume_sstore()?; Ok(()) } @@ -215,11 +215,11 @@ contract_address: address, enabled: bool, ) -> Result { + self.recorder().consume_sload()?; + self.recorder().consume_sstore()?; + >::ensure_owner(contract_address, caller).map_err(dispatch_to_evm::)?; >::toggle_allowlist(contract_address, enabled); - - self.recorder().consume_sload()?; - self.recorder().consume_sstore()?; Ok(()) } @@ -231,11 +231,11 @@ user: address, allowed: bool, ) -> Result { + self.recorder().consume_sload()?; + self.recorder().consume_sstore()?; + >::ensure_owner(contract_address, caller).map_err(dispatch_to_evm::)?; >::toggle_allowed(contract_address, user, allowed); - - self.recorder().consume_sload()?; - self.recorder().consume_sstore()?; Ok(()) }