Update contracts. Add RewardLocker. Simplify assets

Author: jakeloo

packages/thirdweb/scripts/generate/abis/assets/AssetEntrypointERC20.json

@@ -1,5 +1,5 @@
 [
-  "function deployInfraProxyDeterministic(address implementation, bytes data, bytes32 salt, bytes extraData) public returns (address deployedProxy)",
+  "function deployInfraProxyDeterministic(address implementation, bytes data, bytes32 salt, bytes extraData) returns (address deployedProxy)",
   "event AssetInfraDeployed(address indexed implementation, address indexed proxy, bytes32 inputSalt, bytes data, bytes extraData)",
   "error ProxyDeploymentFailed()"
 ]

packages/thirdweb/scripts/generate/abis/assets/AssetInfraDeployer.json

@@ -1,3 +1,49 @@
 [
-  "function initialize(string _name, string _symbol, string _contractURI, uint256 _maxSupply, address _owner) external"
+  "constructor()",
+  "function DOMAIN_SEPARATOR() view returns (bytes32 result)",
+  "function allowance(address owner, address spender) view returns (uint256 result)",
+  "function approve(address spender, uint256 amount) returns (bool)",
+  "function balanceOf(address owner) view returns (uint256 result)",
+  "function burn(uint256 amount)",
+  "function burnFrom(address from, uint256 amount)",
+  "function cancelOwnershipHandover() payable",
+  "function completeOwnershipHandover(address pendingOwner) payable",
+  "function contractURI() view returns (string)",
+  "function decimals() view returns (uint8)",
+  "function initialize(string _name, string _symbol, string _contractURI, uint256 _maxSupply, address _owner)",
+  "function name() view returns (string)",
+  "function nonces(address owner) view returns (uint256 result)",
+  "function owner() view returns (address result)",
+  "function ownershipHandoverExpiresAt(address pendingOwner) view returns (uint256 result)",
+  "function permit(address owner, address spender, uint256 value, uint256 deadline, uint8 v, bytes32 r, bytes32 s)",
+  "function renounceOwnership() payable",
+  "function requestOwnershipHandover() payable",
+  "function setContractURI(string _contractURI)",
+  "function supportsInterface(bytes4 interfaceId) pure returns (bool)",
+  "function symbol() view returns (string)",
+  "function totalSupply() view returns (uint256 result)",
+  "function transfer(address to, uint256 amount) returns (bool)",
+  "function transferFrom(address from, address to, uint256 amount) returns (bool)",
+  "function transferOwnership(address newOwner) payable",
+  "event Approval(address indexed owner, address indexed spender, uint256 amount)",
+  "event ContractURIUpdated()",
+  "event Initialized(uint64 version)",
+  "event OwnershipHandoverCanceled(address indexed pendingOwner)",
+  "event OwnershipHandoverRequested(address indexed pendingOwner)",
+  "event OwnershipTransferred(address indexed oldOwner, address indexed newOwner)",
+  "event Transfer(address indexed from, address indexed to, uint256 amount)",
+  "error AllowanceOverflow()",
+  "error AllowanceUnderflow()",
+  "error AlreadyInitialized()",
+  "error InsufficientAllowance()",
+  "error InsufficientBalance()",
+  "error InvalidInitialization()",
+  "error InvalidPermit()",
+  "error NewOwnerIsZeroAddress()",
+  "error NoHandoverRequest()",
+  "error NotInitializing()",
+  "error Permit2AllowanceIsFixedAtInfinity()",
+  "error PermitExpired()",
+  "error TotalSupplyOverflow()",
+  "error Unauthorized()"
 ]

packages/thirdweb/scripts/generate/abis/assets/ERC20Asset.json

@@ -0,0 +1,67 @@
+[
+  "constructor()",
+  "function addImplementation((bytes32 contractId, address implementation, uint8 implementationType, uint8 createHook, bytes createHookData) config, bool isDefault)",
+  "function buyAsset(address asset, (address recipient, address referrer, address tokenIn, uint256 amountIn, uint256 minAmountOut, uint256 deadline, bytes hookData) params) payable returns (uint256 amountIn, uint256 amountOut)",
+  "function cancelOwnershipHandover() payable",
+  "function claimRewards(address asset)",
+  "function completeOwnershipHandover(address pendingOwner) payable",
+  "function createAsset(address creator, (uint256 amount, address referrer, bytes32 salt, bytes data, bytes hookData) createParams) returns (address asset)",
+  "function createAssetById(bytes32 contractId, address creator, (uint256 amount, address referrer, bytes32 salt, bytes data, bytes hookData) params) returns (address asset)",
+  "function createAssetByImplementationConfig((bytes32 contractId, address implementation, uint8 implementationType, uint8 createHook, bytes createHookData) config, address creator, (uint256 amount, address referrer, bytes32 salt, bytes data, bytes hookData) params) returns (address asset)",
+  "function decodeOwnerFromInitData(bytes data) pure returns (address owner)",
+  "function distributeAsset(address asset, (uint256 amount, address recipient)[] contents) payable",
+  "function getAirdrop() view returns (address airdrop)",
+  "function getImplementation(bytes32 contractId) view returns ((bytes32 contractId, address implementation, uint8 implementationType, uint8 createHook, bytes createHookData) config)",
+  "function getRewardLocker() view returns (address rewardLocker)",
+  "function getRewardPosition(address asset) view returns ((address positionManager, uint256 tokenId, address recipient, address referrer, uint16 referrerBps))",
+  "function getRouter() view returns (address router)",
+  "function guardSalt(bytes32 salt, address creator, bytes contractInitData, bytes hookInitData) view returns (bytes32)",
+  "function initialize(address owner, address router, address rewardLocker, address airdrop)",
+  "function listAsset(address asset, (address tokenOut, uint256 pricePerUnit, uint8 priceDenominator, uint256 totalSupply, uint48 startTime, uint48 endTime, address hook, bytes createHookData) params) returns (address sale, address position, uint256 positionId)",
+  "function owner() view returns (address result)",
+  "function ownershipHandoverExpiresAt(address pendingOwner) view returns (uint256 result)",
+  "function predictAssetAddress(bytes32 contractId, address creator, (uint256 amount, address referrer, bytes32 salt, bytes data, bytes hookData) params) view returns (address predicted)",
+  "function predictAssetAddressByConfig((bytes32 contractId, address implementation, uint8 implementationType, uint8 createHook, bytes createHookData) config, address creator, (uint256 amount, address referrer, bytes32 salt, bytes data, bytes hookData) params) view returns (address predicted)",
+  "function proxiableUUID() view returns (bytes32)",
+  "function renounceOwnership() payable",
+  "function requestOwnershipHandover() payable",
+  "function sellAsset(address asset, (address recipient, address tokenOut, uint256 amountIn, uint256 minAmountOut, uint256 deadline, bytes hookData) params) returns (uint256 amountIn, uint256 amountOut)",
+  "function setAirdrop(address airdrop)",
+  "function setRewardLocker(address rewardLocker)",
+  "function setRouter(address router)",
+  "function transferOwnership(address newOwner) payable",
+  "function upgradeToAndCall(address newImplementation, bytes data) payable",
+  "event AirdropUpdated(address airdrop)",
+  "event AssetCreated(bytes32 contractId, address indexed creator, address indexed asset, address referrer, bytes aux)",
+  "event AssetDistributed(address asset, uint256 recipientCount, uint256 totalAmount)",
+  "event ImplementationAdded(bytes32 contractId, address indexed implementation, uint8 implementationType, uint8 createHook, bytes createHookData)",
+  "event Initialized(uint64 version)",
+  "event OwnershipHandoverCanceled(address indexed pendingOwner)",
+  "event OwnershipHandoverRequested(address indexed pendingOwner)",
+  "event OwnershipTransferred(address indexed oldOwner, address indexed newOwner)",
+  "event RewardLockerUpdated(address locker)",
+  "event RouterUpdated(address router)",
+  "event Upgraded(address indexed implementation)",
+  "error AlreadyInitialized()",
+  "error ArrayLengthMismatch()",
+  "error AssetNotRegistered()",
+  "error CreateHookFailed()",
+  "error CreateHookReverted(string reason)",
+  "error ImplementationAlreadyExists()",
+  "error InvalidContractId()",
+  "error InvalidCreateHook()",
+  "error InvalidCreator()",
+  "error InvalidDeploymentArgs()",
+  "error InvalidImplementation()",
+  "error InvalidInitialization()",
+  "error InvalidInitializer()",
+  "error InvalidSaltFlags()",
+  "error InvalidValue()",
+  "error NewOwnerIsZeroAddress()",
+  "error NoHandoverRequest()",
+  "error NotInitializing()",
+  "error Unauthorized()",
+  "error UnauthorizedCallContext()",
+  "error UpgradeFailed()",
+  "error ValueTransferFailed()"
+]

packages/thirdweb/scripts/generate/abis/assets/ERC20AssetEntrypoint.json

@@ -1,3 +1,47 @@
 [
-  "function initialize(address _owner, address _feeRecipient, uint96 _defaultFee) external"
+  "constructor(address _owner, address _feeRecipient)",
+  "function ROLE_FEE_MANAGER() view returns (uint256)",
+  "function calculateFee(address payer, bytes4 action, uint256 amount, uint256 maxFeeAmount) view returns (address recipient, uint256 feeAmount)",
+  "function cancelOwnershipHandover() payable",
+  "function completeOwnershipHandover(address pendingOwner) payable",
+  "function domainSeparator() view returns (bytes32)",
+  "function eip712Domain() view returns (bytes1 fields, string name, string version, uint256 chainId, address verifyingContract, bytes32 salt, uint256[] extensions)",
+  "function feeConfigs(address target, bytes4 action) view returns (address recipient, uint8 feeType, uint256 value)",
+  "function feeRecipient() view returns (address)",
+  "function getFeeConfig(address target, bytes4 action) view returns ((address recipient, uint8 feeType, uint256 value) config)",
+  "function grantRoles(address user, uint256 roles) payable",
+  "function hasAllRoles(address user, uint256 roles) view returns (bool)",
+  "function hasAnyRole(address user, uint256 roles) view returns (bool)",
+  "function owner() view returns (address result)",
+  "function ownershipHandoverExpiresAt(address pendingOwner) view returns (uint256 result)",
+  "function renounceOwnership() payable",
+  "function renounceRoles(uint256 roles) payable",
+  "function requestOwnershipHandover() payable",
+  "function revokeRoles(address user, uint256 roles) payable",
+  "function rolesOf(address user) view returns (uint256 roles)",
+  "function setFeeConfig(bytes4 action, uint8 feeType, uint256 value)",
+  "function setFeeConfigBySignature(address target, bytes4 action, address recipient, uint8 feeType, uint256 value, uint256 nonce, uint256 deadline, bytes signature)",
+  "function setFeeRecipient(address _feeRecipient)",
+  "function setTargetFeeConfig(address target, bytes4 action, address recipient, uint8 feeType, uint256 value)",
+  "function transferOwnership(address newOwner) payable",
+  "function usedNonces(bytes32 signerNonce) view returns (bool used)",
+  "event FeeConfigUpdated(address indexed target, bytes4 indexed action, address recipient, uint8 feeType, uint256 value)",
+  "event FeeConfigUpdatedBySignature(address indexed signer, address indexed target, bytes4 indexed action, address recipient, uint8 feeType, uint256 value)",
+  "event FeeRecipientUpdated(address feeRecipient)",
+  "event OwnershipHandoverCanceled(address indexed pendingOwner)",
+  "event OwnershipHandoverRequested(address indexed pendingOwner)",
+  "event OwnershipTransferred(address indexed oldOwner, address indexed newOwner)",
+  "event RolesUpdated(address indexed user, uint256 indexed roles)",
+  "error AlreadyInitialized()",
+  "error InvalidConfig()",
+  "error InvalidFeeType()",
+  "error InvalidModule()",
+  "error InvalidNonce()",
+  "error InvalidRecipient()",
+  "error InvalidSignature()",
+  "error InvalidValue()",
+  "error NewOwnerIsZeroAddress()",
+  "error NoHandoverRequest()",
+  "error SignatureExpired()",
+  "error Unauthorized()"
 ]

packages/thirdweb/scripts/generate/abis/assets/FeeManager.json

@@ -0,0 +1,16 @@
+[
+  "constructor(address _feeManager, address _v3PositionManager, address _v4PositionManager)",
+  "function collectRewards(address owner, address asset) returns (address token0, address token1, uint256 amount0, uint256 amount1)",
+  "function feeManager() view returns (address)",
+  "function lockPosition(address asset, address positionManager, uint256 tokenId, address recipient, address referrer, uint16 referrerBps)",
+  "function positions(address owner, address asset) view returns (address positionManager, uint256 tokenId, address recipient, address referrer, uint16 referrerBps)",
+  "function v3PositionManager() view returns (address)",
+  "function v4PositionManager() view returns (address)",
+  "event PositionLocked(address indexed owner, address indexed asset, address positionManager, uint256 tokenId, address recipient, address referrer)",
+  "event RewardsCollected(address indexed owner, address indexed asset, address positionManager, uint256 tokenId, uint256 amount0, uint256 amount1)",
+  "error InvalidPosition()",
+  "error InvalidPositionManager()",
+  "error InvalidReferrerBps()",
+  "error InvalidRewardRecipient()",
+  "error TokenAlreadyLocked()"
+]

packages/thirdweb/scripts/generate/abis/assets/RewardLocker.json

@@ -1,3 +1,54 @@
 [
-  "function initialize(address _owner) external"
+  "constructor()",
+  "function NATIVE_TOKEN() view returns (address)",
+  "function cancelOwnershipHandover() payable",
+  "function completeOwnershipHandover(address pendingOwner) payable",
+  "function createMarket((address creator, address tokenIn, address tokenOut, uint256 pricePerUnit, uint8 priceDenominator, uint256 totalSupply, uint48 startTime, uint48 endTime, uint256 tokenId, address hook, bytes createHookData) createMarketConfig) payable returns (address sale, address position, uint256 positionId)",
+  "function createPool((address recipient, address referrer, address tokenA, address tokenB, uint256 amountA, uint256 amountB, bytes data) createPoolConfig) payable returns (address pool, address position, uint256 positionId, uint256 refundAmount0, uint256 refundAmount1)",
+  "function disableAdapter(uint8 adapterType)",
+  "function enableAdapter(uint8 adapterType, bytes config)",
+  "function initialize(address owner)",
+  "function owner() view returns (address result)",
+  "function ownershipHandoverExpiresAt(address pendingOwner) view returns (uint256 result)",
+  "function proxiableUUID() view returns (bytes32)",
+  "function renounceOwnership() payable",
+  "function requestOwnershipHandover() payable",
+  "function swap((address tokenIn, address tokenOut, uint256 amountIn, uint256 minAmountOut, address recipient, address refundRecipient, uint256 deadline, bytes data) config) payable returns ((uint256 amountIn, uint256 amountOut, address source) result)",
+  "function transferOwnership(address newOwner) payable",
+  "function upgradeToAndCall(address newImplementation, bytes data) payable",
+  "event AdapterDisabled(uint8 adapterType)",
+  "event AdapterEnabled(uint8 adapterType)",
+  "event Initialized(uint64 version)",
+  "event OwnershipHandoverCanceled(address indexed pendingOwner)",
+  "event OwnershipHandoverRequested(address indexed pendingOwner)",
+  "event OwnershipTransferred(address indexed oldOwner, address indexed newOwner)",
+  "event SwapExecuted(address indexed sender, address indexed tokenIn, address indexed tokenOut, uint256 amountIn, uint256 amountOut, uint8 adapterUsed)",
+  "event Upgraded(address indexed implementation)",
+  "error AdapterNotFound()",
+  "error AlreadyInitialized()",
+  "error DeadlineExceeded()",
+  "error ExcessiveInput()",
+  "error InsufficientOutput()",
+  "error InvalidAmount()",
+  "error InvalidConfiguration()",
+  "error InvalidFee()",
+  "error InvalidFee()",
+  "error InvalidInitialization()",
+  "error InvalidPoolConfig()",
+  "error InvalidTick()",
+  "error InvalidTick()",
+  "error NewOwnerIsZeroAddress()",
+  "error NoAvailableRoute()",
+  "error NoHandoverRequest()",
+  "error NotInitializing()",
+  "error PoolAlreadyExists()",
+  "error PoolAlreadyExists()",
+  "error PoolNotFound()",
+  "error PoolNotFound()",
+  "error Reentrancy()",
+  "error SwapFailed()",
+  "error Unauthorized()",
+  "error UnauthorizedCallContext()",
+  "error UpgradeFailed()",
+  "error ZeroAddress()"
 ]