From 672a07da8fab438c2e4bbe747daecb39d911102c Mon Sep 17 00:00:00 2001 From: Joaquin Gonzalez Date: Sun, 28 Jan 2024 15:57:01 -0300 Subject: [PATCH] chore: bump solidity version --- apps/web/src/config/abis/LucidOrigins.ts | 256 +++++++++--------- apps/web/src/config/abis/LucidOrigins.ts.bak | 2 +- packages/contracts/.solhint.json | 2 +- packages/contracts/foundry.toml | 2 +- packages/contracts/script/Base.s.sol | 2 +- .../contracts/script/LucidOriginsDeploy.s.sol | 2 +- packages/contracts/src/Encoder.sol | 2 +- packages/contracts/src/LucidOrigins.sol | 6 +- packages/contracts/src/layers/Background.sol | 2 +- packages/contracts/src/layers/Blob.sol | 2 +- packages/contracts/src/layers/Blush.sol | 2 +- packages/contracts/src/layers/Face.sol | 2 +- packages/contracts/src/utils/Colors.sol | 2 +- packages/contracts/src/utils/constants.sol | 2 +- packages/contracts/test/LucidOrigins.t.sol | 6 +- 15 files changed, 146 insertions(+), 146 deletions(-) diff --git a/apps/web/src/config/abis/LucidOrigins.ts b/apps/web/src/config/abis/LucidOrigins.ts index 00216b5..433379c 100644 --- a/apps/web/src/config/abis/LucidOrigins.ts +++ b/apps/web/src/config/abis/LucidOrigins.ts @@ -1,211 +1,211 @@ export default [ - { inputs: [], stateMutability: 'nonpayable', type: 'constructor' }, - { inputs: [], name: 'ApprovalCallerNotOwnerNorApproved', type: 'error' }, - { inputs: [], name: 'ApprovalQueryForNonexistentToken', type: 'error' }, - { inputs: [], name: 'BalanceQueryForZeroAddress', type: 'error' }, - { inputs: [], name: 'MintERC2309QuantityExceedsLimit', type: 'error' }, - { inputs: [], name: 'MintToZeroAddress', type: 'error' }, - { inputs: [], name: 'MintZeroQuantity', type: 'error' }, - { inputs: [], name: 'OwnerQueryForNonexistentToken', type: 'error' }, - { inputs: [], name: 'OwnershipNotInitializedForExtraData', type: 'error' }, - { inputs: [], name: 'TransferCallerNotOwnerNorApproved', type: 'error' }, - { inputs: [], name: 'TransferFromIncorrectOwner', type: 'error' }, - { inputs: [], name: 'TransferToNonERC721ReceiverImplementer', type: 'error' }, - { inputs: [], name: 'TransferToZeroAddress', type: 'error' }, - { inputs: [], name: 'URIQueryForNonexistentToken', type: 'error' }, - { - anonymous: false, - inputs: [ - { indexed: true, internalType: 'address', name: 'owner', type: 'address' }, - { indexed: true, internalType: 'address', name: 'approved', type: 'address' }, - { indexed: true, internalType: 'uint256', name: 'tokenId', type: 'uint256' }, - ], - name: 'Approval', - type: 'event', - }, - { - anonymous: false, - inputs: [ - { indexed: true, internalType: 'address', name: 'owner', type: 'address' }, - { indexed: true, internalType: 'address', name: 'operator', type: 'address' }, - { indexed: false, internalType: 'bool', name: 'approved', type: 'bool' }, - ], - name: 'ApprovalForAll', - type: 'event', - }, - { - anonymous: false, - inputs: [ - { indexed: true, internalType: 'uint256', name: 'fromTokenId', type: 'uint256' }, - { indexed: false, internalType: 'uint256', name: 'toTokenId', type: 'uint256' }, - { indexed: true, internalType: 'address', name: 'from', type: 'address' }, - { indexed: true, internalType: 'address', name: 'to', type: 'address' }, - ], - name: 'ConsecutiveTransfer', - type: 'event', - }, - { - anonymous: false, - inputs: [ - { indexed: true, internalType: 'address', name: 'user', type: 'address' }, - { indexed: true, internalType: 'address', name: 'newOwner', type: 'address' }, - ], - name: 'OwnershipTransferred', - type: 'event', - }, - { - anonymous: false, - inputs: [ - { indexed: true, internalType: 'address', name: 'from', type: 'address' }, - { indexed: true, internalType: 'address', name: 'to', type: 'address' }, - { indexed: true, internalType: 'uint256', name: 'tokenId', type: 'uint256' }, - ], - name: 'Transfer', - type: 'event', - }, + { type: 'constructor', inputs: [], stateMutability: 'nonpayable' }, { + type: 'function', + name: 'approve', inputs: [ - { internalType: 'address', name: 'to', type: 'address' }, - { internalType: 'uint256', name: 'tokenId', type: 'uint256' }, + { name: 'to', type: 'address', internalType: 'address' }, + { name: 'tokenId', type: 'uint256', internalType: 'uint256' }, ], - name: 'approve', outputs: [], stateMutability: 'payable', - type: 'function', }, { - inputs: [{ internalType: 'address', name: 'owner', type: 'address' }], + type: 'function', name: 'balanceOf', - outputs: [{ internalType: 'uint256', name: '', type: 'uint256' }], + inputs: [{ name: 'owner', type: 'address', internalType: 'address' }], + outputs: [{ name: '', type: 'uint256', internalType: 'uint256' }], stateMutability: 'view', - type: 'function', }, { - inputs: [{ internalType: 'uint256', name: 'tokenId', type: 'uint256' }], + type: 'function', name: 'getApproved', - outputs: [{ internalType: 'address', name: '', type: 'address' }], + inputs: [{ name: 'tokenId', type: 'uint256', internalType: 'uint256' }], + outputs: [{ name: '', type: 'address', internalType: 'address' }], stateMutability: 'view', - type: 'function', }, { + type: 'function', + name: 'isApprovedForAll', inputs: [ - { internalType: 'address', name: 'owner', type: 'address' }, - { internalType: 'address', name: 'operator', type: 'address' }, + { name: 'owner', type: 'address', internalType: 'address' }, + { name: 'operator', type: 'address', internalType: 'address' }, ], - name: 'isApprovedForAll', - outputs: [{ internalType: 'bool', name: '', type: 'bool' }], + outputs: [{ name: '', type: 'bool', internalType: 'bool' }], stateMutability: 'view', - type: 'function', }, { + type: 'function', + name: 'isColorDark', inputs: [ - { internalType: 'uint256', name: 'r', type: 'uint256' }, - { internalType: 'uint256', name: 'g', type: 'uint256' }, - { internalType: 'uint256', name: 'b', type: 'uint256' }, + { name: 'r', type: 'uint256', internalType: 'uint256' }, + { name: 'g', type: 'uint256', internalType: 'uint256' }, + { name: 'b', type: 'uint256', internalType: 'uint256' }, ], - name: 'isColorDark', - outputs: [{ internalType: 'bool', name: '', type: 'bool' }], + outputs: [{ name: '', type: 'bool', internalType: 'bool' }], stateMutability: 'pure', - type: 'function', }, { - inputs: [], + type: 'function', name: 'name', - outputs: [{ internalType: 'string', name: '', type: 'string' }], + inputs: [], + outputs: [{ name: '', type: 'string', internalType: 'string' }], stateMutability: 'view', - type: 'function', }, { - inputs: [], + type: 'function', name: 'owner', - outputs: [{ internalType: 'address', name: '', type: 'address' }], + inputs: [], + outputs: [{ name: '', type: 'address', internalType: 'address' }], stateMutability: 'view', - type: 'function', }, { - inputs: [{ internalType: 'uint256', name: 'tokenId', type: 'uint256' }], + type: 'function', name: 'ownerOf', - outputs: [{ internalType: 'address', name: '', type: 'address' }], + inputs: [{ name: 'tokenId', type: 'uint256', internalType: 'uint256' }], + outputs: [{ name: '', type: 'address', internalType: 'address' }], stateMutability: 'view', - type: 'function', }, { + type: 'function', + name: 'safeTransferFrom', inputs: [ - { internalType: 'address', name: 'from', type: 'address' }, - { internalType: 'address', name: 'to', type: 'address' }, - { internalType: 'uint256', name: 'tokenId', type: 'uint256' }, + { name: 'from', type: 'address', internalType: 'address' }, + { name: 'to', type: 'address', internalType: 'address' }, + { name: 'tokenId', type: 'uint256', internalType: 'uint256' }, ], - name: 'safeTransferFrom', outputs: [], stateMutability: 'payable', - type: 'function', }, { + type: 'function', + name: 'safeTransferFrom', inputs: [ - { internalType: 'address', name: 'from', type: 'address' }, - { internalType: 'address', name: 'to', type: 'address' }, - { internalType: 'uint256', name: 'tokenId', type: 'uint256' }, - { internalType: 'bytes', name: '_data', type: 'bytes' }, + { name: 'from', type: 'address', internalType: 'address' }, + { name: 'to', type: 'address', internalType: 'address' }, + { name: 'tokenId', type: 'uint256', internalType: 'uint256' }, + { name: '_data', type: 'bytes', internalType: 'bytes' }, ], - name: 'safeTransferFrom', outputs: [], stateMutability: 'payable', - type: 'function', }, { + type: 'function', + name: 'setApprovalForAll', inputs: [ - { internalType: 'address', name: 'operator', type: 'address' }, - { internalType: 'bool', name: 'approved', type: 'bool' }, + { name: 'operator', type: 'address', internalType: 'address' }, + { name: 'approved', type: 'bool', internalType: 'bool' }, ], - name: 'setApprovalForAll', outputs: [], stateMutability: 'nonpayable', - type: 'function', }, { - inputs: [{ internalType: 'bytes4', name: 'interfaceId', type: 'bytes4' }], + type: 'function', name: 'supportsInterface', - outputs: [{ internalType: 'bool', name: '', type: 'bool' }], + inputs: [{ name: 'interfaceId', type: 'bytes4', internalType: 'bytes4' }], + outputs: [{ name: '', type: 'bool', internalType: 'bool' }], stateMutability: 'view', - type: 'function', }, { - inputs: [], + type: 'function', name: 'symbol', - outputs: [{ internalType: 'string', name: '', type: 'string' }], + inputs: [], + outputs: [{ name: '', type: 'string', internalType: 'string' }], stateMutability: 'view', - type: 'function', }, { - inputs: [{ internalType: 'uint256', name: 'tokenId', type: 'uint256' }], + type: 'function', name: 'tokenURI', - outputs: [{ internalType: 'string', name: '', type: 'string' }], + inputs: [{ name: 'tokenId', type: 'uint256', internalType: 'uint256' }], + outputs: [{ name: '', type: 'string', internalType: 'string' }], stateMutability: 'view', - type: 'function', }, { - inputs: [], + type: 'function', name: 'totalSupply', - outputs: [{ internalType: 'uint256', name: '', type: 'uint256' }], + inputs: [], + outputs: [{ name: '', type: 'uint256', internalType: 'uint256' }], stateMutability: 'view', - type: 'function', }, { + type: 'function', + name: 'transferFrom', inputs: [ - { internalType: 'address', name: 'from', type: 'address' }, - { internalType: 'address', name: 'to', type: 'address' }, - { internalType: 'uint256', name: 'tokenId', type: 'uint256' }, + { name: 'from', type: 'address', internalType: 'address' }, + { name: 'to', type: 'address', internalType: 'address' }, + { name: 'tokenId', type: 'uint256', internalType: 'uint256' }, ], - name: 'transferFrom', outputs: [], stateMutability: 'payable', - type: 'function', }, { - inputs: [{ internalType: 'address', name: 'newOwner', type: 'address' }], + type: 'function', name: 'transferOwnership', + inputs: [{ name: 'newOwner', type: 'address', internalType: 'address' }], outputs: [], stateMutability: 'nonpayable', - type: 'function', }, + { + type: 'event', + name: 'Approval', + inputs: [ + { name: 'owner', type: 'address', indexed: true, internalType: 'address' }, + { name: 'approved', type: 'address', indexed: true, internalType: 'address' }, + { name: 'tokenId', type: 'uint256', indexed: true, internalType: 'uint256' }, + ], + anonymous: false, + }, + { + type: 'event', + name: 'ApprovalForAll', + inputs: [ + { name: 'owner', type: 'address', indexed: true, internalType: 'address' }, + { name: 'operator', type: 'address', indexed: true, internalType: 'address' }, + { name: 'approved', type: 'bool', indexed: false, internalType: 'bool' }, + ], + anonymous: false, + }, + { + type: 'event', + name: 'ConsecutiveTransfer', + inputs: [ + { name: 'fromTokenId', type: 'uint256', indexed: true, internalType: 'uint256' }, + { name: 'toTokenId', type: 'uint256', indexed: false, internalType: 'uint256' }, + { name: 'from', type: 'address', indexed: true, internalType: 'address' }, + { name: 'to', type: 'address', indexed: true, internalType: 'address' }, + ], + anonymous: false, + }, + { + type: 'event', + name: 'OwnershipTransferred', + inputs: [ + { name: 'user', type: 'address', indexed: true, internalType: 'address' }, + { name: 'newOwner', type: 'address', indexed: true, internalType: 'address' }, + ], + anonymous: false, + }, + { + type: 'event', + name: 'Transfer', + inputs: [ + { name: 'from', type: 'address', indexed: true, internalType: 'address' }, + { name: 'to', type: 'address', indexed: true, internalType: 'address' }, + { name: 'tokenId', type: 'uint256', indexed: true, internalType: 'uint256' }, + ], + anonymous: false, + }, + { type: 'error', name: 'ApprovalCallerNotOwnerNorApproved', inputs: [] }, + { type: 'error', name: 'ApprovalQueryForNonexistentToken', inputs: [] }, + { type: 'error', name: 'BalanceQueryForZeroAddress', inputs: [] }, + { type: 'error', name: 'MintERC2309QuantityExceedsLimit', inputs: [] }, + { type: 'error', name: 'MintToZeroAddress', inputs: [] }, + { type: 'error', name: 'MintZeroQuantity', inputs: [] }, + { type: 'error', name: 'OwnerQueryForNonexistentToken', inputs: [] }, + { type: 'error', name: 'OwnershipNotInitializedForExtraData', inputs: [] }, + { type: 'error', name: 'TransferCallerNotOwnerNorApproved', inputs: [] }, + { type: 'error', name: 'TransferFromIncorrectOwner', inputs: [] }, + { type: 'error', name: 'TransferToNonERC721ReceiverImplementer', inputs: [] }, + { type: 'error', name: 'TransferToZeroAddress', inputs: [] }, + { type: 'error', name: 'URIQueryForNonexistentToken', inputs: [] }, ] as const diff --git a/apps/web/src/config/abis/LucidOrigins.ts.bak b/apps/web/src/config/abis/LucidOrigins.ts.bak index b3cd214..0d2249f 100644 --- a/apps/web/src/config/abis/LucidOrigins.ts.bak +++ b/apps/web/src/config/abis/LucidOrigins.ts.bak @@ -1 +1 @@ -export default [{'inputs': [], 'stateMutability': 'nonpayable', 'type': 'constructor'}, {'inputs': [], 'name': 'ApprovalCallerNotOwnerNorApproved', 'type': 'error'}, {'inputs': [], 'name': 'ApprovalQueryForNonexistentToken', 'type': 'error'}, {'inputs': [], 'name': 'BalanceQueryForZeroAddress', 'type': 'error'}, {'inputs': [], 'name': 'MintERC2309QuantityExceedsLimit', 'type': 'error'}, {'inputs': [], 'name': 'MintToZeroAddress', 'type': 'error'}, {'inputs': [], 'name': 'MintZeroQuantity', 'type': 'error'}, {'inputs': [], 'name': 'OwnerQueryForNonexistentToken', 'type': 'error'}, {'inputs': [], 'name': 'OwnershipNotInitializedForExtraData', 'type': 'error'}, {'inputs': [], 'name': 'TransferCallerNotOwnerNorApproved', 'type': 'error'}, {'inputs': [], 'name': 'TransferFromIncorrectOwner', 'type': 'error'}, {'inputs': [], 'name': 'TransferToNonERC721ReceiverImplementer', 'type': 'error'}, {'inputs': [], 'name': 'TransferToZeroAddress', 'type': 'error'}, {'inputs': [], 'name': 'URIQueryForNonexistentToken', 'type': 'error'}, {'anonymous': False, 'inputs': [{'indexed': true, 'internalType': 'address', 'name': 'owner', 'type': 'address'}, {'indexed': true, 'internalType': 'address', 'name': 'approved', 'type': 'address'}, {'indexed': true, 'internalType': 'uint256', 'name': 'tokenId', 'type': 'uint256'}], 'name': 'Approval', 'type': 'event'}, {'anonymous': False, 'inputs': [{'indexed': true, 'internalType': 'address', 'name': 'owner', 'type': 'address'}, {'indexed': true, 'internalType': 'address', 'name': 'operator', 'type': 'address'}, {'indexed': False, 'internalType': 'bool', 'name': 'approved', 'type': 'bool'}], 'name': 'ApprovalForAll', 'type': 'event'}, {'anonymous': False, 'inputs': [{'indexed': true, 'internalType': 'uint256', 'name': 'fromTokenId', 'type': 'uint256'}, {'indexed': False, 'internalType': 'uint256', 'name': 'toTokenId', 'type': 'uint256'}, {'indexed': true, 'internalType': 'address', 'name': 'from', 'type': 'address'}, {'indexed': true, 'internalType': 'address', 'name': 'to', 'type': 'address'}], 'name': 'ConsecutiveTransfer', 'type': 'event'}, {'anonymous': False, 'inputs': [{'indexed': true, 'internalType': 'address', 'name': 'user', 'type': 'address'}, {'indexed': true, 'internalType': 'address', 'name': 'newOwner', 'type': 'address'}], 'name': 'OwnershipTransferred', 'type': 'event'}, {'anonymous': False, 'inputs': [{'indexed': true, 'internalType': 'address', 'name': 'from', 'type': 'address'}, {'indexed': true, 'internalType': 'address', 'name': 'to', 'type': 'address'}, {'indexed': true, 'internalType': 'uint256', 'name': 'tokenId', 'type': 'uint256'}], 'name': 'Transfer', 'type': 'event'}, {'inputs': [{'internalType': 'address', 'name': 'to', 'type': 'address'}, {'internalType': 'uint256', 'name': 'tokenId', 'type': 'uint256'}], 'name': 'approve', 'outputs': [], 'stateMutability': 'payable', 'type': 'function'}, {'inputs': [{'internalType': 'address', 'name': 'owner', 'type': 'address'}], 'name': 'balanceOf', 'outputs': [{'internalType': 'uint256', 'name': '', 'type': 'uint256'}], 'stateMutability': 'view', 'type': 'function'}, {'inputs': [{'internalType': 'uint256', 'name': 'tokenId', 'type': 'uint256'}], 'name': 'getApproved', 'outputs': [{'internalType': 'address', 'name': '', 'type': 'address'}], 'stateMutability': 'view', 'type': 'function'}, {'inputs': [{'internalType': 'address', 'name': 'owner', 'type': 'address'}, {'internalType': 'address', 'name': 'operator', 'type': 'address'}], 'name': 'isApprovedForAll', 'outputs': [{'internalType': 'bool', 'name': '', 'type': 'bool'}], 'stateMutability': 'view', 'type': 'function'}, {'inputs': [{'internalType': 'uint256', 'name': 'r', 'type': 'uint256'}, {'internalType': 'uint256', 'name': 'g', 'type': 'uint256'}, {'internalType': 'uint256', 'name': 'b', 'type': 'uint256'}], 'name': 'isColorDark', 'outputs': [{'internalType': 'bool', 'name': '', 'type': 'bool'}], 'stateMutability': 'pure', 'type': 'function'}, {'inputs': [], 'name': 'name', 'outputs': [{'internalType': 'string', 'name': '', 'type': 'string'}], 'stateMutability': 'view', 'type': 'function'}, {'inputs': [], 'name': 'owner', 'outputs': [{'internalType': 'address', 'name': '', 'type': 'address'}], 'stateMutability': 'view', 'type': 'function'}, {'inputs': [{'internalType': 'uint256', 'name': 'tokenId', 'type': 'uint256'}], 'name': 'ownerOf', 'outputs': [{'internalType': 'address', 'name': '', 'type': 'address'}], 'stateMutability': 'view', 'type': 'function'}, {'inputs': [{'internalType': 'address', 'name': 'from', 'type': 'address'}, {'internalType': 'address', 'name': 'to', 'type': 'address'}, {'internalType': 'uint256', 'name': 'tokenId', 'type': 'uint256'}], 'name': 'safeTransferFrom', 'outputs': [], 'stateMutability': 'payable', 'type': 'function'}, {'inputs': [{'internalType': 'address', 'name': 'from', 'type': 'address'}, {'internalType': 'address', 'name': 'to', 'type': 'address'}, {'internalType': 'uint256', 'name': 'tokenId', 'type': 'uint256'}, {'internalType': 'bytes', 'name': '_data', 'type': 'bytes'}], 'name': 'safeTransferFrom', 'outputs': [], 'stateMutability': 'payable', 'type': 'function'}, {'inputs': [{'internalType': 'address', 'name': 'operator', 'type': 'address'}, {'internalType': 'bool', 'name': 'approved', 'type': 'bool'}], 'name': 'setApprovalForAll', 'outputs': [], 'stateMutability': 'nonpayable', 'type': 'function'}, {'inputs': [{'internalType': 'bytes4', 'name': 'interfaceId', 'type': 'bytes4'}], 'name': 'supportsInterface', 'outputs': [{'internalType': 'bool', 'name': '', 'type': 'bool'}], 'stateMutability': 'view', 'type': 'function'}, {'inputs': [], 'name': 'symbol', 'outputs': [{'internalType': 'string', 'name': '', 'type': 'string'}], 'stateMutability': 'view', 'type': 'function'}, {'inputs': [{'internalType': 'uint256', 'name': 'tokenId', 'type': 'uint256'}], 'name': 'tokenURI', 'outputs': [{'internalType': 'string', 'name': '', 'type': 'string'}], 'stateMutability': 'view', 'type': 'function'}, {'inputs': [], 'name': 'totalSupply', 'outputs': [{'internalType': 'uint256', 'name': '', 'type': 'uint256'}], 'stateMutability': 'view', 'type': 'function'}, {'inputs': [{'internalType': 'address', 'name': 'from', 'type': 'address'}, {'internalType': 'address', 'name': 'to', 'type': 'address'}, {'internalType': 'uint256', 'name': 'tokenId', 'type': 'uint256'}], 'name': 'transferFrom', 'outputs': [], 'stateMutability': 'payable', 'type': 'function'}, {'inputs': [{'internalType': 'address', 'name': 'newOwner', 'type': 'address'}], 'name': 'transferOwnership', 'outputs': [], 'stateMutability': 'nonpayable', 'type': 'function'}] as const +export default [{'type': 'constructor', 'inputs': [], 'stateMutability': 'nonpayable'}, {'type': 'function', 'name': 'approve', 'inputs': [{'name': 'to', 'type': 'address', 'internalType': 'address'}, {'name': 'tokenId', 'type': 'uint256', 'internalType': 'uint256'}], 'outputs': [], 'stateMutability': 'payable'}, {'type': 'function', 'name': 'balanceOf', 'inputs': [{'name': 'owner', 'type': 'address', 'internalType': 'address'}], 'outputs': [{'name': '', 'type': 'uint256', 'internalType': 'uint256'}], 'stateMutability': 'view'}, {'type': 'function', 'name': 'getApproved', 'inputs': [{'name': 'tokenId', 'type': 'uint256', 'internalType': 'uint256'}], 'outputs': [{'name': '', 'type': 'address', 'internalType': 'address'}], 'stateMutability': 'view'}, {'type': 'function', 'name': 'isApprovedForAll', 'inputs': [{'name': 'owner', 'type': 'address', 'internalType': 'address'}, {'name': 'operator', 'type': 'address', 'internalType': 'address'}], 'outputs': [{'name': '', 'type': 'bool', 'internalType': 'bool'}], 'stateMutability': 'view'}, {'type': 'function', 'name': 'isColorDark', 'inputs': [{'name': 'r', 'type': 'uint256', 'internalType': 'uint256'}, {'name': 'g', 'type': 'uint256', 'internalType': 'uint256'}, {'name': 'b', 'type': 'uint256', 'internalType': 'uint256'}], 'outputs': [{'name': '', 'type': 'bool', 'internalType': 'bool'}], 'stateMutability': 'pure'}, {'type': 'function', 'name': 'name', 'inputs': [], 'outputs': [{'name': '', 'type': 'string', 'internalType': 'string'}], 'stateMutability': 'view'}, {'type': 'function', 'name': 'owner', 'inputs': [], 'outputs': [{'name': '', 'type': 'address', 'internalType': 'address'}], 'stateMutability': 'view'}, {'type': 'function', 'name': 'ownerOf', 'inputs': [{'name': 'tokenId', 'type': 'uint256', 'internalType': 'uint256'}], 'outputs': [{'name': '', 'type': 'address', 'internalType': 'address'}], 'stateMutability': 'view'}, {'type': 'function', 'name': 'safeTransferFrom', 'inputs': [{'name': 'from', 'type': 'address', 'internalType': 'address'}, {'name': 'to', 'type': 'address', 'internalType': 'address'}, {'name': 'tokenId', 'type': 'uint256', 'internalType': 'uint256'}], 'outputs': [], 'stateMutability': 'payable'}, {'type': 'function', 'name': 'safeTransferFrom', 'inputs': [{'name': 'from', 'type': 'address', 'internalType': 'address'}, {'name': 'to', 'type': 'address', 'internalType': 'address'}, {'name': 'tokenId', 'type': 'uint256', 'internalType': 'uint256'}, {'name': '_data', 'type': 'bytes', 'internalType': 'bytes'}], 'outputs': [], 'stateMutability': 'payable'}, {'type': 'function', 'name': 'setApprovalForAll', 'inputs': [{'name': 'operator', 'type': 'address', 'internalType': 'address'}, {'name': 'approved', 'type': 'bool', 'internalType': 'bool'}], 'outputs': [], 'stateMutability': 'nonpayable'}, {'type': 'function', 'name': 'supportsInterface', 'inputs': [{'name': 'interfaceId', 'type': 'bytes4', 'internalType': 'bytes4'}], 'outputs': [{'name': '', 'type': 'bool', 'internalType': 'bool'}], 'stateMutability': 'view'}, {'type': 'function', 'name': 'symbol', 'inputs': [], 'outputs': [{'name': '', 'type': 'string', 'internalType': 'string'}], 'stateMutability': 'view'}, {'type': 'function', 'name': 'tokenURI', 'inputs': [{'name': 'tokenId', 'type': 'uint256', 'internalType': 'uint256'}], 'outputs': [{'name': '', 'type': 'string', 'internalType': 'string'}], 'stateMutability': 'view'}, {'type': 'function', 'name': 'totalSupply', 'inputs': [], 'outputs': [{'name': '', 'type': 'uint256', 'internalType': 'uint256'}], 'stateMutability': 'view'}, {'type': 'function', 'name': 'transferFrom', 'inputs': [{'name': 'from', 'type': 'address', 'internalType': 'address'}, {'name': 'to', 'type': 'address', 'internalType': 'address'}, {'name': 'tokenId', 'type': 'uint256', 'internalType': 'uint256'}], 'outputs': [], 'stateMutability': 'payable'}, {'type': 'function', 'name': 'transferOwnership', 'inputs': [{'name': 'newOwner', 'type': 'address', 'internalType': 'address'}], 'outputs': [], 'stateMutability': 'nonpayable'}, {'type': 'event', 'name': 'Approval', 'inputs': [{'name': 'owner', 'type': 'address', 'indexed': true, 'internalType': 'address'}, {'name': 'approved', 'type': 'address', 'indexed': true, 'internalType': 'address'}, {'name': 'tokenId', 'type': 'uint256', 'indexed': true, 'internalType': 'uint256'}], 'anonymous': False}, {'type': 'event', 'name': 'ApprovalForAll', 'inputs': [{'name': 'owner', 'type': 'address', 'indexed': true, 'internalType': 'address'}, {'name': 'operator', 'type': 'address', 'indexed': true, 'internalType': 'address'}, {'name': 'approved', 'type': 'bool', 'indexed': False, 'internalType': 'bool'}], 'anonymous': False}, {'type': 'event', 'name': 'ConsecutiveTransfer', 'inputs': [{'name': 'fromTokenId', 'type': 'uint256', 'indexed': true, 'internalType': 'uint256'}, {'name': 'toTokenId', 'type': 'uint256', 'indexed': False, 'internalType': 'uint256'}, {'name': 'from', 'type': 'address', 'indexed': true, 'internalType': 'address'}, {'name': 'to', 'type': 'address', 'indexed': true, 'internalType': 'address'}], 'anonymous': False}, {'type': 'event', 'name': 'OwnershipTransferred', 'inputs': [{'name': 'user', 'type': 'address', 'indexed': true, 'internalType': 'address'}, {'name': 'newOwner', 'type': 'address', 'indexed': true, 'internalType': 'address'}], 'anonymous': False}, {'type': 'event', 'name': 'Transfer', 'inputs': [{'name': 'from', 'type': 'address', 'indexed': true, 'internalType': 'address'}, {'name': 'to', 'type': 'address', 'indexed': true, 'internalType': 'address'}, {'name': 'tokenId', 'type': 'uint256', 'indexed': true, 'internalType': 'uint256'}], 'anonymous': False}, {'type': 'error', 'name': 'ApprovalCallerNotOwnerNorApproved', 'inputs': []}, {'type': 'error', 'name': 'ApprovalQueryForNonexistentToken', 'inputs': []}, {'type': 'error', 'name': 'BalanceQueryForZeroAddress', 'inputs': []}, {'type': 'error', 'name': 'MintERC2309QuantityExceedsLimit', 'inputs': []}, {'type': 'error', 'name': 'MintToZeroAddress', 'inputs': []}, {'type': 'error', 'name': 'MintZeroQuantity', 'inputs': []}, {'type': 'error', 'name': 'OwnerQueryForNonexistentToken', 'inputs': []}, {'type': 'error', 'name': 'OwnershipNotInitializedForExtraData', 'inputs': []}, {'type': 'error', 'name': 'TransferCallerNotOwnerNorApproved', 'inputs': []}, {'type': 'error', 'name': 'TransferFromIncorrectOwner', 'inputs': []}, {'type': 'error', 'name': 'TransferToNonERC721ReceiverImplementer', 'inputs': []}, {'type': 'error', 'name': 'TransferToZeroAddress', 'inputs': []}, {'type': 'error', 'name': 'URIQueryForNonexistentToken', 'inputs': []}] as const diff --git a/packages/contracts/.solhint.json b/packages/contracts/.solhint.json index 47d0bba..d0eca36 100644 --- a/packages/contracts/.solhint.json +++ b/packages/contracts/.solhint.json @@ -2,7 +2,7 @@ "extends": "solhint:recommended", "rules": { "code-complexity": ["error", 8], - "compiler-version": ["error", ">=0.8.21"], + "compiler-version": ["error", ">=0.8.23"], "func-name-mixedcase": "off", "func-visibility": ["error", { "ignoreConstructors": true }], "max-line-length": ["error", 120], diff --git a/packages/contracts/foundry.toml b/packages/contracts/foundry.toml index bb0d9b0..c8e3ee7 100644 --- a/packages/contracts/foundry.toml +++ b/packages/contracts/foundry.toml @@ -13,7 +13,7 @@ via_ir = true out = "out" script = "script" - solc = "0.8.21" + solc = "0.8.23" src = "src" test = "test" diff --git a/packages/contracts/script/Base.s.sol b/packages/contracts/script/Base.s.sol index b966c7f..fbea7c0 100644 --- a/packages/contracts/script/Base.s.sol +++ b/packages/contracts/script/Base.s.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity >=0.8.21 <0.9.0; +pragma solidity >=0.8.23 <0.9.0; import { Script } from "forge-std/Script.sol"; diff --git a/packages/contracts/script/LucidOriginsDeploy.s.sol b/packages/contracts/script/LucidOriginsDeploy.s.sol index 6151368..4a5d76a 100644 --- a/packages/contracts/script/LucidOriginsDeploy.s.sol +++ b/packages/contracts/script/LucidOriginsDeploy.s.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity >=0.8.21 <0.9.0; +pragma solidity 0.8.23; import { LucidOrigins } from "../src/LucidOrigins.sol"; import { BaseScript } from "./Base.s.sol"; diff --git a/packages/contracts/src/Encoder.sol b/packages/contracts/src/Encoder.sol index 28dcfa9..42fbe59 100644 --- a/packages/contracts/src/Encoder.sol +++ b/packages/contracts/src/Encoder.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -pragma solidity 0.8.21; +pragma solidity 0.8.23; /// [MIT License] /// @title Base64 diff --git a/packages/contracts/src/LucidOrigins.sol b/packages/contracts/src/LucidOrigins.sol index 95b8fbf..0496ec0 100644 --- a/packages/contracts/src/LucidOrigins.sol +++ b/packages/contracts/src/LucidOrigins.sol @@ -1,10 +1,10 @@ // SPDX-License-Identifier: GNU GPLv3 -pragma solidity 0.8.21; +pragma solidity 0.8.23; import { ERC721A } from "ERC721A/ERC721A.sol"; import { Encoder } from "./Encoder.sol"; import { Owned } from "solmate/auth/Owned.sol"; -import { console2 } from "forge-std/console2.sol"; +// import { console2 } from "forge-std/console2.sol"; import { Background } from "./layers/Background.sol"; import { Face } from "./layers/Face.sol"; import { Blush } from "./layers/Blush.sol"; @@ -60,7 +60,7 @@ contract LucidOrigins is Owned, ERC721A, Background, Face, Blob, Blush, Colors { ) ); - console2.log(svg); + // console2.log(svg); return metadata(name, svg); } diff --git a/packages/contracts/src/layers/Background.sol b/packages/contracts/src/layers/Background.sol index 5d6acd6..ac358bd 100644 --- a/packages/contracts/src/layers/Background.sol +++ b/packages/contracts/src/layers/Background.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GNU GPLv3 -pragma solidity 0.8.21; +pragma solidity 0.8.23; // import { console2 } from "forge-std/console2.sol"; diff --git a/packages/contracts/src/layers/Blob.sol b/packages/contracts/src/layers/Blob.sol index 6efed36..486680b 100644 --- a/packages/contracts/src/layers/Blob.sol +++ b/packages/contracts/src/layers/Blob.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GNU GPLv3 -pragma solidity 0.8.21; +pragma solidity 0.8.23; // import { console2 } from "forge-std/console2.sol"; import { LibString } from "solmate/utils/LibString.sol"; diff --git a/packages/contracts/src/layers/Blush.sol b/packages/contracts/src/layers/Blush.sol index 587ce08..09d11c8 100644 --- a/packages/contracts/src/layers/Blush.sol +++ b/packages/contracts/src/layers/Blush.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GNU GPLv3 -pragma solidity 0.8.21; +pragma solidity 0.8.23; contract Blush { function blush() internal pure returns (string memory) { diff --git a/packages/contracts/src/layers/Face.sol b/packages/contracts/src/layers/Face.sol index 478c311..f60b23f 100644 --- a/packages/contracts/src/layers/Face.sol +++ b/packages/contracts/src/layers/Face.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GNU GPLv3 -pragma solidity 0.8.21; +pragma solidity 0.8.23; // import { console2 } from "forge-std/console2.sol"; import { LibString } from "solmate/utils/LibString.sol"; diff --git a/packages/contracts/src/utils/Colors.sol b/packages/contracts/src/utils/Colors.sol index 749a8ae..25662b9 100644 --- a/packages/contracts/src/utils/Colors.sol +++ b/packages/contracts/src/utils/Colors.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GNU GPLv3 -pragma solidity 0.8.21; +pragma solidity 0.8.23; contract Colors { string[71] internal colors = [ diff --git a/packages/contracts/src/utils/constants.sol b/packages/contracts/src/utils/constants.sol index a633f3a..86ff191 100644 --- a/packages/contracts/src/utils/constants.sol +++ b/packages/contracts/src/utils/constants.sol @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GNU GPLv3 -pragma solidity 0.8.21; +pragma solidity 0.8.23; library Constants { uint16 public constant X = 50; diff --git a/packages/contracts/test/LucidOrigins.t.sol b/packages/contracts/test/LucidOrigins.t.sol index 0076d8e..4b3177b 100644 --- a/packages/contracts/test/LucidOrigins.t.sol +++ b/packages/contracts/test/LucidOrigins.t.sol @@ -1,8 +1,8 @@ // SPDX-License-Identifier: UNLICENSED -pragma solidity 0.8.21; +pragma solidity 0.8.23; import { PRBTest } from "@prb/test/PRBTest.sol"; -import { console2 } from "forge-std/console2.sol"; +// import { console2 } from "forge-std/console2.sol"; import { StdCheats } from "forge-std/StdCheats.sol"; import { LucidOrigins } from "../src/LucidOrigins.sol"; @@ -21,7 +21,7 @@ contract LucidOriginsTest is PRBTest, StdCheats { } /// @dev Basic test. Run it with `forge test -vvv` to see the console log. - function test_Example() external { + function test_Example() view external { lucidOrigins.tokenURI(234); } }