difftreelog
misc: update stubs
in: master
12 files changed
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
@@ -22,6 +22,7 @@
}
<<<<<<< HEAD
+<<<<<<< HEAD
/// @title Magic contract, which allows users to reconfigure other contracts
/// @dev the ERC-165 identifier for this interface is 0xd77fab70
=======
@@ -31,6 +32,9 @@
// Selector: 06fc42e9
>>>>>>> path: add stubs
>>>>>>> path: add stubs
+=======
+// Selector: 6073d917
+>>>>>>> misc: update stubs
contract ContractHelpers is Dummy, ERC165 {
/// Get user, which deployed specified contract
/// @dev May return zero address in case if contract is deployed
@@ -53,6 +57,7 @@
}
<<<<<<< HEAD
+<<<<<<< HEAD
/// Set sponsor.
/// @param contractAddress Contract for which a sponsor is being established.
/// @param sponsor User address who set as pending sponsor.
@@ -60,13 +65,13 @@
/// or in textual repr: setSponsor(address,address)
=======
<<<<<<< HEAD
+=======
+>>>>>>> misc: update stubs
// Set sponsor.
//
// @param contract_address Contract for which a sponsor is being established.
// @param sponsor User address who set as pending sponsor.
//
-=======
->>>>>>> path: add stubs
// Selector: setSponsor(address,address) f01fba93
>>>>>>> path: add stubs
function setSponsor(address contractAddress, address sponsor) public {
@@ -77,6 +82,7 @@
}
<<<<<<< HEAD
+<<<<<<< HEAD
/// Set contract as self sponsored.
///
/// @param contractAddress Contract for which a self sponsoring is being enabled.
@@ -84,6 +90,8 @@
/// or in textual repr: selfSponsoredEnable(address)
=======
<<<<<<< HEAD
+=======
+>>>>>>> misc: update stubs
// Set contract as self sponsored.
//
// @param contract_address Contract for which a self sponsoring is being enabled.
@@ -91,16 +99,13 @@
// Selector: selfSponsoredEnable(address) 89f7d9ae
>>>>>>> path: add stubs
function selfSponsoredEnable(address contractAddress) public {
-=======
- // Selector: confirmSponsorship(address) abc00001
- function confirmSponsorship(address contractAddress) public {
->>>>>>> path: add stubs
require(false, stub_error);
contractAddress;
dummy = 0;
}
<<<<<<< HEAD
+<<<<<<< HEAD
/// Remove sponsor.
///
/// @param contractAddress Contract for which a sponsorship is being removed.
@@ -108,6 +113,8 @@
/// or in textual repr: removeSponsor(address)
=======
<<<<<<< HEAD
+=======
+>>>>>>> misc: update stubs
// Remove sponsor.
//
// @param contract_address Contract for which a sponsorship is being removed.
@@ -140,9 +147,6 @@
/// @dev EVM selector for this function is: 0x743fc745,
/// or in textual repr: getSponsor(address)
function getSponsor(address contractAddress)
-=======
- // Selector: getSponsor(address) 743fc745
- function getSponsor(address contractAddress)
public
view
returns (Tuple0 memory)
@@ -153,27 +157,6 @@
return Tuple0(0x0000000000000000000000000000000000000000, 0);
}
- // Selector: hasSponsor(address) 97418603
- function hasSponsor(address contractAddress) public view returns (bool) {
- require(false, stub_error);
- contractAddress;
- dummy;
- return false;
- }
-
- // Selector: hasPendingSponsor(address) 39b9b242
- function hasPendingSponsor(address contractAddress)
->>>>>>> path: add stubs
- public
- view
- returns (Tuple0 memory)
- {
- require(false, stub_error);
- contractAddress;
- dummy;
- return Tuple0(0x0000000000000000000000000000000000000000, 0);
- }
-
/// Check tat contract has confirmed sponsor.
///
/// @param contractAddress The contract for which the presence of a confirmed sponsor is checked.
@@ -188,6 +171,7 @@
}
<<<<<<< HEAD
+<<<<<<< HEAD
/// Check tat contract has pending sponsor.
///
/// @param contractAddress The contract for which the presence of a pending sponsor is checked.
@@ -196,6 +180,8 @@
/// or in textual repr: hasPendingSponsor(address)
=======
<<<<<<< HEAD
+=======
+>>>>>>> misc: update stubs
// Check tat contract has pending sponsor.
//
// @param contract_address The contract for which the presence of a pending sponsor is checked.
@@ -204,10 +190,6 @@
// Selector: hasPendingSponsor(address) 39b9b242
>>>>>>> path: add stubs
function hasPendingSponsor(address contractAddress)
-=======
- // Selector: sponsoringEnabled(address) 6027dc61
- function sponsoringEnabled(address contractAddress)
->>>>>>> path: add stubs
public
view
returns (bool)
@@ -216,7 +198,6 @@
contractAddress;
dummy;
return false;
-<<<<<<< HEAD
}
/// @dev EVM selector for this function is: 0x6027dc61,
@@ -230,8 +211,6 @@
contractAddress;
dummy;
return false;
-=======
->>>>>>> path: add stubs
}
/// @dev EVM selector for this function is: 0xfde8a560,
pallets/fungible/src/stubs/UniqueFungible.soldiffbeforeafterboth--- a/pallets/fungible/src/stubs/UniqueFungible.sol
+++ b/pallets/fungible/src/stubs/UniqueFungible.sol
@@ -45,7 +45,6 @@
);
}
-<<<<<<< HEAD
// Selector: 79cc6790
contract ERC20UniqueExtensions is Dummy, ERC165 {
// Selector: burnFrom(address,uint256) 79cc6790
@@ -142,11 +141,15 @@
}
}
+<<<<<<< HEAD
// Selector: ffe4da23
=======
// Selector: 765e2fae
>>>>>>> misk: Update stubs
>>>>>>> misk: Update stubs
+=======
+// Selector: e54be640
+>>>>>>> misc: update stubs
contract Collection is Dummy, ERC165 {
/// Set collection property.
///
pallets/nonfungible/src/stubs/UniqueNFT.soldiffbeforeafterboth--- a/pallets/nonfungible/src/stubs/UniqueNFT.sol
+++ b/pallets/nonfungible/src/stubs/UniqueNFT.sol
@@ -482,10 +482,13 @@
}
<<<<<<< HEAD
+<<<<<<< HEAD
/// @title Unique extensions for ERC721.
/// @dev the ERC-165 identifier for this interface is 0xd74d154f
=======
<<<<<<< HEAD
+=======
+>>>>>>> misc: update stubs
// Selector: 780e9d63
contract ERC721Enumerable is Dummy, ERC165 {
// @notice Enumerate valid NFTs
@@ -607,6 +610,7 @@
}
<<<<<<< HEAD
+<<<<<<< HEAD
/// @dev anonymous struct
struct Tuple8 {
uint256 field_0;
@@ -617,6 +621,9 @@
=======
// Selector: 765e2fae
>>>>>>> misk: Update stubs
+=======
+// Selector: e54be640
+>>>>>>> misc: update stubs
contract Collection is Dummy, ERC165 {
// Set collection property.
//
pallets/refungible/src/stubs/UniqueRefungible.soldiffbeforeafterboth--- a/pallets/refungible/src/stubs/UniqueRefungible.sol
+++ b/pallets/refungible/src/stubs/UniqueRefungible.sol
@@ -482,10 +482,13 @@
}
<<<<<<< HEAD
+<<<<<<< HEAD
/// @title Unique extensions for ERC721.
/// @dev the ERC-165 identifier for this interface is 0x7c3bef89
=======
<<<<<<< HEAD
+=======
+>>>>>>> misc: update stubs
// Selector: 780e9d63
contract ERC721Enumerable is Dummy, ERC165 {
// @notice Enumerate valid RFTs
@@ -621,6 +624,7 @@
}
<<<<<<< HEAD
+<<<<<<< HEAD
/// @dev anonymous struct
struct Tuple8 {
uint256 field_0;
@@ -631,6 +635,9 @@
=======
// Selector: 765e2fae
>>>>>>> misk: Update stubs
+=======
+// Selector: e54be640
+>>>>>>> misc: update stubs
contract Collection is Dummy, ERC165 {
// Set collection property.
//
tests/src/eth/api/ContractHelpers.soldiffbeforeafterboth--- a/tests/src/eth/api/ContractHelpers.sol
+++ b/tests/src/eth/api/ContractHelpers.sol
@@ -13,6 +13,7 @@
}
<<<<<<< HEAD
+<<<<<<< HEAD
/// @title Magic contract, which allows users to reconfigure other contracts
/// @dev the ERC-165 identifier for this interface is 0xd77fab70
=======
@@ -22,6 +23,9 @@
// Selector: 06fc42e9
>>>>>>> path: add stubs
>>>>>>> path: add stubs
+=======
+// Selector: 6073d917
+>>>>>>> misc: update stubs
interface ContractHelpers is Dummy, ERC165 {
/// Get user, which deployed specified contract
/// @dev May return zero address in case if contract is deployed
@@ -38,6 +42,7 @@
returns (address);
<<<<<<< HEAD
+<<<<<<< HEAD
/// Set sponsor.
/// @param contractAddress Contract for which a sponsor is being established.
/// @param sponsor User address who set as pending sponsor.
@@ -45,6 +50,8 @@
/// or in textual repr: setSponsor(address,address)
=======
<<<<<<< HEAD
+=======
+>>>>>>> misc: update stubs
// Set sponsor.
//
// @param contract_address Contract for which a sponsor is being established.
@@ -90,14 +97,6 @@
// @param contract_address 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.
//
-=======
- // Selector: setSponsor(address,address) f01fba93
- function setSponsor(address contractAddress, address sponsor) external;
-
- // Selector: confirmSponsorship(address) abc00001
- function confirmSponsorship(address contractAddress) external;
-
->>>>>>> path: add stubs
// Selector: getSponsor(address) 743fc745
>>>>>>> path: add stubs
function getSponsor(address contractAddress)
@@ -106,6 +105,7 @@
returns (Tuple0 memory);
<<<<<<< HEAD
+<<<<<<< HEAD
/// Check tat contract has confirmed sponsor.
///
/// @param contractAddress The contract for which the presence of a confirmed sponsor is checked.
@@ -122,6 +122,8 @@
/// or in textual repr: hasPendingSponsor(address)
=======
<<<<<<< HEAD
+=======
+>>>>>>> misc: update stubs
// Check tat contract has confirmed sponsor.
//
// @param contract_address The contract for which the presence of a confirmed sponsor is checked.
@@ -135,11 +137,6 @@
// @param contract_address The contract for which the presence of a pending sponsor is checked.
// @return **true** if contract has pending sponsor.
//
-=======
- // Selector: hasSponsor(address) 97418603
- function hasSponsor(address contractAddress) external view returns (bool);
-
->>>>>>> path: add stubs
// Selector: hasPendingSponsor(address) 39b9b242
>>>>>>> path: add stubs
function hasPendingSponsor(address contractAddress)
tests/src/eth/api/UniqueFungible.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueFungible.sol
+++ b/tests/src/eth/api/UniqueFungible.sol
@@ -36,7 +36,6 @@
);
}
-<<<<<<< HEAD
// Selector: 79cc6790
interface ERC20UniqueExtensions is Dummy, ERC165 {
// Selector: burnFrom(address,uint256) 79cc6790
@@ -80,11 +79,15 @@
returns (uint256);
}
+<<<<<<< HEAD
// Selector: ffe4da23
=======
// Selector: 765e2fae
>>>>>>> misk: Update stubs
>>>>>>> misk: Update stubs
+=======
+// Selector: e54be640
+>>>>>>> misc: update stubs
interface Collection is Dummy, ERC165 {
/// Set collection property.
///
tests/src/eth/api/UniqueNFT.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueNFT.sol
+++ b/tests/src/eth/api/UniqueNFT.sol
@@ -322,10 +322,13 @@
}
<<<<<<< HEAD
+<<<<<<< HEAD
/// @title Unique extensions for ERC721.
/// @dev the ERC-165 identifier for this interface is 0xd74d154f
=======
<<<<<<< HEAD
+=======
+>>>>>>> misc: update stubs
// Selector: 780e9d63
interface ERC721Enumerable is Dummy, ERC165 {
// @notice Enumerate valid NFTs
@@ -403,6 +406,7 @@
}
<<<<<<< HEAD
+<<<<<<< HEAD
/// @dev anonymous struct
struct Tuple8 {
uint256 field_0;
@@ -413,6 +417,9 @@
=======
// Selector: 765e2fae
>>>>>>> misk: Update stubs
+=======
+// Selector: e54be640
+>>>>>>> misc: update stubs
interface Collection is Dummy, ERC165 {
// Set collection property.
//
tests/src/eth/api/UniqueRefungible.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueRefungible.sol
+++ b/tests/src/eth/api/UniqueRefungible.sol
@@ -322,10 +322,13 @@
}
<<<<<<< HEAD
+<<<<<<< HEAD
/// @title Unique extensions for ERC721.
/// @dev the ERC-165 identifier for this interface is 0x7c3bef89
=======
<<<<<<< HEAD
+=======
+>>>>>>> misc: update stubs
// Selector: 780e9d63
interface ERC721Enumerable is Dummy, ERC165 {
// @notice Enumerate valid RFTs
@@ -415,6 +418,7 @@
}
<<<<<<< HEAD
+<<<<<<< HEAD
/// @dev anonymous struct
struct Tuple8 {
uint256 field_0;
@@ -425,6 +429,9 @@
=======
// Selector: 765e2fae
>>>>>>> misk: Update stubs
+=======
+// Selector: e54be640
+>>>>>>> misc: update stubs
interface Collection is Dummy, ERC165 {
// Set collection property.
//
tests/src/eth/fungibleAbi.jsondiffbeforeafterboth--- a/tests/src/eth/fungibleAbi.json
+++ b/tests/src/eth/fungibleAbi.json
@@ -151,24 +151,6 @@
"type": "function"
},
{
- "inputs": [
- { "internalType": "address", "name": "user", "type": "address" }
- ],
- "name": "isOwnerOrAdmin",
- "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
- "stateMutability": "view",
- "type": "function"
- },
- {
- "inputs": [
- { "internalType": "uint256", "name": "user", "type": "uint256" }
- ],
- "name": "isOwnerOrAdminSubstrate",
- "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
- "stateMutability": "view",
- "type": "function"
- },
- {
"inputs": [],
"name": "getCollectionSponsor",
"outputs": [
@@ -193,6 +175,24 @@
"type": "function"
},
{
+ "inputs": [
+ { "internalType": "address", "name": "user", "type": "address" }
+ ],
+ "name": "isOwnerOrAdmin",
+ "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
+ "stateMutability": "view",
+ "type": "function"
+ },
+ {
+ "inputs": [
+ { "internalType": "uint256", "name": "user", "type": "uint256" }
+ ],
+ "name": "isOwnerOrAdminSubstrate",
+ "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
+ "stateMutability": "view",
+ "type": "function"
+ },
+ {
"inputs": [],
"name": "name",
"outputs": [{ "internalType": "string", "name": "", "type": "string" }],
@@ -309,7 +309,15 @@
},
{
"inputs": [
-<<<<<<< HEAD
+ { "internalType": "uint256", "name": "sponsor", "type": "uint256" }
+ ],
+ "name": "setCollectionSponsorSubstrate",
+ "outputs": [],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
+ "inputs": [
{ "internalType": "address", "name": "newOwner", "type": "address" }
],
"name": "setOwner",
@@ -322,11 +330,6 @@
{ "internalType": "uint256", "name": "newOwner", "type": "uint256" }
],
"name": "setOwnerSubstrate",
-=======
- { "internalType": "uint256", "name": "sponsor", "type": "uint256" }
- ],
- "name": "setCollectionSponsorSubstrate",
->>>>>>> misk: Update stubs
"outputs": [],
"stateMutability": "nonpayable",
"type": "function"
tests/src/eth/nonFungibleAbi.jsondiffbeforeafterboth--- a/tests/src/eth/nonFungibleAbi.json
+++ b/tests/src/eth/nonFungibleAbi.json
@@ -483,7 +483,15 @@
},
{
"inputs": [
-<<<<<<< HEAD
+ { "internalType": "uint256", "name": "sponsor", "type": "uint256" }
+ ],
+ "name": "setCollectionSponsorSubstrate",
+ "outputs": [],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
+ "inputs": [
{ "internalType": "address", "name": "newOwner", "type": "address" }
],
"name": "setOwner",
@@ -496,11 +504,6 @@
{ "internalType": "uint256", "name": "newOwner", "type": "uint256" }
],
"name": "setOwnerSubstrate",
-=======
- { "internalType": "uint256", "name": "sponsor", "type": "uint256" }
- ],
- "name": "setCollectionSponsorSubstrate",
->>>>>>> misk: Update stubs
"outputs": [],
"stateMutability": "nonpayable",
"type": "function"
tests/src/eth/reFungibleAbi.jsondiffbeforeafterboth--- a/tests/src/eth/reFungibleAbi.json
+++ b/tests/src/eth/reFungibleAbi.json
@@ -483,7 +483,15 @@
},
{
"inputs": [
-<<<<<<< HEAD
+ { "internalType": "uint256", "name": "sponsor", "type": "uint256" }
+ ],
+ "name": "setCollectionSponsorSubstrate",
+ "outputs": [],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
+ "inputs": [
{ "internalType": "address", "name": "newOwner", "type": "address" }
],
"name": "setOwner",
@@ -496,11 +504,6 @@
{ "internalType": "uint256", "name": "newOwner", "type": "uint256" }
],
"name": "setOwnerSubstrate",
-=======
- { "internalType": "uint256", "name": "sponsor", "type": "uint256" }
- ],
- "name": "setCollectionSponsorSubstrate",
->>>>>>> misk: Update stubs
"outputs": [],
"stateMutability": "nonpayable",
"type": "function"
tests/src/eth/util/contractHelpersAbi.jsondiffbeforeafterboth120 "internalType": "address",120 "internalType": "address",121 "name": "contractAddress",121 "name": "contractAddress",122 "type": "address"122 "type": "address"123<<<<<<< HEAD124 }123 }125 ],124 ],126 "name": "removeSponsor",125 "name": "removeSponsor",147 "internalType": "address",146 "internalType": "address",148 "name": "contractAddress",147 "name": "contractAddress",149 "type": "address"148 "type": "address"150=======151>>>>>>> path: add stubs152 },149 },153 { "internalType": "address", "name": "sponsor", "type": "address" }150 { "internalType": "address", "name": "sponsor", "type": "address" }154 ],151 ],