Update ABIs and Interfaces

Author: jakeloo

packages/thirdweb/package.json

@@ -16,7 +16,7 @@
     "@emotion/styled": "11.14.1",
     "@noble/curves": "1.8.2",
     "@noble/hashes": "1.7.2",
-    "@passwordless-id/webauthn": "^2.1.2",
+    "@passwordless-id/webauthn": "^2.3.1",
     "@radix-ui/react-dialog": "1.1.14",
     "@radix-ui/react-focus-scope": "1.1.7",
     "@radix-ui/react-icons": "1.3.2",
@@ -30,7 +30,7 @@
     "abitype": "1.0.8",
     "cross-spawn": "7.0.6",
     "fuse.js": "7.1.0",
-    "input-otp": "^1.4.1",
+    "input-otp": "^1.4.2",
     "mipd": "0.0.7",
     "open": "10.1.1",
     "ora": "8.2.0",
@@ -63,12 +63,12 @@
     "@types/prompts": "2.4.9",
     "@types/react": "19.1.8",
     "@viem/anvil": "0.0.10",
-    "@vitejs/plugin-react": "^4.6.0",
+    "@vitejs/plugin-react": "^4.7.0",
     "@vitest/coverage-v8": "3.2.4",
     "@vitest/ui": "3.2.4",
-    "dotenv-mono": "^1.3.14",
-    "ethers5": "npm:ethers@5",
-    "ethers6": "npm:ethers@6",
+    "dotenv-mono": "^1.4.0",
+    "ethers5": "npm:ethers@^5.8.0",
+    "ethers6": "npm:ethers@^6.15.0",
     "expo-linking": "7.0.5",
     "expo-web-browser": "14.0.2",
     "happy-dom": "17.4.4",
@@ -83,7 +83,7 @@
     "react-native-quick-crypto": "0.7.14",
     "react-native-svg": "15.12.0",
     "rimraf": "6.0.1",
-    "sharp": "^0.34.2",
+    "sharp": "^0.34.3",
     "size-limit": "11.2.0",
     "storybook": "9.0.15",
     "typedoc": "0.27.9",

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

@@ -10,7 +10,7 @@
   "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 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)",

packages/thirdweb/scripts/generate/abis/tokens/ERC20Entrypoint.json

@@ -1,7 +1,6 @@
 [
   "constructor()",
   "function addImplementation((bytes32 contractId, address implementation, uint8 implementationType, uint8 createHook, bytes createHookData) config, bool isDefault)",
-  "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",
@@ -11,24 +10,25 @@
   "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 getPoolRouter() view returns (address poolRouter)",
+  "function getReward(address asset) view returns ((uint256 positionId, address recipient, address referrer, uint16 referrerBps, address positionManager, address rewardLocker)[])",
+  "function getSwapRouter() view returns (address swapRouter)",
   "function guardSalt(bytes32 salt, address creator, bytes contractInitData, bytes hookInitData) view returns (bytes32)",
-  "function initialize(address owner, address router, address rewardLocker, address airdrop)",
+  "function initialize(address owner, address poolRouter, address airdrop)",
   "function owner() view returns (address result)",
   "function ownershipHandoverExpiresAt(address pendingOwner) view returns (uint256 result)",
   "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 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 setPoolRouter(address poolRouter)",
+  "function setSwapRouter(address swapRouter)",
+  "function swap((address tokenIn, address tokenOut, uint256 amountIn, uint256 minAmountOut, address recipient, address referrer, uint256 deadline, bytes data) params) payable returns (uint256 amountIn, uint256 amountOut)",
   "function transferOwnership(address newOwner) payable",
   "function upgradeToAndCall(address newImplementation, bytes data) payable",
+  "function withdraw(address token, address to)",
   "event AirdropUpdated(address airdrop)",
   "event Created(bytes32 contractId, address indexed creator, address indexed asset, address referrer, bytes aux)",
   "event Distributed(address asset, uint256 recipientCount, uint256 totalAmount)",
@@ -37,17 +37,16 @@
   "event OwnershipHandoverCanceled(address indexed pendingOwner)",
   "event OwnershipHandoverRequested(address indexed pendingOwner)",
   "event OwnershipTransferred(address indexed oldOwner, address indexed newOwner)",
+  "event PoolRouterUpdated(address poolRouter)",
   "event RewardClaimed(address asset, address claimer)",
   "event RewardLockerUpdated(address locker)",
-  "event RouterUpdated(address router)",
+  "event SwapRouterUpdated(address swapRouter)",
   "event Upgraded(address indexed implementation)",
   "error AlreadyInitialized()",
-  "error ArrayLengthMismatch()",
   "error ImplementationAlreadyExists()",
   "error InvalidAmount()",
   "error InvalidContractId()",
   "error InvalidCreateHook()",
-  "error InvalidCreator()",
   "error InvalidDeploymentCall()",
   "error InvalidImplementation()",
   "error InvalidInitialization()",
@@ -57,9 +56,9 @@
   "error NewOwnerIsZeroAddress()",
   "error NoHandoverRequest()",
   "error NotInitializing()",
-  "error NotRegistered()",
+  "error PoolRouterDisabled()",
+  "error SwapRouterDisabled()",
   "error Unauthorized()",
   "error UnauthorizedCallContext()",
-  "error UpgradeFailed()",
-  "error ValueTransferFailed()"
+  "error UpgradeFailed()"
 ]

packages/thirdweb/scripts/generate/abis/tokens/PoolRouter.json

@@ -0,0 +1,59 @@
+[
+  "constructor()",
+  "function cancelOwnershipHandover() payable",
+  "function claimRewards(address asset)",
+  "function completeOwnershipHandover(address pendingOwner) payable",
+  "function createPool((address recipient, address referrer, uint16 referrerBps, address token, address tokenPair, uint256 amount, uint256 amountPair, bytes data) createPoolConfig) payable returns ((address pool, address positionManager, uint256 positionId, address refundToken0, uint256 refundAmount0, address refundToken1, uint256 refundAmount1) result)",
+  "function disableAdapter(uint8 adapterType)",
+  "function enableAdapter(uint8 adapterType, bytes config, address rewardLocker)",
+  "function getAdapter(uint8 adapterType) view returns ((bytes config, address rewardLocker) adapterConfig)",
+  "function getRewardLocker(uint8 adapterType) view returns (address rewardLocker)",
+  "function getRewardPosition(address asset, uint8 adapterType) view returns ((uint256 positionId, address recipient, address referrer, uint16 referrerBps, address positionManager, address rewardLocker) position)",
+  "function getRewardPositions(address asset) view returns ((uint256 positionId, address recipient, address referrer, uint16 referrerBps, address positionManager, address rewardLocker)[] positions)",
+  "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 initialize(address owner, address manager)",
+  "function owner() view returns (address result)",
+  "function ownershipHandoverExpiresAt(address pendingOwner) view returns (uint256 result)",
+  "function proxiableUUID() view returns (bytes32)",
+  "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 transferOwnership(address newOwner) payable",
+  "function upgradeToAndCall(address newImplementation, bytes data) payable",
+  "function withdraw(address token, address to)",
+  "event AdapterDisabled(uint8 adapterType)",
+  "event AdapterEnabled(uint8 adapterType, address rewardLocker)",
+  "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 rewardLocker, address asset, address claimer)",
+  "event RolesUpdated(address indexed user, uint256 indexed roles)",
+  "event Upgraded(address indexed implementation)",
+  "error AdapterAlreadyEnabled()",
+  "error AdapterNotFound()",
+  "error AlreadyInitialized()",
+  "error InvalidAdapterType()",
+  "error InvalidETHAmount()",
+  "error InvalidFee()",
+  "error InvalidFee()",
+  "error InvalidInitialization()",
+  "error InvalidPoolConfig()",
+  "error InvalidReferrerBps()",
+  "error InvalidRewardLocker()",
+  "error InvalidTick()",
+  "error InvalidTick()",
+  "error NewOwnerIsZeroAddress()",
+  "error NoHandoverRequest()",
+  "error NotInitializing()",
+  "error PoolAlreadyExists()",
+  "error PoolAlreadyExists()",
+  "error Reentrancy()",
+  "error Unauthorized()",
+  "error UnauthorizedCallContext()",
+  "error UpgradeFailed()"
+]

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

@@ -1,16 +1,32 @@
 [
-  "constructor(address _feeManager, address _v3PositionManager, address _v4PositionManager)",
+  "receive() external payable",
+  "function cancelOwnershipHandover() payable",
   "function collectReward(address owner, address asset) returns (address token0, address token1, uint256 amount0, uint256 amount1)",
+  "function completeOwnershipHandover(address pendingOwner) payable",
   "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 RewardCollected(address indexed owner, address indexed asset, address positionManager, uint256 tokenId, uint256 amount0, uint256 amount1)",
+  "function lockPosition(address asset, uint256 positionId, address recipient, address referrer, uint16 referrerBps, bytes data)",
+  "function owner() view returns (address result)",
+  "function ownershipHandoverExpiresAt(address pendingOwner) view returns (uint256 result)",
+  "function position(address owner, address asset) view returns ((uint256 positionId, address recipient, address referrer, uint16 referrerBps, bytes data))",
+  "function positionManager() view returns (address)",
+  "function renounceOwnership() payable",
+  "function requestOwnershipHandover() payable",
+  "function transferOwnership(address newOwner) payable",
+  "function withdraw(address token, address to)",
+  "event OwnershipHandoverCanceled(address indexed pendingOwner)",
+  "event OwnershipHandoverRequested(address indexed pendingOwner)",
+  "event OwnershipTransferred(address indexed oldOwner, address indexed newOwner)",
+  "event PositionLocked(address owner, address indexed asset, address positionManager, uint256 positionId, address recipient, address referrer)",
+  "event RewardCollected(address owner, address indexed asset, address positionManager, uint256 positionId, address recipient, address referrer, address token0, uint256 recipientAmount0, uint256 referrerAmount0, uint256 feeAmount0, address token1, uint256 recipientAmount1, uint256 referrerAmount1, uint256 feeAmount1)",
+  "error AlreadyInitialized()",
   "error InvalidPosition()",
   "error InvalidPositionManager()",
+  "error InvalidPositionOwner()",
   "error InvalidReferrerBps()",
   "error InvalidRewardRecipient()",
-  "error TokenAlreadyLocked()"
+  "error NewOwnerIsZeroAddress()",
+  "error NoAvailableRewards()",
+  "error NoHandoverRequest()",
+  "error TokenAlreadyLocked()",
+  "error Unauthorized()"
 ]

packages/thirdweb/scripts/generate/abis/tokens/Router.json

@@ -1,18 +1,15 @@
 export { getReward } from "../extensions/tokens/__generated__/ERC20Entrypoint/read/getReward.js";
-export { getRewardLocker } from "../extensions/tokens/__generated__/ERC20Entrypoint/read/getRewardLocker.js";
 export { claimReward } from "../extensions/tokens/__generated__/ERC20Entrypoint/write/claimReward.js";
-export { positions } from "../extensions/tokens/__generated__/RewardLocker/read/positions.js";
-export { v3PositionManager } from "../extensions/tokens/__generated__/RewardLocker/read/v3PositionManager.js";
-export { v4PositionManager } from "../extensions/tokens/__generated__/RewardLocker/read/v4PositionManager.js";
+export { position } from "../extensions/tokens/__generated__/RewardLocker/read/position.js";
+export { positionManager } from "../extensions/tokens/__generated__/RewardLocker/read/positionManager.js";
 export {
-  DEFAULT_INFRA_ADMIN,
   DEFAULT_REFERRER_ADDRESS,
   DEFAULT_REFERRER_REWARD_BPS,
 } from "../tokens/constants.js";
 export { createToken } from "../tokens/create-token.js";
 export { distributeToken } from "../tokens/distribute-token.js";
-export { getDeployedEntrypointERC20 } from "../tokens/get-entrypoint-erc20.js";
-export { isRouterEnabled } from "../tokens/is-router-enabled.js";
+export { getEntrypointERC20 } from "../tokens/get-entrypoint-erc20.js";
+export { isPoolRouterEnabled } from "../tokens/is-router-enabled.js";
 export {
   generateSalt,
   SaltFlag,