Merge branch 'yash/ocr-contracts-integration' into 06-16-_tool-4689_dashboard_integrate_erc20asset_contract_in_token_creation_flow

Author: MananTank

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

@@ -1,66 +1,63 @@
 [
   "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 buy(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 claimReward(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 create(address creator, (address referrer, bytes32 salt, bytes data, bytes hookData) createParams) payable returns (address asset)",
+  "function createById(bytes32 contractId, address creator, (address referrer, bytes32 salt, bytes data, bytes hookData) params) payable returns (address asset)",
+  "function createByImplementationConfig((bytes32 contractId, address implementation, uint8 implementationType, uint8 createHook, bytes createHookData) config, address creator, (address referrer, bytes32 salt, bytes data, bytes hookData) params) payable returns (address asset)",
+  "function distribute(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 getReward(address asset) view returns ((address positionManager, uint256 tokenId, address recipient, address referrer, uint16 referrerBps))",
   "function getRewardLocker() view returns (address rewardLocker)",
   "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 predictAddress(bytes32 contractId, address creator, (address referrer, bytes32 salt, bytes data, bytes hookData) params) view returns (address predicted)",
+  "function predictAddressByConfig((bytes32 contractId, address implementation, uint8 implementationType, uint8 createHook, bytes createHookData) config, address creator, (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 sell(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 AssetRewardClaimed(address asset, address claimer)",
+  "event Created(bytes32 contractId, address indexed creator, address indexed asset, address referrer, bytes aux)",
+  "event Distributed(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 RewardClaimed(address asset, address claimer)",
   "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 InvalidAmount()",
   "error InvalidContractId()",
   "error InvalidCreateHook()",
   "error InvalidCreator()",
-  "error InvalidDeploymentArgs()",
+  "error InvalidDeploymentCall()",
   "error InvalidImplementation()",
   "error InvalidInitialization()",
-  "error InvalidInitializer()",
+  "error InvalidPoolAmount()",
   "error InvalidSaltFlags()",
   "error InvalidValue()",
   "error NewOwnerIsZeroAddress()",
   "error NoHandoverRequest()",
   "error NotInitializing()",
+  "error NotRegistered()",
   "error Unauthorized()",
   "error UnauthorizedCallContext()",
   "error UpgradeFailed()",

packages/thirdweb/scripts/generate/abis/assets/ERC20Asset.json renamed to packages/thirdweb/scripts/generate/abis/tokens/ERC20Asset.json

@@ -3,7 +3,6 @@
   "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)",
@@ -27,18 +26,17 @@
   "error AdapterNotFound()",
   "error AlreadyInitialized()",
   "error DeadlineExceeded()",
-  "error ExcessiveInput()",
-  "error InsufficientOutput()",
+  "error InvalidAdapterType()",
   "error InvalidAmount()",
   "error InvalidConfiguration()",
+  "error InvalidETHAmount()",
   "error InvalidFee()",
   "error InvalidFee()",
   "error InvalidInitialization()",
   "error InvalidPoolConfig()",
   "error InvalidTick()",
   "error InvalidTick()",
   "error NewOwnerIsZeroAddress()",
-  "error NoAvailableRoute()",
   "error NoHandoverRequest()",
   "error NotInitializing()",
   "error PoolAlreadyExists()",