difftreelog
CORE-302 Create collection from EVM principle
in: master
9 files changed
Cargo.lockdiffbeforeafterboth--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6078,18 +6078,22 @@
name = "pallet-evm-contract-helpers"
version = "0.1.0"
dependencies = [
+ "ethereum",
"evm-coder",
"fp-evm-mapping",
"frame-support",
"frame-system",
"log",
+ "pallet-common",
"pallet-evm",
"pallet-evm-coder-substrate",
+ "pallet-nonfungible",
"parity-scale-codec 3.1.2",
"scale-info",
"sp-core",
"sp-runtime",
"sp-std",
+ "up-data-structs",
"up-sponsorship",
]
pallets/evm-contract-helpers/Cargo.tomldiffbeforeafterboth--- a/pallets/evm-contract-helpers/Cargo.toml
+++ b/pallets/evm-contract-helpers/Cargo.toml
@@ -8,18 +8,28 @@
scale-info = { version = "2.0.1", default-features = false, features = [
"derive",
] }
-frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.21" }
-frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.21" }
-sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.21" }
-sp-std = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.21" }
-sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.21" }
-evm-coder = { default-features = false, path = '../../crates/evm-coder' }
-pallet-evm-coder-substrate = { default-features = false, path = '../../pallets/evm-coder-substrate' }
+ethereum = { version = "0.12.0", default-features = false }
+log = { default-features = false, version = "0.4.14" }
+
+# Substrate
+frame-support = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.21' }
+frame-system = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.21' }
+sp-runtime = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.21' }
+sp-std = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.21' }
+sp-core = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.21' }
+
+# Unique
pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21-logs" }
fp-evm-mapping = { default-features = false, git = "https://github.com/uniquenetwork/frontier", branch = "unique-polkadot-v0.9.21-logs" }
up-sponsorship = { version = "0.1.0", default-features = false, git = "https://github.com/uniquenetwork/pallet-sponsoring", branch = "polkadot-v0.9.21" }
-log = "0.4.14"
+# Locals
+evm-coder = { default-features = false, path = '../../crates/evm-coder' }
+pallet-common = { default-features = false, path = '../../pallets/common' }
+pallet-evm-coder-substrate = { default-features = false, path = '../../pallets/evm-coder-substrate' }
+pallet-nonfungible = { default-features = false, path = '../../pallets/nonfungible' }
+up-data-structs = { default-features = false, path = '../../primitives/data-structs' }
+
[dependencies.codec]
default-features = false
features = ['derive']
pallets/evm-contract-helpers/src/eth.rsdiffbeforeafterboth1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617use core::marker::PhantomData;18use evm_coder::{abi::AbiWriter, execution::Result, generate_stubgen, solidity_interface, types::*};19use pallet_evm_coder_substrate::{SubstrateRecorder, WithRecorder};20use pallet_evm::{21 ExitRevert, OnCreate, OnMethodCall, PrecompileResult, PrecompileFailure,22 account::CrossAccountId,23};24use sp_core::H160;25use crate::{26 AllowlistEnabled, Config, Owner, Pallet, SponsorBasket, SponsoringRateLimit, SponsoringModeT,27};28use frame_support::traits::Get;29use up_sponsorship::SponsorshipHandler;30use sp_std::vec::Vec;3132struct ContractHelpers<T: Config>(SubstrateRecorder<T>);33impl<T: Config> WithRecorder<T> for ContractHelpers<T> {34 fn recorder(&self) -> &SubstrateRecorder<T> {35 &self.036 }3738 fn into_recorder(self) -> SubstrateRecorder<T> {39 self.040 }41}4243#[solidity_interface(name = "ContractHelpers")]44impl<T: Config> ContractHelpers<T> {45 fn contract_owner(&self, contract_address: address) -> Result<address> {46 Ok(<Owner<T>>::get(contract_address))47 }4849 fn sponsoring_enabled(&self, contract_address: address) -> Result<bool> {50 Ok(<Pallet<T>>::sponsoring_mode(contract_address) != SponsoringModeT::Disabled)51 }5253 /// Deprecated54 fn toggle_sponsoring(55 &mut self,56 caller: caller,57 contract_address: address,58 enabled: bool,59 ) -> Result<void> {60 <Pallet<T>>::ensure_owner(contract_address, caller)?;61 <Pallet<T>>::toggle_sponsoring(contract_address, enabled);62 Ok(())63 }6465 fn set_sponsoring_mode(66 &mut self,67 caller: caller,68 contract_address: address,69 mode: uint8,70 ) -> Result<void> {71 <Pallet<T>>::ensure_owner(contract_address, caller)?;72 let mode = SponsoringModeT::from_eth(mode).ok_or("unknown mode")?;73 <Pallet<T>>::set_sponsoring_mode(contract_address, mode);74 Ok(())75 }7677 fn sponsoring_mode(&self, contract_address: address) -> Result<uint8> {78 Ok(<Pallet<T>>::sponsoring_mode(contract_address).to_eth())79 }8081 fn set_sponsoring_rate_limit(82 &mut self,83 caller: caller,84 contract_address: address,85 rate_limit: uint32,86 ) -> Result<void> {87 <Pallet<T>>::ensure_owner(contract_address, caller)?;88 <Pallet<T>>::set_sponsoring_rate_limit(contract_address, rate_limit.into());89 Ok(())90 }9192 fn get_sponsoring_rate_limit(&self, contract_address: address) -> Result<uint32> {93 Ok(<SponsoringRateLimit<T>>::get(contract_address)94 .try_into()95 .map_err(|_| "rate limit > u32::MAX")?)96 }9798 fn allowed(&self, contract_address: address, user: address) -> Result<bool> {99 self.0.consume_sload()?;100 Ok(<Pallet<T>>::allowed(contract_address, user))101 }102103 fn allowlist_enabled(&self, contract_address: address) -> Result<bool> {104 Ok(<AllowlistEnabled<T>>::get(contract_address))105 }106107 fn toggle_allowlist(108 &mut self,109 caller: caller,110 contract_address: address,111 enabled: bool,112 ) -> Result<void> {113 <Pallet<T>>::ensure_owner(contract_address, caller)?;114 <Pallet<T>>::toggle_allowlist(contract_address, enabled);115 Ok(())116 }117118 fn toggle_allowed(119 &mut self,120 caller: caller,121 contract_address: address,122 user: address,123 allowed: bool,124 ) -> Result<void> {125 <Pallet<T>>::ensure_owner(contract_address, caller)?;126 <Pallet<T>>::toggle_allowed(contract_address, user, allowed);127 Ok(())128 }129}130131pub struct HelpersOnMethodCall<T: Config>(PhantomData<*const T>);132impl<T: Config> OnMethodCall<T> for HelpersOnMethodCall<T> {133 fn is_reserved(contract: &sp_core::H160) -> bool {134 contract == &T::ContractAddress::get()135 }136137 fn is_used(contract: &sp_core::H160) -> bool {138 contract == &T::ContractAddress::get()139 }140141 fn call(142 source: &sp_core::H160,143 target: &sp_core::H160,144 gas_left: u64,145 input: &[u8],146 value: sp_core::U256,147 ) -> Option<PrecompileResult> {148 // TODO: Extract to another OnMethodCall handler149 if <AllowlistEnabled<T>>::get(target) && !<Pallet<T>>::allowed(*target, *source) {150 return Some(Err(PrecompileFailure::Revert {151 exit_status: ExitRevert::Reverted,152 cost: 0,153 output: {154 let mut writer = AbiWriter::new_call(evm_coder::fn_selector!(Error(string)));155 writer.string("Target contract is allowlisted");156 writer.finish()157 },158 }));159 }160161 if target != &T::ContractAddress::get() {162 return None;163 }164165 let helpers = ContractHelpers::<T>(SubstrateRecorder::<T>::new(gas_left));166 pallet_evm_coder_substrate::call(*source, helpers, value, input)167 }168169 fn get_code(contract: &sp_core::H160) -> Option<Vec<u8>> {170 (contract == &T::ContractAddress::get())171 .then(|| include_bytes!("./stubs/ContractHelpers.raw").to_vec())172 }173}174175pub struct HelpersOnCreate<T: Config>(PhantomData<*const T>);176impl<T: Config> OnCreate<T> for HelpersOnCreate<T> {177 fn on_create(owner: H160, contract: H160) {178 <Owner<T>>::insert(contract, owner);179 }180}181182pub struct HelpersContractSponsoring<T: Config>(PhantomData<*const T>);183impl<T: Config> SponsorshipHandler<T::CrossAccountId, (H160, Vec<u8>)>184 for HelpersContractSponsoring<T>185{186 fn get_sponsor(who: &T::CrossAccountId, call: &(H160, Vec<u8>)) -> Option<T::CrossAccountId> {187 let mode = <Pallet<T>>::sponsoring_mode(call.0);188 if mode == SponsoringModeT::Disabled {189 return None;190 }191192 if mode == SponsoringModeT::Allowlisted && !<Pallet<T>>::allowed(call.0, *who.as_eth()) {193 return None;194 }195 let block_number = <frame_system::Pallet<T>>::block_number() as T::BlockNumber;196197 if let Some(last_tx_block) = <SponsorBasket<T>>::get(&call.0, who.as_eth()) {198 let limit = <SponsoringRateLimit<T>>::get(&call.0);199200 let timeout = last_tx_block + limit;201 if block_number < timeout {202 return None;203 }204 }205206 <SponsorBasket<T>>::insert(&call.0, who.as_eth(), block_number);207208 let sponsor = T::CrossAccountId::from_eth(call.0);209 Some(sponsor)210 }211}212213generate_stubgen!(contract_helpers_impl, ContractHelpersCall<()>, true);214generate_stubgen!(contract_helpers_iface, ContractHelpersCall<()>, false);1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617use core::marker::PhantomData;18use evm_coder::{abi::AbiWriter, execution::*, generate_stubgen, solidity_interface, types::*, ToLog};19use ethereum as _;20use pallet_evm_coder_substrate::{SubstrateRecorder, WithRecorder};21use pallet_evm::{22 ExitRevert, OnCreate, OnMethodCall, PrecompileResult, PrecompileFailure,23 account::CrossAccountId, Pallet as PalletEvm24};25use sp_core::H160;26use crate::{27 AllowlistEnabled, Config, Owner, Pallet, SponsorBasket, SponsoringRateLimit, SponsoringModeT,28};29use frame_support::traits::Get;30use up_sponsorship::SponsorshipHandler;31use sp_std::vec::Vec;3233struct ContractHelpers<T: Config>(SubstrateRecorder<T>);34impl<T: Config> WithRecorder<T> for ContractHelpers<T> {35 fn recorder(&self) -> &SubstrateRecorder<T> {36 &self.037 }3839 fn into_recorder(self) -> SubstrateRecorder<T> {40 self.041 }42}4344#[derive(ToLog)]45pub enum ContractHelperEvent {46 CollectionCreated {47 #[indexed]48 owner: address,49 #[indexed]50 collection_id: address,51 },52}5354#[solidity_interface(name = "ContractHelpers")]55impl<T: Config> ContractHelpers<T> {56 fn contract_owner(&self, contract_address: address) -> Result<address> {57 Ok(<Owner<T>>::get(contract_address))58 }5960 fn sponsoring_enabled(&self, contract_address: address) -> Result<bool> {61 Ok(<Pallet<T>>::sponsoring_mode(contract_address) != SponsoringModeT::Disabled)62 }6364 /// Deprecated65 fn toggle_sponsoring(66 &mut self,67 caller: caller,68 contract_address: address,69 enabled: bool,70 ) -> Result<void> {71 <Pallet<T>>::ensure_owner(contract_address, caller)?;72 <Pallet<T>>::toggle_sponsoring(contract_address, enabled);73 Ok(())74 }7576 fn set_sponsoring_mode(77 &mut self,78 caller: caller,79 contract_address: address,80 mode: uint8,81 ) -> Result<void> {82 <Pallet<T>>::ensure_owner(contract_address, caller)?;83 let mode = SponsoringModeT::from_eth(mode).ok_or("unknown mode")?;84 <Pallet<T>>::set_sponsoring_mode(contract_address, mode);85 Ok(())86 }8788 fn sponsoring_mode(&self, contract_address: address) -> Result<uint8> {89 Ok(<Pallet<T>>::sponsoring_mode(contract_address).to_eth())90 }9192 fn set_sponsoring_rate_limit(93 &mut self,94 caller: caller,95 contract_address: address,96 rate_limit: uint32,97 ) -> Result<void> {98 <Pallet<T>>::ensure_owner(contract_address, caller)?;99 <Pallet<T>>::set_sponsoring_rate_limit(contract_address, rate_limit.into());100 Ok(())101 }102103 fn get_sponsoring_rate_limit(&self, contract_address: address) -> Result<uint32> {104 Ok(<SponsoringRateLimit<T>>::get(contract_address)105 .try_into()106 .map_err(|_| "rate limit > u32::MAX")?)107 }108109 fn allowed(&self, contract_address: address, user: address) -> Result<bool> {110 self.0.consume_sload()?;111 Ok(<Pallet<T>>::allowed(contract_address, user))112 }113114 fn allowlist_enabled(&self, contract_address: address) -> Result<bool> {115 Ok(<AllowlistEnabled<T>>::get(contract_address))116 }117118 fn toggle_allowlist(119 &mut self,120 caller: caller,121 contract_address: address,122 enabled: bool,123 ) -> Result<void> {124 <Pallet<T>>::ensure_owner(contract_address, caller)?;125 <Pallet<T>>::toggle_allowlist(contract_address, enabled);126 Ok(())127 }128129 fn toggle_allowed(130 &mut self,131 caller: caller,132 contract_address: address,133 user: address,134 allowed: bool,135 ) -> Result<void> {136 <Pallet<T>>::ensure_owner(contract_address, caller)?;137 <Pallet<T>>::toggle_allowed(contract_address, user, allowed);138 Ok(())139 }140141 fn create_721_collection(&self, caller: caller) -> Result<address> {142 let caller = T::CrossAccountId::from_eth(caller);143 let collection_id = <pallet_nonfungible::Pallet<T>>::init_collection(144 caller.as_sub().clone(),145 Default::default(),146 )147 .map_err(pallet_evm_coder_substrate::dispatch_to_evm::<T>)?;148 let address = pallet_common::eth::collection_id_to_address(collection_id);149150 <PalletEvm<T>>::deposit_log(151 ContractHelperEvent::CollectionCreated {152 owner: *caller.as_eth(),153 collection_id: address,154 }155 .to_log(address),156 );157 Ok(address)158 }159}160161pub struct HelpersOnMethodCall<T: Config>(PhantomData<*const T>);162impl<T: Config> OnMethodCall<T> for HelpersOnMethodCall<T> {163 fn is_reserved(contract: &sp_core::H160) -> bool {164 contract == &T::ContractAddress::get()165 }166167 fn is_used(contract: &sp_core::H160) -> bool {168 contract == &T::ContractAddress::get()169 }170171 fn call(172 source: &sp_core::H160,173 target: &sp_core::H160,174 gas_left: u64,175 input: &[u8],176 value: sp_core::U256,177 ) -> Option<PrecompileResult> {178 // TODO: Extract to another OnMethodCall handler179 if <AllowlistEnabled<T>>::get(target) && !<Pallet<T>>::allowed(*target, *source) {180 return Some(Err(PrecompileFailure::Revert {181 exit_status: ExitRevert::Reverted,182 cost: 0,183 output: {184 let mut writer = AbiWriter::new_call(evm_coder::fn_selector!(Error(string)));185 writer.string("Target contract is allowlisted");186 writer.finish()187 },188 }));189 }190191 if target != &T::ContractAddress::get() {192 return None;193 }194195 let helpers = ContractHelpers::<T>(SubstrateRecorder::<T>::new(gas_left));196 pallet_evm_coder_substrate::call(*source, helpers, value, input)197 }198199 fn get_code(contract: &sp_core::H160) -> Option<Vec<u8>> {200 (contract == &T::ContractAddress::get())201 .then(|| include_bytes!("./stubs/ContractHelpers.raw").to_vec())202 }203}204205pub struct HelpersOnCreate<T: Config>(PhantomData<*const T>);206impl<T: Config> OnCreate<T> for HelpersOnCreate<T> {207 fn on_create(owner: H160, contract: H160) {208 <Owner<T>>::insert(contract, owner);209 }210}211212pub struct HelpersContractSponsoring<T: Config>(PhantomData<*const T>);213impl<T: Config> SponsorshipHandler<T::CrossAccountId, (H160, Vec<u8>)>214 for HelpersContractSponsoring<T>215{216 fn get_sponsor(who: &T::CrossAccountId, call: &(H160, Vec<u8>)) -> Option<T::CrossAccountId> {217 let mode = <Pallet<T>>::sponsoring_mode(call.0);218 if mode == SponsoringModeT::Disabled {219 return None;220 }221222 if mode == SponsoringModeT::Allowlisted && !<Pallet<T>>::allowed(call.0, *who.as_eth()) {223 return None;224 }225 let block_number = <frame_system::Pallet<T>>::block_number() as T::BlockNumber;226227 if let Some(last_tx_block) = <SponsorBasket<T>>::get(&call.0, who.as_eth()) {228 let limit = <SponsoringRateLimit<T>>::get(&call.0);229230 let timeout = last_tx_block + limit;231 if block_number < timeout {232 return None;233 }234 }235236 <SponsorBasket<T>>::insert(&call.0, who.as_eth(), block_number);237238 let sponsor = T::CrossAccountId::from_eth(call.0);239 Some(sponsor)240 }241}242243generate_stubgen!(contract_helpers_impl, ContractHelpersCall<()>, true);244generate_stubgen!(contract_helpers_iface, ContractHelpersCall<()>, false);pallets/evm-contract-helpers/src/lib.rsdiffbeforeafterboth--- a/pallets/evm-contract-helpers/src/lib.rs
+++ b/pallets/evm-contract-helpers/src/lib.rs
@@ -31,7 +31,7 @@
#[pallet::config]
pub trait Config:
- frame_system::Config + pallet_evm_coder_substrate::Config + pallet_evm::account::Config
+ frame_system::Config + pallet_evm_coder_substrate::Config + pallet_evm::account::Config + pallet_nonfungible::Config
{
type ContractAddress: Get<H160>;
type DefaultSponsoringRateLimit: Get<Self::BlockNumber>;
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
@@ -21,7 +21,7 @@
}
}
-// Selector: 7b4866f9
+// Selector: e123b7a8
contract ContractHelpers is Dummy, ERC165 {
// Selector: contractOwner(address) 5152b14c
function contractOwner(address contractAddress)
@@ -144,4 +144,11 @@
allowed;
dummy = 0;
}
+
+ // Selector: create721Collection() 9a6bd151
+ function create721Collection() public view returns (address) {
+ require(false, stub_error);
+ dummy;
+ return 0x0000000000000000000000000000000000000000;
+ }
}
tests/src/eth/api/ContractHelpers.soldiffbeforeafterboth--- a/tests/src/eth/api/ContractHelpers.sol
+++ b/tests/src/eth/api/ContractHelpers.sol
@@ -12,7 +12,7 @@
function supportsInterface(bytes4 interfaceID) external view returns (bool);
}
-// Selector: 7b4866f9
+// Selector: e123b7a8
interface ContractHelpers is Dummy, ERC165 {
// Selector: contractOwner(address) 5152b14c
function contractOwner(address contractAddress)
@@ -71,4 +71,7 @@
address user,
bool allowed
) external;
+
+ // Selector: create721Collection() 9a6bd151
+ function create721Collection() external view returns (address);
}
tests/src/eth/base.test.tsdiffbeforeafterboth--- a/tests/src/eth/base.test.ts
+++ b/tests/src/eth/base.test.ts
@@ -14,9 +14,21 @@
// You should have received a copy of the GNU General Public License
// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
-import {collectionIdToAddress, createEthAccount, createEthAccountWithBalance, deployFlipper, ethBalanceViaSub, GAS_ARGS, itWeb3, recordEthFee, usingWeb3} from './util/helpers';
+import {
+ collectionIdFromAddress,
+ collectionIdToAddress,
+ contractHelpers,
+ createEthAccount,
+ createEthAccountWithBalance,
+ deployFlipper,
+ ethBalanceViaSub,
+ GAS_ARGS,
+ itWeb3,
+ recordEthFee,
+ usingWeb3,
+} from './util/helpers';
import {expect} from 'chai';
-import {createCollectionExpectSuccess, createItemExpectSuccess, UNIQUE} from '../util/helpers';
+import {createCollectionExpectSuccess, createItemExpectSuccess, getCreatedCollectionCount, UNIQUE} from '../util/helpers';
import nonFungibleAbi from './nonFungibleAbi.json';
import privateKey from '../substrate/privateKey';
import {Contract} from 'web3-eth-contract';
@@ -112,3 +124,18 @@
expect(await contract(web3).methods.supportsInterface('0x01ffc9a7').call()).to.be.true;
});
});
+
+describe('Create collection from EVM', () => {
+ itWeb3('Create collection', async ({api, web3}) => {
+ const owner = await createEthAccountWithBalance(api, web3);
+ console.log(owner);
+ const helpers = contractHelpers(web3, owner);
+ const collectionCountBefore = await getCreatedCollectionCount(api);
+ const result = await helpers.methods.create721Collection().send();
+ console.log(result.events[0].raw);
+ const collectionId = collectionIdFromAddress(result.events[0].raw.topics[2]);
+ const collectionCountAfter = await getCreatedCollectionCount(api);
+ expect(collectionCountAfter - collectionCountBefore).to.be.eq(1);
+ expect(collectionId).to.be.eq(collectionCountAfter);
+ });
+});
tests/src/eth/util/contractHelpersAbi.jsondiffbeforeafterboth--- a/tests/src/eth/util/contractHelpersAbi.json
+++ b/tests/src/eth/util/contractHelpersAbi.json
@@ -1,216 +1,248 @@
[
- {
- "inputs": [
- {
- "internalType": "address",
- "name": "contract",
- "type": "address"
- }
- ],
- "name": "allowlistEnabled",
- "outputs": [
- {
- "internalType": "bool",
- "name": "",
- "type": "bool"
- }
- ],
- "stateMutability": "view",
- "type": "function"
- },
- {
- "inputs": [
- {
- "internalType": "address",
- "name": "target",
- "type": "address"
- },
- {
- "internalType": "address",
- "name": "caller",
- "type": "address"
- }
- ],
- "name": "allowed",
- "outputs": [
- {
- "internalType": "bool",
- "name": "",
- "type": "bool"
- }
- ],
- "stateMutability": "view",
- "type": "function"
- },
- {
- "inputs": [
- {
- "internalType": "address",
- "name": "target",
- "type": "address"
- }
- ],
- "name": "contractOwner",
- "outputs": [
- {
- "internalType": "address",
- "name": "",
- "type": "address"
- }
- ],
- "stateMutability": "view",
- "type": "function"
- },
- {
- "inputs": [
- {
- "internalType": "address",
- "name": "target",
- "type": "address"
- }
- ],
- "name": "sponsoringEnabled",
- "outputs": [
- {
- "internalType": "bool",
- "name": "",
- "type": "bool"
- }
- ],
- "stateMutability": "view",
- "type": "function"
- },
- {
- "inputs": [
- {
- "internalType": "address",
- "name": "target",
- "type": "address"
- },
- {
- "internalType": "address",
- "name": "user",
- "type": "address"
- },
- {
- "internalType": "bool",
- "name": "isAllowed",
- "type": "bool"
- }
- ],
- "name": "toggleAllowed",
- "outputs": [],
- "stateMutability": "nonpayable",
- "type": "function"
- },
- {
- "inputs": [
- {
- "internalType": "address",
- "name": "target",
- "type": "address"
- },
- {
- "internalType": "bool",
- "name": "enabled",
- "type": "bool"
- }
- ],
- "name": "toggleAllowlist",
- "outputs": [],
- "stateMutability": "nonpayable",
- "type": "function"
- },
- {
- "inputs": [
- {
- "internalType": "address",
- "name": "target",
- "type": "address"
- },
- {
- "internalType": "bool",
- "name": "enabled",
- "type": "bool"
- }
- ],
- "name": "toggleSponsoring",
- "outputs": [],
- "stateMutability": "nonpayable",
- "type": "function"
- },
- {
- "inputs": [
- {
- "internalType": "address",
- "name": "target",
- "type": "address"
- },
- {
- "internalType": "uint8",
- "name": "mode",
- "type": "uint8"
- }
- ],
- "name": "setSponsoringMode",
- "outputs": [],
- "stateMutability": "nonpayable",
- "type": "function"
- },
- {
- "inputs": [
- {
- "internalType": "address",
- "name": "target",
- "type": "address"
- }
- ],
- "name": "sponsoringMode",
- "outputs": [
- {
- "internalType": "uint8",
- "name": "",
- "type": "uint8"
- }
- ],
- "stateMutability": "nonpayable",
- "type": "function"
- },
- {
- "inputs": [
- {
- "internalType": "address",
- "name": "target",
- "type": "address"
- },
- {
- "internalType": "uint32",
- "name": "limit",
- "type": "uint32"
- }
- ],
- "name": "setSponsoringRateLimit",
- "outputs": [],
- "stateMutability": "nonpayable",
- "type": "function"
- },
- {
- "inputs": [
- {
- "internalType": "address",
- "name": "contractAddress",
- "type": "address"
- }
- ],
- "name": "getSponsoringRateLimit",
- "outputs": [
- {
- "internalType": "uint32",
- "name": "",
- "type": "uint32"
- }
- ],
- "stateMutability": "view",
- "type": "function"
- }
-]
+ {
+ "inputs": [
+ {
+ "internalType": "address",
+ "name": "contractAddress",
+ "type": "address"
+ },
+ {
+ "internalType": "address",
+ "name": "user",
+ "type": "address"
+ }
+ ],
+ "name": "allowed",
+ "outputs": [
+ {
+ "internalType": "bool",
+ "name": "",
+ "type": "bool"
+ }
+ ],
+ "stateMutability": "view",
+ "type": "function"
+ },
+ {
+ "inputs": [
+ {
+ "internalType": "address",
+ "name": "contractAddress",
+ "type": "address"
+ }
+ ],
+ "name": "allowlistEnabled",
+ "outputs": [
+ {
+ "internalType": "bool",
+ "name": "",
+ "type": "bool"
+ }
+ ],
+ "stateMutability": "view",
+ "type": "function"
+ },
+ {
+ "inputs": [
+ {
+ "internalType": "address",
+ "name": "contractAddress",
+ "type": "address"
+ }
+ ],
+ "name": "contractOwner",
+ "outputs": [
+ {
+ "internalType": "address",
+ "name": "",
+ "type": "address"
+ }
+ ],
+ "stateMutability": "view",
+ "type": "function"
+ },
+ {
+ "inputs": [],
+ "name": "create721Collection",
+ "outputs": [
+ {
+ "internalType": "address",
+ "name": "",
+ "type": "address"
+ }
+ ],
+ "stateMutability": "view",
+ "type": "function"
+ },
+ {
+ "inputs": [
+ {
+ "internalType": "address",
+ "name": "contractAddress",
+ "type": "address"
+ }
+ ],
+ "name": "getSponsoringRateLimit",
+ "outputs": [
+ {
+ "internalType": "uint32",
+ "name": "",
+ "type": "uint32"
+ }
+ ],
+ "stateMutability": "view",
+ "type": "function"
+ },
+ {
+ "inputs": [
+ {
+ "internalType": "address",
+ "name": "contractAddress",
+ "type": "address"
+ },
+ {
+ "internalType": "uint8",
+ "name": "mode",
+ "type": "uint8"
+ }
+ ],
+ "name": "setSponsoringMode",
+ "outputs": [],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
+ "inputs": [
+ {
+ "internalType": "address",
+ "name": "contractAddress",
+ "type": "address"
+ },
+ {
+ "internalType": "uint32",
+ "name": "rateLimit",
+ "type": "uint32"
+ }
+ ],
+ "name": "setSponsoringRateLimit",
+ "outputs": [],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
+ "inputs": [
+ {
+ "internalType": "address",
+ "name": "contractAddress",
+ "type": "address"
+ }
+ ],
+ "name": "sponsoringEnabled",
+ "outputs": [
+ {
+ "internalType": "bool",
+ "name": "",
+ "type": "bool"
+ }
+ ],
+ "stateMutability": "view",
+ "type": "function"
+ },
+ {
+ "inputs": [
+ {
+ "internalType": "address",
+ "name": "contractAddress",
+ "type": "address"
+ }
+ ],
+ "name": "sponsoringMode",
+ "outputs": [
+ {
+ "internalType": "uint8",
+ "name": "",
+ "type": "uint8"
+ }
+ ],
+ "stateMutability": "view",
+ "type": "function"
+ },
+ {
+ "inputs": [
+ {
+ "internalType": "bytes4",
+ "name": "interfaceID",
+ "type": "bytes4"
+ }
+ ],
+ "name": "supportsInterface",
+ "outputs": [
+ {
+ "internalType": "bool",
+ "name": "",
+ "type": "bool"
+ }
+ ],
+ "stateMutability": "view",
+ "type": "function"
+ },
+ {
+ "inputs": [
+ {
+ "internalType": "address",
+ "name": "contractAddress",
+ "type": "address"
+ },
+ {
+ "internalType": "address",
+ "name": "user",
+ "type": "address"
+ },
+ {
+ "internalType": "bool",
+ "name": "allowed",
+ "type": "bool"
+ }
+ ],
+ "name": "toggleAllowed",
+ "outputs": [],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
+ "inputs": [
+ {
+ "internalType": "address",
+ "name": "contractAddress",
+ "type": "address"
+ },
+ {
+ "internalType": "bool",
+ "name": "enabled",
+ "type": "bool"
+ }
+ ],
+ "name": "toggleAllowlist",
+ "outputs": [],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
+ "inputs": [
+ {
+ "internalType": "address",
+ "name": "contractAddress",
+ "type": "address"
+ },
+ {
+ "internalType": "bool",
+ "name": "enabled",
+ "type": "bool"
+ }
+ ],
+ "name": "toggleSponsoring",
+ "outputs": [],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ }
+]
\ No newline at end of file
tests/src/eth/util/helpers.tsdiffbeforeafterboth--- a/tests/src/eth/util/helpers.ts
+++ b/tests/src/eth/util/helpers.ts
@@ -72,6 +72,9 @@
]);
return Web3.utils.toChecksumAddress('0x' + buf.toString('hex'));
}
+export function collectionIdFromAddress(address: string): number {
+ return Number('0x' + address.substring(address.length - 8));
+}
export function tokenIdToAddress(collection: number, token: number): string {
const buf = Buffer.from([0xf8, 0x23, 0x8c, 0xcf, 0xff, 0x8e, 0xd8, 0x87, 0x46, 0x3f, 0xd5, 0xe0,
@@ -84,7 +87,6 @@
return {
Ethereum: tokenIdToAddress(collection, token),
};
-}
export function createEthAccount(web3: Web3) {
const account = web3.eth.accounts.create();