Merge remote-tracking branch 'origin/fix/changes-after-final-review-t…

…est'
Apillon · Sep 5, 2023 · 6b5c9c5 · 6b5c9c5
2 parents db891e9 + 71e3f83
commit 6b5c9c5
Showing 1 changed file with 8 additions and 9 deletions.
diff --git a/src/lib/nftAbi.js b/src/lib/nftAbi.js
@@ -1,5 +1,5 @@
 const nftAbi = [
-  'constructor(string _name, string _symbol, string _initBaseURI, string _baseExtension, bool[] _settings, uint256 _dropStart, uint256 _reserve, tuple(address erc20TokenAddress, bool tokenUriIsEnumerable, address royaltyRecipient, uint16 royaltyPercentageBps, uint256 maxSupply, uint256 pricePerMint) _data)',
+  'constructor(string _name, string _symbol, string _initBaseURI, string _baseExtension, bool[] _settings, uint256 _dropStart, uint256 _reserve, tuple(address royaltyRecipient, uint16 royaltyPercentageBps, uint256 maxSupply, uint256 pricePerMint) _data)',
   'error ERC721AddressZeroIsNotaValidOwner()',
   'error ERC721ApprovalToCurrentOwner()',
   'error ERC721ApproveCallerIsNotOwnerNorApprovedForAll()',
@@ -15,12 +15,10 @@ const nftAbi = [
   'error RMRKChildIndexOutOfRange()',
   'error RMRKIdZeroForbidden()',
   'error RMRKIsNotContract()',
-  'error RMRKLocked()',
   'error RMRKMaxPendingChildrenReached()',
   'error RMRKMaxRecursiveBurnsReached(address childContract, uint256 childId)',
   'error RMRKMintOverMax()',
   'error RMRKMintToNonRMRKNestableImplementer()',
-  'error RMRKMintUnderpriced()',
   'error RMRKMintZero()',
   'error RMRKNestableTooDeep()',
   'error RMRKNestableTransferToDescendant()',
@@ -34,6 +32,7 @@ const nftAbi = [
   'error RMRKRoyaltiesTooHigh()',
   'error RMRKUnexpectedChildId()',
   'error RMRKUnexpectedNumberOfChildren()',
+  'error RMRKWrongValueSent()',
   'event AllChildrenRejected(uint256 indexed tokenId)',
   'event Approval(address indexed owner, address indexed approved, uint256 indexed tokenId)',
   'event ApprovalForAll(address indexed owner, address indexed operator, bool approved)',
@@ -44,6 +43,7 @@ const nftAbi = [
   'event NestTransfer(address indexed from, address indexed to, uint256 fromTokenId, uint256 toTokenId, uint256 indexed tokenId)',
   'event OwnershipTransferred(address indexed previousOwner, address indexed newOwner)',
   'event Transfer(address indexed from, address indexed to, uint256 indexed tokenId)',
+  'function RMRK_INTERFACE() view returns (bytes4)',
   'function VERSION() view returns (string)',
   'function acceptChild(uint256 parentId, uint256 childIndex, address childAddress, uint256 childId)',
   'function addChild(uint256 parentId, uint256 childId, bytes data)',
@@ -53,26 +53,25 @@ const nftAbi = [
   'function baseExtension() view returns (string)',
   'function burn(uint256 tokenId)',
   'function burn(uint256 tokenId, uint256 maxChildrenBurns) returns (uint256)',
-  'function childIsInActive(address childAddress, uint256 childId) view returns (bool)',
   'function childOf(uint256 parentId, uint256 index) view returns (tuple(uint256 tokenId, address contractAddress))',
   'function childrenOf(uint256 parentId) view returns (tuple(uint256 tokenId, address contractAddress)[])',
   'function collectionMetadata() view returns (string)',
   'function directOwnerOf(uint256 tokenId) view returns (address, uint256, bool)',
   'function dropStart() view returns (uint256)',
   'function getApproved(uint256 tokenId) view returns (address)',
-  'function getLock() view returns (bool)',
   'function getRoyaltyPercentage() view returns (uint256)',
   'function getRoyaltyRecipient() view returns (address)',
   'function isApprovedForAll(address owner, address operator) view returns (bool)',
   'function isContributor(address contributor) view returns (bool)',
   'function isDrop() view returns (bool)',
   'function isRevokable() view returns (bool)',
   'function isSoulbound() view returns (bool)',
+  'function lastId() view returns (uint256)',
   'function manageContributor(address contributor, bool grantRole)',
   'function maxSupply() view returns (uint256)',
-  'function mint(address to, uint256 numToMint) payable',
+  'function mint(address to, uint256 numToMint) payable returns (uint256)',
   'function name() view returns (string)',
-  'function nestMint(address to, uint256 numToMint, uint256 destinationId) payable',
+  'function nestMint(address to, uint256 numToMint, uint256 destinationId) payable returns (uint256)',
   'function nestTransferFrom(address from, address to, uint256 tokenId, uint256 destinationId, bytes data)',
   'function owner() view returns (address)',
   'function ownerMint(address _receiver, uint16 _numToMint)',
@@ -91,18 +90,18 @@ const nftAbi = [
   'function setBaseExtension(string _newBaseExtension)',
   'function setBaseURI(string _newBaseURI)',
   'function setDropStart(uint256 _dropStart)',
-  'function setLock()',
   'function supportsInterface(bytes4 interfaceId) view returns (bool)',
   'function symbol() view returns (string)',
   'function tokenByIndex(uint256 index) view returns (uint256)',
   'function tokenOfOwnerByIndex(address owner, uint256 index) view returns (uint256)',
   'function tokenURI(uint256 tokenId) view returns (string)',
+  'function totalAssets() view returns (uint256)',
   'function totalSupply() view returns (uint256)',
   'function transferChild(uint256 tokenId, address to, uint256 destinationId, uint256 childIndex, address childAddress, uint256 childId, bool isPending, bytes data)',
   'function transferFrom(address from, address to, uint256 tokenId)',
   'function transferOwnership(address newOwner)',
   'function updateRoyaltyRecipient(address newRoyaltyRecipient)',
   'function walletOfOwner(address _owner) view returns (uint256[])',
-  'function withdrawRaised(address to, uint256 amount)'
+  'function withdrawRaised(address to, uint256 amount)',
 ]
 export default nftAbi