Skip to content

Commit 47bdd80

Browse files
committed
Update ABI and tokens
1 parent 1dba7fd commit 47bdd80

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+4472
-93
lines changed
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
[
2+
"constructor(address owner, address manager)",
3+
"function cancelOwnershipHandover() payable",
4+
"function completeOwnershipHandover(address pendingOwner) payable",
5+
"function computeDeployAddress(uint8 deployType, bytes bytecode, bytes constructorArgs, bytes32 salt) view returns (address)",
6+
"function computeProxyAddress(uint8 deployType, address implementation, bytes data, bytes32 salt) view returns (address)",
7+
"function deployContract(bytes32 id, uint8 deployType, bytes bytecode, bytes constructorArgs, bytes32 salt, bytes[] postDeployCalls) returns (address deployed)",
8+
"function deployContractWithSignature((bytes32 id, uint8 deployType, bytes bytecode, bytes constructorArgs, bytes32 salt, bytes[] postDeployCalls, uint256 nonce, uint256 deadline) request, bytes signature) returns (address deployed)",
9+
"function deployProxy(bytes32 id, uint8 deployType, address implementation, bytes data, bytes32 salt, bytes[] postDeployCalls) returns (address deployed)",
10+
"function deployProxyWithSignature((bytes32 id, uint8 deployType, address implementation, bytes data, bytes32 salt, bytes[] postDeployCalls, uint256 nonce, uint256 deadline) request, bytes signature) returns (address deployed)",
11+
"function getDeployment(bytes32 id, uint256 version) view returns (address)",
12+
"function grantRoles(address user, uint256 roles) payable",
13+
"function hasAllRoles(address user, uint256 roles) view returns (bool)",
14+
"function hasAnyRole(address user, uint256 roles) view returns (bool)",
15+
"function owner() view returns (address result)",
16+
"function ownershipHandoverExpiresAt(address pendingOwner) view returns (uint256 result)",
17+
"function renounceOwnership() payable",
18+
"function renounceRoles(uint256 roles) payable",
19+
"function requestOwnershipHandover() payable",
20+
"function revokeRoles(address user, uint256 roles) payable",
21+
"function rolesOf(address user) view returns (uint256 roles)",
22+
"function transferOwnership(address newOwner) payable",
23+
"event ContractDeployed(bytes32 id, uint256 version, address contractAddress, bytes32 salt)",
24+
"event NonceUsed(address account, uint256 nonce)",
25+
"event OwnershipHandoverCanceled(address indexed pendingOwner)",
26+
"event OwnershipHandoverRequested(address indexed pendingOwner)",
27+
"event OwnershipTransferred(address indexed oldOwner, address indexed newOwner)",
28+
"event ProxyDeployed(bytes32 id, uint256 version, address proxyAddress, address implementation, bytes32 salt)",
29+
"event RolesUpdated(address indexed user, uint256 indexed roles)",
30+
"error AlreadyInitialized()",
31+
"error DeploymentFailed()",
32+
"error InvalidDeploymentType()",
33+
"error InvalidImplementation()",
34+
"error InvalidNonce()",
35+
"error InvalidSignature()",
36+
"error NewOwnerIsZeroAddress()",
37+
"error NoHandoverRequest()",
38+
"error SignatureExpired()",
39+
"error Unauthorized()"
40+
]

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

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,54 @@
11
[
22
"constructor()",
33
"function addImplementation((bytes32 contractId, address implementation, uint8 implementationType, uint8 createHook, bytes createHookData) config, bool isDefault)",
4+
"function addImplementationWithSignature(((bytes32 contractId, address implementation, uint8 implementationType, uint8 createHook, bytes createHookData) config, bool isDefault, uint256 nonce, uint256 deadline) request, bytes signature)",
45
"function cancelOwnershipHandover() payable",
56
"function claimRewards(address asset)",
67
"function completeOwnershipHandover(address pendingOwner) payable",
7-
"function create(address creator, (address referrer, bytes32 salt, bytes data, bytes hookData) createParams) payable returns (address asset)",
8-
"function createById(bytes32 contractId, address creator, (address referrer, bytes32 salt, bytes data, bytes hookData) params) payable returns (address asset)",
9-
"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)",
8+
"function create(address creator, (address developer, bytes32 salt, bytes data, bytes hookData) createParams) payable returns (address asset)",
9+
"function createById(bytes32 contractId, address creator, (address developer, bytes32 salt, bytes data, bytes hookData) params) payable returns (address asset)",
10+
"function createByImplementationConfig((bytes32 contractId, address implementation, uint8 implementationType, uint8 createHook, bytes createHookData) config, address creator, (address developer, bytes32 salt, bytes data, bytes hookData) params) payable returns (address asset)",
1011
"function distribute(address asset, (uint256 amount, address recipient)[] contents) payable",
1112
"function getAirdrop() view returns (address airdrop)",
1213
"function getImplementation(bytes32 contractId) view returns ((bytes32 contractId, address implementation, uint8 implementationType, uint8 createHook, bytes createHookData) config)",
1314
"function getPoolRouter() view returns (address poolRouter)",
14-
"function getRewards(address asset) view returns ((uint256 positionId, address recipient, address referrer, uint16 referrerBps, address positionManager, address rewardLocker)[])",
15+
"function getRewards(address asset) view returns ((uint256 positionId, address recipient, address developer, uint16 developerBps, address positionManager, address rewardLocker)[])",
1516
"function getSwapRouter() view returns (address swapRouter)",
17+
"function grantRoles(address user, uint256 roles) payable",
1618
"function guardSalt(bytes32 salt, address creator, bytes contractInitData, bytes hookInitData) view returns (bytes32)",
17-
"function initialize(address owner, address poolRouter, address airdrop)",
19+
"function hasAllRoles(address user, uint256 roles) view returns (bool)",
20+
"function hasAnyRole(address user, uint256 roles) view returns (bool)",
21+
"function initialize(address owner, address manager, address poolRouter, address airdrop)",
1822
"function owner() view returns (address result)",
1923
"function ownershipHandoverExpiresAt(address pendingOwner) view returns (uint256 result)",
20-
"function predictAddress(bytes32 contractId, address creator, (address referrer, bytes32 salt, bytes data, bytes hookData) params) view returns (address predicted)",
21-
"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)",
24+
"function predictAddress(bytes32 contractId, address creator, (address developer, bytes32 salt, bytes data, bytes hookData) params) view returns (address predicted)",
25+
"function predictAddressByConfig((bytes32 contractId, address implementation, uint8 implementationType, uint8 createHook, bytes createHookData) config, address creator, (address developer, bytes32 salt, bytes data, bytes hookData) params) view returns (address predicted)",
2226
"function proxiableUUID() view returns (bytes32)",
2327
"function renounceOwnership() payable",
28+
"function renounceRoles(uint256 roles) payable",
2429
"function requestOwnershipHandover() payable",
30+
"function revokeRoles(address user, uint256 roles) payable",
31+
"function rolesOf(address user) view returns (uint256 roles)",
2532
"function setAirdrop(address airdrop)",
2633
"function setPoolRouter(address poolRouter)",
2734
"function setSwapRouter(address swapRouter)",
28-
"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)",
35+
"function swap((address tokenIn, address tokenOut, uint256 amountIn, uint256 minAmountOut, address recipient, address developer, uint256 deadline, bytes data) params) payable returns (uint256 amountIn, uint256 amountOut)",
2936
"function transferOwnership(address newOwner) payable",
3037
"function upgradeToAndCall(address newImplementation, bytes data) payable",
3138
"function withdraw(address token, address to)",
3239
"event AirdropUpdated(address airdrop)",
33-
"event Created(bytes32 contractId, address indexed creator, address indexed asset, address referrer, bytes hookData)",
40+
"event Created(bytes32 contractId, address indexed creator, address indexed asset, address developer, bytes hookData)",
3441
"event Distributed(address asset, uint256 recipientCount, uint256 totalAmount)",
3542
"event ImplementationAdded(bytes32 contractId, address indexed implementation, uint8 implementationType, uint8 createHook, bytes createHookData)",
3643
"event Initialized(uint64 version)",
44+
"event NonceUsed(address account, uint256 nonce)",
3745
"event OwnershipHandoverCanceled(address indexed pendingOwner)",
3846
"event OwnershipHandoverRequested(address indexed pendingOwner)",
3947
"event OwnershipTransferred(address indexed oldOwner, address indexed newOwner)",
4048
"event PoolRouterUpdated(address poolRouter)",
4149
"event RewardClaimed(address asset, address claimer)",
4250
"event RewardLockerUpdated(address locker)",
51+
"event RolesUpdated(address indexed user, uint256 indexed roles)",
4352
"event SwapRouterUpdated(address swapRouter)",
4453
"event Upgraded(address indexed implementation)",
4554
"error AlreadyInitialized()",
@@ -50,13 +59,16 @@
5059
"error InvalidDeploymentCall()",
5160
"error InvalidImplementation()",
5261
"error InvalidInitialization()",
62+
"error InvalidNonce()",
5363
"error InvalidPoolAmount()",
5464
"error InvalidSaltFlags()",
65+
"error InvalidSignature()",
5566
"error InvalidValue()",
5667
"error NewOwnerIsZeroAddress()",
5768
"error NoHandoverRequest()",
5869
"error NotInitializing()",
5970
"error PoolRouterDisabled()",
71+
"error SignatureExpired()",
6072
"error SwapRouterDisabled()",
6173
"error Unauthorized()",
6274
"error UnauthorizedCallContext()",

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

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,14 @@
33
"function cancelOwnershipHandover() payable",
44
"function claimRewards(address asset)",
55
"function completeOwnershipHandover(address pendingOwner) payable",
6-
"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)",
6+
"function createPool((address recipient, address developer, uint16 developerBps, 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)",
77
"function disableAdapter(uint8 adapterType)",
88
"function enableAdapter(uint8 adapterType, bytes config, address rewardLocker)",
9+
"function enableAdapterWithSignature((uint8 adapterType, bytes config, address rewardLocker, uint256 nonce, uint256 deadline) request, bytes signature)",
910
"function getAdapter(uint8 adapterType) view returns ((bytes config, address rewardLocker) adapterConfig)",
1011
"function getRewardLocker(uint8 adapterType) view returns (address rewardLocker)",
11-
"function getRewardPosition(address asset, uint8 adapterType) view returns ((uint256 positionId, address recipient, address referrer, uint16 referrerBps, address positionManager, address rewardLocker) position)",
12-
"function getRewardPositions(address asset) view returns ((uint256 positionId, address recipient, address referrer, uint16 referrerBps, address positionManager, address rewardLocker)[] positions)",
12+
"function getRewardPosition(address asset, uint8 adapterType) view returns ((uint256 positionId, address recipient, address developer, uint16 developerBps, address positionManager, address rewardLocker) position)",
13+
"function getRewardPositions(address asset) view returns ((uint256 positionId, address recipient, address developer, uint16 developerBps, address positionManager, address rewardLocker)[] positions)",
1314
"function grantRoles(address user, uint256 roles) payable",
1415
"function hasAllRoles(address user, uint256 roles) view returns (bool)",
1516
"function hasAnyRole(address user, uint256 roles) view returns (bool)",
@@ -28,6 +29,7 @@
2829
"event AdapterDisabled(uint8 adapterType)",
2930
"event AdapterEnabled(uint8 adapterType, address rewardLocker)",
3031
"event Initialized(uint64 version)",
32+
"event NonceUsed(address account, uint256 nonce)",
3133
"event OwnershipHandoverCanceled(address indexed pendingOwner)",
3234
"event OwnershipHandoverRequested(address indexed pendingOwner)",
3335
"event OwnershipTransferred(address indexed oldOwner, address indexed newOwner)",
@@ -38,13 +40,15 @@
3840
"error AdapterNotFound()",
3941
"error AlreadyInitialized()",
4042
"error InvalidAdapterType()",
43+
"error InvalidDeveloperBps()",
4144
"error InvalidETHAmount()",
4245
"error InvalidFee()",
4346
"error InvalidFee()",
4447
"error InvalidInitialization()",
48+
"error InvalidNonce()",
4549
"error InvalidPoolConfig()",
46-
"error InvalidReferrerBps()",
4750
"error InvalidRewardLocker()",
51+
"error InvalidSignature()",
4852
"error InvalidTick()",
4953
"error InvalidTick()",
5054
"error NewOwnerIsZeroAddress()",
@@ -53,6 +57,7 @@
5357
"error PoolAlreadyExists()",
5458
"error PoolAlreadyExists()",
5559
"error Reentrancy()",
60+
"error SignatureExpired()",
5661
"error Unauthorized()",
5762
"error UnauthorizedCallContext()",
5863
"error UpgradeFailed()"

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
"function collectReward(address owner, address asset) returns (address token0, address token1, uint256 amount0, uint256 amount1)",
55
"function completeOwnershipHandover(address pendingOwner) payable",
66
"function feeManager() view returns (address)",
7-
"function lockPosition(address asset, uint256 positionId, address recipient, address referrer, uint16 referrerBps, bytes data)",
7+
"function lockPosition(address asset, uint256 positionId, address recipient, address developer, uint16 developerBps, bytes data)",
88
"function owner() view returns (address result)",
99
"function ownershipHandoverExpiresAt(address pendingOwner) view returns (uint256 result)",
10-
"function position(address owner, address asset) view returns ((uint256 positionId, address recipient, address referrer, uint16 referrerBps, bytes data))",
10+
"function position(address owner, address asset) view returns ((uint256 positionId, address recipient, address developer, uint16 developerBps, bytes data))",
1111
"function positionManager() view returns (address)",
1212
"function renounceOwnership() payable",
1313
"function requestOwnershipHandover() payable",
@@ -16,13 +16,13 @@
1616
"event OwnershipHandoverCanceled(address indexed pendingOwner)",
1717
"event OwnershipHandoverRequested(address indexed pendingOwner)",
1818
"event OwnershipTransferred(address indexed oldOwner, address indexed newOwner)",
19-
"event PositionLocked(address owner, address indexed asset, address positionManager, uint256 positionId, address recipient, address referrer)",
20-
"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)",
19+
"event PositionLocked(address owner, address indexed asset, address positionManager, uint256 positionId, address recipient, address developer)",
20+
"event RewardCollected(address owner, address indexed asset, address positionManager, uint256 positionId, address recipient, address developer, address token0, uint256 recipientAmount0, uint256 developerAmount0, uint256 feeAmount0, address token1, uint256 recipientAmount1, uint256 developerAmount1, uint256 feeAmount1)",
2121
"error AlreadyInitialized()",
22+
"error InvalidDeveloperBps()",
2223
"error InvalidPosition()",
2324
"error InvalidPositionManager()",
2425
"error InvalidPositionOwner()",
25-
"error InvalidReferrerBps()",
2626
"error InvalidRewardRecipient()",
2727
"error NewOwnerIsZeroAddress()",
2828
"error NoAvailableRewards()",

packages/thirdweb/src/extensions/tokens/__generated__/ContractFactory/events/ContractDeployed.ts

Lines changed: 25 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/thirdweb/src/extensions/tokens/__generated__/ContractFactory/events/NonceUsed.ts

Lines changed: 24 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/thirdweb/src/extensions/tokens/__generated__/ContractFactory/events/OwnershipHandoverCanceled.ts

Lines changed: 42 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/thirdweb/src/extensions/tokens/__generated__/ContractFactory/events/OwnershipHandoverRequested.ts

Lines changed: 42 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)