difftreelog
fix change sponsor to OptioCrossAddress
in: master
9 files changed
crates/evm-coder/src/abi/impls.rsdiffbeforeafterboth--- a/crates/evm-coder/src/abi/impls.rs
+++ b/crates/evm-coder/src/abi/impls.rs
@@ -181,11 +181,6 @@
}
}
-macro_rules! count {
- () => (0usize);
- ( $x:tt $($xs:tt)* ) => (1usize + count!($($xs)*));
-}
-
macro_rules! impl_tuples {
($($ident:ident)+) => {
impl<$($ident: AbiType,)+> AbiType for ($($ident,)+)
pallets/common/src/eth.rsdiffbeforeafterboth--- a/pallets/common/src/eth.rs
+++ b/pallets/common/src/eth.rs
@@ -122,6 +122,13 @@
}
}
+/// Ethereum representation of Optional value with CrossAddress.
+#[derive(Debug, Default, AbiCoder)]
+pub struct OptionCrossAddress {
+ pub status: bool,
+ pub value: CrossAddress,
+}
+
/// Cross account struct
#[derive(Debug, Default, AbiCoder)]
pub struct CrossAddress {
pallets/evm-contract-helpers/src/eth.rsdiffbeforeafterboth--- a/pallets/evm-contract-helpers/src/eth.rs
+++ b/pallets/evm-contract-helpers/src/eth.rs
@@ -25,6 +25,7 @@
types::*,
ToLog,
};
+use pallet_common::eth;
use pallet_evm::{
ExitRevert, OnCreate, OnMethodCall, PrecompileResult, PrecompileFailure, PrecompileHandle,
account::CrossAccountId,
@@ -174,12 +175,17 @@
///
/// @param contractAddress The contract for which a sponsor is requested.
/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.
- fn sponsor(&self, contract_address: address) -> Result<pallet_common::eth::CrossAddress> {
- Ok(
- pallet_common::eth::CrossAddress::from_sub_cross_account::<T>(
- &Pallet::<T>::get_sponsor(contract_address).ok_or("Contract has no sponsor")?,
- ),
- )
+ fn sponsor(&self, contract_address: address) -> Result<eth::OptionCrossAddress> {
+ Ok(match Pallet::<T>::get_sponsor(contract_address) {
+ Some(ref value) => eth::OptionCrossAddress {
+ status: true,
+ value: eth::CrossAddress::from_sub_cross_account::<T>(value),
+ },
+ None => eth::OptionCrossAddress {
+ status: false,
+ value: Default::default(),
+ },
+ })
}
/// Check tat contract has confirmed sponsor.
pallets/evm-contract-helpers/src/stubs/ContractHelpers.rawdiffbeforeafterbothbinary blob — no preview
pallets/evm-contract-helpers/src/stubs/ContractHelpers.soldiffbeforeafterboth--- a/pallets/evm-contract-helpers/src/stubs/ContractHelpers.sol
+++ b/pallets/evm-contract-helpers/src/stubs/ContractHelpers.sol
@@ -96,11 +96,11 @@
/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.
/// @dev EVM selector for this function is: 0x766c4f37,
/// or in textual repr: sponsor(address)
- function sponsor(address contractAddress) public view returns (CrossAddress memory) {
+ function sponsor(address contractAddress) public view returns (OptionCrossAddress memory) {
require(false, stub_error);
contractAddress;
dummy;
- return CrossAddress(0x0000000000000000000000000000000000000000, 0);
+ return OptionCrossAddress(false, CrossAddress(0x0000000000000000000000000000000000000000, 0));
}
/// Check tat contract has confirmed sponsor.
@@ -270,3 +270,9 @@
address eth;
uint256 sub;
}
+
+/// @dev Ethereum representation of Optional value with CrossAddress.
+struct OptionCrossAddress {
+ bool status;
+ CrossAddress value;
+}
pallets/unique/src/lib.rsdiffbeforeafterboth--- a/pallets/unique/src/lib.rs
+++ b/pallets/unique/src/lib.rs
@@ -74,7 +74,7 @@
extern crate alloc;
use frame_support::{
- decl_module, decl_storage, decl_error, decl_event,
+ decl_module, decl_storage, decl_error,
dispatch::DispatchResult,
ensure, fail,
weights::{Weight},
tests/src/eth/abi/contractHelpers.jsondiffbeforeafterboth--- a/tests/src/eth/abi/contractHelpers.json
+++ b/tests/src/eth/abi/contractHelpers.json
@@ -223,10 +223,18 @@
"outputs": [
{
"components": [
- { "internalType": "address", "name": "eth", "type": "address" },
- { "internalType": "uint256", "name": "sub", "type": "uint256" }
+ { "internalType": "bool", "name": "status", "type": "bool" },
+ {
+ "components": [
+ { "internalType": "address", "name": "eth", "type": "address" },
+ { "internalType": "uint256", "name": "sub", "type": "uint256" }
+ ],
+ "internalType": "struct CrossAddress",
+ "name": "value",
+ "type": "tuple"
+ }
],
- "internalType": "struct CrossAddress",
+ "internalType": "struct OptionCrossAddress",
"name": "",
"type": "tuple"
}
tests/src/eth/api/ContractHelpers.soldiffbeforeafterboth1// SPDX-License-Identifier: OTHER2// This code is automatically generated34pragma solidity >=0.8.0 <0.9.0;56/// @dev common stubs holder7interface Dummy {89}1011interface ERC165 is Dummy {12 function supportsInterface(bytes4 interfaceID) external view returns (bool);13}1415/// @dev inlined interface16interface ContractHelpersEvents {17 event ContractSponsorSet(address indexed contractAddress, address sponsor);18 event ContractSponsorshipConfirmed(address indexed contractAddress, address sponsor);19 event ContractSponsorRemoved(address indexed contractAddress);20}2122/// @title Magic contract, which allows users to reconfigure other contracts23/// @dev the ERC-165 identifier for this interface is 0x30afad0424interface ContractHelpers is Dummy, ERC165, ContractHelpersEvents {25 /// Get user, which deployed specified contract26 /// @dev May return zero address in case if contract is deployed27 /// using uniquenetwork evm-migration pallet, or using other terms not28 /// intended by pallet-evm29 /// @dev Returns zero address if contract does not exists30 /// @param contractAddress Contract to get owner of31 /// @return address Owner of contract32 /// @dev EVM selector for this function is: 0x5152b14c,33 /// or in textual repr: contractOwner(address)34 function contractOwner(address contractAddress) external view returns (address);3536 /// Set sponsor.37 /// @param contractAddress Contract for which a sponsor is being established.38 /// @param sponsor User address who set as pending sponsor.39 /// @dev EVM selector for this function is: 0xf01fba93,40 /// or in textual repr: setSponsor(address,address)41 function setSponsor(address contractAddress, address sponsor) external;4243 /// Set contract as self sponsored.44 ///45 /// @param contractAddress Contract for which a self sponsoring is being enabled.46 /// @dev EVM selector for this function is: 0x89f7d9ae,47 /// or in textual repr: selfSponsoredEnable(address)48 function selfSponsoredEnable(address contractAddress) external;4950 /// Remove sponsor.51 ///52 /// @param contractAddress Contract for which a sponsorship is being removed.53 /// @dev EVM selector for this function is: 0xef784250,54 /// or in textual repr: removeSponsor(address)55 function removeSponsor(address contractAddress) external;5657 /// Confirm sponsorship.58 ///59 /// @dev Caller must be same that set via [`setSponsor`].60 ///61 /// @param contractAddress Сontract for which need to confirm sponsorship.62 /// @dev EVM selector for this function is: 0xabc00001,63 /// or in textual repr: confirmSponsorship(address)64 function confirmSponsorship(address contractAddress) external;6566 /// Get current sponsor.67 ///68 /// @param contractAddress The contract for which a sponsor is requested.69 /// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.70 /// @dev EVM selector for this function is: 0x766c4f37,71 /// or in textual repr: sponsor(address)72 function sponsor(address contractAddress) external view returns (CrossAddress memory);7374 /// Check tat contract has confirmed sponsor.75 ///76 /// @param contractAddress The contract for which the presence of a confirmed sponsor is checked.77 /// @return **true** if contract has confirmed sponsor.78 /// @dev EVM selector for this function is: 0x97418603,79 /// or in textual repr: hasSponsor(address)80 function hasSponsor(address contractAddress) external view returns (bool);8182 /// Check tat contract has pending sponsor.83 ///84 /// @param contractAddress The contract for which the presence of a pending sponsor is checked.85 /// @return **true** if contract has pending sponsor.86 /// @dev EVM selector for this function is: 0x39b9b242,87 /// or in textual repr: hasPendingSponsor(address)88 function hasPendingSponsor(address contractAddress) external view returns (bool);8990 /// @dev EVM selector for this function is: 0x6027dc61,91 /// or in textual repr: sponsoringEnabled(address)92 function sponsoringEnabled(address contractAddress) external view returns (bool);9394 /// @dev EVM selector for this function is: 0xfde8a560,95 /// or in textual repr: setSponsoringMode(address,uint8)96 function setSponsoringMode(address contractAddress, uint8 mode) external;9798 /// Get current contract sponsoring rate limit99 /// @param contractAddress Contract to get sponsoring rate limit of100 /// @return uint32 Amount of blocks between two sponsored transactions101 /// @dev EVM selector for this function is: 0xf29694d8,102 /// or in textual repr: sponsoringRateLimit(address)103 function sponsoringRateLimit(address contractAddress) external view returns (uint32);104105 /// Set contract sponsoring rate limit106 /// @dev Sponsoring rate limit - is a minimum amount of blocks that should107 /// pass between two sponsored transactions108 /// @param contractAddress Contract to change sponsoring rate limit of109 /// @param rateLimit Target rate limit110 /// @dev Only contract owner can change this setting111 /// @dev EVM selector for this function is: 0x77b6c908,112 /// or in textual repr: setSponsoringRateLimit(address,uint32)113 function setSponsoringRateLimit(address contractAddress, uint32 rateLimit) external;114115 /// Set contract sponsoring fee limit116 /// @dev Sponsoring fee limit - is maximum fee that could be spent by117 /// single transaction118 /// @param contractAddress Contract to change sponsoring fee limit of119 /// @param feeLimit Fee limit120 /// @dev Only contract owner can change this setting121 /// @dev EVM selector for this function is: 0x03aed665,122 /// or in textual repr: setSponsoringFeeLimit(address,uint256)123 function setSponsoringFeeLimit(address contractAddress, uint256 feeLimit) external;124125 /// Get current contract sponsoring fee limit126 /// @param contractAddress Contract to get sponsoring fee limit of127 /// @return uint256 Maximum amount of fee that could be spent by single128 /// transaction129 /// @dev EVM selector for this function is: 0x75b73606,130 /// or in textual repr: sponsoringFeeLimit(address)131 function sponsoringFeeLimit(address contractAddress) external view returns (uint256);132133 /// Is specified user present in contract allow list134 /// @dev Contract owner always implicitly included135 /// @param contractAddress Contract to check allowlist of136 /// @param user User to check137 /// @return bool Is specified users exists in contract allowlist138 /// @dev EVM selector for this function is: 0x5c658165,139 /// or in textual repr: allowed(address,address)140 function allowed(address contractAddress, address user) external view returns (bool);141142 /// Toggle user presence in contract allowlist143 /// @param contractAddress Contract to change allowlist of144 /// @param user Which user presence should be toggled145 /// @param isAllowed `true` if user should be allowed to be sponsored146 /// or call this contract, `false` otherwise147 /// @dev Only contract owner can change this setting148 /// @dev EVM selector for this function is: 0x4706cc1c,149 /// or in textual repr: toggleAllowed(address,address,bool)150 function toggleAllowed(151 address contractAddress,152 address user,153 bool isAllowed154 ) external;155156 /// Is this contract has allowlist access enabled157 /// @dev Allowlist always can have users, and it is used for two purposes:158 /// in case of allowlist sponsoring mode, users will be sponsored if they exist in allowlist159 /// in case of allowlist access enabled, only users from allowlist may call this contract160 /// @param contractAddress Contract to get allowlist access of161 /// @return bool Is specified contract has allowlist access enabled162 /// @dev EVM selector for this function is: 0xc772ef6c,163 /// or in textual repr: allowlistEnabled(address)164 function allowlistEnabled(address contractAddress) external view returns (bool);165166 /// Toggle contract allowlist access167 /// @param contractAddress Contract to change allowlist access of168 /// @param enabled Should allowlist access to be enabled?169 /// @dev EVM selector for this function is: 0x36de20f5,170 /// or in textual repr: toggleAllowlist(address,bool)171 function toggleAllowlist(address contractAddress, bool enabled) external;172}173174/// @dev Cross account struct175struct CrossAddress {176 address eth;177 uint256 sub;178}1// SPDX-License-Identifier: OTHER2// This code is automatically generated34pragma solidity >=0.8.0 <0.9.0;56/// @dev common stubs holder7interface Dummy {89}1011interface ERC165 is Dummy {12 function supportsInterface(bytes4 interfaceID) external view returns (bool);13}1415/// @dev inlined interface16interface ContractHelpersEvents {17 event ContractSponsorSet(address indexed contractAddress, address sponsor);18 event ContractSponsorshipConfirmed(address indexed contractAddress, address sponsor);19 event ContractSponsorRemoved(address indexed contractAddress);20}2122/// @title Magic contract, which allows users to reconfigure other contracts23/// @dev the ERC-165 identifier for this interface is 0x30afad0424interface ContractHelpers is Dummy, ERC165, ContractHelpersEvents {25 /// Get user, which deployed specified contract26 /// @dev May return zero address in case if contract is deployed27 /// using uniquenetwork evm-migration pallet, or using other terms not28 /// intended by pallet-evm29 /// @dev Returns zero address if contract does not exists30 /// @param contractAddress Contract to get owner of31 /// @return address Owner of contract32 /// @dev EVM selector for this function is: 0x5152b14c,33 /// or in textual repr: contractOwner(address)34 function contractOwner(address contractAddress) external view returns (address);3536 /// Set sponsor.37 /// @param contractAddress Contract for which a sponsor is being established.38 /// @param sponsor User address who set as pending sponsor.39 /// @dev EVM selector for this function is: 0xf01fba93,40 /// or in textual repr: setSponsor(address,address)41 function setSponsor(address contractAddress, address sponsor) external;4243 /// Set contract as self sponsored.44 ///45 /// @param contractAddress Contract for which a self sponsoring is being enabled.46 /// @dev EVM selector for this function is: 0x89f7d9ae,47 /// or in textual repr: selfSponsoredEnable(address)48 function selfSponsoredEnable(address contractAddress) external;4950 /// Remove sponsor.51 ///52 /// @param contractAddress Contract for which a sponsorship is being removed.53 /// @dev EVM selector for this function is: 0xef784250,54 /// or in textual repr: removeSponsor(address)55 function removeSponsor(address contractAddress) external;5657 /// Confirm sponsorship.58 ///59 /// @dev Caller must be same that set via [`setSponsor`].60 ///61 /// @param contractAddress Сontract for which need to confirm sponsorship.62 /// @dev EVM selector for this function is: 0xabc00001,63 /// or in textual repr: confirmSponsorship(address)64 function confirmSponsorship(address contractAddress) external;6566 /// Get current sponsor.67 ///68 /// @param contractAddress The contract for which a sponsor is requested.69 /// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.70 /// @dev EVM selector for this function is: 0x766c4f37,71 /// or in textual repr: sponsor(address)72 function sponsor(address contractAddress) external view returns (OptionCrossAddress memory);7374 /// Check tat contract has confirmed sponsor.75 ///76 /// @param contractAddress The contract for which the presence of a confirmed sponsor is checked.77 /// @return **true** if contract has confirmed sponsor.78 /// @dev EVM selector for this function is: 0x97418603,79 /// or in textual repr: hasSponsor(address)80 function hasSponsor(address contractAddress) external view returns (bool);8182 /// Check tat contract has pending sponsor.83 ///84 /// @param contractAddress The contract for which the presence of a pending sponsor is checked.85 /// @return **true** if contract has pending sponsor.86 /// @dev EVM selector for this function is: 0x39b9b242,87 /// or in textual repr: hasPendingSponsor(address)88 function hasPendingSponsor(address contractAddress) external view returns (bool);8990 /// @dev EVM selector for this function is: 0x6027dc61,91 /// or in textual repr: sponsoringEnabled(address)92 function sponsoringEnabled(address contractAddress) external view returns (bool);9394 /// @dev EVM selector for this function is: 0xfde8a560,95 /// or in textual repr: setSponsoringMode(address,uint8)96 function setSponsoringMode(address contractAddress, uint8 mode) external;9798 /// Get current contract sponsoring rate limit99 /// @param contractAddress Contract to get sponsoring rate limit of100 /// @return uint32 Amount of blocks between two sponsored transactions101 /// @dev EVM selector for this function is: 0xf29694d8,102 /// or in textual repr: sponsoringRateLimit(address)103 function sponsoringRateLimit(address contractAddress) external view returns (uint32);104105 /// Set contract sponsoring rate limit106 /// @dev Sponsoring rate limit - is a minimum amount of blocks that should107 /// pass between two sponsored transactions108 /// @param contractAddress Contract to change sponsoring rate limit of109 /// @param rateLimit Target rate limit110 /// @dev Only contract owner can change this setting111 /// @dev EVM selector for this function is: 0x77b6c908,112 /// or in textual repr: setSponsoringRateLimit(address,uint32)113 function setSponsoringRateLimit(address contractAddress, uint32 rateLimit) external;114115 /// Set contract sponsoring fee limit116 /// @dev Sponsoring fee limit - is maximum fee that could be spent by117 /// single transaction118 /// @param contractAddress Contract to change sponsoring fee limit of119 /// @param feeLimit Fee limit120 /// @dev Only contract owner can change this setting121 /// @dev EVM selector for this function is: 0x03aed665,122 /// or in textual repr: setSponsoringFeeLimit(address,uint256)123 function setSponsoringFeeLimit(address contractAddress, uint256 feeLimit) external;124125 /// Get current contract sponsoring fee limit126 /// @param contractAddress Contract to get sponsoring fee limit of127 /// @return uint256 Maximum amount of fee that could be spent by single128 /// transaction129 /// @dev EVM selector for this function is: 0x75b73606,130 /// or in textual repr: sponsoringFeeLimit(address)131 function sponsoringFeeLimit(address contractAddress) external view returns (uint256);132133 /// Is specified user present in contract allow list134 /// @dev Contract owner always implicitly included135 /// @param contractAddress Contract to check allowlist of136 /// @param user User to check137 /// @return bool Is specified users exists in contract allowlist138 /// @dev EVM selector for this function is: 0x5c658165,139 /// or in textual repr: allowed(address,address)140 function allowed(address contractAddress, address user) external view returns (bool);141142 /// Toggle user presence in contract allowlist143 /// @param contractAddress Contract to change allowlist of144 /// @param user Which user presence should be toggled145 /// @param isAllowed `true` if user should be allowed to be sponsored146 /// or call this contract, `false` otherwise147 /// @dev Only contract owner can change this setting148 /// @dev EVM selector for this function is: 0x4706cc1c,149 /// or in textual repr: toggleAllowed(address,address,bool)150 function toggleAllowed(151 address contractAddress,152 address user,153 bool isAllowed154 ) external;155156 /// Is this contract has allowlist access enabled157 /// @dev Allowlist always can have users, and it is used for two purposes:158 /// in case of allowlist sponsoring mode, users will be sponsored if they exist in allowlist159 /// in case of allowlist access enabled, only users from allowlist may call this contract160 /// @param contractAddress Contract to get allowlist access of161 /// @return bool Is specified contract has allowlist access enabled162 /// @dev EVM selector for this function is: 0xc772ef6c,163 /// or in textual repr: allowlistEnabled(address)164 function allowlistEnabled(address contractAddress) external view returns (bool);165166 /// Toggle contract allowlist access167 /// @param contractAddress Contract to change allowlist access of168 /// @param enabled Should allowlist access to be enabled?169 /// @dev EVM selector for this function is: 0x36de20f5,170 /// or in textual repr: toggleAllowlist(address,bool)171 function toggleAllowlist(address contractAddress, bool enabled) external;172}173174/// @dev Ethereum representation of Optional value with CrossAddress.175struct OptionCrossAddress {176 bool status;177 CrossAddress value;178}179180/// @dev Cross account struct181struct CrossAddress {182 address eth;183 uint256 sub;184}tests/src/eth/contractSponsoring.test.tsdiffbeforeafterboth--- a/tests/src/eth/contractSponsoring.test.ts
+++ b/tests/src/eth/contractSponsoring.test.ts
@@ -42,7 +42,9 @@
expect(await helpers.methods.hasSponsor(flipper.options.address).call()).to.be.true;
// 1.1 Can get sponsor using methods.sponsor:
- const actualSponsor = await helpers.methods.sponsor(flipper.options.address).call();
+ const actualSponsorOpt = await helpers.methods.sponsor(flipper.options.address).call();
+ expect(actualSponsorOpt.status).to.be.true;
+ const actualSponsor = actualSponsorOpt.value;
expect(actualSponsor.eth).to.eq(flipper.options.address);
expect(actualSponsor.sub).to.eq('0');
@@ -151,7 +153,9 @@
expect(await helpers.methods.hasSponsor(flipper.options.address).call()).to.be.true;
// 1.1 Can get sponsor using methods.sponsor:
- const actualSponsor = await helpers.methods.sponsor(flipper.options.address).call();
+ const actualSponsorOpt = await helpers.methods.sponsor(flipper.options.address).call();
+ expect(actualSponsorOpt.status).to.be.true;
+ const actualSponsor = actualSponsorOpt.value;
expect(actualSponsor.eth).to.eq(sponsor);
expect(actualSponsor.sub).to.eq('0');