From 4e67eec111038b957925788de4fa7d82554da61f Mon Sep 17 00:00:00 2001 From: Sergey Potekhin Date: Wed, 6 Nov 2024 15:25:29 +0400 Subject: [PATCH] Update ABIs --- abi/MagicSpendStakeManager.abi.json | 161 ++++++++++------------- abi/MagicSpendWithdrawalManager.abi.json | 74 +++++------ 2 files changed, 110 insertions(+), 125 deletions(-) diff --git a/abi/MagicSpendStakeManager.abi.json b/abi/MagicSpendStakeManager.abi.json index 8bf710e..d50373a 100644 --- a/abi/MagicSpendStakeManager.abi.json +++ b/abi/MagicSpendStakeManager.abi.json @@ -47,7 +47,7 @@ "name": "addStake", "inputs": [ { - "name": "asset", + "name": "token", "type": "address", "internalType": "address" }, @@ -70,9 +70,9 @@ "name": "claim", "inputs": [ { - "name": "request", + "name": "allowance", "type": "tuple", - "internalType": "struct ClaimRequest", + "internalType": "struct Allowance", "components": [ { "name": "account", @@ -80,12 +80,12 @@ "internalType": "address" }, { - "name": "claims", + "name": "assets", "type": "tuple[]", - "internalType": "struct ClaimStruct[]", + "internalType": "struct AssetAllowance[]", "components": [ { - "name": "asset", + "name": "token", "type": "address", "internalType": "address" }, @@ -94,11 +94,6 @@ "type": "uint128", "internalType": "uint128" }, - { - "name": "fee", - "type": "uint128", - "internalType": "uint128" - }, { "name": "chainId", "type": "uint128", @@ -122,7 +117,7 @@ "internalType": "uint48" }, { - "name": "signer", + "name": "operator", "type": "address", "internalType": "address" } @@ -134,7 +129,7 @@ "internalType": "bytes" }, { - "name": "claimId", + "name": "assetId", "type": "uint8", "internalType": "uint8" }, @@ -152,7 +147,7 @@ "name": "claimed", "inputs": [ { - "name": "asset", + "name": "token", "type": "address", "internalType": "address" } @@ -211,12 +206,12 @@ }, { "type": "function", - "name": "getClaimRequestHash", + "name": "getAllowanceHash", "inputs": [ { - "name": "request", + "name": "allowance", "type": "tuple", - "internalType": "struct ClaimRequest", + "internalType": "struct Allowance", "components": [ { "name": "account", @@ -224,12 +219,12 @@ "internalType": "address" }, { - "name": "claims", + "name": "assets", "type": "tuple[]", - "internalType": "struct ClaimStruct[]", + "internalType": "struct AssetAllowance[]", "components": [ { - "name": "asset", + "name": "token", "type": "address", "internalType": "address" }, @@ -238,11 +233,6 @@ "type": "uint128", "internalType": "uint128" }, - { - "name": "fee", - "type": "uint128", - "internalType": "uint128" - }, { "name": "chainId", "type": "uint128", @@ -266,7 +256,7 @@ "internalType": "uint48" }, { - "name": "signer", + "name": "operator", "type": "address", "internalType": "address" } @@ -284,15 +274,15 @@ }, { "type": "function", - "name": "getClaimStructHash", + "name": "getAssetAllowanceHash", "inputs": [ { - "name": "claim_", + "name": "asset", "type": "tuple", - "internalType": "struct ClaimStruct", + "internalType": "struct AssetAllowance", "components": [ { - "name": "asset", + "name": "token", "type": "address", "internalType": "address" }, @@ -301,11 +291,6 @@ "type": "uint128", "internalType": "uint128" }, - { - "name": "fee", - "type": "uint128", - "internalType": "uint128" - }, { "name": "chainId", "type": "uint128", @@ -333,7 +318,7 @@ "internalType": "address" }, { - "name": "asset", + "name": "token", "type": "address", "internalType": "address" } @@ -426,7 +411,7 @@ "name": "skim", "inputs": [ { - "name": "asset", + "name": "token", "type": "address", "internalType": "address" } @@ -444,7 +429,7 @@ "internalType": "address" }, { - "name": "asset", + "name": "token", "type": "address", "internalType": "address" } @@ -476,7 +461,7 @@ "name": "unlockStake", "inputs": [ { - "name": "asset", + "name": "token", "type": "address", "internalType": "address" } @@ -489,7 +474,7 @@ "name": "withdrawStake", "inputs": [ { - "name": "asset", + "name": "token", "type": "address", "internalType": "address" }, @@ -504,10 +489,22 @@ }, { "type": "event", - "name": "AssetSkimmed", + "name": "AllowanceClaimed", "inputs": [ { - "name": "asset", + "name": "hash_", + "type": "bytes32", + "indexed": true, + "internalType": "bytes32" + }, + { + "name": "account", + "type": "address", + "indexed": true, + "internalType": "address" + }, + { + "name": "token", "type": "address", "indexed": true, "internalType": "address" @@ -529,63 +526,51 @@ }, { "type": "event", - "name": "Initialized", + "name": "FeeSkimmed", "inputs": [ { - "name": "version", - "type": "uint64", + "name": "token", + "type": "address", + "indexed": true, + "internalType": "address" + }, + { + "name": "amount", + "type": "uint256", "indexed": false, - "internalType": "uint64" + "internalType": "uint256" } ], "anonymous": false }, { "type": "event", - "name": "OwnershipTransferred", + "name": "Initialized", "inputs": [ { - "name": "previousOwner", - "type": "address", - "indexed": true, - "internalType": "address" - }, - { - "name": "newOwner", - "type": "address", - "indexed": true, - "internalType": "address" + "name": "version", + "type": "uint64", + "indexed": false, + "internalType": "uint64" } ], "anonymous": false }, { "type": "event", - "name": "RequestClaimed", + "name": "OwnershipTransferred", "inputs": [ { - "name": "hash_", - "type": "bytes32", - "indexed": true, - "internalType": "bytes32" - }, - { - "name": "account", + "name": "previousOwner", "type": "address", "indexed": true, "internalType": "address" }, { - "name": "asset", + "name": "newOwner", "type": "address", "indexed": true, "internalType": "address" - }, - { - "name": "amount", - "type": "uint256", - "indexed": false, - "internalType": "uint256" } ], "anonymous": false @@ -696,6 +681,16 @@ ], "anonymous": false }, + { + "type": "error", + "name": "AllowanceExpired", + "inputs": [] + }, + { + "type": "error", + "name": "AllowanceNotYetValid", + "inputs": [] + }, { "type": "error", "name": "AlreadyUsed", @@ -711,6 +706,11 @@ "name": "AmountTooLow", "inputs": [] }, + { + "type": "error", + "name": "AssetAllowanceInvalidChain", + "inputs": [] + }, { "type": "error", "name": "InsufficientFunds", @@ -718,7 +718,7 @@ }, { "type": "error", - "name": "InvalidClaimId", + "name": "InvalidAssetAllowanceId", "inputs": [] }, { @@ -763,21 +763,6 @@ "name": "ReentrancyGuardReentrantCall", "inputs": [] }, - { - "type": "error", - "name": "RequestExpired", - "inputs": [] - }, - { - "type": "error", - "name": "RequestInvalidChain", - "inputs": [] - }, - { - "type": "error", - "name": "RequestNotYetValid", - "inputs": [] - }, { "type": "error", "name": "SignatureInvalid", diff --git a/abi/MagicSpendWithdrawalManager.abi.json b/abi/MagicSpendWithdrawalManager.abi.json index f5995e8..f6e0545 100644 --- a/abi/MagicSpendWithdrawalManager.abi.json +++ b/abi/MagicSpendWithdrawalManager.abi.json @@ -4,7 +4,7 @@ "name": "addLiquidity", "inputs": [ { - "name": "asset", + "name": "token", "type": "address", "internalType": "address" }, @@ -75,12 +75,12 @@ }, { "type": "function", - "name": "getCallStructHash", + "name": "getCallHash", "inputs": [ { "name": "call", "type": "tuple", - "internalType": "struct CallStruct", + "internalType": "struct Call", "components": [ { "name": "to", @@ -124,15 +124,15 @@ }, { "type": "function", - "name": "getWithdrawRequestHash", + "name": "getWithdrawalHash", "inputs": [ { - "name": "request", + "name": "withdrawal", "type": "tuple", - "internalType": "struct WithdrawRequest", + "internalType": "struct Withdrawal", "components": [ { - "name": "asset", + "name": "token", "type": "address", "internalType": "address" }, @@ -154,7 +154,7 @@ { "name": "preCalls", "type": "tuple[]", - "internalType": "struct CallStruct[]", + "internalType": "struct Call[]", "components": [ { "name": "to", @@ -176,7 +176,7 @@ { "name": "postCalls", "type": "tuple[]", - "internalType": "struct CallStruct[]", + "internalType": "struct Call[]", "components": [ { "name": "to", @@ -258,7 +258,7 @@ "name": "removeLiquidity", "inputs": [ { - "name": "asset", + "name": "token", "type": "address", "internalType": "address" }, @@ -315,12 +315,12 @@ "name": "withdraw", "inputs": [ { - "name": "request", + "name": "withdrawal", "type": "tuple", - "internalType": "struct WithdrawRequest", + "internalType": "struct Withdrawal", "components": [ { - "name": "asset", + "name": "token", "type": "address", "internalType": "address" }, @@ -342,7 +342,7 @@ { "name": "preCalls", "type": "tuple[]", - "internalType": "struct CallStruct[]", + "internalType": "struct Call[]", "components": [ { "name": "to", @@ -364,7 +364,7 @@ { "name": "postCalls", "type": "tuple[]", - "internalType": "struct CallStruct[]", + "internalType": "struct Call[]", "components": [ { "name": "to", @@ -433,7 +433,7 @@ "name": "LiquidityAdded", "inputs": [ { - "name": "asset", + "name": "token", "type": "address", "indexed": false, "internalType": "address" @@ -452,7 +452,7 @@ "name": "LiquidityRemoved", "inputs": [ { - "name": "asset", + "name": "token", "type": "address", "indexed": false, "internalType": "address" @@ -487,7 +487,20 @@ }, { "type": "event", - "name": "RequestWithdrawn", + "name": "SignerAdded", + "inputs": [ + { + "name": "signer", + "type": "address", + "indexed": false, + "internalType": "address" + } + ], + "anonymous": false + }, + { + "type": "event", + "name": "WithdrawalExecuted", "inputs": [ { "name": "hash_", @@ -502,7 +515,7 @@ "internalType": "address" }, { - "name": "asset", + "name": "token", "type": "address", "indexed": true, "internalType": "address" @@ -516,19 +529,6 @@ ], "anonymous": false }, - { - "type": "event", - "name": "SignerAdded", - "inputs": [ - { - "name": "signer", - "type": "address", - "indexed": false, - "internalType": "address" - } - ], - "anonymous": false - }, { "type": "error", "name": "AlreadyUsed", @@ -539,7 +539,7 @@ "name": "InsufficientLiquidity", "inputs": [ { - "name": "asset", + "name": "token", "type": "address", "internalType": "address" } @@ -606,22 +606,22 @@ }, { "type": "error", - "name": "RequestExpired", + "name": "SignatureInvalid", "inputs": [] }, { "type": "error", - "name": "RequestInvalidChain", + "name": "WithdrawalExpired", "inputs": [] }, { "type": "error", - "name": "RequestNotYetValid", + "name": "WithdrawalInvalidChain", "inputs": [] }, { "type": "error", - "name": "SignatureInvalid", + "name": "WithdrawalNotYetValid", "inputs": [] } ]