difftreelog
fix rename some methods
in: master
6 files changed
pallets/evm-contract-helpers/src/eth.rsdiffbeforeafterboth--- a/pallets/evm-contract-helpers/src/eth.rs
+++ b/pallets/evm-contract-helpers/src/eth.rs
@@ -169,7 +169,7 @@
///
/// @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 get_sponsor(&self, contract_address: address) -> Result<(address, uint256)> {
+ fn sponsor(&self, contract_address: address) -> Result<(address, uint256)> {
let sponsor =
Pallet::<T>::get_sponsor(contract_address).ok_or("Contract has no sponsor")?;
Ok(pallet_common::eth::convert_cross_account_to_tuple::<T>(
@@ -220,7 +220,7 @@
/// Get current contract sponsoring rate limit
/// @param contractAddress Contract to get sponsoring rate limit of
/// @return uint32 Amount of blocks between two sponsored transactions
- fn get_sponsoring_rate_limit(&self, contract_address: address) -> Result<uint32> {
+ fn sponsoring_rate_limit(&self, contract_address: address) -> Result<uint32> {
self.recorder().consume_sload()?;
Ok(<SponsoringRateLimit<T>>::get(contract_address)
@@ -273,7 +273,7 @@
/// @param contractAddress Contract to get sponsoring fee limit of
/// @return uint256 Maximum amount of fee that could be spent by single
/// transaction
- fn get_sponsoring_fee_limit(&self, contract_address: address) -> Result<uint256> {
+ fn sponsoring_fee_limit(&self, contract_address: address) -> Result<uint256> {
self.recorder().consume_sload()?;
Ok(get_sponsoring_fee_limit::<T>(contract_address))
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
@@ -25,7 +25,7 @@
}
/// @title Magic contract, which allows users to reconfigure other contracts
-/// @dev the ERC-165 identifier for this interface is 0x172cb4fb
+/// @dev the ERC-165 identifier for this interface is 0x30afad04
contract ContractHelpers is Dummy, ERC165, ContractHelpersEvents {
/// Get user, which deployed specified contract
/// @dev May return zero address in case if contract is deployed
@@ -94,9 +94,9 @@
///
/// @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.
- /// @dev EVM selector for this function is: 0x743fc745,
- /// or in textual repr: getSponsor(address)
- function getSponsor(address contractAddress) public view returns (Tuple0 memory) {
+ /// @dev EVM selector for this function is: 0x766c4f37,
+ /// or in textual repr: sponsor(address)
+ function sponsor(address contractAddress) public view returns (Tuple0 memory) {
require(false, stub_error);
contractAddress;
dummy;
@@ -150,9 +150,9 @@
/// Get current contract sponsoring rate limit
/// @param contractAddress Contract to get sponsoring rate limit of
/// @return uint32 Amount of blocks between two sponsored transactions
- /// @dev EVM selector for this function is: 0x610cfabd,
- /// or in textual repr: getSponsoringRateLimit(address)
- function getSponsoringRateLimit(address contractAddress) public view returns (uint32) {
+ /// @dev EVM selector for this function is: 0xf29694d8,
+ /// or in textual repr: sponsoringRateLimit(address)
+ function sponsoringRateLimit(address contractAddress) public view returns (uint32) {
require(false, stub_error);
contractAddress;
dummy;
@@ -193,9 +193,9 @@
/// @param contractAddress Contract to get sponsoring fee limit of
/// @return uint256 Maximum amount of fee that could be spent by single
/// transaction
- /// @dev EVM selector for this function is: 0xc3fdc9ee,
- /// or in textual repr: getSponsoringFeeLimit(address)
- function getSponsoringFeeLimit(address contractAddress) public view returns (uint256) {
+ /// @dev EVM selector for this function is: 0x75b73606,
+ /// or in textual repr: sponsoringFeeLimit(address)
+ function sponsoringFeeLimit(address contractAddress) public view returns (uint256) {
require(false, stub_error);
contractAddress;
dummy;
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 0x172cb4fb24interface 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: 0x743fc745,71 /// or in textual repr: getSponsor(address)72 function getSponsor(address contractAddress) external view returns (Tuple0 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: 0x610cfabd,102 /// or in textual repr: getSponsoringRateLimit(address)103 function getSponsoringRateLimit(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: 0xc3fdc9ee,130 /// or in textual repr: getSponsoringFeeLimit(address)131 function getSponsoringFeeLimit(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 anonymous struct175struct Tuple0 {176 address field_0;177 uint256 field_1;178}tests/src/eth/contractSponsoring.test.tsdiffbeforeafterboth--- a/tests/src/eth/contractSponsoring.test.ts
+++ b/tests/src/eth/contractSponsoring.test.ts
@@ -223,7 +223,7 @@
const helpers = contractHelpers(web3, owner);
await helpers.methods.selfSponsoredEnable(flipper.options.address).send();
- const result = await helpers.methods.getSponsor(flipper.options.address).call();
+ const result = await helpers.methods.sponsor(flipper.options.address).call();
expect(result[0]).to.be.eq(flipper.options.address);
expect(result[1]).to.be.eq('0');
@@ -237,7 +237,7 @@
await helpers.methods.setSponsor(flipper.options.address, sponsor).send();
await helpers.methods.confirmSponsorship(flipper.options.address).send({from: sponsor});
- const result = await helpers.methods.getSponsor(flipper.options.address).call();
+ const result = await helpers.methods.sponsor(flipper.options.address).call();
expect(result[0]).to.be.eq(sponsor);
expect(result[1]).to.be.eq('0');
@@ -482,7 +482,7 @@
const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
const flipper = await deployFlipper(web3, owner);
const helpers = contractHelpers(web3, owner);
- expect(await helpers.methods.getSponsoringRateLimit(flipper.options.address).call()).to.be.equals('7200');
+ expect(await helpers.methods.sponsoringRateLimit(flipper.options.address).call()).to.be.equals('7200');
});
});
@@ -551,7 +551,7 @@
const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
const flipper = await deployFlipper(web3, owner);
const helpers = contractHelpers(web3, owner);
- expect(await helpers.methods.getSponsoringFeeLimit(flipper.options.address).call()).to.be.equals('115792089237316195423570985008687907853269984665640564039457584007913129639935');
+ expect(await helpers.methods.sponsoringFeeLimit(flipper.options.address).call()).to.be.equals('115792089237316195423570985008687907853269984665640564039457584007913129639935');
});
itWeb3('Set fee limit', async ({api, web3, privateKeyWrapper}) => {
@@ -559,7 +559,7 @@
const flipper = await deployFlipper(web3, owner);
const helpers = contractHelpers(web3, owner);
await helpers.methods.setSponsoringFeeLimit(flipper.options.address, 100).send();
- expect(await helpers.methods.getSponsoringFeeLimit(flipper.options.address).call()).to.be.equals('100');
+ expect(await helpers.methods.sponsoringFeeLimit(flipper.options.address).call()).to.be.equals('100');
});
itWeb3('Negative test - set fee limit by non-owner', async ({api, web3, privateKeyWrapper}) => {
tests/src/eth/util/contractHelpersAbi.jsondiffbeforeafterboth--- a/tests/src/eth/util/contractHelpersAbi.json
+++ b/tests/src/eth/util/contractHelpersAbi.json
@@ -111,18 +111,8 @@
"type": "address"
}
],
- "name": "getSponsor",
- "outputs": [
- {
- "components": [
- { "internalType": "address", "name": "field_0", "type": "address" },
- { "internalType": "uint256", "name": "field_1", "type": "uint256" }
- ],
- "internalType": "struct Tuple0",
- "name": "",
- "type": "tuple"
- }
- ],
+ "name": "hasPendingSponsor",
+ "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
"stateMutability": "view",
"type": "function"
},
@@ -134,8 +124,8 @@
"type": "address"
}
],
- "name": "getSponsoringFeeLimit",
- "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
+ "name": "hasSponsor",
+ "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
"stateMutability": "view",
"type": "function"
},
@@ -147,9 +137,9 @@
"type": "address"
}
],
- "name": "getSponsoringRateLimit",
- "outputs": [{ "internalType": "uint32", "name": "", "type": "uint32" }],
- "stateMutability": "view",
+ "name": "removeSponsor",
+ "outputs": [],
+ "stateMutability": "nonpayable",
"type": "function"
},
{
@@ -160,9 +150,9 @@
"type": "address"
}
],
- "name": "hasPendingSponsor",
- "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
- "stateMutability": "view",
+ "name": "selfSponsoredEnable",
+ "outputs": [],
+ "stateMutability": "nonpayable",
"type": "function"
},
{
@@ -171,11 +161,12 @@
"internalType": "address",
"name": "contractAddress",
"type": "address"
- }
+ },
+ { "internalType": "address", "name": "sponsor", "type": "address" }
],
- "name": "hasSponsor",
- "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
- "stateMutability": "view",
+ "name": "setSponsor",
+ "outputs": [],
+ "stateMutability": "nonpayable",
"type": "function"
},
{
@@ -184,9 +175,10 @@
"internalType": "address",
"name": "contractAddress",
"type": "address"
- }
+ },
+ { "internalType": "uint256", "name": "feeLimit", "type": "uint256" }
],
- "name": "removeSponsor",
+ "name": "setSponsoringFeeLimit",
"outputs": [],
"stateMutability": "nonpayable",
"type": "function"
@@ -197,9 +189,10 @@
"internalType": "address",
"name": "contractAddress",
"type": "address"
- }
+ },
+ { "internalType": "uint8", "name": "mode", "type": "uint8" }
],
- "name": "selfSponsoredEnable",
+ "name": "setSponsoringMode",
"outputs": [],
"stateMutability": "nonpayable",
"type": "function"
@@ -211,9 +204,9 @@
"name": "contractAddress",
"type": "address"
},
- { "internalType": "address", "name": "sponsor", "type": "address" }
+ { "internalType": "uint32", "name": "rateLimit", "type": "uint32" }
],
- "name": "setSponsor",
+ "name": "setSponsoringRateLimit",
"outputs": [],
"stateMutability": "nonpayable",
"type": "function"
@@ -224,12 +217,21 @@
"internalType": "address",
"name": "contractAddress",
"type": "address"
- },
- { "internalType": "uint256", "name": "feeLimit", "type": "uint256" }
+ }
+ ],
+ "name": "sponsor",
+ "outputs": [
+ {
+ "components": [
+ { "internalType": "address", "name": "field_0", "type": "address" },
+ { "internalType": "uint256", "name": "field_1", "type": "uint256" }
+ ],
+ "internalType": "struct Tuple0",
+ "name": "",
+ "type": "tuple"
+ }
],
- "name": "setSponsoringFeeLimit",
- "outputs": [],
- "stateMutability": "nonpayable",
+ "stateMutability": "view",
"type": "function"
},
{
@@ -238,12 +240,11 @@
"internalType": "address",
"name": "contractAddress",
"type": "address"
- },
- { "internalType": "uint8", "name": "mode", "type": "uint8" }
+ }
],
- "name": "setSponsoringMode",
- "outputs": [],
- "stateMutability": "nonpayable",
+ "name": "sponsoringEnabled",
+ "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
+ "stateMutability": "view",
"type": "function"
},
{
@@ -252,12 +253,11 @@
"internalType": "address",
"name": "contractAddress",
"type": "address"
- },
- { "internalType": "uint32", "name": "rateLimit", "type": "uint32" }
+ }
],
- "name": "setSponsoringRateLimit",
- "outputs": [],
- "stateMutability": "nonpayable",
+ "name": "sponsoringFeeLimit",
+ "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
+ "stateMutability": "view",
"type": "function"
},
{
@@ -268,8 +268,8 @@
"type": "address"
}
],
- "name": "sponsoringEnabled",
- "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
+ "name": "sponsoringRateLimit",
+ "outputs": [{ "internalType": "uint32", "name": "", "type": "uint32" }],
"stateMutability": "view",
"type": "function"
},