git.delta.rocks / unique-network / refs/commits / 837c29c459b6

--- a/pallets/evm-contract-helpers/src/eth.rs
+++ b/pallets/evm-contract-helpers/src/eth.rs
@@ -42,9 +42,8 @@
 	ContractSponsorSet {
 		/// Contract address of the affected collection.
 		#[indexed]
-		contract: address,
+		contract_address: address,
 		/// New sponsor address.
-		#[indexed]
 		sponsor: address,
 	},
 
@@ -52,9 +51,8 @@
 	ContractSponsorshipConfirmed {
 		/// Contract address of the affected collection.
 		#[indexed]
-		contract: address,
+		contract_address: address,
 		/// New sponsor address.
-		#[indexed]
 		sponsor: address,
 	},
 
@@ -62,7 +60,7 @@
 	ContractSponsorRemoved {
 		/// Contract address of the affected collection.
 		#[indexed]
-		contract: address,
+		contract_address: address,
 	},
 }
 

208			));208			));
209			<PalletEvm<T>>::deposit_log(209			<PalletEvm<T>>::deposit_log(
210				ContractHelpersEvents::ContractSponsorSet {210				ContractHelpersEvents::ContractSponsorSet {
211					contract,211					contract_address: contract,
212					sponsor: *sponsor.as_eth(),212					sponsor: *sponsor.as_eth(),
213				}213				}
214				.to_log(contract),214				.to_log(contract),
221		/// `sender` must be owner of contract.221		/// `sender` must be owner of contract.
222		pub fn force_set_sponsor(222		pub fn force_set_sponsor(
223			sender: &T::CrossAccountId,223			sender: &T::CrossAccountId,
224			contract: H160,224			contract_address: H160,
225			sponsor: &T::CrossAccountId,225			sponsor: &T::CrossAccountId,
226		) -> DispatchResult {226		) -> DispatchResult {
227			Pallet::<T>::ensure_owner(contract, *sender.as_eth())?;227			Pallet::<T>::ensure_owner(contract_address, *sender.as_eth())?;
228			Sponsoring::<T>::insert(228			Sponsoring::<T>::insert(
229				contract,229				contract_address,
230				SponsorshipState::<T::CrossAccountId>::Confirmed(T::CrossAccountId::from_eth(230				SponsorshipState::<T::CrossAccountId>::Confirmed(T::CrossAccountId::from_eth(
231					contract,231					contract_address,
232				)),232				)),
233			);233			);
234234
235			let eth_sponsor = *sponsor.as_eth();235			let eth_sponsor = *sponsor.as_eth();
236			let sub_sponsor = sponsor.as_sub().clone();236			let sub_sponsor = sponsor.as_sub().clone();
237237
238			<Pallet<T>>::deposit_event(Event::<T>::ContractSponsorSet(238			<Pallet<T>>::deposit_event(Event::<T>::ContractSponsorSet(
239				contract,239				contract_address,
240				sub_sponsor.clone(),240				sub_sponsor.clone(),
241			));241			));
242			<PalletEvm<T>>::deposit_log(242			<PalletEvm<T>>::deposit_log(
243				ContractHelpersEvents::ContractSponsorSet {243				ContractHelpersEvents::ContractSponsorSet {
244					contract,244					contract_address,
245					sponsor: eth_sponsor,245					sponsor: eth_sponsor,
246				}246				}
247				.to_log(contract),247				.to_log(contract_address),
248			);248			);
249249
250			<Pallet<T>>::deposit_event(Event::<T>::ContractSponsorshipConfirmed(250			<Pallet<T>>::deposit_event(Event::<T>::ContractSponsorshipConfirmed(
251				contract,251				contract_address,
252				sub_sponsor,252				sub_sponsor,
253			));253			));
254			<PalletEvm<T>>::deposit_log(254			<PalletEvm<T>>::deposit_log(
255				ContractHelpersEvents::ContractSponsorshipConfirmed {255				ContractHelpersEvents::ContractSponsorshipConfirmed {
256					contract,256					contract_address,
257					sponsor: eth_sponsor,257					sponsor: eth_sponsor,
258				}258				}
259				.to_log(contract),259				.to_log(contract_address),
260			);260			);
261261
262			Ok(())262			Ok(())
265		/// Remove sponsor for `contract`.265		/// Remove sponsor for `contract`.
266		///266		///
267		/// `sender` must be owner of contract.267		/// `sender` must be owner of contract.
268		pub fn remove_sponsor(sender: &T::CrossAccountId, contract: H160) -> DispatchResult {268		pub fn remove_sponsor(sender: &T::CrossAccountId, contract_address: H160) -> DispatchResult {
269			Pallet::<T>::ensure_owner(contract, *sender.as_eth())?;269			Pallet::<T>::ensure_owner(contract_address, *sender.as_eth())?;
270			Sponsoring::<T>::remove(contract);270			Sponsoring::<T>::remove(contract_address);
271271
272			<Pallet<T>>::deposit_event(Event::<T>::ContractSponsorRemoved(contract));272			<Pallet<T>>::deposit_event(Event::<T>::ContractSponsorRemoved(contract_address));
273			<PalletEvm<T>>::deposit_log(273			<PalletEvm<T>>::deposit_log(
274				ContractHelpersEvents::ContractSponsorRemoved { contract }.to_log(contract),274				ContractHelpersEvents::ContractSponsorRemoved { contract_address }.to_log(contract_address),
275			);275			);
276276
277			Ok(())277			Ok(())
280		/// Confirm sponsorship.280		/// Confirm sponsorship.
281		///281		///
282		/// `sender` must be same that set via [`set_sponsor`].282		/// `sender` must be same that set via [`set_sponsor`].
283		pub fn confirm_sponsorship(sender: &T::CrossAccountId, contract: H160) -> DispatchResult {283		pub fn confirm_sponsorship(sender: &T::CrossAccountId, contract_address: H160) -> DispatchResult {
284			match Sponsoring::<T>::get(contract) {284			match Sponsoring::<T>::get(contract_address) {
285				SponsorshipState::Unconfirmed(sponsor) => {285				SponsorshipState::Unconfirmed(sponsor) => {
286					ensure!(sponsor == *sender, Error::<T>::NoPermission);286					ensure!(sponsor == *sender, Error::<T>::NoPermission);
287					let eth_sponsor = *sponsor.as_eth();287					let eth_sponsor = *sponsor.as_eth();
288					let sub_sponsor = sponsor.as_sub().clone();288					let sub_sponsor = sponsor.as_sub().clone();
289					Sponsoring::<T>::insert(289					Sponsoring::<T>::insert(
290						contract,290						contract_address,
291						SponsorshipState::<T::CrossAccountId>::Confirmed(sponsor),291						SponsorshipState::<T::CrossAccountId>::Confirmed(sponsor),
292					);292					);
293293
294					<Pallet<T>>::deposit_event(Event::<T>::ContractSponsorshipConfirmed(294					<Pallet<T>>::deposit_event(Event::<T>::ContractSponsorshipConfirmed(
295						contract,295						contract_address,
296						sub_sponsor,296						sub_sponsor,
297					));297					));
298					<PalletEvm<T>>::deposit_log(298					<PalletEvm<T>>::deposit_log(
299						ContractHelpersEvents::ContractSponsorshipConfirmed {299						ContractHelpersEvents::ContractSponsorshipConfirmed {
300							contract,300							contract_address,
301							sponsor: eth_sponsor,301							sponsor: eth_sponsor,
302						}302						}
303						.to_log(contract),303						.to_log(contract_address),
304					);304					);
305305
306					Ok(())306					Ok(())

binary blob — no preview

--- a/pallets/evm-contract-helpers/src/stubs/ContractHelpers.sol
+++ b/pallets/evm-contract-helpers/src/stubs/ContractHelpers.sol
@@ -21,9 +21,19 @@
 	}
 }
 
+/// @dev inlined interface
+contract ContractHelpersEvents {
+	event ContractSponsorSet(address indexed contractAddress, address sponsor);
+	event ContractSponsorshipConfirmed(
+		address indexed contractAddress,
+		address sponsor
+	);
+	event ContractSponsorRemoved(address indexed contractAddress);
+}
+
 /// @title Magic contract, which allows users to reconfigure other contracts
 /// @dev the ERC-165 identifier for this interface is 0xd77fab70
-contract ContractHelpers is Dummy, ERC165 {
+contract ContractHelpers is Dummy, ERC165, ContractHelpersEvents {
 	/// Get user, which deployed specified contract
 	/// @dev May return zero address in case if contract is deployed
 	///  using uniquenetwork evm-migration pallet, or using other terms not

--- a/tests/src/eth/api/ContractHelpers.sol
+++ b/tests/src/eth/api/ContractHelpers.sol
@@ -12,9 +12,19 @@
 	function supportsInterface(bytes4 interfaceID) external view returns (bool);
 }
 
+/// @dev inlined interface
+interface ContractHelpersEvents {
+	event ContractSponsorSet(address indexed contractAddress, address sponsor);
+	event ContractSponsorshipConfirmed(
+		address indexed contractAddress,
+		address sponsor
+	);
+	event ContractSponsorRemoved(address indexed contractAddress);
+}
+
 /// @title Magic contract, which allows users to reconfigure other contracts
 /// @dev the ERC-165 identifier for this interface is 0xd77fab70
-interface ContractHelpers is Dummy, ERC165 {
+interface ContractHelpers is Dummy, ERC165, ContractHelpersEvents {
 	/// Get user, which deployed specified contract
 	/// @dev May return zero address in case if contract is deployed
 	///  using uniquenetwork evm-migration pallet, or using other terms not

--- a/tests/src/eth/contractSponsoring.test.ts
+++ b/tests/src/eth/contractSponsoring.test.ts
@@ -24,6 +24,7 @@
   SponsoringMode,
   createEthAccount,
   ethBalanceViaSub,
+  normalizeEvents,
 } from './util/helpers';
 
 describe('Sponsoring EVM contracts', () => {
@@ -36,6 +37,33 @@
     expect(await helpers.methods.hasSponsor(flipper.options.address).call()).to.be.true;
   });
 
+  itWeb3.only('Set self sponsored events', async ({api, web3, privateKeyWrapper}) => {
+    const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
+    const flipper = await deployFlipper(web3, owner);
+    const helpers = contractHelpers(web3, owner);
+    
+    const result = await helpers.methods.selfSponsoredEnable(flipper.options.address).send();
+    const events = normalizeEvents(result.events);
+    expect(events).to.be.deep.equal([
+      {
+        address: flipper.options.address,
+        event: 'ContractSponsorSet',
+        args: {
+          contractAddress: flipper.options.address,
+          sponsor: flipper.options.address,
+        },
+      },
+      {
+        address: flipper.options.address,
+        event: 'ContractSponsorshipConfirmed',
+        args: {
+          contractAddress: flipper.options.address,
+          sponsor: flipper.options.address,
+        },
+      },
+    ]);
+  });
+
   itWeb3('Self sponsored can not be set by the address that did not deployed the contract', async ({api, web3, privateKeyWrapper}) => {
     const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
     const notOwner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
@@ -75,6 +103,26 @@
     expect(await helpers.methods.hasPendingSponsor(flipper.options.address).call()).to.be.true;
   });
   
+  itWeb3('Set sponsor event', async ({api, web3, privateKeyWrapper}) => {
+    const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
+    const sponsor = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
+    const flipper = await deployFlipper(web3, owner);
+    const helpers = contractHelpers(web3, owner);
+    
+    const result = await helpers.methods.setSponsor(flipper.options.address, sponsor).send();
+    const events = normalizeEvents(result.events);
+    expect(events).to.be.deep.equal([
+      {
+        address: flipper.options.address,
+        event: 'ContractSponsorSet',
+        args: {
+          contractAddress: flipper.options.address,
+          sponsor: sponsor,
+        },
+      },
+    ]);
+  });
+  
   itWeb3('Sponsor can not be set by the address that did not deployed the contract', async ({api, web3, privateKeyWrapper}) => {
     const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
     const sponsor = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
@@ -97,6 +145,26 @@
     expect(await helpers.methods.hasSponsor(flipper.options.address).call()).to.be.true;
   });
 
+  itWeb3('Confirm sponsorship event', async ({api, web3, privateKeyWrapper}) => {
+    const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
+    const sponsor = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
+    const flipper = await deployFlipper(web3, owner);
+    const helpers = contractHelpers(web3, owner);
+    await expect(helpers.methods.setSponsor(flipper.options.address, sponsor).send()).to.be.not.rejected;
+    const result = await helpers.methods.confirmSponsorship(flipper.options.address).send({from: sponsor});
+    const events = normalizeEvents(result.events);
+    expect(events).to.be.deep.equal([
+      {
+        address: flipper.options.address,
+        event: 'ContractSponsorshipConfirmed',
+        args: {
+          contractAddress: flipper.options.address,
+          sponsor: sponsor,
+        },
+      },
+    ]);
+  });
+
   itWeb3('Sponsorship can not be confirmed by the address that not pending as sponsor', async ({api, web3, privateKeyWrapper}) => {
     const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
     const sponsor = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
@@ -160,6 +228,28 @@
     expect(await helpers.methods.hasSponsor(flipper.options.address).call()).to.be.false;
   });
 
+  itWeb3('Remove sponsor event', async ({api, web3, privateKeyWrapper}) => {
+    const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
+    const sponsor = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
+    const flipper = await deployFlipper(web3, owner);
+    const helpers = contractHelpers(web3, owner);
+
+    await helpers.methods.setSponsor(flipper.options.address, sponsor).send();
+    await helpers.methods.confirmSponsorship(flipper.options.address).send({from: sponsor});
+    
+    const result = await helpers.methods.removeSponsor(flipper.options.address).send();
+    const events = normalizeEvents(result.events);
+    expect(events).to.be.deep.equal([
+      {
+        address: flipper.options.address,
+        event: 'ContractSponsorRemoved',
+        args: {
+          contractAddress: flipper.options.address,
+        },
+      },
+    ]);
+  });
+
   itWeb3('Sponsor can not be removed by the address that did not deployed the contract', async ({api, web3, privateKeyWrapper}) => {
     const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
     const notOwner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);

--- a/tests/src/eth/util/contractHelpersAbi.json
+++ b/tests/src/eth/util/contractHelpersAbi.json
@@ -1,5 +1,56 @@
 [
   {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "contractAddress",
+        "type": "address"
+      }
+    ],
+    "name": "ContractSponsorRemoved",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "contractAddress",
+        "type": "address"
+      },
+      {
+        "indexed": false,
+        "internalType": "address",
+        "name": "sponsor",
+        "type": "address"
+      }
+    ],
+    "name": "ContractSponsorSet",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "contractAddress",
+        "type": "address"
+      },
+      {
+        "indexed": false,
+        "internalType": "address",
+        "name": "sponsor",
+        "type": "address"
+      }
+    ],
+    "name": "ContractSponsorshipConfirmed",
+    "type": "event"
+  },
+  {
     "inputs": [
       {
         "internalType": "address",