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.jsondiffbeforeafterboth1[2 {3 "anonymous": false,4 "inputs": [5 {6 "indexed": true,7 "internalType": "address",8 "name": "contractAddress",9 "type": "address"10 }11 ],12 "name": "ContractSponsorRemoved",13 "type": "event"14 },15 {16 "anonymous": false,17 "inputs": [18 {19 "indexed": true,20 "internalType": "address",21 "name": "contractAddress",22 "type": "address"23 },24 {25 "indexed": false,26 "internalType": "address",27 "name": "sponsor",28 "type": "address"29 }30 ],31 "name": "ContractSponsorSet",32 "type": "event"33 },34 {35 "anonymous": false,36 "inputs": [37 {38 "indexed": true,39 "internalType": "address",40 "name": "contractAddress",41 "type": "address"42 },43 {44 "indexed": false,45 "internalType": "address",46 "name": "sponsor",47 "type": "address"48 }49 ],50 "name": "ContractSponsorshipConfirmed",51 "type": "event"52 },53 {54 "inputs": [55 {56 "internalType": "address",57 "name": "contractAddress",58 "type": "address"59 },60 { "internalType": "address", "name": "user", "type": "address" }61 ],62 "name": "allowed",63 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],64 "stateMutability": "view",65 "type": "function"66 },67 {68 "inputs": [69 {70 "internalType": "address",71 "name": "contractAddress",72 "type": "address"73 }74 ],75 "name": "allowlistEnabled",76 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],77 "stateMutability": "view",78 "type": "function"79 },80 {81 "inputs": [82 {83 "internalType": "address",84 "name": "contractAddress",85 "type": "address"86 }87 ],88 "name": "confirmSponsorship",89 "outputs": [],90 "stateMutability": "nonpayable",91 "type": "function"92 },93 {94 "inputs": [95 {96 "internalType": "address",97 "name": "contractAddress",98 "type": "address"99 }100 ],101 "name": "contractOwner",102 "outputs": [{ "internalType": "address", "name": "", "type": "address" }],103 "stateMutability": "view",104 "type": "function"105 },106 {107 "inputs": [108 {109 "internalType": "address",110 "name": "contractAddress",111 "type": "address"112 }113 ],114 "name": "hasPendingSponsor",115 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],116 "stateMutability": "view",117 "type": "function"118 },119 {120 "inputs": [121 {122 "internalType": "address",123 "name": "contractAddress",124 "type": "address"125 }126 ],127 "name": "hasSponsor",128 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],129 "stateMutability": "view",130 "type": "function"131 },132 {133 "inputs": [134 {135 "internalType": "address",136 "name": "contractAddress",137 "type": "address"138 }139 ],140 "name": "removeSponsor",141 "outputs": [],142 "stateMutability": "nonpayable",143 "type": "function"144 },145 {146 "inputs": [147 {148 "internalType": "address",149 "name": "contractAddress",150 "type": "address"151 }152 ],153 "name": "selfSponsoredEnable",154 "outputs": [],155 "stateMutability": "nonpayable",156 "type": "function"157 },158 {159 "inputs": [160 {161 "internalType": "address",162 "name": "contractAddress",163 "type": "address"164 },165 { "internalType": "address", "name": "sponsor", "type": "address" }166 ],167 "name": "setSponsor",168 "outputs": [],169 "stateMutability": "nonpayable",170 "type": "function"171 },172 {173 "inputs": [174 {175 "internalType": "address",176 "name": "contractAddress",177 "type": "address"178 },179 { "internalType": "uint256", "name": "feeLimit", "type": "uint256" }180 ],181 "name": "setSponsoringFeeLimit",182 "outputs": [],183 "stateMutability": "nonpayable",184 "type": "function"185 },186 {187 "inputs": [188 {189 "internalType": "address",190 "name": "contractAddress",191 "type": "address"192 },193 { "internalType": "uint8", "name": "mode", "type": "uint8" }194 ],195 "name": "setSponsoringMode",196 "outputs": [],197 "stateMutability": "nonpayable",198 "type": "function"199 },200 {201 "inputs": [202 {203 "internalType": "address",204 "name": "contractAddress",205 "type": "address"206 },207 { "internalType": "uint32", "name": "rateLimit", "type": "uint32" }208 ],209 "name": "setSponsoringRateLimit",210 "outputs": [],211 "stateMutability": "nonpayable",212 "type": "function"213 },214 {215 "inputs": [216 {217 "internalType": "address",218 "name": "contractAddress",219 "type": "address"220 }221 ],222 "name": "sponsor",223 "outputs": [224 {225 "components": [226 { "internalType": "address", "name": "eth", "type": "address" },227 { "internalType": "uint256", "name": "sub", "type": "uint256" }228 ],229 "internalType": "struct CrossAddress",230 "name": "",231 "type": "tuple"232 }233 ],234 "stateMutability": "view",235 "type": "function"236 },237 {238 "inputs": [239 {240 "internalType": "address",241 "name": "contractAddress",242 "type": "address"243 }244 ],245 "name": "sponsoringEnabled",246 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],247 "stateMutability": "view",248 "type": "function"249 },250 {251 "inputs": [252 {253 "internalType": "address",254 "name": "contractAddress",255 "type": "address"256 }257 ],258 "name": "sponsoringFeeLimit",259 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],260 "stateMutability": "view",261 "type": "function"262 },263 {264 "inputs": [265 {266 "internalType": "address",267 "name": "contractAddress",268 "type": "address"269 }270 ],271 "name": "sponsoringRateLimit",272 "outputs": [{ "internalType": "uint32", "name": "", "type": "uint32" }],273 "stateMutability": "view",274 "type": "function"275 },276 {277 "inputs": [278 { "internalType": "bytes4", "name": "interfaceID", "type": "bytes4" }279 ],280 "name": "supportsInterface",281 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],282 "stateMutability": "view",283 "type": "function"284 },285 {286 "inputs": [287 {288 "internalType": "address",289 "name": "contractAddress",290 "type": "address"291 },292 { "internalType": "address", "name": "user", "type": "address" },293 { "internalType": "bool", "name": "isAllowed", "type": "bool" }294 ],295 "name": "toggleAllowed",296 "outputs": [],297 "stateMutability": "nonpayable",298 "type": "function"299 },300 {301 "inputs": [302 {303 "internalType": "address",304 "name": "contractAddress",305 "type": "address"306 },307 { "internalType": "bool", "name": "enabled", "type": "bool" }308 ],309 "name": "toggleAllowlist",310 "outputs": [],311 "stateMutability": "nonpayable",312 "type": "function"313 }314]1[2 {3 "anonymous": false,4 "inputs": [5 {6 "indexed": true,7 "internalType": "address",8 "name": "contractAddress",9 "type": "address"10 }11 ],12 "name": "ContractSponsorRemoved",13 "type": "event"14 },15 {16 "anonymous": false,17 "inputs": [18 {19 "indexed": true,20 "internalType": "address",21 "name": "contractAddress",22 "type": "address"23 },24 {25 "indexed": false,26 "internalType": "address",27 "name": "sponsor",28 "type": "address"29 }30 ],31 "name": "ContractSponsorSet",32 "type": "event"33 },34 {35 "anonymous": false,36 "inputs": [37 {38 "indexed": true,39 "internalType": "address",40 "name": "contractAddress",41 "type": "address"42 },43 {44 "indexed": false,45 "internalType": "address",46 "name": "sponsor",47 "type": "address"48 }49 ],50 "name": "ContractSponsorshipConfirmed",51 "type": "event"52 },53 {54 "inputs": [55 {56 "internalType": "address",57 "name": "contractAddress",58 "type": "address"59 },60 { "internalType": "address", "name": "user", "type": "address" }61 ],62 "name": "allowed",63 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],64 "stateMutability": "view",65 "type": "function"66 },67 {68 "inputs": [69 {70 "internalType": "address",71 "name": "contractAddress",72 "type": "address"73 }74 ],75 "name": "allowlistEnabled",76 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],77 "stateMutability": "view",78 "type": "function"79 },80 {81 "inputs": [82 {83 "internalType": "address",84 "name": "contractAddress",85 "type": "address"86 }87 ],88 "name": "confirmSponsorship",89 "outputs": [],90 "stateMutability": "nonpayable",91 "type": "function"92 },93 {94 "inputs": [95 {96 "internalType": "address",97 "name": "contractAddress",98 "type": "address"99 }100 ],101 "name": "contractOwner",102 "outputs": [{ "internalType": "address", "name": "", "type": "address" }],103 "stateMutability": "view",104 "type": "function"105 },106 {107 "inputs": [108 {109 "internalType": "address",110 "name": "contractAddress",111 "type": "address"112 }113 ],114 "name": "hasPendingSponsor",115 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],116 "stateMutability": "view",117 "type": "function"118 },119 {120 "inputs": [121 {122 "internalType": "address",123 "name": "contractAddress",124 "type": "address"125 }126 ],127 "name": "hasSponsor",128 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],129 "stateMutability": "view",130 "type": "function"131 },132 {133 "inputs": [134 {135 "internalType": "address",136 "name": "contractAddress",137 "type": "address"138 }139 ],140 "name": "removeSponsor",141 "outputs": [],142 "stateMutability": "nonpayable",143 "type": "function"144 },145 {146 "inputs": [147 {148 "internalType": "address",149 "name": "contractAddress",150 "type": "address"151 }152 ],153 "name": "selfSponsoredEnable",154 "outputs": [],155 "stateMutability": "nonpayable",156 "type": "function"157 },158 {159 "inputs": [160 {161 "internalType": "address",162 "name": "contractAddress",163 "type": "address"164 },165 { "internalType": "address", "name": "sponsor", "type": "address" }166 ],167 "name": "setSponsor",168 "outputs": [],169 "stateMutability": "nonpayable",170 "type": "function"171 },172 {173 "inputs": [174 {175 "internalType": "address",176 "name": "contractAddress",177 "type": "address"178 },179 { "internalType": "uint256", "name": "feeLimit", "type": "uint256" }180 ],181 "name": "setSponsoringFeeLimit",182 "outputs": [],183 "stateMutability": "nonpayable",184 "type": "function"185 },186 {187 "inputs": [188 {189 "internalType": "address",190 "name": "contractAddress",191 "type": "address"192 },193 { "internalType": "uint8", "name": "mode", "type": "uint8" }194 ],195 "name": "setSponsoringMode",196 "outputs": [],197 "stateMutability": "nonpayable",198 "type": "function"199 },200 {201 "inputs": [202 {203 "internalType": "address",204 "name": "contractAddress",205 "type": "address"206 },207 { "internalType": "uint32", "name": "rateLimit", "type": "uint32" }208 ],209 "name": "setSponsoringRateLimit",210 "outputs": [],211 "stateMutability": "nonpayable",212 "type": "function"213 },214 {215 "inputs": [216 {217 "internalType": "address",218 "name": "contractAddress",219 "type": "address"220 }221 ],222 "name": "sponsor",223 "outputs": [224 {225 "components": [226 { "internalType": "bool", "name": "status", "type": "bool" },227 {228 "components": [229 { "internalType": "address", "name": "eth", "type": "address" },230 { "internalType": "uint256", "name": "sub", "type": "uint256" }231 ],232 "internalType": "struct CrossAddress",233 "name": "value",234 "type": "tuple"235 }236 ],237 "internalType": "struct OptionCrossAddress",238 "name": "",239 "type": "tuple"240 }241 ],242 "stateMutability": "view",243 "type": "function"244 },245 {246 "inputs": [247 {248 "internalType": "address",249 "name": "contractAddress",250 "type": "address"251 }252 ],253 "name": "sponsoringEnabled",254 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],255 "stateMutability": "view",256 "type": "function"257 },258 {259 "inputs": [260 {261 "internalType": "address",262 "name": "contractAddress",263 "type": "address"264 }265 ],266 "name": "sponsoringFeeLimit",267 "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],268 "stateMutability": "view",269 "type": "function"270 },271 {272 "inputs": [273 {274 "internalType": "address",275 "name": "contractAddress",276 "type": "address"277 }278 ],279 "name": "sponsoringRateLimit",280 "outputs": [{ "internalType": "uint32", "name": "", "type": "uint32" }],281 "stateMutability": "view",282 "type": "function"283 },284 {285 "inputs": [286 { "internalType": "bytes4", "name": "interfaceID", "type": "bytes4" }287 ],288 "name": "supportsInterface",289 "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],290 "stateMutability": "view",291 "type": "function"292 },293 {294 "inputs": [295 {296 "internalType": "address",297 "name": "contractAddress",298 "type": "address"299 },300 { "internalType": "address", "name": "user", "type": "address" },301 { "internalType": "bool", "name": "isAllowed", "type": "bool" }302 ],303 "name": "toggleAllowed",304 "outputs": [],305 "stateMutability": "nonpayable",306 "type": "function"307 },308 {309 "inputs": [310 {311 "internalType": "address",312 "name": "contractAddress",313 "type": "address"314 },315 { "internalType": "bool", "name": "enabled", "type": "bool" }316 ],317 "name": "toggleAllowlist",318 "outputs": [],319 "stateMutability": "nonpayable",320 "type": "function"321 }322]tests/src/eth/api/ContractHelpers.soldiffbeforeafterboth--- a/tests/src/eth/api/ContractHelpers.sol
+++ b/tests/src/eth/api/ContractHelpers.sol
@@ -69,7 +69,7 @@
/// @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) external view returns (CrossAddress memory);
+ function sponsor(address contractAddress) external view returns (OptionCrossAddress memory);
/// Check tat contract has confirmed sponsor.
///
@@ -171,6 +171,12 @@
function toggleAllowlist(address contractAddress, bool enabled) external;
}
+/// @dev Ethereum representation of Optional value with CrossAddress.
+struct OptionCrossAddress {
+ bool status;
+ CrossAddress value;
+}
+
/// @dev Cross account struct
struct CrossAddress {
address eth;
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');