From e2dbbef026b299f19e8a0e689f483def6e7ce3a2 Mon Sep 17 00:00:00 2001 From: darek Date: Wed, 19 Oct 2022 18:49:10 +0200 Subject: [PATCH 1/2] add swap hub module --- abis/Euler.json | 756 +++++----- abis/PToken.json | 238 ++-- abis/mining/EulDistributor.json | 148 +- abis/mining/EulStakes.json | 128 +- abis/modules/DToken.json | 986 +++++++------ abis/modules/EToken.json | 1096 +++++++------- abis/modules/Exec.json | 1072 +++++++------- abis/modules/Liquidation.json | 870 ++++++----- abis/modules/Markets.json | 1006 +++++++------ abis/modules/Swap.json | 1014 +++++++------ abis/modules/SwapHub.json | 1171 +++++++++++++++ addresses/addresses-mainnet.json | 3 + contracts/IEuler.sol | 30 + package.json | 2 +- types/Euler.ts | 75 + types/factories/Euler__factory.ts | 602 ++++---- types/factories/PToken__factory.ts | 194 +-- .../mining/EulDistributor__factory.ts | 110 +- types/factories/mining/EulStakes__factory.ts | 96 +- types/factories/modules/DToken__factory.ts | 724 ++++++---- types/factories/modules/EToken__factory.ts | 832 ++++++----- types/factories/modules/Exec__factory.ts | 816 ++++++----- .../factories/modules/Liquidation__factory.ts | 682 +++++---- types/factories/modules/Markets__factory.ts | 792 +++++----- types/factories/modules/SwapHub__factory.ts | 1190 ++++++++++++++++ types/factories/modules/Swap__factory.ts | 786 +++++----- types/factories/modules/index.ts | 1 + types/index.ts | 2 + types/modules/DToken.ts | 75 + types/modules/EToken.ts | 75 + types/modules/Exec.ts | 75 + types/modules/Liquidation.ts | 75 + types/modules/Markets.ts | 75 + types/modules/Swap.ts | 75 + types/modules/SwapHub.ts | 1269 +++++++++++++++++ types/modules/index.ts | 1 + 36 files changed, 11353 insertions(+), 5789 deletions(-) create mode 100644 abis/modules/SwapHub.json create mode 100644 types/factories/modules/SwapHub__factory.ts create mode 100644 types/modules/SwapHub.ts diff --git a/abis/Euler.json b/abis/Euler.json index b33794b..0436657 100644 --- a/abis/Euler.json +++ b/abis/Euler.json @@ -1,84 +1,83 @@ { "abi" : [ { - "type" : "constructor", "inputs" : [ { - "internalType" : "address", + "type" : "address", "name" : "admin", - "type" : "address" + "internalType" : "address" }, { - "name" : "installerModule", + "internalType" : "address", "type" : "address", - "internalType" : "address" + "name" : "installerModule" } ], - "stateMutability" : "nonpayable" + "stateMutability" : "nonpayable", + "type" : "constructor" }, { "inputs" : [ { - "name" : "underlying", "type" : "address", - "internalType" : "address", - "indexed" : true + "indexed" : true, + "name" : "underlying", + "internalType" : "address" }, { - "internalType" : "uint256", + "type" : "uint256", "indexed" : false, "name" : "totalBalances", - "type" : "uint256" + "internalType" : "uint256" }, { - "name" : "totalBorrows", "type" : "uint256", - "internalType" : "uint256", - "indexed" : false + "indexed" : false, + "name" : "totalBorrows", + "internalType" : "uint256" }, { "type" : "uint96", - "name" : "reserveBalance", "indexed" : false, + "name" : "reserveBalance", "internalType" : "uint96" }, { - "internalType" : "uint256", "indexed" : false, + "type" : "uint256", "name" : "poolSize", - "type" : "uint256" + "internalType" : "uint256" }, { - "name" : "interestAccumulator", - "type" : "uint256", "indexed" : false, + "type" : "uint256", + "name" : "interestAccumulator", "internalType" : "uint256" }, { - "internalType" : "int96", + "type" : "int96", "indexed" : false, "name" : "interestRate", - "type" : "int96" + "internalType" : "int96" }, { - "internalType" : "uint256", - "indexed" : false, "type" : "uint256", - "name" : "timestamp" + "internalType" : "uint256", + "name" : "timestamp", + "indexed" : false } ], - "anonymous" : false, "type" : "event", + "anonymous" : false, "name" : "AssetStatus" }, { - "anonymous" : false, "inputs" : [ { - "internalType" : "address", - "indexed" : true, "type" : "address", - "name" : "underlying" + "name" : "underlying", + "indexed" : true, + "internalType" : "address" }, { "type" : "address", @@ -87,96 +86,97 @@ "indexed" : true }, { - "name" : "amount", "type" : "uint256", - "indexed" : false, - "internalType" : "uint256" + "internalType" : "uint256", + "name" : "amount", + "indexed" : false } ], - "name" : "Borrow", - "type" : "event" + "anonymous" : false, + "type" : "event", + "name" : "Borrow" }, { - "name" : "DelegateAverageLiquidity", - "type" : "event", "anonymous" : false, + "type" : "event", + "name" : "DelegateAverageLiquidity", "inputs" : [ { - "type" : "address", "name" : "account", + "type" : "address", "indexed" : true, "internalType" : "address" }, { "indexed" : true, - "internalType" : "address", + "type" : "address", "name" : "delegate", - "type" : "address" + "internalType" : "address" } ] }, { - "type" : "event", - "name" : "Deposit", "inputs" : [ { - "name" : "underlying", - "type" : "address", "internalType" : "address", + "type" : "address", + "name" : "underlying", "indexed" : true }, { - "indexed" : true, - "internalType" : "address", + "type" : "address", "name" : "account", - "type" : "address" + "internalType" : "address", + "indexed" : true }, { - "type" : "uint256", "name" : "amount", - "indexed" : false, - "internalType" : "uint256" + "type" : "uint256", + "internalType" : "uint256", + "indexed" : false } ], - "anonymous" : false + "type" : "event", + "anonymous" : false, + "name" : "Deposit" }, { + "anonymous" : false, "type" : "event", "name" : "EnterMarket", "inputs" : [ { - "indexed" : true, - "internalType" : "address", "type" : "address", - "name" : "underlying" + "indexed" : true, + "name" : "underlying", + "internalType" : "address" }, { - "internalType" : "address", - "indexed" : true, + "name" : "account", "type" : "address", - "name" : "account" + "internalType" : "address", + "indexed" : true } - ], - "anonymous" : false + ] }, { "anonymous" : false, + "type" : "event", + "name" : "ExitMarket", "inputs" : [ { - "internalType" : "address", + "type" : "address", "indexed" : true, "name" : "underlying", - "type" : "address" + "internalType" : "address" }, { "type" : "address", - "name" : "account", "indexed" : true, + "name" : "account", "internalType" : "address" } - ], - "name" : "ExitMarket", - "type" : "event" + ] }, { "name" : "Genesis", @@ -185,240 +185,241 @@ "inputs" : [] }, { - "anonymous" : false, "inputs" : [ { "name" : "underlying", "type" : "address", - "internalType" : "address", - "indexed" : true + "indexed" : true, + "internalType" : "address" }, { + "indexed" : true, "type" : "address", "name" : "recipient", - "internalType" : "address", - "indexed" : true + "internalType" : "address" }, { "indexed" : false, - "internalType" : "uint256", "type" : "uint256", - "name" : "amount" + "name" : "amount", + "internalType" : "uint256" } ], - "name" : "GovConvertReserves", - "type" : "event" + "type" : "event", + "anonymous" : false, + "name" : "GovConvertReserves" }, { + "name" : "GovSetAssetConfig", + "type" : "event", + "anonymous" : false, "inputs" : [ { + "type" : "address", "internalType" : "address", - "indexed" : true, "name" : "underlying", - "type" : "address" + "indexed" : true }, { + "indexed" : false, "type" : "tuple", + "name" : "newConfig", + "internalType" : "struct Storage.AssetConfig", "components" : [ { - "name" : "eTokenAddress", "type" : "address", - "internalType" : "address" + "internalType" : "address", + "name" : "eTokenAddress" }, { + "type" : "bool", "internalType" : "bool", - "name" : "borrowIsolated", - "type" : "bool" + "name" : "borrowIsolated" }, { - "internalType" : "uint32", + "type" : "uint32", "name" : "collateralFactor", - "type" : "uint32" + "internalType" : "uint32" }, { - "name" : "borrowFactor", "type" : "uint32", + "name" : "borrowFactor", "internalType" : "uint32" }, { - "type" : "uint24", "name" : "twapWindow", + "type" : "uint24", "internalType" : "uint24" } - ], - "name" : "newConfig", - "indexed" : false, - "internalType" : "struct Storage.AssetConfig" + ] } - ], - "anonymous" : false, - "type" : "event", - "name" : "GovSetAssetConfig" + ] }, { - "name" : "GovSetChainlinkPriceFeed", - "type" : "event", "anonymous" : false, + "type" : "event", + "name" : "GovSetChainlinkPriceFeed", "inputs" : [ { - "name" : "underlying", + "indexed" : true, "type" : "address", - "internalType" : "address", - "indexed" : true + "name" : "underlying", + "internalType" : "address" }, { - "internalType" : "address", + "type" : "address", "indexed" : false, "name" : "chainlinkAggregator", - "type" : "address" + "internalType" : "address" } ] }, { "inputs" : [ { - "indexed" : true, - "internalType" : "address", + "type" : "address", "name" : "underlying", - "type" : "address" + "internalType" : "address", + "indexed" : true }, { - "type" : "uint256", "name" : "interestRateModel", + "type" : "uint256", "internalType" : "uint256", "indexed" : false }, { - "indexed" : false, - "internalType" : "bytes", + "name" : "resetParams", "type" : "bytes", - "name" : "resetParams" + "indexed" : false, + "internalType" : "bytes" } ], - "anonymous" : false, "type" : "event", + "anonymous" : false, "name" : "GovSetIRM" }, { - "name" : "GovSetPricingConfig", - "type" : "event", - "anonymous" : false, "inputs" : [ { - "type" : "address", "name" : "underlying", + "type" : "address", "internalType" : "address", "indexed" : true }, { "indexed" : false, - "internalType" : "uint16", + "type" : "uint16", "name" : "newPricingType", - "type" : "uint16" + "internalType" : "uint16" }, { - "internalType" : "uint32", - "indexed" : false, "name" : "newPricingParameter", - "type" : "uint32" + "type" : "uint32", + "indexed" : false, + "internalType" : "uint32" } - ] + ], + "type" : "event", + "anonymous" : false, + "name" : "GovSetPricingConfig" }, { - "anonymous" : false, "inputs" : [ { "type" : "address", - "name" : "underlying", "indexed" : true, + "name" : "underlying", "internalType" : "address" }, { - "name" : "newReserveFee", "type" : "uint32", "indexed" : false, + "name" : "newReserveFee", "internalType" : "uint32" } ], - "name" : "GovSetReserveFee", - "type" : "event" + "anonymous" : false, + "type" : "event", + "name" : "GovSetReserveFee" }, { - "type" : "event", - "name" : "InstallerInstallModule", "inputs" : [ { "indexed" : true, - "internalType" : "uint256", "type" : "uint256", - "name" : "moduleId" + "name" : "moduleId", + "internalType" : "uint256" }, { + "indexed" : true, "type" : "address", "name" : "moduleImpl", - "internalType" : "address", - "indexed" : true + "internalType" : "address" }, { - "type" : "bytes32", "name" : "moduleGitCommit", - "indexed" : false, - "internalType" : "bytes32" + "type" : "bytes32", + "internalType" : "bytes32", + "indexed" : false } ], + "name" : "InstallerInstallModule", + "type" : "event", "anonymous" : false }, { "inputs" : [ { - "name" : "newGovernorAdmin", "type" : "address", "internalType" : "address", + "name" : "newGovernorAdmin", "indexed" : true } ], - "anonymous" : false, "type" : "event", - "name" : "InstallerSetGovernorAdmin" + "name" : "InstallerSetGovernorAdmin", + "anonymous" : false }, { - "name" : "InstallerSetUpgradeAdmin", "type" : "event", "anonymous" : false, + "name" : "InstallerSetUpgradeAdmin", "inputs" : [ { - "name" : "newUpgradeAdmin", "type" : "address", - "indexed" : true, - "internalType" : "address" + "name" : "newUpgradeAdmin", + "internalType" : "address", + "indexed" : true } ] }, { + "anonymous" : false, "type" : "event", "name" : "Liquidation", "inputs" : [ { - "name" : "liquidator", - "type" : "address", "indexed" : true, + "type" : "address", + "name" : "liquidator", "internalType" : "address" }, { + "internalType" : "address", "type" : "address", "name" : "violator", - "internalType" : "address", "indexed" : true }, { + "indexed" : true, "type" : "address", "name" : "underlying", - "indexed" : true, "internalType" : "address" }, { - "type" : "address", "name" : "collateral", + "type" : "address", "indexed" : false, "internalType" : "address" }, @@ -429,149 +430,145 @@ "internalType" : "uint256" }, { - "indexed" : false, - "internalType" : "uint256", - "type" : "uint256", - "name" : "yield" - }, - { - "name" : "healthScore", "type" : "uint256", + "name" : "yield", "internalType" : "uint256", "indexed" : false }, { - "internalType" : "uint256", - "indexed" : false, "type" : "uint256", - "name" : "baseDiscount" + "indexed" : false, + "name" : "healthScore", + "internalType" : "uint256" }, { + "type" : "uint256", "indexed" : false, - "internalType" : "uint256", + "name" : "baseDiscount", + "internalType" : "uint256" + }, + { "name" : "discount", - "type" : "uint256" + "type" : "uint256", + "internalType" : "uint256", + "indexed" : false } - ], - "anonymous" : false + ] }, { - "anonymous" : false, "inputs" : [ { - "internalType" : "address", - "indexed" : true, "type" : "address", - "name" : "underlying" + "indexed" : true, + "name" : "underlying", + "internalType" : "address" }, { - "indexed" : true, - "internalType" : "address", "type" : "address", - "name" : "eToken" + "indexed" : true, + "name" : "eToken", + "internalType" : "address" }, { - "internalType" : "address", - "indexed" : true, "type" : "address", - "name" : "dToken" + "indexed" : true, + "name" : "dToken", + "internalType" : "address" } ], - "name" : "MarketActivated", - "type" : "event" + "anonymous" : false, + "type" : "event", + "name" : "MarketActivated" }, { - "name" : "PTokenActivated", - "type" : "event", "anonymous" : false, + "type" : "event", + "name" : "PTokenActivated", "inputs" : [ { "internalType" : "address", - "indexed" : true, "type" : "address", - "name" : "underlying" + "name" : "underlying", + "indexed" : true }, { - "name" : "pToken", - "type" : "address", "indexed" : true, + "type" : "address", + "name" : "pToken", "internalType" : "address" } ] }, { - "type" : "event", - "name" : "PTokenUnWrap", "inputs" : [ { - "name" : "underlying", "type" : "address", + "name" : "underlying", "indexed" : true, "internalType" : "address" }, { - "internalType" : "address", - "indexed" : true, "name" : "account", - "type" : "address" + "type" : "address", + "indexed" : true, + "internalType" : "address" }, { "type" : "uint256", - "name" : "amount", "internalType" : "uint256", + "name" : "amount", "indexed" : false } ], + "type" : "event", + "name" : "PTokenUnWrap", "anonymous" : false }, { - "name" : "PTokenWrap", - "type" : "event", - "anonymous" : false, "inputs" : [ { "type" : "address", "name" : "underlying", - "indexed" : true, - "internalType" : "address" + "internalType" : "address", + "indexed" : true }, { "name" : "account", "type" : "address", - "internalType" : "address", - "indexed" : true + "indexed" : true, + "internalType" : "address" }, { "type" : "uint256", - "name" : "amount", "indexed" : false, + "name" : "amount", "internalType" : "uint256" } - ] + ], + "anonymous" : false, + "type" : "event", + "name" : "PTokenWrap" }, { + "type" : "event", "anonymous" : false, + "name" : "ProxyCreated", "inputs" : [ { + "indexed" : true, "type" : "address", "name" : "proxy", - "indexed" : true, "internalType" : "address" }, { - "indexed" : false, - "internalType" : "uint256", "name" : "moduleId", - "type" : "uint256" + "type" : "uint256", + "indexed" : false, + "internalType" : "uint256" } - ], - "name" : "ProxyCreated", - "type" : "event" + ] }, { - "name" : "Repay", - "type" : "event", - "anonymous" : false, "inputs" : [ { "type" : "address", @@ -581,17 +578,20 @@ }, { "internalType" : "address", - "indexed" : true, "type" : "address", - "name" : "account" + "name" : "account", + "indexed" : true }, { - "name" : "amount", - "type" : "uint256", "internalType" : "uint256", + "type" : "uint256", + "name" : "amount", "indexed" : false } - ] + ], + "type" : "event", + "name" : "Repay", + "anonymous" : false }, { "name" : "RequestBorrow", @@ -599,15 +599,15 @@ "anonymous" : false, "inputs" : [ { + "internalType" : "address", "type" : "address", "name" : "account", - "internalType" : "address", "indexed" : true }, { + "indexed" : false, "type" : "uint256", "name" : "amount", - "indexed" : false, "internalType" : "uint256" } ] @@ -615,145 +615,188 @@ { "inputs" : [ { - "internalType" : "address", - "indexed" : true, + "name" : "account", "type" : "address", - "name" : "account" + "indexed" : true, + "internalType" : "address" }, { - "indexed" : false, - "internalType" : "uint256", + "name" : "amount", "type" : "uint256", - "name" : "amount" + "indexed" : false, + "internalType" : "uint256" } ], - "anonymous" : false, "type" : "event", + "anonymous" : false, "name" : "RequestBurn" }, { - "type" : "event", - "name" : "RequestDeposit", "inputs" : [ { "indexed" : true, - "internalType" : "address", "type" : "address", - "name" : "account" + "name" : "account", + "internalType" : "address" }, { - "name" : "amount", - "type" : "uint256", "indexed" : false, + "type" : "uint256", + "name" : "amount", "internalType" : "uint256" } ], - "anonymous" : false + "anonymous" : false, + "type" : "event", + "name" : "RequestDeposit" }, { "type" : "event", + "anonymous" : false, "name" : "RequestDonate", "inputs" : [ { "name" : "account", "type" : "address", - "indexed" : true, - "internalType" : "address" + "internalType" : "address", + "indexed" : true }, { "type" : "uint256", + "internalType" : "uint256", "name" : "amount", - "indexed" : false, - "internalType" : "uint256" + "indexed" : false } - ], - "anonymous" : false + ] }, { + "anonymous" : false, "type" : "event", "name" : "RequestLiquidate", "inputs" : [ { - "name" : "liquidator", "type" : "address", + "name" : "liquidator", "internalType" : "address", "indexed" : true }, { - "indexed" : true, - "internalType" : "address", + "name" : "violator", "type" : "address", - "name" : "violator" + "internalType" : "address", + "indexed" : true }, { "internalType" : "address", - "indexed" : true, + "type" : "address", "name" : "underlying", - "type" : "address" + "indexed" : true }, { - "internalType" : "address", - "indexed" : false, "name" : "collateral", - "type" : "address" + "type" : "address", + "indexed" : false, + "internalType" : "address" }, { + "indexed" : false, "type" : "uint256", "name" : "repay", - "indexed" : false, "internalType" : "uint256" }, { - "internalType" : "uint256", - "indexed" : false, "type" : "uint256", - "name" : "minYield" + "indexed" : false, + "name" : "minYield", + "internalType" : "uint256" } - ], - "anonymous" : false + ] }, { "inputs" : [ { - "internalType" : "address", - "indexed" : true, "type" : "address", - "name" : "account" + "name" : "account", + "internalType" : "address", + "indexed" : true }, { - "indexed" : false, - "internalType" : "uint256", + "name" : "amount", "type" : "uint256", - "name" : "amount" + "internalType" : "uint256", + "indexed" : false } ], - "anonymous" : false, "type" : "event", + "anonymous" : false, "name" : "RequestMint" }, { + "anonymous" : false, + "type" : "event", + "name" : "RequestRepay", "inputs" : [ { "type" : "address", + "indexed" : true, "name" : "account", - "internalType" : "address", - "indexed" : true + "internalType" : "address" }, { - "indexed" : false, - "internalType" : "uint256", "name" : "amount", - "type" : "uint256" + "type" : "uint256", + "internalType" : "uint256", + "indexed" : false } - ], + ] + }, + { "anonymous" : false, "type" : "event", - "name" : "RequestRepay" + "name" : "RequestSwap", + "inputs" : [ + { + "type" : "address", + "indexed" : true, + "name" : "accountIn", + "internalType" : "address" + }, + { + "type" : "address", + "indexed" : true, + "name" : "accountOut", + "internalType" : "address" + }, + { + "type" : "address", + "indexed" : true, + "name" : "underlyingIn", + "internalType" : "address" + }, + { + "type" : "address", + "indexed" : false, + "name" : "underlyingOut", + "internalType" : "address" + }, + { + "indexed" : false, + "type" : "uint256", + "name" : "amount", + "internalType" : "uint256" + }, + { + "indexed" : false, + "type" : "uint256", + "name" : "swapType", + "internalType" : "uint256" + } + ] }, { - "name" : "RequestSwap", "type" : "event", "anonymous" : false, + "name" : "RequestSwapHub", "inputs" : [ { "name" : "accountIn", @@ -762,16 +805,16 @@ "indexed" : true }, { - "indexed" : true, + "type" : "address", "internalType" : "address", "name" : "accountOut", - "type" : "address" + "indexed" : true }, { - "internalType" : "address", - "indexed" : true, + "type" : "address", "name" : "underlyingIn", - "type" : "address" + "indexed" : true, + "internalType" : "address" }, { "type" : "address", @@ -781,185 +824,239 @@ }, { "type" : "uint256", - "name" : "amount", "internalType" : "uint256", + "name" : "amountIn", "indexed" : false }, { - "name" : "swapType", + "indexed" : false, "type" : "uint256", + "name" : "amountOut", + "internalType" : "uint256" + }, + { "internalType" : "uint256", + "type" : "uint256", + "name" : "mode", "indexed" : false + }, + { + "indexed" : false, + "type" : "address", + "name" : "swapHandler", + "internalType" : "address" } ] }, { "anonymous" : false, + "type" : "event", + "name" : "RequestSwapHubRepay", "inputs" : [ { "type" : "address", - "name" : "from", + "indexed" : true, + "name" : "accountIn", + "internalType" : "address" + }, + { + "type" : "address", + "name" : "accountOut", "internalType" : "address", "indexed" : true }, { - "indexed" : true, "internalType" : "address", - "name" : "to", - "type" : "address" + "type" : "address", + "name" : "underlyingIn", + "indexed" : true + }, + { + "internalType" : "address", + "type" : "address", + "name" : "underlyingOut", + "indexed" : false }, { "type" : "uint256", - "name" : "amount", + "name" : "targetDebt", + "internalType" : "uint256", + "indexed" : false + }, + { "indexed" : false, - "internalType" : "uint256" + "type" : "address", + "name" : "swapHandler", + "internalType" : "address" } - ], - "name" : "RequestTransferDToken", - "type" : "event" + ] }, { + "name" : "RequestTransferDToken", "type" : "event", - "name" : "RequestTransferEToken", + "anonymous" : false, "inputs" : [ { - "indexed" : true, "internalType" : "address", "type" : "address", - "name" : "from" + "name" : "from", + "indexed" : true }, { "internalType" : "address", - "indexed" : true, + "type" : "address", "name" : "to", - "type" : "address" + "indexed" : true }, { + "internalType" : "uint256", "type" : "uint256", "name" : "amount", - "internalType" : "uint256", "indexed" : false } - ], - "anonymous" : false + ] }, { "inputs" : [ { + "indexed" : true, "type" : "address", - "name" : "account", - "internalType" : "address", - "indexed" : true + "name" : "from", + "internalType" : "address" + }, + { + "indexed" : true, + "type" : "address", + "name" : "to", + "internalType" : "address" }, { - "name" : "amount", "type" : "uint256", - "internalType" : "uint256", - "indexed" : false + "name" : "amount", + "indexed" : false, + "internalType" : "uint256" } ], - "anonymous" : false, "type" : "event", - "name" : "RequestWithdraw" + "anonymous" : false, + "name" : "RequestTransferEToken" }, { - "name" : "TrackAverageLiquidity", "type" : "event", + "name" : "RequestWithdraw", "anonymous" : false, "inputs" : [ { "name" : "account", "type" : "address", - "internalType" : "address", - "indexed" : true + "indexed" : true, + "internalType" : "address" + }, + { + "type" : "uint256", + "name" : "amount", + "internalType" : "uint256", + "indexed" : false } ] }, { - "anonymous" : false, "inputs" : [ { - "internalType" : "address", - "indexed" : true, "type" : "address", - "name" : "account" + "internalType" : "address", + "name" : "account", + "indexed" : true } ], + "anonymous" : false, + "type" : "event", + "name" : "TrackAverageLiquidity" + }, + { + "anonymous" : false, + "type" : "event", "name" : "UnTrackAverageLiquidity", - "type" : "event" + "inputs" : [ + { + "name" : "account", + "type" : "address", + "indexed" : true, + "internalType" : "address" + } + ] }, { "inputs" : [ { - "internalType" : "address", "indexed" : true, + "type" : "address", "name" : "underlying", - "type" : "address" + "internalType" : "address" }, { - "name" : "account", - "type" : "address", "internalType" : "address", + "type" : "address", + "name" : "account", "indexed" : true }, { - "indexed" : false, - "internalType" : "uint256", + "type" : "uint256", "name" : "amount", - "type" : "uint256" + "internalType" : "uint256", + "indexed" : false } ], - "anonymous" : false, "type" : "event", - "name" : "Withdraw" + "name" : "Withdraw", + "anonymous" : false }, { - "name" : "dispatch", "type" : "function", + "name" : "dispatch", "stateMutability" : "nonpayable", - "outputs" : [], - "inputs" : [] + "inputs" : [], + "outputs" : [] }, { - "name" : "moduleIdToImplementation", - "type" : "function", - "stateMutability" : "view", "outputs" : [ { - "name" : "", "type" : "address", + "name" : "", "internalType" : "address" } ], "inputs" : [ { "internalType" : "uint256", - "name" : "moduleId", - "type" : "uint256" + "type" : "uint256", + "name" : "moduleId" } - ] + ], + "name" : "moduleIdToImplementation", + "type" : "function", + "stateMutability" : "view" }, { - "stateMutability" : "view", - "outputs" : [ + "inputs" : [ { - "internalType" : "address", - "type" : "address", - "name" : "" + "internalType" : "uint256", + "type" : "uint256", + "name" : "moduleId" } ], - "inputs" : [ + "outputs" : [ { - "internalType" : "uint256", - "name" : "moduleId", - "type" : "uint256" + "type" : "address", + "internalType" : "address", + "name" : "" } ], + "type" : "function", "name" : "moduleIdToProxy", - "type" : "function" + "stateMutability" : "view" }, { - "inputs" : [], "outputs" : [ { "internalType" : "string", @@ -967,9 +1064,10 @@ "name" : "" } ], - "stateMutability" : "view", + "inputs" : [], + "name" : "name", "type" : "function", - "name" : "name" + "stateMutability" : "view" } ] } diff --git a/abis/PToken.json b/abis/PToken.json index c70c63c..2eb0ddd 100644 --- a/abis/PToken.json +++ b/abis/PToken.json @@ -1,246 +1,253 @@ { "abi" : [ { - "type" : "constructor", "inputs" : [ { - "type" : "address", "name" : "euler_", + "type" : "address", "internalType" : "address" }, { - "internalType" : "address", "name" : "underlying_", - "type" : "address" + "type" : "address", + "internalType" : "address" } ], + "type" : "constructor", "stateMutability" : "nonpayable" }, { + "type" : "event", + "name" : "Approval", "anonymous" : false, "inputs" : [ { - "indexed" : true, "internalType" : "address", + "type" : "address", "name" : "owner", - "type" : "address" + "indexed" : true }, { "name" : "spender", "type" : "address", - "internalType" : "address", - "indexed" : true + "indexed" : true, + "internalType" : "address" }, { - "internalType" : "uint256", - "indexed" : false, + "name" : "value", "type" : "uint256", - "name" : "value" + "indexed" : false, + "internalType" : "uint256" } - ], - "name" : "Approval", - "type" : "event" + ] }, { "type" : "event", + "anonymous" : false, "name" : "Transfer", "inputs" : [ { "name" : "from", "type" : "address", - "internalType" : "address", - "indexed" : true + "indexed" : true, + "internalType" : "address" }, { "type" : "address", "name" : "to", - "indexed" : true, - "internalType" : "address" + "internalType" : "address", + "indexed" : true }, { - "indexed" : false, - "internalType" : "uint256", + "name" : "value", "type" : "uint256", - "name" : "value" + "internalType" : "uint256", + "indexed" : false } - ], - "anonymous" : false + ] }, { "type" : "function", + "stateMutability" : "view", "name" : "allowance", + "outputs" : [ + { + "internalType" : "uint256", + "type" : "uint256", + "name" : "" + } + ], "inputs" : [ { "internalType" : "address", - "name" : "holder", - "type" : "address" + "type" : "address", + "name" : "holder" }, { "internalType" : "address", "type" : "address", "name" : "spender" } - ], - "stateMutability" : "view", - "outputs" : [ - { - "internalType" : "uint256", - "type" : "uint256", - "name" : "" - } ] }, { - "type" : "function", - "name" : "approve", + "outputs" : [ + { + "name" : "", + "type" : "bool", + "internalType" : "bool" + } + ], "inputs" : [ { - "name" : "spender", "type" : "address", - "internalType" : "address" + "internalType" : "address", + "name" : "spender" }, { - "name" : "amount", "type" : "uint256", + "name" : "amount", "internalType" : "uint256" } ], "stateMutability" : "nonpayable", - "outputs" : [ - { - "internalType" : "bool", - "type" : "bool", - "name" : "" - } - ] + "type" : "function", + "name" : "approve" }, { "stateMutability" : "view", - "outputs" : [ - { - "name" : "", - "type" : "uint256", - "internalType" : "uint256" - } - ], + "type" : "function", + "name" : "balanceOf", "inputs" : [ { "type" : "address", - "name" : "who", - "internalType" : "address" + "internalType" : "address", + "name" : "who" } ], - "name" : "balanceOf", - "type" : "function" + "outputs" : [ + { + "internalType" : "uint256", + "type" : "uint256", + "name" : "" + } + ] }, { - "name" : "claimSurplus", + "stateMutability" : "nonpayable", "type" : "function", + "name" : "claimSurplus", "outputs" : [], - "stateMutability" : "nonpayable", "inputs" : [ { - "name" : "who", "type" : "address", - "internalType" : "address" + "internalType" : "address", + "name" : "who" } ] }, { + "type" : "function", + "stateMutability" : "view", + "name" : "decimals", "inputs" : [], "outputs" : [ { - "type" : "uint8", "name" : "", + "type" : "uint8", "internalType" : "uint8" } - ], - "stateMutability" : "view", - "type" : "function", - "name" : "decimals" + ] }, { - "type" : "function", - "name" : "forceUnwrap", + "outputs" : [], "inputs" : [ { - "internalType" : "address", + "name" : "who", "type" : "address", - "name" : "who" + "internalType" : "address" }, { - "internalType" : "uint256", + "name" : "amount", "type" : "uint256", - "name" : "amount" + "internalType" : "uint256" } ], - "outputs" : [], + "type" : "function", + "name" : "forceUnwrap", "stateMutability" : "nonpayable" }, { + "type" : "function", + "name" : "name", + "stateMutability" : "view", + "inputs" : [], "outputs" : [ { - "type" : "string", "name" : "", + "type" : "string", "internalType" : "string" } - ], - "stateMutability" : "view", - "inputs" : [], - "name" : "name", - "type" : "function" + ] }, { - "name" : "symbol", "type" : "function", + "name" : "symbol", + "stateMutability" : "view", "outputs" : [ { + "internalType" : "string", "type" : "string", - "name" : "", - "internalType" : "string" + "name" : "" } ], - "stateMutability" : "view", "inputs" : [] }, { - "inputs" : [], - "stateMutability" : "view", "outputs" : [ { - "type" : "uint256", "name" : "", + "type" : "uint256", "internalType" : "uint256" } ], + "inputs" : [], "type" : "function", - "name" : "totalSupply" + "name" : "totalSupply", + "stateMutability" : "view" }, { + "name" : "transfer", + "type" : "function", + "stateMutability" : "nonpayable", + "outputs" : [ + { + "internalType" : "bool", + "type" : "bool", + "name" : "" + } + ], "inputs" : [ { - "internalType" : "address", + "type" : "address", "name" : "recipient", - "type" : "address" + "internalType" : "address" }, { - "internalType" : "uint256", + "type" : "uint256", "name" : "amount", - "type" : "uint256" + "internalType" : "uint256" } - ], - "stateMutability" : "nonpayable", + ] + }, + { "outputs" : [ { - "internalType" : "bool", + "name" : "", "type" : "bool", - "name" : "" + "internalType" : "bool" } ], - "type" : "function", - "name" : "transfer" - }, - { "inputs" : [ { "internalType" : "address", @@ -249,35 +256,28 @@ }, { "internalType" : "address", - "name" : "recipient", - "type" : "address" + "type" : "address", + "name" : "recipient" }, { - "name" : "amount", "type" : "uint256", + "name" : "amount", "internalType" : "uint256" } ], - "stateMutability" : "nonpayable", - "outputs" : [ - { - "name" : "", - "type" : "bool", - "internalType" : "bool" - } - ], "type" : "function", + "stateMutability" : "nonpayable", "name" : "transferFrom" }, { - "inputs" : [], "outputs" : [ { - "type" : "address", "name" : "", + "type" : "address", "internalType" : "address" } ], + "inputs" : [], "stateMutability" : "view", "type" : "function", "name" : "underlying" @@ -286,18 +286,16 @@ "name" : "unwrap", "type" : "function", "stateMutability" : "nonpayable", - "outputs" : [], "inputs" : [ { + "type" : "uint256", "internalType" : "uint256", - "name" : "amount", - "type" : "uint256" + "name" : "amount" } - ] + ], + "outputs" : [] }, { - "outputs" : [], - "stateMutability" : "nonpayable", "inputs" : [ { "name" : "amount", @@ -305,8 +303,10 @@ "internalType" : "uint256" } ], - "name" : "wrap", - "type" : "function" + "outputs" : [], + "type" : "function", + "stateMutability" : "nonpayable", + "name" : "wrap" } ] } diff --git a/abis/mining/EulDistributor.json b/abis/mining/EulDistributor.json index 95b9c8c..fc6e0a4 100644 --- a/abis/mining/EulDistributor.json +++ b/abis/mining/EulDistributor.json @@ -1,68 +1,75 @@ { "abi" : [ { - "type" : "constructor", - "stateMutability" : "nonpayable", "inputs" : [ { - "name" : "eul_", "type" : "address", - "internalType" : "address" + "internalType" : "address", + "name" : "eul_" }, { "type" : "address", "name" : "eulStakes_", "internalType" : "address" } - ] + ], + "type" : "constructor", + "stateMutability" : "nonpayable" }, { - "anonymous" : false, "inputs" : [ { - "name" : "newOwner", - "type" : "address", "indexed" : true, + "type" : "address", + "name" : "newOwner", "internalType" : "address" } ], "name" : "OwnerChanged", - "type" : "event" + "type" : "event", + "anonymous" : false }, { - "name" : "claim", - "type" : "function", - "stateMutability" : "nonpayable", - "outputs" : [], "inputs" : [ { - "internalType" : "address", + "name" : "account", "type" : "address", - "name" : "account" + "internalType" : "address" }, { - "name" : "token", "type" : "address", - "internalType" : "address" + "internalType" : "address", + "name" : "token" }, { - "internalType" : "uint256", + "type" : "uint256", "name" : "claimable", - "type" : "uint256" + "internalType" : "uint256" }, { - "name" : "proof", "type" : "bytes32[]", - "internalType" : "bytes32[]" + "internalType" : "bytes32[]", + "name" : "proof" }, { - "internalType" : "address", "name" : "stake", - "type" : "address" + "type" : "address", + "internalType" : "address" } - ] + ], + "outputs" : [], + "type" : "function", + "name" : "claim", + "stateMutability" : "nonpayable" }, { + "outputs" : [ + { + "internalType" : "uint256", + "type" : "uint256", + "name" : "" + } + ], "inputs" : [ { "name" : "", @@ -70,37 +77,32 @@ "internalType" : "address" }, { - "name" : "", "type" : "address", - "internalType" : "address" - } - ], - "outputs" : [ - { - "type" : "uint256", - "name" : "", - "internalType" : "uint256" + "internalType" : "address", + "name" : "" } ], - "stateMutability" : "view", "type" : "function", - "name" : "claimed" + "name" : "claimed", + "stateMutability" : "view" }, { - "type" : "function", - "name" : "currRoot", - "inputs" : [], - "stateMutability" : "view", "outputs" : [ { - "internalType" : "bytes32", "type" : "bytes32", - "name" : "" + "name" : "", + "internalType" : "bytes32" } - ] + ], + "inputs" : [], + "type" : "function", + "name" : "currRoot", + "stateMutability" : "view" }, { + "type" : "function", "stateMutability" : "view", + "name" : "eul", "outputs" : [ { "internalType" : "address", @@ -108,87 +110,85 @@ "name" : "" } ], - "inputs" : [], - "name" : "eul", - "type" : "function" + "inputs" : [] }, { - "stateMutability" : "view", "outputs" : [ { - "name" : "", "type" : "address", + "name" : "", "internalType" : "address" } ], "inputs" : [], - "name" : "eulStakes", - "type" : "function" + "stateMutability" : "view", + "type" : "function", + "name" : "eulStakes" }, { + "inputs" : [], "outputs" : [ { + "type" : "string", "internalType" : "string", - "name" : "", - "type" : "string" + "name" : "" } ], + "type" : "function", "stateMutability" : "view", - "inputs" : [], - "name" : "name", - "type" : "function" + "name" : "name" }, { - "type" : "function", - "name" : "owner", - "inputs" : [], - "stateMutability" : "view", "outputs" : [ { + "internalType" : "address", "type" : "address", - "name" : "", - "internalType" : "address" + "name" : "" } - ] + ], + "inputs" : [], + "name" : "owner", + "type" : "function", + "stateMutability" : "view" }, { - "inputs" : [], + "type" : "function", "stateMutability" : "view", + "name" : "prevRoot", "outputs" : [ { - "name" : "", + "internalType" : "bytes32", "type" : "bytes32", - "internalType" : "bytes32" + "name" : "" } ], - "type" : "function", - "name" : "prevRoot" + "inputs" : [] }, { - "type" : "function", - "name" : "transferOwnership", "inputs" : [ { - "name" : "newOwner", + "internalType" : "address", "type" : "address", - "internalType" : "address" + "name" : "newOwner" } ], + "outputs" : [], + "type" : "function", "stateMutability" : "nonpayable", - "outputs" : [] + "name" : "transferOwnership" }, { "name" : "updateRoot", "type" : "function", "stateMutability" : "nonpayable", - "outputs" : [], "inputs" : [ { - "name" : "newRoot", "type" : "bytes32", + "name" : "newRoot", "internalType" : "bytes32" } - ] + ], + "outputs" : [] } ] } diff --git a/abis/mining/EulStakes.json b/abis/mining/EulStakes.json index 2d24598..9743ead 100644 --- a/abis/mining/EulStakes.json +++ b/abis/mining/EulStakes.json @@ -1,46 +1,46 @@ { "abi" : [ { + "stateMutability" : "nonpayable", + "type" : "constructor", "inputs" : [ { - "name" : "eul_", "type" : "address", + "name" : "eul_", "internalType" : "address" } - ], - "stateMutability" : "nonpayable", - "type" : "constructor" + ] }, { + "anonymous" : false, "type" : "event", "name" : "Stake", "inputs" : [ { + "type" : "address", "indexed" : true, - "internalType" : "address", "name" : "who", - "type" : "address" + "internalType" : "address" }, { - "type" : "address", "name" : "underlying", - "internalType" : "address", - "indexed" : true + "type" : "address", + "indexed" : true, + "internalType" : "address" }, { + "indexed" : false, "type" : "address", "name" : "sender", - "indexed" : false, "internalType" : "address" }, { "type" : "uint256", "name" : "newAmount", - "indexed" : false, - "internalType" : "uint256" + "internalType" : "uint256", + "indexed" : false } - ], - "anonymous" : false + ] }, { "name" : "eul", @@ -48,147 +48,147 @@ "stateMutability" : "view", "outputs" : [ { - "internalType" : "address", + "type" : "address", "name" : "", - "type" : "address" + "internalType" : "address" } ], "inputs" : [] }, { - "type" : "function", - "name" : "name", "inputs" : [], - "stateMutability" : "view", "outputs" : [ { "name" : "", "type" : "string", "internalType" : "string" } - ] + ], + "type" : "function", + "stateMutability" : "view", + "name" : "name" }, { + "stateMutability" : "nonpayable", + "type" : "function", + "name" : "stake", "inputs" : [ { - "type" : "tuple[]", "components" : [ { - "name" : "underlying", + "internalType" : "address", "type" : "address", - "internalType" : "address" + "name" : "underlying" }, { - "name" : "amount", + "internalType" : "int256", "type" : "int256", - "internalType" : "int256" + "name" : "amount" } ], + "type" : "tuple[]", "name" : "ops", "internalType" : "struct EulStakes.StakeOp[]" } ], - "stateMutability" : "nonpayable", - "outputs" : [], - "type" : "function", - "name" : "stake" + "outputs" : [] }, { - "outputs" : [], - "stateMutability" : "nonpayable", "inputs" : [ { - "internalType" : "address", "type" : "address", + "internalType" : "address", "name" : "beneficiary" }, { - "internalType" : "address", "type" : "address", + "internalType" : "address", "name" : "underlying" }, { + "type" : "uint256", "internalType" : "uint256", - "name" : "amount", - "type" : "uint256" + "name" : "amount" } ], + "outputs" : [], + "type" : "function", "name" : "stakeGift", - "type" : "function" + "stateMutability" : "nonpayable" }, { + "type" : "function", "stateMutability" : "nonpayable", - "outputs" : [], + "name" : "stakePermit", "inputs" : [ { - "internalType" : "struct EulStakes.StakeOp[]", - "name" : "ops", - "type" : "tuple[]", "components" : [ { + "type" : "address", "internalType" : "address", - "name" : "underlying", - "type" : "address" + "name" : "underlying" }, { - "type" : "int256", "name" : "amount", + "type" : "int256", "internalType" : "int256" } - ] + ], + "type" : "tuple[]", + "name" : "ops", + "internalType" : "struct EulStakes.StakeOp[]" }, { - "internalType" : "uint256", "type" : "uint256", - "name" : "value" + "name" : "value", + "internalType" : "uint256" }, { - "internalType" : "uint256", "name" : "deadline", - "type" : "uint256" + "type" : "uint256", + "internalType" : "uint256" }, { - "internalType" : "uint8", + "type" : "uint8", "name" : "v", - "type" : "uint8" + "internalType" : "uint8" }, { "type" : "bytes32", - "name" : "r", - "internalType" : "bytes32" + "internalType" : "bytes32", + "name" : "r" }, { - "name" : "s", "type" : "bytes32", - "internalType" : "bytes32" + "internalType" : "bytes32", + "name" : "s" } ], - "name" : "stakePermit", - "type" : "function" + "outputs" : [] }, { "inputs" : [ { "internalType" : "address", - "name" : "account", - "type" : "address" + "type" : "address", + "name" : "account" }, { "type" : "address", - "name" : "underlying", - "internalType" : "address" + "internalType" : "address", + "name" : "underlying" } ], "outputs" : [ { "type" : "uint256", - "name" : "", - "internalType" : "uint256" + "internalType" : "uint256", + "name" : "" } ], - "stateMutability" : "view", + "name" : "staked", "type" : "function", - "name" : "staked" + "stateMutability" : "view" } ] } diff --git a/abis/modules/DToken.json b/abis/modules/DToken.json index c2b69e4..a67cd44 100644 --- a/abis/modules/DToken.json +++ b/abis/modules/DToken.json @@ -3,8 +3,8 @@ { "inputs" : [ { - "type" : "bytes32", "name" : "moduleGitCommit_", + "type" : "bytes32", "internalType" : "bytes32" } ], @@ -12,21 +12,21 @@ "type" : "constructor" }, { - "name" : "Approval", "type" : "event", + "name" : "Approval", "anonymous" : false, "inputs" : [ { - "name" : "owner", + "internalType" : "address", "type" : "address", - "indexed" : true, - "internalType" : "address" + "name" : "owner", + "indexed" : true }, { - "indexed" : true, - "internalType" : "address", "type" : "address", - "name" : "spender" + "name" : "spender", + "internalType" : "address", + "indexed" : true }, { "type" : "uint256", @@ -37,27 +37,27 @@ ] }, { - "name" : "AssetStatus", "type" : "event", + "name" : "AssetStatus", "anonymous" : false, "inputs" : [ { - "internalType" : "address", - "indexed" : true, + "type" : "address", "name" : "underlying", - "type" : "address" + "internalType" : "address", + "indexed" : true }, { - "name" : "totalBalances", "type" : "uint256", + "name" : "totalBalances", "indexed" : false, "internalType" : "uint256" }, { - "internalType" : "uint256", - "indexed" : false, "type" : "uint256", - "name" : "totalBorrows" + "internalType" : "uint256", + "name" : "totalBorrows", + "indexed" : false }, { "name" : "reserveBalance", @@ -66,109 +66,107 @@ "internalType" : "uint96" }, { - "indexed" : false, - "internalType" : "uint256", "name" : "poolSize", - "type" : "uint256" - }, - { "type" : "uint256", - "name" : "interestAccumulator", "internalType" : "uint256", "indexed" : false }, { + "name" : "interestAccumulator", + "type" : "uint256", "indexed" : false, + "internalType" : "uint256" + }, + { "internalType" : "int96", + "type" : "int96", "name" : "interestRate", - "type" : "int96" + "indexed" : false }, { - "name" : "timestamp", "type" : "uint256", - "indexed" : false, - "internalType" : "uint256" + "name" : "timestamp", + "internalType" : "uint256", + "indexed" : false } ] }, { + "type" : "event", "anonymous" : false, + "name" : "Borrow", "inputs" : [ { - "indexed" : true, "internalType" : "address", "type" : "address", - "name" : "underlying" + "name" : "underlying", + "indexed" : true }, { - "internalType" : "address", - "indexed" : true, "type" : "address", - "name" : "account" + "indexed" : true, + "name" : "account", + "internalType" : "address" }, { - "internalType" : "uint256", - "indexed" : false, + "name" : "amount", "type" : "uint256", - "name" : "amount" + "indexed" : false, + "internalType" : "uint256" } - ], - "name" : "Borrow", - "type" : "event" + ] }, { - "type" : "event", - "name" : "DelegateAverageLiquidity", "inputs" : [ { - "indexed" : true, - "internalType" : "address", "type" : "address", - "name" : "account" + "name" : "account", + "internalType" : "address", + "indexed" : true }, { "name" : "delegate", "type" : "address", - "internalType" : "address", - "indexed" : true + "indexed" : true, + "internalType" : "address" } ], + "type" : "event", + "name" : "DelegateAverageLiquidity", "anonymous" : false }, { + "anonymous" : false, + "type" : "event", + "name" : "Deposit", "inputs" : [ { "internalType" : "address", - "indexed" : true, + "type" : "address", "name" : "underlying", - "type" : "address" + "indexed" : true }, { - "internalType" : "address", - "indexed" : true, + "type" : "address", "name" : "account", - "type" : "address" + "indexed" : true, + "internalType" : "address" }, { - "name" : "amount", "type" : "uint256", "indexed" : false, + "name" : "amount", "internalType" : "uint256" } - ], - "anonymous" : false, - "type" : "event", - "name" : "Deposit" + ] }, { - "type" : "event", - "name" : "EnterMarket", "inputs" : [ { "type" : "address", "name" : "underlying", - "indexed" : true, - "internalType" : "address" + "internalType" : "address", + "indexed" : true }, { "type" : "address", @@ -177,111 +175,113 @@ "internalType" : "address" } ], + "type" : "event", + "name" : "EnterMarket", "anonymous" : false }, { + "name" : "ExitMarket", + "type" : "event", + "anonymous" : false, "inputs" : [ { - "name" : "underlying", "type" : "address", - "indexed" : true, - "internalType" : "address" + "name" : "underlying", + "internalType" : "address", + "indexed" : true }, { - "indexed" : true, - "internalType" : "address", + "type" : "address", "name" : "account", - "type" : "address" + "indexed" : true, + "internalType" : "address" } - ], - "anonymous" : false, - "type" : "event", - "name" : "ExitMarket" + ] }, { - "type" : "event", "name" : "Genesis", - "inputs" : [], - "anonymous" : false - }, - { - "name" : "GovConvertReserves", "type" : "event", "anonymous" : false, + "inputs" : [] + }, + { "inputs" : [ { - "name" : "underlying", "type" : "address", - "indexed" : true, - "internalType" : "address" + "internalType" : "address", + "name" : "underlying", + "indexed" : true }, { - "indexed" : true, "internalType" : "address", "type" : "address", - "name" : "recipient" + "name" : "recipient", + "indexed" : true }, { "type" : "uint256", + "internalType" : "uint256", "name" : "amount", - "indexed" : false, - "internalType" : "uint256" + "indexed" : false } - ] + ], + "anonymous" : false, + "type" : "event", + "name" : "GovConvertReserves" }, { "type" : "event", "name" : "GovSetAssetConfig", + "anonymous" : false, "inputs" : [ { - "name" : "underlying", "type" : "address", - "indexed" : true, - "internalType" : "address" + "name" : "underlying", + "internalType" : "address", + "indexed" : true }, { "type" : "tuple", + "name" : "newConfig", "components" : [ { - "name" : "eTokenAddress", "type" : "address", + "name" : "eTokenAddress", "internalType" : "address" }, { - "internalType" : "bool", "name" : "borrowIsolated", - "type" : "bool" + "type" : "bool", + "internalType" : "bool" }, { + "internalType" : "uint32", "type" : "uint32", - "name" : "collateralFactor", - "internalType" : "uint32" + "name" : "collateralFactor" }, { - "internalType" : "uint32", "type" : "uint32", + "internalType" : "uint32", "name" : "borrowFactor" }, { "type" : "uint24", - "name" : "twapWindow", - "internalType" : "uint24" + "internalType" : "uint24", + "name" : "twapWindow" } ], - "name" : "newConfig", - "indexed" : false, - "internalType" : "struct Storage.AssetConfig" + "internalType" : "struct Storage.AssetConfig", + "indexed" : false } - ], - "anonymous" : false + ] }, { "inputs" : [ { - "internalType" : "address", - "indexed" : true, "name" : "underlying", - "type" : "address" + "type" : "address", + "indexed" : true, + "internalType" : "address" }, { "type" : "address", @@ -295,43 +295,44 @@ "name" : "GovSetChainlinkPriceFeed" }, { - "anonymous" : false, "inputs" : [ { - "indexed" : true, - "internalType" : "address", + "type" : "address", "name" : "underlying", - "type" : "address" + "indexed" : true, + "internalType" : "address" }, { - "indexed" : false, - "internalType" : "uint256", "type" : "uint256", - "name" : "interestRateModel" + "indexed" : false, + "name" : "interestRateModel", + "internalType" : "uint256" }, { "type" : "bytes", + "indexed" : false, "name" : "resetParams", - "internalType" : "bytes", - "indexed" : false + "internalType" : "bytes" } ], + "type" : "event", "name" : "GovSetIRM", - "type" : "event" + "anonymous" : false }, { "type" : "event", "name" : "GovSetPricingConfig", + "anonymous" : false, "inputs" : [ { - "indexed" : true, - "internalType" : "address", + "type" : "address", "name" : "underlying", - "type" : "address" + "indexed" : true, + "internalType" : "address" }, { - "name" : "newPricingType", "type" : "uint16", + "name" : "newPricingType", "internalType" : "uint16", "indexed" : false }, @@ -341,70 +342,66 @@ "internalType" : "uint32", "indexed" : false } - ], - "anonymous" : false + ] }, { + "type" : "event", + "name" : "GovSetReserveFee", + "anonymous" : false, "inputs" : [ { + "type" : "address", "internalType" : "address", - "indexed" : true, "name" : "underlying", - "type" : "address" + "indexed" : true }, { - "internalType" : "uint32", - "indexed" : false, "name" : "newReserveFee", - "type" : "uint32" + "type" : "uint32", + "indexed" : false, + "internalType" : "uint32" } - ], - "anonymous" : false, - "type" : "event", - "name" : "GovSetReserveFee" + ] }, { - "name" : "InstallerInstallModule", - "type" : "event", - "anonymous" : false, "inputs" : [ { - "indexed" : true, - "internalType" : "uint256", "type" : "uint256", - "name" : "moduleId" + "indexed" : true, + "name" : "moduleId", + "internalType" : "uint256" }, { - "internalType" : "address", - "indexed" : true, + "name" : "moduleImpl", "type" : "address", - "name" : "moduleImpl" + "indexed" : true, + "internalType" : "address" }, { - "internalType" : "bytes32", - "indexed" : false, "type" : "bytes32", - "name" : "moduleGitCommit" + "name" : "moduleGitCommit", + "indexed" : false, + "internalType" : "bytes32" } - ] + ], + "type" : "event", + "name" : "InstallerInstallModule", + "anonymous" : false }, { + "anonymous" : false, "type" : "event", "name" : "InstallerSetGovernorAdmin", "inputs" : [ { - "internalType" : "address", - "indexed" : true, + "name" : "newGovernorAdmin", "type" : "address", - "name" : "newGovernorAdmin" + "internalType" : "address", + "indexed" : true } - ], - "anonymous" : false + ] }, { - "name" : "InstallerSetUpgradeAdmin", - "type" : "event", - "anonymous" : false, "inputs" : [ { "name" : "newUpgradeAdmin", @@ -412,209 +409,211 @@ "indexed" : true, "internalType" : "address" } - ] + ], + "name" : "InstallerSetUpgradeAdmin", + "type" : "event", + "anonymous" : false }, { - "name" : "Liquidation", "type" : "event", + "name" : "Liquidation", "anonymous" : false, "inputs" : [ { - "name" : "liquidator", "type" : "address", + "name" : "liquidator", "indexed" : true, "internalType" : "address" }, { "name" : "violator", "type" : "address", - "indexed" : true, - "internalType" : "address" + "internalType" : "address", + "indexed" : true }, { "type" : "address", - "name" : "underlying", "internalType" : "address", + "name" : "underlying", "indexed" : true }, { "name" : "collateral", "type" : "address", - "indexed" : false, - "internalType" : "address" + "internalType" : "address", + "indexed" : false }, { - "indexed" : false, - "internalType" : "uint256", "type" : "uint256", - "name" : "repay" + "indexed" : false, + "name" : "repay", + "internalType" : "uint256" }, { - "indexed" : false, "internalType" : "uint256", "type" : "uint256", - "name" : "yield" + "name" : "yield", + "indexed" : false }, { + "internalType" : "uint256", "type" : "uint256", "name" : "healthScore", - "indexed" : false, - "internalType" : "uint256" + "indexed" : false }, { - "name" : "baseDiscount", "type" : "uint256", - "indexed" : false, - "internalType" : "uint256" + "name" : "baseDiscount", + "internalType" : "uint256", + "indexed" : false }, { - "name" : "discount", "type" : "uint256", - "internalType" : "uint256", - "indexed" : false + "name" : "discount", + "indexed" : false, + "internalType" : "uint256" } ] }, { - "type" : "event", - "name" : "MarketActivated", "inputs" : [ { - "name" : "underlying", "type" : "address", + "name" : "underlying", "internalType" : "address", "indexed" : true }, { - "internalType" : "address", - "indexed" : true, + "type" : "address", "name" : "eToken", - "type" : "address" + "indexed" : true, + "internalType" : "address" }, { "type" : "address", + "internalType" : "address", "name" : "dToken", - "indexed" : true, - "internalType" : "address" + "indexed" : true } ], - "anonymous" : false + "type" : "event", + "anonymous" : false, + "name" : "MarketActivated" }, { "type" : "event", + "anonymous" : false, "name" : "PTokenActivated", "inputs" : [ { - "indexed" : true, - "internalType" : "address", + "type" : "address", "name" : "underlying", - "type" : "address" + "indexed" : true, + "internalType" : "address" }, { - "name" : "pToken", "type" : "address", "indexed" : true, + "name" : "pToken", "internalType" : "address" } - ], - "anonymous" : false + ] }, { "anonymous" : false, + "type" : "event", + "name" : "PTokenUnWrap", "inputs" : [ { - "internalType" : "address", + "type" : "address", "indexed" : true, "name" : "underlying", - "type" : "address" + "internalType" : "address" }, { - "name" : "account", "type" : "address", + "name" : "account", "internalType" : "address", "indexed" : true }, { - "type" : "uint256", "name" : "amount", - "indexed" : false, - "internalType" : "uint256" + "type" : "uint256", + "internalType" : "uint256", + "indexed" : false } - ], - "name" : "PTokenUnWrap", - "type" : "event" + ] }, { - "anonymous" : false, "inputs" : [ { - "indexed" : true, - "internalType" : "address", + "name" : "underlying", "type" : "address", - "name" : "underlying" + "indexed" : true, + "internalType" : "address" }, { - "name" : "account", + "internalType" : "address", "type" : "address", - "indexed" : true, - "internalType" : "address" + "name" : "account", + "indexed" : true }, { "type" : "uint256", "name" : "amount", - "indexed" : false, - "internalType" : "uint256" + "internalType" : "uint256", + "indexed" : false } ], "name" : "PTokenWrap", - "type" : "event" + "type" : "event", + "anonymous" : false }, { - "type" : "event", - "name" : "ProxyCreated", "inputs" : [ { "type" : "address", + "internalType" : "address", "name" : "proxy", - "indexed" : true, - "internalType" : "address" + "indexed" : true }, { - "indexed" : false, - "internalType" : "uint256", + "name" : "moduleId", "type" : "uint256", - "name" : "moduleId" + "internalType" : "uint256", + "indexed" : false } ], - "anonymous" : false + "anonymous" : false, + "type" : "event", + "name" : "ProxyCreated" }, { "inputs" : [ { - "internalType" : "address", - "indexed" : true, "name" : "underlying", - "type" : "address" + "type" : "address", + "internalType" : "address", + "indexed" : true }, { - "internalType" : "address", - "indexed" : true, + "name" : "account", "type" : "address", - "name" : "account" + "indexed" : true, + "internalType" : "address" }, { - "internalType" : "uint256", - "indexed" : false, "type" : "uint256", - "name" : "amount" + "name" : "amount", + "indexed" : false, + "internalType" : "uint256" } ], - "anonymous" : false, + "name" : "Repay", "type" : "event", - "name" : "Repay" + "anonymous" : false }, { - "anonymous" : false, "inputs" : [ { "type" : "address", @@ -623,104 +622,107 @@ "indexed" : true }, { - "internalType" : "uint256", - "indexed" : false, "type" : "uint256", - "name" : "amount" + "name" : "amount", + "internalType" : "uint256", + "indexed" : false } ], "name" : "RequestBorrow", - "type" : "event" + "type" : "event", + "anonymous" : false }, { - "name" : "RequestBurn", - "type" : "event", - "anonymous" : false, "inputs" : [ { - "internalType" : "address", - "indexed" : true, "type" : "address", - "name" : "account" + "name" : "account", + "internalType" : "address", + "indexed" : true }, { "name" : "amount", "type" : "uint256", - "internalType" : "uint256", - "indexed" : false + "indexed" : false, + "internalType" : "uint256" } - ] + ], + "name" : "RequestBurn", + "type" : "event", + "anonymous" : false }, { - "anonymous" : false, "inputs" : [ { "name" : "account", "type" : "address", - "indexed" : true, - "internalType" : "address" + "internalType" : "address", + "indexed" : true }, { - "type" : "uint256", "name" : "amount", + "type" : "uint256", "indexed" : false, "internalType" : "uint256" } ], "name" : "RequestDeposit", - "type" : "event" + "type" : "event", + "anonymous" : false }, { + "name" : "RequestDonate", + "type" : "event", + "anonymous" : false, "inputs" : [ { - "indexed" : true, - "internalType" : "address", + "type" : "address", "name" : "account", - "type" : "address" + "indexed" : true, + "internalType" : "address" }, { - "indexed" : false, - "internalType" : "uint256", "type" : "uint256", - "name" : "amount" + "name" : "amount", + "internalType" : "uint256", + "indexed" : false } - ], - "anonymous" : false, - "type" : "event", - "name" : "RequestDonate" + ] }, { "anonymous" : false, + "type" : "event", + "name" : "RequestLiquidate", "inputs" : [ { "indexed" : true, - "internalType" : "address", "type" : "address", - "name" : "liquidator" + "name" : "liquidator", + "internalType" : "address" }, { - "indexed" : true, - "internalType" : "address", "type" : "address", - "name" : "violator" + "internalType" : "address", + "name" : "violator", + "indexed" : true }, { - "internalType" : "address", - "indexed" : true, "type" : "address", - "name" : "underlying" + "indexed" : true, + "name" : "underlying", + "internalType" : "address" }, { - "indexed" : false, - "internalType" : "address", + "type" : "address", "name" : "collateral", - "type" : "address" + "internalType" : "address", + "indexed" : false }, { - "internalType" : "uint256", - "indexed" : false, + "name" : "repay", "type" : "uint256", - "name" : "repay" + "indexed" : false, + "internalType" : "uint256" }, { "type" : "uint256", @@ -728,192 +730,288 @@ "internalType" : "uint256", "indexed" : false } - ], - "name" : "RequestLiquidate", - "type" : "event" + ] }, { - "type" : "event", - "name" : "RequestMint", "inputs" : [ { - "name" : "account", "type" : "address", + "name" : "account", "indexed" : true, "internalType" : "address" }, { "type" : "uint256", + "indexed" : false, "name" : "amount", - "internalType" : "uint256", - "indexed" : false + "internalType" : "uint256" } ], - "anonymous" : false + "anonymous" : false, + "type" : "event", + "name" : "RequestMint" }, { - "anonymous" : false, "inputs" : [ { - "internalType" : "address", - "indexed" : true, + "type" : "address", "name" : "account", - "type" : "address" + "internalType" : "address", + "indexed" : true }, { - "internalType" : "uint256", - "indexed" : false, + "type" : "uint256", "name" : "amount", - "type" : "uint256" + "indexed" : false, + "internalType" : "uint256" } ], + "type" : "event", "name" : "RequestRepay", - "type" : "event" + "anonymous" : false }, { + "name" : "RequestSwap", + "type" : "event", "anonymous" : false, "inputs" : [ { - "internalType" : "address", - "indexed" : true, + "type" : "address", "name" : "accountIn", - "type" : "address" + "internalType" : "address", + "indexed" : true }, { + "type" : "address", + "name" : "accountOut", "indexed" : true, + "internalType" : "address" + }, + { + "type" : "address", "internalType" : "address", + "name" : "underlyingIn", + "indexed" : true + }, + { + "name" : "underlyingOut", + "type" : "address", + "indexed" : false, + "internalType" : "address" + }, + { + "name" : "amount", + "type" : "uint256", + "internalType" : "uint256", + "indexed" : false + }, + { + "name" : "swapType", + "type" : "uint256", + "indexed" : false, + "internalType" : "uint256" + } + ] + }, + { + "type" : "event", + "name" : "RequestSwapHub", + "anonymous" : false, + "inputs" : [ + { + "type" : "address", + "name" : "accountIn", + "indexed" : true, + "internalType" : "address" + }, + { + "type" : "address", "name" : "accountOut", - "type" : "address" + "internalType" : "address", + "indexed" : true }, { + "internalType" : "address", + "type" : "address", "name" : "underlyingIn", + "indexed" : true + }, + { + "type" : "address", + "indexed" : false, + "name" : "underlyingOut", + "internalType" : "address" + }, + { + "name" : "amountIn", + "type" : "uint256", + "indexed" : false, + "internalType" : "uint256" + }, + { + "type" : "uint256", + "name" : "amountOut", + "indexed" : false, + "internalType" : "uint256" + }, + { + "name" : "mode", + "type" : "uint256", + "internalType" : "uint256", + "indexed" : false + }, + { + "type" : "address", + "internalType" : "address", + "name" : "swapHandler", + "indexed" : false + } + ] + }, + { + "inputs" : [ + { + "indexed" : true, + "type" : "address", + "name" : "accountIn", + "internalType" : "address" + }, + { + "name" : "accountOut", "type" : "address", "internalType" : "address", "indexed" : true }, { - "indexed" : false, - "internalType" : "address", + "name" : "underlyingIn", + "type" : "address", + "indexed" : true, + "internalType" : "address" + }, + { + "type" : "address", "name" : "underlyingOut", - "type" : "address" + "indexed" : false, + "internalType" : "address" }, { - "internalType" : "uint256", - "indexed" : false, "type" : "uint256", - "name" : "amount" + "internalType" : "uint256", + "name" : "targetDebt", + "indexed" : false }, { - "name" : "swapType", - "type" : "uint256", - "indexed" : false, - "internalType" : "uint256" + "type" : "address", + "name" : "swapHandler", + "internalType" : "address", + "indexed" : false } ], - "name" : "RequestSwap", - "type" : "event" + "type" : "event", + "name" : "RequestSwapHubRepay", + "anonymous" : false }, { - "name" : "RequestTransferDToken", - "type" : "event", - "anonymous" : false, "inputs" : [ { "type" : "address", + "internalType" : "address", "name" : "from", - "indexed" : true, - "internalType" : "address" + "indexed" : true }, { - "internalType" : "address", - "indexed" : true, "name" : "to", - "type" : "address" + "type" : "address", + "internalType" : "address", + "indexed" : true }, { "type" : "uint256", + "internalType" : "uint256", "name" : "amount", - "indexed" : false, - "internalType" : "uint256" + "indexed" : false } - ] + ], + "type" : "event", + "anonymous" : false, + "name" : "RequestTransferDToken" }, { + "type" : "event", + "name" : "RequestTransferEToken", "anonymous" : false, "inputs" : [ { + "internalType" : "address", "type" : "address", "name" : "from", - "internalType" : "address", "indexed" : true }, { "type" : "address", + "internalType" : "address", "name" : "to", - "indexed" : true, - "internalType" : "address" + "indexed" : true }, { + "type" : "uint256", "indexed" : false, - "internalType" : "uint256", "name" : "amount", - "type" : "uint256" + "internalType" : "uint256" } - ], - "name" : "RequestTransferEToken", - "type" : "event" + ] }, { - "name" : "RequestWithdraw", - "type" : "event", - "anonymous" : false, "inputs" : [ { - "indexed" : true, - "internalType" : "address", "type" : "address", - "name" : "account" + "name" : "account", + "internalType" : "address", + "indexed" : true }, { - "internalType" : "uint256", "indexed" : false, "type" : "uint256", - "name" : "amount" + "name" : "amount", + "internalType" : "uint256" } - ] + ], + "type" : "event", + "anonymous" : false, + "name" : "RequestWithdraw" }, { - "anonymous" : false, "inputs" : [ { - "indexed" : true, - "internalType" : "address", "name" : "account", - "type" : "address" + "type" : "address", + "indexed" : true, + "internalType" : "address" } ], - "name" : "TrackAverageLiquidity", - "type" : "event" + "type" : "event", + "anonymous" : false, + "name" : "TrackAverageLiquidity" }, { "inputs" : [ { - "internalType" : "address", - "indexed" : true, + "type" : "address", "name" : "from", - "type" : "address" + "internalType" : "address", + "indexed" : true }, { - "internalType" : "address", - "indexed" : true, "name" : "to", - "type" : "address" + "type" : "address", + "indexed" : true, + "internalType" : "address" }, { - "name" : "value", "type" : "uint256", - "indexed" : false, - "internalType" : "uint256" + "name" : "value", + "internalType" : "uint256", + "indexed" : false } ], "anonymous" : false, @@ -921,31 +1019,31 @@ "name" : "Transfer" }, { + "anonymous" : false, "type" : "event", "name" : "UnTrackAverageLiquidity", "inputs" : [ { "type" : "address", "name" : "account", - "internalType" : "address", - "indexed" : true + "indexed" : true, + "internalType" : "address" } - ], - "anonymous" : false + ] }, { "inputs" : [ { - "name" : "underlying", - "type" : "address", "internalType" : "address", + "type" : "address", + "name" : "underlying", "indexed" : true }, { - "indexed" : true, - "internalType" : "address", + "type" : "address", "name" : "account", - "type" : "address" + "internalType" : "address", + "indexed" : true }, { "type" : "uint256", @@ -954,98 +1052,96 @@ "internalType" : "uint256" } ], - "anonymous" : false, "type" : "event", - "name" : "Withdraw" + "name" : "Withdraw", + "anonymous" : false }, { - "stateMutability" : "nonpayable", "outputs" : [ { - "internalType" : "bool", "name" : "", - "type" : "bool" + "type" : "bool", + "internalType" : "bool" } ], "inputs" : [ { - "name" : "subAccountId", "type" : "uint256", + "name" : "subAccountId", "internalType" : "uint256" }, { - "type" : "address", "name" : "spender", + "type" : "address", "internalType" : "address" }, { - "internalType" : "uint256", + "type" : "uint256", "name" : "amount", - "type" : "uint256" + "internalType" : "uint256" } ], + "type" : "function", "name" : "approveDebt", - "type" : "function" + "stateMutability" : "nonpayable" }, { "stateMutability" : "view", - "outputs" : [ - { - "internalType" : "uint256", - "name" : "", - "type" : "uint256" - } - ], + "type" : "function", + "name" : "balanceOf", "inputs" : [ { + "type" : "address", "internalType" : "address", - "name" : "account", - "type" : "address" + "name" : "account" } ], - "name" : "balanceOf", - "type" : "function" + "outputs" : [ + { + "name" : "", + "type" : "uint256", + "internalType" : "uint256" + } + ] }, { - "name" : "balanceOfExact", "type" : "function", "stateMutability" : "view", + "name" : "balanceOfExact", "outputs" : [ { + "type" : "uint256", "internalType" : "uint256", - "name" : "", - "type" : "uint256" + "name" : "" } ], "inputs" : [ { - "internalType" : "address", "name" : "account", - "type" : "address" + "type" : "address", + "internalType" : "address" } ] }, { - "name" : "borrow", "type" : "function", + "name" : "borrow", "stateMutability" : "nonpayable", - "outputs" : [], "inputs" : [ { - "internalType" : "uint256", "type" : "uint256", - "name" : "subAccountId" + "name" : "subAccountId", + "internalType" : "uint256" }, { + "internalType" : "uint256", "type" : "uint256", - "name" : "amount", - "internalType" : "uint256" + "name" : "amount" } - ] + ], + "outputs" : [] }, { - "name" : "debtAllowance", - "type" : "function", "outputs" : [ { "type" : "uint256", @@ -1053,31 +1149,33 @@ "internalType" : "uint256" } ], - "stateMutability" : "view", "inputs" : [ { + "type" : "address", "internalType" : "address", - "name" : "holder", - "type" : "address" + "name" : "holder" }, { + "internalType" : "address", "type" : "address", - "name" : "spender", - "internalType" : "address" + "name" : "spender" } - ] + ], + "stateMutability" : "view", + "type" : "function", + "name" : "debtAllowance" }, { - "name" : "decimals", "type" : "function", + "stateMutability" : "view", + "name" : "decimals", "outputs" : [ { - "internalType" : "uint8", "name" : "", - "type" : "uint8" + "type" : "uint8", + "internalType" : "uint8" } ], - "stateMutability" : "view", "inputs" : [] }, { @@ -1088,58 +1186,57 @@ "inputs" : [ { "internalType" : "uint256", - "name" : "amount", - "type" : "uint256" + "type" : "uint256", + "name" : "amount" }, { - "name" : "data", "type" : "bytes", - "internalType" : "bytes" + "internalType" : "bytes", + "name" : "data" } ] }, { - "type" : "function", - "name" : "moduleGitCommit", "inputs" : [], - "stateMutability" : "view", "outputs" : [ { "name" : "", "type" : "bytes32", "internalType" : "bytes32" } - ] + ], + "type" : "function", + "stateMutability" : "view", + "name" : "moduleGitCommit" }, { + "type" : "function", + "stateMutability" : "view", + "name" : "moduleId", "outputs" : [ { - "internalType" : "uint256", "name" : "", - "type" : "uint256" + "type" : "uint256", + "internalType" : "uint256" } ], - "stateMutability" : "view", - "inputs" : [], - "name" : "moduleId", - "type" : "function" + "inputs" : [] }, { "outputs" : [ { - "internalType" : "string", + "type" : "string", "name" : "", - "type" : "string" + "internalType" : "string" } ], - "stateMutability" : "view", "inputs" : [], - "name" : "name", - "type" : "function" + "stateMutability" : "view", + "type" : "function", + "name" : "name" }, { - "type" : "function", - "name" : "repay", + "outputs" : [], "inputs" : [ { "type" : "uint256", @@ -1147,26 +1244,27 @@ "internalType" : "uint256" }, { - "internalType" : "uint256", + "name" : "amount", "type" : "uint256", - "name" : "amount" + "internalType" : "uint256" } ], - "outputs" : [], + "type" : "function", + "name" : "repay", "stateMutability" : "nonpayable" }, { - "inputs" : [], "outputs" : [ { "type" : "string", - "name" : "", - "internalType" : "string" + "internalType" : "string", + "name" : "" } ], - "stateMutability" : "view", + "inputs" : [], + "name" : "symbol", "type" : "function", - "name" : "symbol" + "stateMutability" : "view" }, { "name" : "totalSupply", @@ -1174,29 +1272,27 @@ "stateMutability" : "view", "outputs" : [ { - "type" : "uint256", "name" : "", + "type" : "uint256", "internalType" : "uint256" } ], "inputs" : [] }, { - "name" : "totalSupplyExact", "type" : "function", + "stateMutability" : "view", + "name" : "totalSupplyExact", "outputs" : [ { - "name" : "", "type" : "uint256", + "name" : "", "internalType" : "uint256" } ], - "stateMutability" : "view", "inputs" : [] }, { - "type" : "function", - "name" : "transfer", "inputs" : [ { "name" : "to", @@ -1205,33 +1301,34 @@ }, { "internalType" : "uint256", - "name" : "amount", - "type" : "uint256" + "type" : "uint256", + "name" : "amount" } ], "outputs" : [ { + "type" : "bool", "internalType" : "bool", - "name" : "", - "type" : "bool" + "name" : "" } ], - "stateMutability" : "nonpayable" + "stateMutability" : "nonpayable", + "type" : "function", + "name" : "transfer" }, { "outputs" : [ { - "internalType" : "bool", + "name" : "", "type" : "bool", - "name" : "" + "internalType" : "bool" } ], - "stateMutability" : "nonpayable", "inputs" : [ { "type" : "address", - "name" : "from", - "internalType" : "address" + "internalType" : "address", + "name" : "from" }, { "type" : "address", @@ -1239,19 +1336,20 @@ "internalType" : "address" }, { - "internalType" : "uint256", + "name" : "amount", "type" : "uint256", - "name" : "amount" + "internalType" : "uint256" } ], - "name" : "transferFrom", - "type" : "function" + "type" : "function", + "stateMutability" : "nonpayable", + "name" : "transferFrom" }, { "type" : "function", + "stateMutability" : "view", "name" : "underlyingAsset", "inputs" : [], - "stateMutability" : "view", "outputs" : [ { "internalType" : "address", diff --git a/abis/modules/EToken.json b/abis/modules/EToken.json index c7d40b1..f2d21f8 100644 --- a/abis/modules/EToken.json +++ b/abis/modules/EToken.json @@ -1,31 +1,29 @@ { "abi" : [ { + "type" : "constructor", + "stateMutability" : "nonpayable", "inputs" : [ { - "name" : "moduleGitCommit_", + "internalType" : "bytes32", "type" : "bytes32", - "internalType" : "bytes32" + "name" : "moduleGitCommit_" } - ], - "stateMutability" : "nonpayable", - "type" : "constructor" + ] }, { - "type" : "event", - "name" : "Approval", "inputs" : [ { - "internalType" : "address", "indexed" : true, "type" : "address", - "name" : "owner" + "name" : "owner", + "internalType" : "address" }, { - "internalType" : "address", - "indexed" : true, "type" : "address", - "name" : "spender" + "name" : "spender", + "internalType" : "address", + "indexed" : true }, { "name" : "value", @@ -34,23 +32,23 @@ "internalType" : "uint256" } ], - "anonymous" : false + "anonymous" : false, + "type" : "event", + "name" : "Approval" }, { - "type" : "event", - "name" : "AssetStatus", "inputs" : [ { - "internalType" : "address", + "type" : "address", "indexed" : true, "name" : "underlying", - "type" : "address" + "internalType" : "address" }, { - "indexed" : false, - "internalType" : "uint256", "type" : "uint256", - "name" : "totalBalances" + "name" : "totalBalances", + "indexed" : false, + "internalType" : "uint256" }, { "type" : "uint256", @@ -59,235 +57,237 @@ "internalType" : "uint256" }, { + "type" : "uint96", "indexed" : false, - "internalType" : "uint96", "name" : "reserveBalance", - "type" : "uint96" + "internalType" : "uint96" }, { - "type" : "uint256", "name" : "poolSize", - "indexed" : false, - "internalType" : "uint256" + "type" : "uint256", + "internalType" : "uint256", + "indexed" : false }, { - "indexed" : false, - "internalType" : "uint256", "name" : "interestAccumulator", - "type" : "uint256" + "type" : "uint256", + "indexed" : false, + "internalType" : "uint256" }, { - "internalType" : "int96", - "indexed" : false, "type" : "int96", - "name" : "interestRate" + "name" : "interestRate", + "indexed" : false, + "internalType" : "int96" }, { - "name" : "timestamp", "type" : "uint256", "indexed" : false, + "name" : "timestamp", "internalType" : "uint256" } ], + "name" : "AssetStatus", + "type" : "event", "anonymous" : false }, { "anonymous" : false, + "type" : "event", + "name" : "Borrow", "inputs" : [ { + "internalType" : "address", "type" : "address", "name" : "underlying", - "indexed" : true, - "internalType" : "address" + "indexed" : true }, { - "type" : "address", "name" : "account", - "indexed" : true, - "internalType" : "address" + "type" : "address", + "internalType" : "address", + "indexed" : true }, { - "name" : "amount", "type" : "uint256", - "internalType" : "uint256", - "indexed" : false + "name" : "amount", + "indexed" : false, + "internalType" : "uint256" } - ], - "name" : "Borrow", - "type" : "event" + ] }, { - "type" : "event", - "name" : "DelegateAverageLiquidity", "inputs" : [ { + "internalType" : "address", "type" : "address", "name" : "account", - "indexed" : true, - "internalType" : "address" + "indexed" : true }, { "indexed" : true, - "internalType" : "address", + "type" : "address", "name" : "delegate", - "type" : "address" + "internalType" : "address" } ], - "anonymous" : false + "anonymous" : false, + "type" : "event", + "name" : "DelegateAverageLiquidity" }, { - "anonymous" : false, "inputs" : [ { "indexed" : true, - "internalType" : "address", + "type" : "address", "name" : "underlying", - "type" : "address" + "internalType" : "address" }, { "indexed" : true, - "internalType" : "address", + "type" : "address", "name" : "account", - "type" : "address" + "internalType" : "address" }, { - "indexed" : false, - "internalType" : "uint256", "name" : "amount", - "type" : "uint256" + "type" : "uint256", + "indexed" : false, + "internalType" : "uint256" } ], - "name" : "Deposit", - "type" : "event" + "anonymous" : false, + "type" : "event", + "name" : "Deposit" }, { + "anonymous" : false, "type" : "event", "name" : "EnterMarket", "inputs" : [ { - "indexed" : true, - "internalType" : "address", "type" : "address", - "name" : "underlying" + "name" : "underlying", + "internalType" : "address", + "indexed" : true }, { - "type" : "address", "name" : "account", + "type" : "address", "indexed" : true, "internalType" : "address" } - ], - "anonymous" : false + ] }, { "type" : "event", + "anonymous" : false, "name" : "ExitMarket", "inputs" : [ { - "name" : "underlying", "type" : "address", "indexed" : true, + "name" : "underlying", "internalType" : "address" }, { - "internalType" : "address", - "indexed" : true, "type" : "address", - "name" : "account" + "name" : "account", + "indexed" : true, + "internalType" : "address" } - ], - "anonymous" : false + ] }, { - "anonymous" : false, - "inputs" : [], "name" : "Genesis", - "type" : "event" + "type" : "event", + "anonymous" : false, + "inputs" : [] }, { - "type" : "event", - "name" : "GovConvertReserves", "inputs" : [ { - "name" : "underlying", "type" : "address", - "internalType" : "address", - "indexed" : true + "name" : "underlying", + "indexed" : true, + "internalType" : "address" }, { + "internalType" : "address", "type" : "address", "name" : "recipient", - "internalType" : "address", "indexed" : true }, { - "name" : "amount", + "internalType" : "uint256", "type" : "uint256", - "indexed" : false, - "internalType" : "uint256" + "name" : "amount", + "indexed" : false } ], + "type" : "event", + "name" : "GovConvertReserves", "anonymous" : false }, { + "anonymous" : false, + "type" : "event", + "name" : "GovSetAssetConfig", "inputs" : [ { "type" : "address", - "name" : "underlying", "indexed" : true, + "name" : "underlying", "internalType" : "address" }, { - "name" : "newConfig", "type" : "tuple", + "indexed" : false, + "name" : "newConfig", + "internalType" : "struct Storage.AssetConfig", "components" : [ { - "type" : "address", "name" : "eTokenAddress", + "type" : "address", "internalType" : "address" }, { - "type" : "bool", "name" : "borrowIsolated", + "type" : "bool", "internalType" : "bool" }, { - "internalType" : "uint32", "type" : "uint32", + "internalType" : "uint32", "name" : "collateralFactor" }, { - "type" : "uint32", "name" : "borrowFactor", + "type" : "uint32", "internalType" : "uint32" }, { "type" : "uint24", - "name" : "twapWindow", - "internalType" : "uint24" + "internalType" : "uint24", + "name" : "twapWindow" } - ], - "indexed" : false, - "internalType" : "struct Storage.AssetConfig" + ] } - ], - "anonymous" : false, - "type" : "event", - "name" : "GovSetAssetConfig" + ] }, { "inputs" : [ { + "indexed" : true, "type" : "address", "name" : "underlying", - "internalType" : "address", - "indexed" : true + "internalType" : "address" }, { - "name" : "chainlinkAggregator", + "indexed" : false, "type" : "address", - "internalType" : "address", - "indexed" : false + "name" : "chainlinkAggregator", + "internalType" : "address" } ], "anonymous" : false, @@ -295,13 +295,12 @@ "name" : "GovSetChainlinkPriceFeed" }, { - "anonymous" : false, "inputs" : [ { - "name" : "underlying", + "indexed" : true, "type" : "address", - "internalType" : "address", - "indexed" : true + "name" : "underlying", + "internalType" : "address" }, { "name" : "interestRateModel", @@ -311,218 +310,219 @@ }, { "type" : "bytes", + "indexed" : false, "name" : "resetParams", - "internalType" : "bytes", - "indexed" : false + "internalType" : "bytes" } ], + "type" : "event", "name" : "GovSetIRM", - "type" : "event" + "anonymous" : false }, { - "anonymous" : false, "inputs" : [ { - "type" : "address", "name" : "underlying", - "internalType" : "address", - "indexed" : true + "type" : "address", + "indexed" : true, + "internalType" : "address" }, { - "name" : "newPricingType", - "type" : "uint16", "indexed" : false, + "type" : "uint16", + "name" : "newPricingType", "internalType" : "uint16" }, { - "internalType" : "uint32", - "indexed" : false, "name" : "newPricingParameter", - "type" : "uint32" + "type" : "uint32", + "indexed" : false, + "internalType" : "uint32" } ], + "type" : "event", "name" : "GovSetPricingConfig", - "type" : "event" + "anonymous" : false }, { + "type" : "event", + "name" : "GovSetReserveFee", + "anonymous" : false, "inputs" : [ { - "internalType" : "address", - "indexed" : true, + "type" : "address", "name" : "underlying", - "type" : "address" + "indexed" : true, + "internalType" : "address" }, { "type" : "uint32", - "name" : "newReserveFee", "indexed" : false, + "name" : "newReserveFee", "internalType" : "uint32" } - ], - "anonymous" : false, - "type" : "event", - "name" : "GovSetReserveFee" + ] }, { "type" : "event", "name" : "InstallerInstallModule", + "anonymous" : false, "inputs" : [ { - "internalType" : "uint256", - "indexed" : true, "type" : "uint256", - "name" : "moduleId" + "indexed" : true, + "name" : "moduleId", + "internalType" : "uint256" }, { "type" : "address", + "indexed" : true, "name" : "moduleImpl", - "internalType" : "address", - "indexed" : true + "internalType" : "address" }, { + "internalType" : "bytes32", "type" : "bytes32", "name" : "moduleGitCommit", - "internalType" : "bytes32", "indexed" : false } - ], - "anonymous" : false + ] }, { - "type" : "event", - "name" : "InstallerSetGovernorAdmin", "inputs" : [ { - "type" : "address", "name" : "newGovernorAdmin", - "internalType" : "address", - "indexed" : true + "type" : "address", + "indexed" : true, + "internalType" : "address" } ], - "anonymous" : false + "type" : "event", + "anonymous" : false, + "name" : "InstallerSetGovernorAdmin" }, { - "anonymous" : false, "inputs" : [ { - "name" : "newUpgradeAdmin", - "type" : "address", "internalType" : "address", + "type" : "address", + "name" : "newUpgradeAdmin", "indexed" : true } ], + "type" : "event", "name" : "InstallerSetUpgradeAdmin", - "type" : "event" + "anonymous" : false }, { - "name" : "Liquidation", - "type" : "event", "anonymous" : false, + "type" : "event", + "name" : "Liquidation", "inputs" : [ { - "name" : "liquidator", "type" : "address", "indexed" : true, + "name" : "liquidator", "internalType" : "address" }, { "indexed" : true, - "internalType" : "address", + "type" : "address", "name" : "violator", - "type" : "address" + "internalType" : "address" }, { - "internalType" : "address", "indexed" : true, + "type" : "address", "name" : "underlying", - "type" : "address" + "internalType" : "address" }, { - "internalType" : "address", "indexed" : false, + "type" : "address", "name" : "collateral", - "type" : "address" + "internalType" : "address" }, { - "name" : "repay", - "type" : "uint256", "indexed" : false, + "type" : "uint256", + "name" : "repay", "internalType" : "uint256" }, { "type" : "uint256", + "indexed" : false, "name" : "yield", - "internalType" : "uint256", - "indexed" : false + "internalType" : "uint256" }, { "indexed" : false, - "internalType" : "uint256", "type" : "uint256", - "name" : "healthScore" + "name" : "healthScore", + "internalType" : "uint256" }, { - "internalType" : "uint256", - "indexed" : false, "type" : "uint256", - "name" : "baseDiscount" + "name" : "baseDiscount", + "internalType" : "uint256", + "indexed" : false }, { - "internalType" : "uint256", - "indexed" : false, "name" : "discount", - "type" : "uint256" + "type" : "uint256", + "indexed" : false, + "internalType" : "uint256" } ] }, { - "name" : "MarketActivated", - "type" : "event", "anonymous" : false, + "type" : "event", + "name" : "MarketActivated", "inputs" : [ { - "name" : "underlying", "type" : "address", "indexed" : true, + "name" : "underlying", "internalType" : "address" }, { - "name" : "eToken", "type" : "address", + "name" : "eToken", "indexed" : true, "internalType" : "address" }, { - "indexed" : true, - "internalType" : "address", "type" : "address", - "name" : "dToken" + "name" : "dToken", + "indexed" : true, + "internalType" : "address" } ] }, { - "type" : "event", - "name" : "PTokenActivated", "inputs" : [ { - "name" : "underlying", "type" : "address", + "name" : "underlying", "internalType" : "address", "indexed" : true }, { - "internalType" : "address", + "type" : "address", "indexed" : true, "name" : "pToken", - "type" : "address" + "internalType" : "address" } ], - "anonymous" : false + "anonymous" : false, + "type" : "event", + "name" : "PTokenActivated" }, { - "name" : "PTokenUnWrap", "type" : "event", "anonymous" : false, + "name" : "PTokenUnWrap", "inputs" : [ { "name" : "underlying", @@ -531,106 +531,106 @@ "indexed" : true }, { - "indexed" : true, - "internalType" : "address", "type" : "address", - "name" : "account" + "name" : "account", + "indexed" : true, + "internalType" : "address" }, { - "type" : "uint256", "name" : "amount", - "internalType" : "uint256", - "indexed" : false + "type" : "uint256", + "indexed" : false, + "internalType" : "uint256" } ] }, { - "type" : "event", - "name" : "PTokenWrap", "inputs" : [ { - "name" : "underlying", + "internalType" : "address", "type" : "address", - "indexed" : true, - "internalType" : "address" + "name" : "underlying", + "indexed" : true }, { "name" : "account", "type" : "address", - "indexed" : true, - "internalType" : "address" + "internalType" : "address", + "indexed" : true }, { - "type" : "uint256", "name" : "amount", + "type" : "uint256", "indexed" : false, "internalType" : "uint256" } ], - "anonymous" : false + "anonymous" : false, + "type" : "event", + "name" : "PTokenWrap" }, { "anonymous" : false, + "type" : "event", + "name" : "ProxyCreated", "inputs" : [ { + "indexed" : true, "type" : "address", "name" : "proxy", - "indexed" : true, "internalType" : "address" }, { - "internalType" : "uint256", "indexed" : false, + "type" : "uint256", "name" : "moduleId", - "type" : "uint256" + "internalType" : "uint256" } - ], - "name" : "ProxyCreated", - "type" : "event" + ] }, { + "name" : "Repay", + "type" : "event", "anonymous" : false, "inputs" : [ { - "internalType" : "address", "indexed" : true, "type" : "address", - "name" : "underlying" + "name" : "underlying", + "internalType" : "address" }, { "internalType" : "address", - "indexed" : true, "type" : "address", - "name" : "account" + "name" : "account", + "indexed" : true }, { "type" : "uint256", "name" : "amount", - "internalType" : "uint256", - "indexed" : false + "indexed" : false, + "internalType" : "uint256" } - ], - "name" : "Repay", - "type" : "event" + ] }, { - "name" : "RequestBorrow", - "type" : "event", - "anonymous" : false, "inputs" : [ { - "indexed" : true, "internalType" : "address", "type" : "address", - "name" : "account" + "name" : "account", + "indexed" : true }, { - "internalType" : "uint256", "indexed" : false, + "type" : "uint256", "name" : "amount", - "type" : "uint256" + "internalType" : "uint256" } - ] + ], + "name" : "RequestBorrow", + "type" : "event", + "anonymous" : false }, { "inputs" : [ @@ -641,26 +641,23 @@ "indexed" : true }, { - "internalType" : "uint256", - "indexed" : false, + "name" : "amount", "type" : "uint256", - "name" : "amount" + "internalType" : "uint256", + "indexed" : false } ], - "anonymous" : false, "type" : "event", + "anonymous" : false, "name" : "RequestBurn" }, { - "name" : "RequestDeposit", - "type" : "event", - "anonymous" : false, "inputs" : [ { - "type" : "address", "name" : "account", - "indexed" : true, - "internalType" : "address" + "type" : "address", + "internalType" : "address", + "indexed" : true }, { "name" : "amount", @@ -668,326 +665,427 @@ "indexed" : false, "internalType" : "uint256" } - ] + ], + "type" : "event", + "anonymous" : false, + "name" : "RequestDeposit" }, { - "type" : "event", "name" : "RequestDonate", + "type" : "event", + "anonymous" : false, "inputs" : [ { "internalType" : "address", - "indexed" : true, + "type" : "address", "name" : "account", - "type" : "address" + "indexed" : true }, { - "internalType" : "uint256", - "indexed" : false, "name" : "amount", - "type" : "uint256" + "type" : "uint256", + "internalType" : "uint256", + "indexed" : false } - ], - "anonymous" : false + ] }, { + "anonymous" : false, "type" : "event", "name" : "RequestLiquidate", "inputs" : [ { - "name" : "liquidator", "type" : "address", + "name" : "liquidator", "indexed" : true, "internalType" : "address" }, { "type" : "address", - "name" : "violator", "indexed" : true, + "name" : "violator", "internalType" : "address" }, { + "internalType" : "address", "type" : "address", "name" : "underlying", - "internalType" : "address", "indexed" : true }, { - "indexed" : false, "internalType" : "address", + "type" : "address", "name" : "collateral", - "type" : "address" + "indexed" : false }, { + "indexed" : false, "type" : "uint256", "name" : "repay", - "indexed" : false, "internalType" : "uint256" }, { + "indexed" : false, "type" : "uint256", "name" : "minYield", - "indexed" : false, "internalType" : "uint256" } - ], - "anonymous" : false + ] }, { - "name" : "RequestMint", - "type" : "event", - "anonymous" : false, "inputs" : [ { + "indexed" : true, "type" : "address", "name" : "account", - "indexed" : true, "internalType" : "address" }, { - "type" : "uint256", "name" : "amount", + "type" : "uint256", "indexed" : false, "internalType" : "uint256" } - ] + ], + "anonymous" : false, + "type" : "event", + "name" : "RequestMint" }, { - "type" : "event", - "name" : "RequestRepay", "inputs" : [ { "type" : "address", "name" : "account", - "indexed" : true, - "internalType" : "address" + "internalType" : "address", + "indexed" : true }, { - "indexed" : false, - "internalType" : "uint256", + "name" : "amount", "type" : "uint256", - "name" : "amount" + "indexed" : false, + "internalType" : "uint256" } ], - "anonymous" : false + "anonymous" : false, + "type" : "event", + "name" : "RequestRepay" }, { + "type" : "event", + "anonymous" : false, + "name" : "RequestSwap", "inputs" : [ { - "name" : "accountIn", "type" : "address", "indexed" : true, + "name" : "accountIn", "internalType" : "address" }, { "type" : "address", "name" : "accountOut", - "internalType" : "address", - "indexed" : true + "indexed" : true, + "internalType" : "address" }, { - "internalType" : "address", - "indexed" : true, + "type" : "address", "name" : "underlyingIn", - "type" : "address" + "indexed" : true, + "internalType" : "address" }, { - "internalType" : "address", - "indexed" : false, "type" : "address", - "name" : "underlyingOut" + "indexed" : false, + "name" : "underlyingOut", + "internalType" : "address" }, { - "internalType" : "uint256", - "indexed" : false, + "name" : "amount", "type" : "uint256", - "name" : "amount" + "internalType" : "uint256", + "indexed" : false }, { - "indexed" : false, - "internalType" : "uint256", "name" : "swapType", - "type" : "uint256" + "type" : "uint256", + "indexed" : false, + "internalType" : "uint256" } - ], - "anonymous" : false, - "type" : "event", - "name" : "RequestSwap" + ] }, { + "anonymous" : false, "type" : "event", - "name" : "RequestTransferDToken", + "name" : "RequestSwapHub", "inputs" : [ { "internalType" : "address", - "indexed" : true, - "name" : "from", - "type" : "address" + "type" : "address", + "name" : "accountIn", + "indexed" : true }, { - "name" : "to", + "name" : "accountOut", "type" : "address", "internalType" : "address", "indexed" : true }, { - "type" : "uint256", - "name" : "amount", - "internalType" : "uint256", - "indexed" : false - } - ], - "anonymous" : false - }, - { - "anonymous" : false, - "inputs" : [ - { - "name" : "from", + "internalType" : "address", "type" : "address", - "indexed" : true, - "internalType" : "address" + "name" : "underlyingIn", + "indexed" : true }, { - "internalType" : "address", - "indexed" : true, + "name" : "underlyingOut", "type" : "address", - "name" : "to" + "internalType" : "address", + "indexed" : false }, { + "type" : "uint256", + "name" : "amountIn", "indexed" : false, - "internalType" : "uint256", + "internalType" : "uint256" + }, + { "type" : "uint256", - "name" : "amount" - } - ], - "name" : "RequestTransferEToken", - "type" : "event" + "indexed" : false, + "name" : "amountOut", + "internalType" : "uint256" + }, + { + "indexed" : false, + "type" : "uint256", + "name" : "mode", + "internalType" : "uint256" + }, + { + "indexed" : false, + "type" : "address", + "name" : "swapHandler", + "internalType" : "address" + } + ] }, { "inputs" : [ { + "indexed" : true, "type" : "address", - "name" : "account", + "name" : "accountIn", + "internalType" : "address" + }, + { + "indexed" : true, + "type" : "address", + "name" : "accountOut", + "internalType" : "address" + }, + { "internalType" : "address", + "type" : "address", + "name" : "underlyingIn", "indexed" : true }, { - "name" : "amount", + "type" : "address", + "name" : "underlyingOut", + "indexed" : false, + "internalType" : "address" + }, + { "type" : "uint256", "internalType" : "uint256", + "name" : "targetDebt", "indexed" : false + }, + { + "indexed" : false, + "type" : "address", + "name" : "swapHandler", + "internalType" : "address" } ], "anonymous" : false, "type" : "event", - "name" : "RequestWithdraw" + "name" : "RequestSwapHubRepay" }, { + "type" : "event", + "name" : "RequestTransferDToken", + "anonymous" : false, "inputs" : [ { - "indexed" : true, + "type" : "address", "internalType" : "address", - "name" : "account", - "type" : "address" + "name" : "from", + "indexed" : true + }, + { + "type" : "address", + "internalType" : "address", + "name" : "to", + "indexed" : true + }, + { + "internalType" : "uint256", + "type" : "uint256", + "name" : "amount", + "indexed" : false } - ], - "anonymous" : false, - "type" : "event", - "name" : "TrackAverageLiquidity" + ] }, { "type" : "event", - "name" : "Transfer", + "anonymous" : false, + "name" : "RequestTransferEToken", "inputs" : [ { - "indexed" : true, "internalType" : "address", "type" : "address", - "name" : "from" + "name" : "from", + "indexed" : true }, { + "internalType" : "address", + "type" : "address", "name" : "to", + "indexed" : true + }, + { + "name" : "amount", + "type" : "uint256", + "internalType" : "uint256", + "indexed" : false + } + ] + }, + { + "inputs" : [ + { "type" : "address", "internalType" : "address", + "name" : "account", "indexed" : true }, { - "internalType" : "uint256", - "indexed" : false, "type" : "uint256", - "name" : "value" + "indexed" : false, + "name" : "amount", + "internalType" : "uint256" } ], + "name" : "RequestWithdraw", + "type" : "event", "anonymous" : false }, { + "anonymous" : false, + "type" : "event", + "name" : "TrackAverageLiquidity", "inputs" : [ { - "name" : "account", "type" : "address", + "name" : "account", + "indexed" : true, + "internalType" : "address" + } + ] + }, + { + "anonymous" : false, + "type" : "event", + "name" : "Transfer", + "inputs" : [ + { "internalType" : "address", + "type" : "address", + "name" : "from", "indexed" : true + }, + { + "indexed" : true, + "type" : "address", + "name" : "to", + "internalType" : "address" + }, + { + "indexed" : false, + "type" : "uint256", + "name" : "value", + "internalType" : "uint256" + } + ] + }, + { + "inputs" : [ + { + "indexed" : true, + "type" : "address", + "name" : "account", + "internalType" : "address" } ], - "anonymous" : false, "type" : "event", + "anonymous" : false, "name" : "UnTrackAverageLiquidity" }, { - "name" : "Withdraw", - "type" : "event", "anonymous" : false, + "type" : "event", + "name" : "Withdraw", "inputs" : [ { - "internalType" : "address", "indexed" : true, + "type" : "address", "name" : "underlying", - "type" : "address" + "internalType" : "address" }, { - "indexed" : true, - "internalType" : "address", + "type" : "address", "name" : "account", - "type" : "address" + "internalType" : "address", + "indexed" : true }, { - "indexed" : false, - "internalType" : "uint256", "name" : "amount", - "type" : "uint256" + "type" : "uint256", + "indexed" : false, + "internalType" : "uint256" } ] }, { - "name" : "allowance", "type" : "function", - "outputs" : [ - { - "internalType" : "uint256", - "type" : "uint256", - "name" : "" - } - ], "stateMutability" : "view", + "name" : "allowance", "inputs" : [ { + "internalType" : "address", "type" : "address", - "name" : "holder", - "internalType" : "address" + "name" : "holder" }, { - "internalType" : "address", + "name" : "spender", "type" : "address", - "name" : "spender" + "internalType" : "address" + } + ], + "outputs" : [ + { + "type" : "uint256", + "name" : "", + "internalType" : "uint256" } ] }, { "inputs" : [ { + "internalType" : "address", "type" : "address", - "name" : "spender", - "internalType" : "address" + "name" : "spender" }, { "type" : "uint256", @@ -997,8 +1095,8 @@ ], "outputs" : [ { - "type" : "bool", "name" : "", + "type" : "bool", "internalType" : "bool" } ], @@ -1007,93 +1105,91 @@ "name" : "approve" }, { + "name" : "approveSubAccount", + "type" : "function", + "stateMutability" : "nonpayable", "outputs" : [ { - "internalType" : "bool", "name" : "", - "type" : "bool" + "type" : "bool", + "internalType" : "bool" } ], - "stateMutability" : "nonpayable", "inputs" : [ { - "name" : "subAccountId", "type" : "uint256", - "internalType" : "uint256" + "internalType" : "uint256", + "name" : "subAccountId" }, { - "internalType" : "address", "name" : "spender", - "type" : "address" + "type" : "address", + "internalType" : "address" }, { "type" : "uint256", - "name" : "amount", - "internalType" : "uint256" + "internalType" : "uint256", + "name" : "amount" } - ], - "name" : "approveSubAccount", - "type" : "function" + ] }, { + "stateMutability" : "view", "type" : "function", "name" : "balanceOf", - "inputs" : [ + "outputs" : [ { - "internalType" : "address", - "type" : "address", - "name" : "account" + "internalType" : "uint256", + "type" : "uint256", + "name" : "" } ], - "stateMutability" : "view", - "outputs" : [ + "inputs" : [ { - "internalType" : "uint256", - "name" : "", - "type" : "uint256" + "type" : "address", + "name" : "account", + "internalType" : "address" } ] }, { - "type" : "function", - "name" : "balanceOfUnderlying", "inputs" : [ { + "type" : "address", "internalType" : "address", - "name" : "account", - "type" : "address" + "name" : "account" } ], "outputs" : [ { + "internalType" : "uint256", "type" : "uint256", - "name" : "", - "internalType" : "uint256" + "name" : "" } ], + "name" : "balanceOfUnderlying", + "type" : "function", "stateMutability" : "view" }, { + "name" : "burn", + "type" : "function", + "stateMutability" : "nonpayable", "inputs" : [ { "internalType" : "uint256", - "name" : "subAccountId", - "type" : "uint256" + "type" : "uint256", + "name" : "subAccountId" }, { "internalType" : "uint256", - "name" : "amount", - "type" : "uint256" + "type" : "uint256", + "name" : "amount" } ], - "stateMutability" : "nonpayable", - "outputs" : [], - "type" : "function", - "name" : "burn" + "outputs" : [] }, { - "type" : "function", - "name" : "convertBalanceToUnderlying", "inputs" : [ { "internalType" : "uint256", @@ -1108,11 +1204,11 @@ "internalType" : "uint256" } ], + "type" : "function", + "name" : "convertBalanceToUnderlying", "stateMutability" : "view" }, { - "type" : "function", - "name" : "convertUnderlyingToBalance", "inputs" : [ { "type" : "uint256", @@ -1120,18 +1216,18 @@ "internalType" : "uint256" } ], - "stateMutability" : "view", "outputs" : [ { + "type" : "uint256", "internalType" : "uint256", - "name" : "", - "type" : "uint256" + "name" : "" } - ] + ], + "name" : "convertUnderlyingToBalance", + "type" : "function", + "stateMutability" : "view" }, { - "inputs" : [], - "stateMutability" : "pure", "outputs" : [ { "internalType" : "uint8", @@ -1139,13 +1235,14 @@ "name" : "" } ], + "inputs" : [], "type" : "function", - "name" : "decimals" + "name" : "decimals", + "stateMutability" : "pure" }, { - "name" : "deposit", "type" : "function", - "outputs" : [], + "name" : "deposit", "stateMutability" : "nonpayable", "inputs" : [ { @@ -1154,160 +1251,168 @@ "internalType" : "uint256" }, { - "internalType" : "uint256", + "type" : "uint256", "name" : "amount", - "type" : "uint256" + "internalType" : "uint256" } - ] + ], + "outputs" : [] }, { - "name" : "donateToReserves", - "type" : "function", - "stateMutability" : "nonpayable", "outputs" : [], "inputs" : [ { - "name" : "subAccountId", "type" : "uint256", + "name" : "subAccountId", "internalType" : "uint256" }, { - "name" : "amount", + "internalType" : "uint256", "type" : "uint256", - "internalType" : "uint256" + "name" : "amount" } - ] + ], + "name" : "donateToReserves", + "type" : "function", + "stateMutability" : "nonpayable" }, { - "type" : "function", - "name" : "mint", + "outputs" : [], "inputs" : [ { - "internalType" : "uint256", "type" : "uint256", - "name" : "subAccountId" + "name" : "subAccountId", + "internalType" : "uint256" }, { + "internalType" : "uint256", "type" : "uint256", - "name" : "amount", - "internalType" : "uint256" + "name" : "amount" } ], "stateMutability" : "nonpayable", - "outputs" : [] + "type" : "function", + "name" : "mint" }, { - "inputs" : [], + "type" : "function", "stateMutability" : "view", + "name" : "moduleGitCommit", + "inputs" : [], "outputs" : [ { - "internalType" : "bytes32", "name" : "", - "type" : "bytes32" + "type" : "bytes32", + "internalType" : "bytes32" } - ], - "type" : "function", - "name" : "moduleGitCommit" + ] }, { - "type" : "function", - "name" : "moduleId", - "inputs" : [], "outputs" : [ { + "internalType" : "uint256", "type" : "uint256", - "name" : "", - "internalType" : "uint256" + "name" : "" } ], - "stateMutability" : "view" + "inputs" : [], + "stateMutability" : "view", + "type" : "function", + "name" : "moduleId" }, { - "type" : "function", - "name" : "name", "inputs" : [], "outputs" : [ { - "internalType" : "string", "type" : "string", + "internalType" : "string", "name" : "" } ], + "name" : "name", + "type" : "function", "stateMutability" : "view" }, { + "inputs" : [], "outputs" : [ { - "name" : "", + "internalType" : "uint256", "type" : "uint256", - "internalType" : "uint256" + "name" : "" } ], - "stateMutability" : "view", - "inputs" : [], "name" : "reserveBalance", - "type" : "function" + "type" : "function", + "stateMutability" : "view" }, { "name" : "reserveBalanceUnderlying", "type" : "function", + "stateMutability" : "view", + "inputs" : [], "outputs" : [ { "internalType" : "uint256", "type" : "uint256", "name" : "" } - ], - "stateMutability" : "view", - "inputs" : [] + ] }, { "name" : "symbol", "type" : "function", "stateMutability" : "view", + "inputs" : [], "outputs" : [ { + "type" : "string", "internalType" : "string", - "name" : "", - "type" : "string" + "name" : "" } - ], - "inputs" : [] + ] }, { - "inputs" : [], + "type" : "function", + "name" : "totalSupply", + "stateMutability" : "view", "outputs" : [ { - "name" : "", "type" : "uint256", + "name" : "", "internalType" : "uint256" } ], - "stateMutability" : "view", - "type" : "function", - "name" : "totalSupply" + "inputs" : [] }, { - "name" : "totalSupplyUnderlying", - "type" : "function", + "inputs" : [], "outputs" : [ { "internalType" : "uint256", - "name" : "", - "type" : "uint256" + "type" : "uint256", + "name" : "" } ], - "stateMutability" : "view", - "inputs" : [] + "name" : "totalSupplyUnderlying", + "type" : "function", + "stateMutability" : "view" }, { - "outputs" : [], - "stateMutability" : "nonpayable", - "inputs" : [], + "type" : "function", "name" : "touch", - "type" : "function" + "stateMutability" : "nonpayable", + "outputs" : [], + "inputs" : [] }, { + "outputs" : [ + { + "internalType" : "bool", + "type" : "bool", + "name" : "" + } + ], "inputs" : [ { "name" : "to", @@ -1315,104 +1420,97 @@ "internalType" : "address" }, { - "internalType" : "uint256", + "type" : "uint256", "name" : "amount", - "type" : "uint256" - } - ], - "stateMutability" : "nonpayable", - "outputs" : [ - { - "name" : "", - "type" : "bool", - "internalType" : "bool" + "internalType" : "uint256" } ], "type" : "function", + "stateMutability" : "nonpayable", "name" : "transfer" }, { "inputs" : [ { + "internalType" : "address", "type" : "address", - "name" : "from", - "internalType" : "address" + "name" : "from" }, { - "internalType" : "address", + "name" : "to", "type" : "address", - "name" : "to" + "internalType" : "address" }, { + "type" : "uint256", "internalType" : "uint256", - "name" : "amount", - "type" : "uint256" + "name" : "amount" } ], - "stateMutability" : "nonpayable", "outputs" : [ { - "type" : "bool", "name" : "", + "type" : "bool", "internalType" : "bool" } ], "type" : "function", + "stateMutability" : "nonpayable", "name" : "transferFrom" }, { - "name" : "transferFromMax", "type" : "function", - "outputs" : [ - { - "name" : "", - "type" : "bool", - "internalType" : "bool" - } - ], + "name" : "transferFromMax", "stateMutability" : "nonpayable", "inputs" : [ { - "name" : "from", "type" : "address", - "internalType" : "address" + "internalType" : "address", + "name" : "from" }, { "internalType" : "address", "type" : "address", "name" : "to" } + ], + "outputs" : [ + { + "type" : "bool", + "name" : "", + "internalType" : "bool" + } ] }, { - "type" : "function", - "name" : "underlyingAsset", "inputs" : [], "outputs" : [ { - "internalType" : "address", "name" : "", - "type" : "address" + "type" : "address", + "internalType" : "address" } ], - "stateMutability" : "view" + "stateMutability" : "view", + "type" : "function", + "name" : "underlyingAsset" }, { - "type" : "function", "name" : "withdraw", + "type" : "function", + "stateMutability" : "nonpayable", "inputs" : [ { + "internalType" : "uint256", "type" : "uint256", - "name" : "subAccountId", - "internalType" : "uint256" + "name" : "subAccountId" }, { - "name" : "amount", + "internalType" : "uint256", "type" : "uint256", - "internalType" : "uint256" + "name" : "amount" } ], - "stateMutability" : "nonpayable", "outputs" : [] } ] diff --git a/abis/modules/Exec.json b/abis/modules/Exec.json index 12765c5..3cca559 100644 --- a/abis/modules/Exec.json +++ b/abis/modules/Exec.json @@ -1,6 +1,7 @@ { "abi" : [ { + "stateMutability" : "nonpayable", "type" : "constructor", "inputs" : [ { @@ -8,16 +9,14 @@ "name" : "moduleGitCommit_", "internalType" : "bytes32" } - ], - "stateMutability" : "nonpayable" + ] }, { - "type" : "error", - "name" : "BatchDispatchSimulation", "inputs" : [ { - "internalType" : "struct Exec.EulerBatchItemResponse[]", "type" : "tuple[]", + "name" : "simulation", + "internalType" : "struct Exec.EulerBatchItemResponse[]", "components" : [ { "type" : "bool", @@ -29,36 +28,40 @@ "type" : "bytes", "internalType" : "bytes" } - ], - "name" : "simulation" + ] } - ] + ], + "name" : "BatchDispatchSimulation", + "type" : "error" }, { + "type" : "event", + "name" : "AssetStatus", + "anonymous" : false, "inputs" : [ { - "name" : "underlying", "type" : "address", + "name" : "underlying", "internalType" : "address", "indexed" : true }, { - "name" : "totalBalances", "type" : "uint256", - "indexed" : false, - "internalType" : "uint256" + "name" : "totalBalances", + "internalType" : "uint256", + "indexed" : false }, { + "type" : "uint256", "internalType" : "uint256", - "indexed" : false, "name" : "totalBorrows", - "type" : "uint256" + "indexed" : false }, { "type" : "uint96", "name" : "reserveBalance", - "indexed" : false, - "internalType" : "uint96" + "internalType" : "uint96", + "indexed" : false }, { "type" : "uint256", @@ -69,69 +72,66 @@ { "name" : "interestAccumulator", "type" : "uint256", - "internalType" : "uint256", - "indexed" : false + "indexed" : false, + "internalType" : "uint256" }, { - "internalType" : "int96", + "type" : "int96", "indexed" : false, "name" : "interestRate", - "type" : "int96" + "internalType" : "int96" }, { - "indexed" : false, "internalType" : "uint256", + "type" : "uint256", "name" : "timestamp", - "type" : "uint256" + "indexed" : false } - ], - "anonymous" : false, - "type" : "event", - "name" : "AssetStatus" + ] }, { "anonymous" : false, + "type" : "event", + "name" : "Borrow", "inputs" : [ { - "indexed" : true, - "internalType" : "address", + "type" : "address", "name" : "underlying", - "type" : "address" + "internalType" : "address", + "indexed" : true }, { "type" : "address", "name" : "account", - "indexed" : true, - "internalType" : "address" + "internalType" : "address", + "indexed" : true }, { - "internalType" : "uint256", - "indexed" : false, "type" : "uint256", - "name" : "amount" + "name" : "amount", + "indexed" : false, + "internalType" : "uint256" } - ], - "name" : "Borrow", - "type" : "event" + ] }, { "inputs" : [ { - "name" : "account", + "indexed" : true, "type" : "address", - "internalType" : "address", - "indexed" : true + "name" : "account", + "internalType" : "address" }, { + "indexed" : true, "type" : "address", "name" : "delegate", - "internalType" : "address", - "indexed" : true + "internalType" : "address" } ], - "anonymous" : false, "type" : "event", - "name" : "DelegateAverageLiquidity" + "name" : "DelegateAverageLiquidity", + "anonymous" : false }, { "name" : "Deposit", @@ -140,198 +140,199 @@ "inputs" : [ { "internalType" : "address", - "indexed" : true, "type" : "address", - "name" : "underlying" + "name" : "underlying", + "indexed" : true }, { "name" : "account", "type" : "address", - "indexed" : true, - "internalType" : "address" + "internalType" : "address", + "indexed" : true }, { - "name" : "amount", "type" : "uint256", - "indexed" : false, - "internalType" : "uint256" + "name" : "amount", + "internalType" : "uint256", + "indexed" : false } ] }, { + "name" : "EnterMarket", + "type" : "event", "anonymous" : false, "inputs" : [ { - "internalType" : "address", - "indexed" : true, + "type" : "address", "name" : "underlying", - "type" : "address" + "internalType" : "address", + "indexed" : true }, { "type" : "address", "name" : "account", - "internalType" : "address", - "indexed" : true + "indexed" : true, + "internalType" : "address" } - ], - "name" : "EnterMarket", - "type" : "event" + ] }, { - "name" : "ExitMarket", - "type" : "event", - "anonymous" : false, "inputs" : [ { - "internalType" : "address", - "indexed" : true, + "type" : "address", "name" : "underlying", - "type" : "address" + "internalType" : "address", + "indexed" : true }, { - "name" : "account", "type" : "address", + "name" : "account", "internalType" : "address", "indexed" : true } - ] + ], + "name" : "ExitMarket", + "type" : "event", + "anonymous" : false }, { - "anonymous" : false, - "inputs" : [], + "type" : "event", "name" : "Genesis", - "type" : "event" + "anonymous" : false, + "inputs" : [] }, { + "type" : "event", "anonymous" : false, + "name" : "GovConvertReserves", "inputs" : [ { - "name" : "underlying", "type" : "address", - "indexed" : true, - "internalType" : "address" + "name" : "underlying", + "internalType" : "address", + "indexed" : true }, { - "internalType" : "address", - "indexed" : true, "name" : "recipient", - "type" : "address" + "type" : "address", + "internalType" : "address", + "indexed" : true }, { - "name" : "amount", - "type" : "uint256", "internalType" : "uint256", + "type" : "uint256", + "name" : "amount", "indexed" : false } - ], - "name" : "GovConvertReserves", - "type" : "event" + ] }, { + "anonymous" : false, + "type" : "event", + "name" : "GovSetAssetConfig", "inputs" : [ { - "indexed" : true, "internalType" : "address", "type" : "address", - "name" : "underlying" + "name" : "underlying", + "indexed" : true }, { "indexed" : false, + "type" : "tuple", + "name" : "newConfig", "internalType" : "struct Storage.AssetConfig", "components" : [ { - "internalType" : "address", "type" : "address", - "name" : "eTokenAddress" + "name" : "eTokenAddress", + "internalType" : "address" }, { - "internalType" : "bool", "type" : "bool", - "name" : "borrowIsolated" + "name" : "borrowIsolated", + "internalType" : "bool" }, { - "name" : "collateralFactor", "type" : "uint32", + "name" : "collateralFactor", "internalType" : "uint32" }, { - "internalType" : "uint32", + "type" : "uint32", "name" : "borrowFactor", - "type" : "uint32" + "internalType" : "uint32" }, { - "internalType" : "uint24", "type" : "uint24", + "internalType" : "uint24", "name" : "twapWindow" } - ], - "type" : "tuple", - "name" : "newConfig" + ] } - ], - "anonymous" : false, - "type" : "event", - "name" : "GovSetAssetConfig" + ] }, { + "anonymous" : false, + "type" : "event", + "name" : "GovSetChainlinkPriceFeed", "inputs" : [ { - "name" : "underlying", + "indexed" : true, "type" : "address", - "internalType" : "address", - "indexed" : true + "name" : "underlying", + "internalType" : "address" }, { "type" : "address", "name" : "chainlinkAggregator", - "indexed" : false, - "internalType" : "address" + "internalType" : "address", + "indexed" : false } - ], - "anonymous" : false, - "type" : "event", - "name" : "GovSetChainlinkPriceFeed" + ] }, { + "type" : "event", + "name" : "GovSetIRM", "anonymous" : false, "inputs" : [ { "name" : "underlying", "type" : "address", - "indexed" : true, - "internalType" : "address" + "internalType" : "address", + "indexed" : true }, { - "indexed" : false, - "internalType" : "uint256", "type" : "uint256", - "name" : "interestRateModel" + "name" : "interestRateModel", + "internalType" : "uint256", + "indexed" : false }, { - "name" : "resetParams", "type" : "bytes", "internalType" : "bytes", + "name" : "resetParams", "indexed" : false } - ], - "name" : "GovSetIRM", - "type" : "event" + ] }, { "type" : "event", "name" : "GovSetPricingConfig", + "anonymous" : false, "inputs" : [ { - "indexed" : true, - "internalType" : "address", + "type" : "address", "name" : "underlying", - "type" : "address" + "indexed" : true, + "internalType" : "address" }, { - "indexed" : false, + "type" : "uint16", "internalType" : "uint16", "name" : "newPricingType", - "type" : "uint16" + "indexed" : false }, { "type" : "uint32", @@ -339,41 +340,40 @@ "internalType" : "uint32", "indexed" : false } - ], - "anonymous" : false + ] }, { - "anonymous" : false, "inputs" : [ { "type" : "address", + "internalType" : "address", "name" : "underlying", - "indexed" : true, - "internalType" : "address" + "indexed" : true }, { - "internalType" : "uint32", - "indexed" : false, + "type" : "uint32", "name" : "newReserveFee", - "type" : "uint32" + "internalType" : "uint32", + "indexed" : false } ], + "type" : "event", "name" : "GovSetReserveFee", - "type" : "event" + "anonymous" : false }, { "inputs" : [ { "type" : "uint256", - "name" : "moduleId", "internalType" : "uint256", + "name" : "moduleId", "indexed" : true }, { "indexed" : true, - "internalType" : "address", + "type" : "address", "name" : "moduleImpl", - "type" : "address" + "internalType" : "address" }, { "name" : "moduleGitCommit", @@ -382,75 +382,73 @@ "indexed" : false } ], - "anonymous" : false, "type" : "event", + "anonymous" : false, "name" : "InstallerInstallModule" }, { - "name" : "InstallerSetGovernorAdmin", "type" : "event", + "name" : "InstallerSetGovernorAdmin", "anonymous" : false, "inputs" : [ { "type" : "address", "name" : "newGovernorAdmin", - "indexed" : true, - "internalType" : "address" + "internalType" : "address", + "indexed" : true } ] }, { + "type" : "event", + "name" : "InstallerSetUpgradeAdmin", + "anonymous" : false, "inputs" : [ { - "type" : "address", "name" : "newUpgradeAdmin", + "type" : "address", "internalType" : "address", "indexed" : true } - ], - "anonymous" : false, - "type" : "event", - "name" : "InstallerSetUpgradeAdmin" + ] }, { - "type" : "event", - "name" : "Liquidation", "inputs" : [ { - "name" : "liquidator", + "indexed" : true, "type" : "address", - "internalType" : "address", - "indexed" : true + "name" : "liquidator", + "internalType" : "address" }, { + "indexed" : true, "type" : "address", "name" : "violator", - "internalType" : "address", - "indexed" : true + "internalType" : "address" }, { - "name" : "underlying", "type" : "address", "indexed" : true, + "name" : "underlying", "internalType" : "address" }, { - "internalType" : "address", - "indexed" : false, "name" : "collateral", - "type" : "address" - }, - { - "name" : "repay", - "type" : "uint256", - "internalType" : "uint256", + "type" : "address", + "internalType" : "address", "indexed" : false }, { - "name" : "yield", "type" : "uint256", - "internalType" : "uint256", - "indexed" : false + "name" : "repay", + "indexed" : false, + "internalType" : "uint256" + }, + { + "type" : "uint256", + "name" : "yield", + "indexed" : false, + "internalType" : "uint256" }, { "name" : "healthScore", @@ -459,107 +457,109 @@ "indexed" : false }, { - "name" : "baseDiscount", "type" : "uint256", - "indexed" : false, - "internalType" : "uint256" + "name" : "baseDiscount", + "internalType" : "uint256", + "indexed" : false }, { "type" : "uint256", "name" : "discount", - "internalType" : "uint256", - "indexed" : false + "indexed" : false, + "internalType" : "uint256" } ], + "name" : "Liquidation", + "type" : "event", "anonymous" : false }, { "type" : "event", "name" : "MarketActivated", + "anonymous" : false, "inputs" : [ { - "indexed" : true, - "internalType" : "address", "type" : "address", - "name" : "underlying" + "name" : "underlying", + "internalType" : "address", + "indexed" : true }, { - "name" : "eToken", "type" : "address", - "indexed" : true, - "internalType" : "address" + "name" : "eToken", + "internalType" : "address", + "indexed" : true }, { + "type" : "address", "internalType" : "address", - "indexed" : true, "name" : "dToken", - "type" : "address" + "indexed" : true } - ], - "anonymous" : false + ] }, { - "anonymous" : false, "inputs" : [ { "type" : "address", "name" : "underlying", - "indexed" : true, - "internalType" : "address" + "internalType" : "address", + "indexed" : true }, { - "indexed" : true, - "internalType" : "address", "type" : "address", - "name" : "pToken" + "internalType" : "address", + "name" : "pToken", + "indexed" : true } ], - "name" : "PTokenActivated", - "type" : "event" + "anonymous" : false, + "type" : "event", + "name" : "PTokenActivated" }, { - "name" : "PTokenUnWrap", - "type" : "event", - "anonymous" : false, "inputs" : [ { - "indexed" : true, - "internalType" : "address", + "type" : "address", "name" : "underlying", - "type" : "address" + "indexed" : true, + "internalType" : "address" }, { - "internalType" : "address", - "indexed" : true, "type" : "address", - "name" : "account" + "indexed" : true, + "name" : "account", + "internalType" : "address" }, { - "name" : "amount", "type" : "uint256", - "indexed" : false, - "internalType" : "uint256" + "name" : "amount", + "internalType" : "uint256", + "indexed" : false } - ] + ], + "type" : "event", + "name" : "PTokenUnWrap", + "anonymous" : false }, { "inputs" : [ { - "type" : "address", "name" : "underlying", + "type" : "address", "internalType" : "address", "indexed" : true }, { "name" : "account", "type" : "address", - "indexed" : true, - "internalType" : "address" + "internalType" : "address", + "indexed" : true }, { - "name" : "amount", - "type" : "uint256", "indexed" : false, + "type" : "uint256", + "name" : "amount", "internalType" : "uint256" } ], @@ -569,128 +569,125 @@ }, { "type" : "event", + "anonymous" : false, "name" : "ProxyCreated", "inputs" : [ { - "indexed" : true, - "internalType" : "address", "type" : "address", - "name" : "proxy" + "indexed" : true, + "name" : "proxy", + "internalType" : "address" }, { - "type" : "uint256", "name" : "moduleId", + "type" : "uint256", "internalType" : "uint256", "indexed" : false } - ], - "anonymous" : false + ] }, { - "type" : "event", - "name" : "Repay", "inputs" : [ { + "type" : "address", "internalType" : "address", - "indexed" : true, "name" : "underlying", - "type" : "address" + "indexed" : true }, { - "indexed" : true, - "internalType" : "address", "type" : "address", - "name" : "account" + "name" : "account", + "internalType" : "address", + "indexed" : true }, { - "internalType" : "uint256", - "indexed" : false, "type" : "uint256", - "name" : "amount" + "name" : "amount", + "indexed" : false, + "internalType" : "uint256" } ], + "name" : "Repay", + "type" : "event", "anonymous" : false }, { + "type" : "event", + "name" : "RequestBorrow", "anonymous" : false, "inputs" : [ { - "name" : "account", "type" : "address", - "indexed" : true, - "internalType" : "address" + "name" : "account", + "internalType" : "address", + "indexed" : true }, { - "name" : "amount", "type" : "uint256", - "internalType" : "uint256", - "indexed" : false + "name" : "amount", + "indexed" : false, + "internalType" : "uint256" } - ], - "name" : "RequestBorrow", - "type" : "event" + ] }, { - "anonymous" : false, "inputs" : [ { - "indexed" : true, - "internalType" : "address", + "type" : "address", "name" : "account", - "type" : "address" + "internalType" : "address", + "indexed" : true }, { - "name" : "amount", "type" : "uint256", - "internalType" : "uint256", - "indexed" : false + "name" : "amount", + "indexed" : false, + "internalType" : "uint256" } ], + "type" : "event", "name" : "RequestBurn", - "type" : "event" + "anonymous" : false }, { "anonymous" : false, + "type" : "event", + "name" : "RequestDeposit", "inputs" : [ { - "name" : "account", "type" : "address", - "indexed" : true, - "internalType" : "address" + "name" : "account", + "internalType" : "address", + "indexed" : true }, { - "type" : "uint256", "name" : "amount", - "internalType" : "uint256", - "indexed" : false + "type" : "uint256", + "indexed" : false, + "internalType" : "uint256" } - ], - "name" : "RequestDeposit", - "type" : "event" + ] }, { - "name" : "RequestDonate", "type" : "event", + "name" : "RequestDonate", "anonymous" : false, "inputs" : [ { - "internalType" : "address", - "indexed" : true, + "name" : "account", "type" : "address", - "name" : "account" + "internalType" : "address", + "indexed" : true }, { - "name" : "amount", "type" : "uint256", - "internalType" : "uint256", - "indexed" : false + "name" : "amount", + "indexed" : false, + "internalType" : "uint256" } ] }, { - "name" : "RequestLiquidate", - "type" : "event", - "anonymous" : false, "inputs" : [ { "type" : "address", @@ -699,93 +696,197 @@ "indexed" : true }, { - "name" : "violator", "type" : "address", "internalType" : "address", + "name" : "violator", "indexed" : true }, { "internalType" : "address", - "indexed" : true, "type" : "address", - "name" : "underlying" + "name" : "underlying", + "indexed" : true }, { "indexed" : false, - "internalType" : "address", + "type" : "address", "name" : "collateral", - "type" : "address" + "internalType" : "address" }, { + "indexed" : false, "type" : "uint256", "name" : "repay", - "indexed" : false, "internalType" : "uint256" }, { - "name" : "minYield", "type" : "uint256", - "indexed" : false, - "internalType" : "uint256" + "name" : "minYield", + "internalType" : "uint256", + "indexed" : false } - ] + ], + "anonymous" : false, + "type" : "event", + "name" : "RequestLiquidate" }, { - "type" : "event", "name" : "RequestMint", + "type" : "event", + "anonymous" : false, "inputs" : [ { - "indexed" : true, - "internalType" : "address", + "name" : "account", "type" : "address", - "name" : "account" + "internalType" : "address", + "indexed" : true }, { - "name" : "amount", "type" : "uint256", + "name" : "amount", "internalType" : "uint256", "indexed" : false } + ] + }, + { + "inputs" : [ + { + "type" : "address", + "name" : "account", + "internalType" : "address", + "indexed" : true + }, + { + "type" : "uint256", + "name" : "amount", + "indexed" : false, + "internalType" : "uint256" + } ], + "name" : "RequestRepay", + "type" : "event", "anonymous" : false }, { "inputs" : [ { - "indexed" : true, + "type" : "address", + "name" : "accountIn", "internalType" : "address", + "indexed" : true + }, + { "type" : "address", - "name" : "account" + "name" : "accountOut", + "internalType" : "address", + "indexed" : true + }, + { + "type" : "address", + "internalType" : "address", + "name" : "underlyingIn", + "indexed" : true + }, + { + "type" : "address", + "name" : "underlyingOut", + "internalType" : "address", + "indexed" : false }, { - "name" : "amount", "type" : "uint256", + "name" : "amount", "internalType" : "uint256", "indexed" : false + }, + { + "name" : "swapType", + "type" : "uint256", + "indexed" : false, + "internalType" : "uint256" } ], "anonymous" : false, "type" : "event", - "name" : "RequestRepay" + "name" : "RequestSwap" }, { + "type" : "event", + "name" : "RequestSwapHub", + "anonymous" : false, "inputs" : [ { "name" : "accountIn", "type" : "address", + "internalType" : "address", + "indexed" : true + }, + { + "type" : "address", + "name" : "accountOut", "indexed" : true, "internalType" : "address" }, { - "name" : "accountOut", + "type" : "address", + "name" : "underlyingIn", + "internalType" : "address", + "indexed" : true + }, + { + "type" : "address", + "name" : "underlyingOut", + "internalType" : "address", + "indexed" : false + }, + { + "type" : "uint256", + "name" : "amountIn", + "indexed" : false, + "internalType" : "uint256" + }, + { + "indexed" : false, + "type" : "uint256", + "name" : "amountOut", + "internalType" : "uint256" + }, + { + "indexed" : false, + "type" : "uint256", + "name" : "mode", + "internalType" : "uint256" + }, + { + "type" : "address", + "indexed" : false, + "name" : "swapHandler", + "internalType" : "address" + } + ] + }, + { + "type" : "event", + "name" : "RequestSwapHubRepay", + "anonymous" : false, + "inputs" : [ + { "type" : "address", "indexed" : true, + "name" : "accountIn", "internalType" : "address" }, { - "name" : "underlyingIn", "type" : "address", "internalType" : "address", + "name" : "accountOut", + "indexed" : true + }, + { + "type" : "address", + "name" : "underlyingIn", + "internalType" : "address", "indexed" : true }, { @@ -796,95 +897,92 @@ }, { "type" : "uint256", - "name" : "amount", "internalType" : "uint256", + "name" : "targetDebt", "indexed" : false }, { - "name" : "swapType", - "type" : "uint256", - "indexed" : false, - "internalType" : "uint256" + "name" : "swapHandler", + "type" : "address", + "internalType" : "address", + "indexed" : false } - ], - "anonymous" : false, - "type" : "event", - "name" : "RequestSwap" + ] }, { "inputs" : [ { - "internalType" : "address", - "indexed" : true, + "type" : "address", "name" : "from", - "type" : "address" + "internalType" : "address", + "indexed" : true }, { - "internalType" : "address", - "indexed" : true, "name" : "to", - "type" : "address" + "type" : "address", + "internalType" : "address", + "indexed" : true }, { - "internalType" : "uint256", - "indexed" : false, + "type" : "uint256", "name" : "amount", - "type" : "uint256" + "internalType" : "uint256", + "indexed" : false } ], - "anonymous" : false, "type" : "event", - "name" : "RequestTransferDToken" + "name" : "RequestTransferDToken", + "anonymous" : false }, { "anonymous" : false, + "type" : "event", + "name" : "RequestTransferEToken", "inputs" : [ { - "indexed" : true, - "internalType" : "address", + "name" : "from", "type" : "address", - "name" : "from" + "internalType" : "address", + "indexed" : true }, { "internalType" : "address", - "indexed" : true, + "type" : "address", "name" : "to", - "type" : "address" + "indexed" : true }, { - "name" : "amount", "type" : "uint256", + "name" : "amount", "indexed" : false, "internalType" : "uint256" } - ], - "name" : "RequestTransferEToken", - "type" : "event" + ] }, { - "name" : "RequestWithdraw", "type" : "event", + "name" : "RequestWithdraw", "anonymous" : false, "inputs" : [ { - "name" : "account", "type" : "address", + "name" : "account", "internalType" : "address", "indexed" : true }, { - "name" : "amount", "type" : "uint256", - "indexed" : false, - "internalType" : "uint256" + "name" : "amount", + "internalType" : "uint256", + "indexed" : false } ] }, { "inputs" : [ { - "name" : "account", "type" : "address", + "name" : "account", "indexed" : true, "internalType" : "address" } @@ -894,59 +992,61 @@ "name" : "TrackAverageLiquidity" }, { - "name" : "UnTrackAverageLiquidity", - "type" : "event", "anonymous" : false, + "type" : "event", + "name" : "UnTrackAverageLiquidity", "inputs" : [ { + "indexed" : true, "type" : "address", "name" : "account", - "internalType" : "address", - "indexed" : true + "internalType" : "address" } ] }, { + "type" : "event", + "name" : "Withdraw", + "anonymous" : false, "inputs" : [ { - "indexed" : true, - "internalType" : "address", + "type" : "address", "name" : "underlying", - "type" : "address" + "indexed" : true, + "internalType" : "address" }, { + "internalType" : "address", "type" : "address", "name" : "account", - "indexed" : true, - "internalType" : "address" + "indexed" : true }, { - "type" : "uint256", "name" : "amount", + "type" : "uint256", "internalType" : "uint256", "indexed" : false } - ], - "anonymous" : false, - "type" : "event", - "name" : "Withdraw" + ] }, { "type" : "function", + "stateMutability" : "nonpayable", "name" : "batchDispatch", + "outputs" : [], "inputs" : [ { - "name" : "items", "type" : "tuple[]", + "name" : "items", "components" : [ { - "internalType" : "bool", + "type" : "bool", "name" : "allowError", - "type" : "bool" + "internalType" : "bool" }, { - "internalType" : "address", "type" : "address", + "internalType" : "address", "name" : "proxyAddr" }, { @@ -958,20 +1058,22 @@ "internalType" : "struct Exec.EulerBatchItem[]" }, { - "internalType" : "address[]", "name" : "deferLiquidityChecks", - "type" : "address[]" + "type" : "address[]", + "internalType" : "address[]" } - ], - "stateMutability" : "nonpayable", - "outputs" : [] + ] }, { "type" : "function", "name" : "batchDispatchSimulate", + "stateMutability" : "nonpayable", + "outputs" : [], "inputs" : [ { + "type" : "tuple[]", "name" : "items", + "internalType" : "struct Exec.EulerBatchItem[]", "components" : [ { "type" : "bool", @@ -979,33 +1081,26 @@ "internalType" : "bool" }, { - "internalType" : "address", + "type" : "address", "name" : "proxyAddr", - "type" : "address" + "internalType" : "address" }, { - "internalType" : "bytes", "type" : "bytes", + "internalType" : "bytes", "name" : "data" } - ], - "type" : "tuple[]", - "internalType" : "struct Exec.EulerBatchItem[]" + ] }, { "type" : "address[]", "name" : "deferLiquidityChecks", "internalType" : "address[]" } - ], - "stateMutability" : "nonpayable", - "outputs" : [] + ] }, { - "name" : "deferLiquidityCheck", - "type" : "function", "outputs" : [], - "stateMutability" : "nonpayable", "inputs" : [ { "internalType" : "address", @@ -1013,136 +1108,134 @@ "name" : "account" }, { - "internalType" : "bytes", "type" : "bytes", + "internalType" : "bytes", "name" : "data" } - ] + ], + "name" : "deferLiquidityCheck", + "type" : "function", + "stateMutability" : "nonpayable" }, { + "type" : "function", + "stateMutability" : "view", + "name" : "detailedLiquidity", "inputs" : [ { - "internalType" : "address", + "type" : "address", "name" : "account", - "type" : "address" + "internalType" : "address" } ], "outputs" : [ { - "name" : "assets", - "type" : "tuple[]", "components" : [ { - "internalType" : "address", "type" : "address", - "name" : "underlying" + "name" : "underlying", + "internalType" : "address" }, { - "internalType" : "struct IRiskManager.LiquidityStatus", - "name" : "status", "components" : [ { - "name" : "collateralValue", "type" : "uint256", + "name" : "collateralValue", "internalType" : "uint256" }, { - "internalType" : "uint256", + "type" : "uint256", "name" : "liabilityValue", - "type" : "uint256" + "internalType" : "uint256" }, { - "name" : "numBorrows", "type" : "uint256", - "internalType" : "uint256" + "internalType" : "uint256", + "name" : "numBorrows" }, { - "internalType" : "bool", + "name" : "borrowIsolated", "type" : "bool", - "name" : "borrowIsolated" + "internalType" : "bool" } ], - "type" : "tuple" + "type" : "tuple", + "name" : "status", + "internalType" : "struct IRiskManager.LiquidityStatus" } ], + "type" : "tuple[]", + "name" : "assets", "internalType" : "struct IRiskManager.AssetLiquidity[]" } - ], - "stateMutability" : "view", - "type" : "function", - "name" : "detailedLiquidity" + ] }, { + "outputs" : [ + { + "name" : "", + "type" : "bytes", + "internalType" : "bytes" + } + ], "inputs" : [ { - "type" : "address", "name" : "contractAddress", + "type" : "address", "internalType" : "address" }, { - "internalType" : "bytes", - "name" : "payload", - "type" : "bytes" - } - ], - "stateMutability" : "view", - "outputs" : [ - { - "internalType" : "bytes", "type" : "bytes", - "name" : "" + "internalType" : "bytes", + "name" : "payload" } ], "type" : "function", + "stateMutability" : "view", "name" : "doStaticCall" }, { + "type" : "function", + "name" : "getAverageLiquidity", + "stateMutability" : "nonpayable", "outputs" : [ { - "name" : "", "type" : "uint256", + "name" : "", "internalType" : "uint256" } ], - "stateMutability" : "nonpayable", "inputs" : [ { "name" : "account", "type" : "address", "internalType" : "address" } - ], - "name" : "getAverageLiquidity", - "type" : "function" + ] }, { + "type" : "function", "stateMutability" : "view", + "name" : "getAverageLiquidityDelegateAccount", "outputs" : [ { - "internalType" : "address", "type" : "address", + "internalType" : "address", "name" : "" } ], "inputs" : [ { - "name" : "account", "type" : "address", + "name" : "account", "internalType" : "address" } - ], - "name" : "getAverageLiquidityDelegateAccount", - "type" : "function" + ] }, { - "inputs" : [ - { - "name" : "account", - "type" : "address", - "internalType" : "address" - } - ], + "type" : "function", "stateMutability" : "nonpayable", + "name" : "getAverageLiquidityWithDelegate", "outputs" : [ { "name" : "", @@ -1150,15 +1243,20 @@ "internalType" : "uint256" } ], - "type" : "function", - "name" : "getAverageLiquidityWithDelegate" + "inputs" : [ + { + "type" : "address", + "name" : "account", + "internalType" : "address" + } + ] }, { "inputs" : [ { - "internalType" : "address", + "type" : "address", "name" : "underlying", - "type" : "address" + "internalType" : "address" } ], "outputs" : [ @@ -1168,23 +1266,19 @@ "internalType" : "uint256" }, { + "type" : "uint256", "internalType" : "uint256", - "name" : "twapPeriod", - "type" : "uint256" + "name" : "twapPeriod" } ], - "stateMutability" : "view", + "name" : "getPrice", "type" : "function", - "name" : "getPrice" + "stateMutability" : "view" }, { - "inputs" : [ - { - "internalType" : "address", - "name" : "underlying", - "type" : "address" - } - ], + "type" : "function", + "stateMutability" : "view", + "name" : "getPriceFull", "outputs" : [ { "internalType" : "uint256", @@ -1192,22 +1286,25 @@ "name" : "twap" }, { - "internalType" : "uint256", + "type" : "uint256", "name" : "twapPeriod", - "type" : "uint256" + "internalType" : "uint256" }, { - "internalType" : "uint256", "type" : "uint256", - "name" : "currPrice" + "name" : "currPrice", + "internalType" : "uint256" } ], - "stateMutability" : "view", - "type" : "function", - "name" : "getPriceFull" + "inputs" : [ + { + "type" : "address", + "name" : "underlying", + "internalType" : "address" + } + ] }, { - "stateMutability" : "view", "outputs" : [ { "type" : "tuple", @@ -1218,14 +1315,14 @@ "internalType" : "uint256" }, { + "internalType" : "uint256", "type" : "uint256", - "name" : "liabilityValue", - "internalType" : "uint256" + "name" : "liabilityValue" }, { "internalType" : "uint256", - "name" : "numBorrows", - "type" : "uint256" + "type" : "uint256", + "name" : "numBorrows" }, { "internalType" : "bool", @@ -1239,87 +1336,89 @@ ], "inputs" : [ { - "internalType" : "address", + "name" : "account", "type" : "address", - "name" : "account" + "internalType" : "address" } ], - "name" : "liquidity", - "type" : "function" + "stateMutability" : "view", + "type" : "function", + "name" : "liquidity" }, { - "inputs" : [], + "type" : "function", + "name" : "moduleGitCommit", + "stateMutability" : "view", "outputs" : [ { - "name" : "", "type" : "bytes32", - "internalType" : "bytes32" + "internalType" : "bytes32", + "name" : "" } ], - "stateMutability" : "view", - "type" : "function", - "name" : "moduleGitCommit" + "inputs" : [] }, { - "type" : "function", - "name" : "moduleId", - "inputs" : [], "outputs" : [ { - "name" : "", "type" : "uint256", + "name" : "", "internalType" : "uint256" } ], + "inputs" : [], + "type" : "function", + "name" : "moduleId", "stateMutability" : "view" }, { - "name" : "pTokenUnWrap", - "type" : "function", "stateMutability" : "nonpayable", + "type" : "function", + "name" : "pTokenUnWrap", "outputs" : [], "inputs" : [ { - "internalType" : "address", + "type" : "address", "name" : "underlying", - "type" : "address" + "internalType" : "address" }, { + "type" : "uint256", "internalType" : "uint256", - "name" : "amount", - "type" : "uint256" + "name" : "amount" } ] }, { - "name" : "pTokenWrap", "type" : "function", - "outputs" : [], "stateMutability" : "nonpayable", + "name" : "pTokenWrap", + "outputs" : [], "inputs" : [ { - "internalType" : "address", + "type" : "address", "name" : "underlying", - "type" : "address" + "internalType" : "address" }, { - "name" : "amount", "type" : "uint256", + "name" : "amount", "internalType" : "uint256" } ] }, { + "outputs" : [], "inputs" : [ { + "type" : "uint256", "internalType" : "uint256", - "name" : "subAccountId", - "type" : "uint256" + "name" : "subAccountId" }, { - "internalType" : "address", "type" : "address", - "name" : "delegate" + "name" : "delegate", + "internalType" : "address" }, { "type" : "bool", @@ -1327,35 +1426,35 @@ "internalType" : "bool" } ], - "outputs" : [], "stateMutability" : "nonpayable", "type" : "function", "name" : "trackAverageLiquidity" }, { - "name" : "unTrackAverageLiquidity", - "type" : "function", - "outputs" : [], - "stateMutability" : "nonpayable", "inputs" : [ { "name" : "subAccountId", "type" : "uint256", "internalType" : "uint256" } - ] + ], + "outputs" : [], + "type" : "function", + "name" : "unTrackAverageLiquidity", + "stateMutability" : "nonpayable" }, { + "outputs" : [], "inputs" : [ { - "type" : "address", "name" : "token", + "type" : "address", "internalType" : "address" }, { "type" : "uint256", - "name" : "value", - "internalType" : "uint256" + "internalType" : "uint256", + "name" : "value" }, { "type" : "uint256", @@ -1363,14 +1462,14 @@ "internalType" : "uint256" }, { - "internalType" : "uint8", + "type" : "uint8", "name" : "v", - "type" : "uint8" + "internalType" : "uint8" }, { - "internalType" : "bytes32", + "type" : "bytes32", "name" : "r", - "type" : "bytes32" + "internalType" : "bytes32" }, { "name" : "s", @@ -1378,35 +1477,33 @@ "internalType" : "bytes32" } ], - "outputs" : [], "stateMutability" : "nonpayable", "type" : "function", "name" : "usePermit" }, { - "name" : "usePermitAllowed", "type" : "function", "stateMutability" : "nonpayable", - "outputs" : [], + "name" : "usePermitAllowed", "inputs" : [ { "internalType" : "address", - "name" : "token", - "type" : "address" + "type" : "address", + "name" : "token" }, { + "internalType" : "uint256", "type" : "uint256", - "name" : "nonce", - "internalType" : "uint256" + "name" : "nonce" }, { "internalType" : "uint256", - "name" : "expiry", - "type" : "uint256" + "type" : "uint256", + "name" : "expiry" }, { - "internalType" : "bool", "type" : "bool", + "internalType" : "bool", "name" : "allowed" }, { @@ -1415,20 +1512,23 @@ "internalType" : "uint8" }, { + "internalType" : "bytes32", "type" : "bytes32", - "name" : "r", - "internalType" : "bytes32" + "name" : "r" }, { "type" : "bytes32", "name" : "s", "internalType" : "bytes32" } - ] + ], + "outputs" : [] }, { - "outputs" : [], "stateMutability" : "nonpayable", + "type" : "function", + "name" : "usePermitPacked", + "outputs" : [], "inputs" : [ { "type" : "address", @@ -1436,23 +1536,21 @@ "internalType" : "address" }, { + "type" : "uint256", "internalType" : "uint256", - "name" : "value", - "type" : "uint256" + "name" : "value" }, { - "internalType" : "uint256", "type" : "uint256", - "name" : "deadline" + "name" : "deadline", + "internalType" : "uint256" }, { + "type" : "bytes", "internalType" : "bytes", - "name" : "signature", - "type" : "bytes" + "name" : "signature" } - ], - "name" : "usePermitPacked", - "type" : "function" + ] } ] } diff --git a/abis/modules/Liquidation.json b/abis/modules/Liquidation.json index d9dd86b..403767d 100644 --- a/abis/modules/Liquidation.json +++ b/abis/modules/Liquidation.json @@ -1,43 +1,41 @@ { "abi" : [ { - "type" : "constructor", - "stateMutability" : "nonpayable", "inputs" : [ { "internalType" : "bytes32", "type" : "bytes32", "name" : "moduleGitCommit_" } - ] + ], + "stateMutability" : "nonpayable", + "type" : "constructor" }, { - "type" : "event", - "name" : "AssetStatus", "inputs" : [ { - "indexed" : true, - "internalType" : "address", + "type" : "address", "name" : "underlying", - "type" : "address" + "internalType" : "address", + "indexed" : true }, { - "indexed" : false, - "internalType" : "uint256", + "type" : "uint256", "name" : "totalBalances", - "type" : "uint256" + "internalType" : "uint256", + "indexed" : false }, { - "internalType" : "uint256", - "indexed" : false, + "type" : "uint256", "name" : "totalBorrows", - "type" : "uint256" + "indexed" : false, + "internalType" : "uint256" }, { "internalType" : "uint96", - "indexed" : false, + "type" : "uint96", "name" : "reserveBalance", - "type" : "uint96" + "indexed" : false }, { "name" : "poolSize", @@ -46,27 +44,31 @@ "internalType" : "uint256" }, { - "internalType" : "uint256", - "indexed" : false, "type" : "uint256", - "name" : "interestAccumulator" + "name" : "interestAccumulator", + "internalType" : "uint256", + "indexed" : false }, { + "type" : "int96", "indexed" : false, - "internalType" : "int96", "name" : "interestRate", - "type" : "int96" + "internalType" : "int96" }, { - "internalType" : "uint256", - "indexed" : false, "name" : "timestamp", - "type" : "uint256" + "type" : "uint256", + "indexed" : false, + "internalType" : "uint256" } ], + "type" : "event", + "name" : "AssetStatus", "anonymous" : false }, { + "name" : "Borrow", + "type" : "event", "anonymous" : false, "inputs" : [ { @@ -76,146 +78,148 @@ "indexed" : true }, { - "indexed" : true, - "internalType" : "address", "type" : "address", - "name" : "account" + "indexed" : true, + "name" : "account", + "internalType" : "address" }, { - "name" : "amount", "type" : "uint256", - "internalType" : "uint256", - "indexed" : false + "name" : "amount", + "indexed" : false, + "internalType" : "uint256" } - ], - "name" : "Borrow", - "type" : "event" + ] }, { - "anonymous" : false, "inputs" : [ { "indexed" : true, - "internalType" : "address", "type" : "address", - "name" : "account" + "name" : "account", + "internalType" : "address" }, { + "internalType" : "address", "type" : "address", "name" : "delegate", - "indexed" : true, - "internalType" : "address" + "indexed" : true } ], "name" : "DelegateAverageLiquidity", - "type" : "event" + "type" : "event", + "anonymous" : false }, { "inputs" : [ { "type" : "address", - "name" : "underlying", "internalType" : "address", + "name" : "underlying", "indexed" : true }, { "internalType" : "address", - "indexed" : true, + "type" : "address", "name" : "account", - "type" : "address" + "indexed" : true }, { - "internalType" : "uint256", "indexed" : false, + "type" : "uint256", "name" : "amount", - "type" : "uint256" + "internalType" : "uint256" } ], - "anonymous" : false, "type" : "event", - "name" : "Deposit" + "name" : "Deposit", + "anonymous" : false }, { - "name" : "EnterMarket", - "type" : "event", - "anonymous" : false, "inputs" : [ { + "indexed" : true, "type" : "address", "name" : "underlying", - "internalType" : "address", - "indexed" : true + "internalType" : "address" }, { - "internalType" : "address", "indexed" : true, "type" : "address", - "name" : "account" + "name" : "account", + "internalType" : "address" } - ] + ], + "anonymous" : false, + "type" : "event", + "name" : "EnterMarket" }, { "inputs" : [ { - "indexed" : true, - "internalType" : "address", + "type" : "address", "name" : "underlying", - "type" : "address" + "internalType" : "address", + "indexed" : true }, { - "indexed" : true, - "internalType" : "address", + "type" : "address", "name" : "account", - "type" : "address" + "internalType" : "address", + "indexed" : true } ], - "anonymous" : false, "type" : "event", + "anonymous" : false, "name" : "ExitMarket" }, { + "inputs" : [], "type" : "event", "name" : "Genesis", - "inputs" : [], "anonymous" : false }, { + "type" : "event", "anonymous" : false, + "name" : "GovConvertReserves", "inputs" : [ { "indexed" : true, - "internalType" : "address", "type" : "address", - "name" : "underlying" + "name" : "underlying", + "internalType" : "address" }, { - "indexed" : true, - "internalType" : "address", "type" : "address", - "name" : "recipient" + "internalType" : "address", + "name" : "recipient", + "indexed" : true }, { - "type" : "uint256", "name" : "amount", - "indexed" : false, - "internalType" : "uint256" + "type" : "uint256", + "internalType" : "uint256", + "indexed" : false } - ], - "name" : "GovConvertReserves", - "type" : "event" + ] }, { + "anonymous" : false, "type" : "event", "name" : "GovSetAssetConfig", "inputs" : [ { - "internalType" : "address", - "indexed" : true, + "name" : "underlying", "type" : "address", - "name" : "underlying" + "indexed" : true, + "internalType" : "address" }, { + "internalType" : "struct Storage.AssetConfig", + "type" : "tuple", "name" : "newConfig", + "indexed" : false, "components" : [ { "type" : "address", @@ -223,67 +227,61 @@ "internalType" : "address" }, { - "internalType" : "bool", "type" : "bool", - "name" : "borrowIsolated" + "name" : "borrowIsolated", + "internalType" : "bool" }, { + "internalType" : "uint32", "type" : "uint32", - "name" : "collateralFactor", - "internalType" : "uint32" + "name" : "collateralFactor" }, { - "internalType" : "uint32", "type" : "uint32", + "internalType" : "uint32", "name" : "borrowFactor" }, { - "internalType" : "uint24", "type" : "uint24", + "internalType" : "uint24", "name" : "twapWindow" } - ], - "type" : "tuple", - "indexed" : false, - "internalType" : "struct Storage.AssetConfig" + ] } - ], - "anonymous" : false + ] }, { - "type" : "event", - "name" : "GovSetChainlinkPriceFeed", "inputs" : [ { - "indexed" : true, "internalType" : "address", + "type" : "address", "name" : "underlying", - "type" : "address" + "indexed" : true }, { "type" : "address", - "name" : "chainlinkAggregator", "internalType" : "address", + "name" : "chainlinkAggregator", "indexed" : false } ], - "anonymous" : false + "type" : "event", + "anonymous" : false, + "name" : "GovSetChainlinkPriceFeed" }, { - "type" : "event", - "name" : "GovSetIRM", "inputs" : [ { - "name" : "underlying", + "internalType" : "address", "type" : "address", - "indexed" : true, - "internalType" : "address" + "name" : "underlying", + "indexed" : true }, { - "name" : "interestRateModel", + "indexed" : false, "type" : "uint256", - "internalType" : "uint256", - "indexed" : false + "name" : "interestRateModel", + "internalType" : "uint256" }, { "name" : "resetParams", @@ -292,35 +290,36 @@ "indexed" : false } ], - "anonymous" : false + "anonymous" : false, + "type" : "event", + "name" : "GovSetIRM" }, { "inputs" : [ { + "indexed" : true, "type" : "address", "name" : "underlying", - "internalType" : "address", - "indexed" : true + "internalType" : "address" }, { "type" : "uint16", - "name" : "newPricingType", "indexed" : false, + "name" : "newPricingType", "internalType" : "uint16" }, { - "internalType" : "uint32", - "indexed" : false, "type" : "uint32", - "name" : "newPricingParameter" + "name" : "newPricingParameter", + "internalType" : "uint32", + "indexed" : false } ], - "anonymous" : false, "type" : "event", - "name" : "GovSetPricingConfig" + "name" : "GovSetPricingConfig", + "anonymous" : false }, { - "anonymous" : false, "inputs" : [ { "type" : "address", @@ -329,92 +328,95 @@ "internalType" : "address" }, { - "indexed" : false, "internalType" : "uint32", "type" : "uint32", - "name" : "newReserveFee" + "name" : "newReserveFee", + "indexed" : false } ], - "name" : "GovSetReserveFee", - "type" : "event" - }, - { - "name" : "InstallerInstallModule", "type" : "event", "anonymous" : false, + "name" : "GovSetReserveFee" + }, + { "inputs" : [ { - "name" : "moduleId", "type" : "uint256", + "name" : "moduleId", "indexed" : true, "internalType" : "uint256" }, { + "internalType" : "address", "type" : "address", "name" : "moduleImpl", - "indexed" : true, - "internalType" : "address" + "indexed" : true }, { "type" : "bytes32", - "name" : "moduleGitCommit", "internalType" : "bytes32", + "name" : "moduleGitCommit", "indexed" : false } - ] + ], + "type" : "event", + "anonymous" : false, + "name" : "InstallerInstallModule" }, { - "type" : "event", - "name" : "InstallerSetGovernorAdmin", "inputs" : [ { - "indexed" : true, - "internalType" : "address", "type" : "address", - "name" : "newGovernorAdmin" + "name" : "newGovernorAdmin", + "internalType" : "address", + "indexed" : true } ], - "anonymous" : false + "anonymous" : false, + "type" : "event", + "name" : "InstallerSetGovernorAdmin" }, { "inputs" : [ { - "internalType" : "address", - "indexed" : true, "name" : "newUpgradeAdmin", - "type" : "address" + "type" : "address", + "indexed" : true, + "internalType" : "address" } ], - "anonymous" : false, "type" : "event", - "name" : "InstallerSetUpgradeAdmin" + "name" : "InstallerSetUpgradeAdmin", + "anonymous" : false }, { "anonymous" : false, + "type" : "event", + "name" : "Liquidation", "inputs" : [ { - "indexed" : true, "internalType" : "address", "type" : "address", - "name" : "liquidator" + "name" : "liquidator", + "indexed" : true }, { - "internalType" : "address", - "indexed" : true, "type" : "address", - "name" : "violator" + "indexed" : true, + "name" : "violator", + "internalType" : "address" }, { - "name" : "underlying", "type" : "address", "indexed" : true, + "name" : "underlying", "internalType" : "address" }, { - "indexed" : false, - "internalType" : "address", "name" : "collateral", - "type" : "address" + "type" : "address", + "indexed" : false, + "internalType" : "address" }, { "name" : "repay", @@ -423,428 +425,505 @@ "indexed" : false }, { - "name" : "yield", + "indexed" : false, "type" : "uint256", - "internalType" : "uint256", - "indexed" : false + "name" : "yield", + "internalType" : "uint256" }, { - "indexed" : false, - "internalType" : "uint256", + "type" : "uint256", "name" : "healthScore", - "type" : "uint256" + "indexed" : false, + "internalType" : "uint256" }, { - "name" : "baseDiscount", - "type" : "uint256", "indexed" : false, + "type" : "uint256", + "name" : "baseDiscount", "internalType" : "uint256" }, { "indexed" : false, - "internalType" : "uint256", "type" : "uint256", - "name" : "discount" + "name" : "discount", + "internalType" : "uint256" } - ], - "name" : "Liquidation", - "type" : "event" + ] }, { - "type" : "event", - "name" : "MarketActivated", "inputs" : [ { - "name" : "underlying", "type" : "address", - "indexed" : true, - "internalType" : "address" + "name" : "underlying", + "internalType" : "address", + "indexed" : true }, { + "type" : "address", "name" : "eToken", + "internalType" : "address", + "indexed" : true + }, + { "type" : "address", + "name" : "dToken", "indexed" : true, "internalType" : "address" - }, - { - "internalType" : "address", - "indexed" : true, - "type" : "address", - "name" : "dToken" } ], + "name" : "MarketActivated", + "type" : "event", "anonymous" : false }, { + "name" : "PTokenActivated", + "type" : "event", + "anonymous" : false, "inputs" : [ { + "type" : "address", "indexed" : true, - "internalType" : "address", "name" : "underlying", - "type" : "address" + "internalType" : "address" }, { - "indexed" : true, - "internalType" : "address", "type" : "address", - "name" : "pToken" + "name" : "pToken", + "indexed" : true, + "internalType" : "address" } - ], - "anonymous" : false, - "type" : "event", - "name" : "PTokenActivated" + ] }, { - "anonymous" : false, "inputs" : [ { - "indexed" : true, - "internalType" : "address", "name" : "underlying", - "type" : "address" + "type" : "address", + "indexed" : true, + "internalType" : "address" }, { - "indexed" : true, + "type" : "address", "internalType" : "address", "name" : "account", - "type" : "address" + "indexed" : true }, { - "name" : "amount", "type" : "uint256", + "name" : "amount", "internalType" : "uint256", "indexed" : false } ], - "name" : "PTokenUnWrap", - "type" : "event" + "anonymous" : false, + "type" : "event", + "name" : "PTokenUnWrap" }, { "inputs" : [ { - "internalType" : "address", - "indexed" : true, + "name" : "underlying", "type" : "address", - "name" : "underlying" + "indexed" : true, + "internalType" : "address" }, { - "name" : "account", "type" : "address", + "name" : "account", "internalType" : "address", "indexed" : true }, { - "internalType" : "uint256", "indexed" : false, "type" : "uint256", - "name" : "amount" + "name" : "amount", + "internalType" : "uint256" } ], - "anonymous" : false, "type" : "event", + "anonymous" : false, "name" : "PTokenWrap" }, { - "name" : "ProxyCreated", "type" : "event", + "name" : "ProxyCreated", "anonymous" : false, "inputs" : [ { - "internalType" : "address", + "type" : "address", "indexed" : true, "name" : "proxy", - "type" : "address" + "internalType" : "address" }, { - "indexed" : false, - "internalType" : "uint256", + "name" : "moduleId", "type" : "uint256", - "name" : "moduleId" + "indexed" : false, + "internalType" : "uint256" } ] }, { - "type" : "event", - "name" : "Repay", "inputs" : [ { "indexed" : true, - "internalType" : "address", + "type" : "address", "name" : "underlying", - "type" : "address" + "internalType" : "address" }, { "type" : "address", + "indexed" : true, "name" : "account", - "internalType" : "address", - "indexed" : true + "internalType" : "address" }, { "internalType" : "uint256", - "indexed" : false, + "type" : "uint256", "name" : "amount", - "type" : "uint256" + "indexed" : false } ], - "anonymous" : false - }, - { "anonymous" : false, - "inputs" : [ - { - "type" : "address", - "name" : "account", - "internalType" : "address", - "indexed" : true - }, - { - "name" : "amount", - "type" : "uint256", - "indexed" : false, - "internalType" : "uint256" - } - ], - "name" : "RequestBorrow", - "type" : "event" + "type" : "event", + "name" : "Repay" }, { - "name" : "RequestBurn", "type" : "event", + "name" : "RequestBorrow", "anonymous" : false, "inputs" : [ { "indexed" : true, - "internalType" : "address", "type" : "address", - "name" : "account" + "name" : "account", + "internalType" : "address" }, { - "name" : "amount", "type" : "uint256", + "name" : "amount", "indexed" : false, "internalType" : "uint256" } ] }, { - "name" : "RequestDeposit", - "type" : "event", "anonymous" : false, + "type" : "event", + "name" : "RequestBurn", "inputs" : [ { - "type" : "address", "name" : "account", + "type" : "address", "internalType" : "address", "indexed" : true }, { - "indexed" : false, - "internalType" : "uint256", "type" : "uint256", - "name" : "amount" + "name" : "amount", + "internalType" : "uint256", + "indexed" : false } ] }, { "inputs" : [ { - "indexed" : true, - "internalType" : "address", "name" : "account", - "type" : "address" + "type" : "address", + "indexed" : true, + "internalType" : "address" }, { - "name" : "amount", "type" : "uint256", + "name" : "amount", "internalType" : "uint256", "indexed" : false } ], "anonymous" : false, "type" : "event", - "name" : "RequestDonate" + "name" : "RequestDeposit" }, { + "type" : "event", + "name" : "RequestDonate", "anonymous" : false, "inputs" : [ { - "indexed" : true, + "type" : "address", "internalType" : "address", + "name" : "account", + "indexed" : true + }, + { + "type" : "uint256", + "name" : "amount", + "indexed" : false, + "internalType" : "uint256" + } + ] + }, + { + "inputs" : [ + { + "indexed" : true, "type" : "address", - "name" : "liquidator" + "name" : "liquidator", + "internalType" : "address" }, { "type" : "address", - "name" : "violator", "internalType" : "address", + "name" : "violator", "indexed" : true }, { - "internalType" : "address", - "indexed" : true, + "name" : "underlying", "type" : "address", - "name" : "underlying" + "internalType" : "address", + "indexed" : true }, { + "indexed" : false, "type" : "address", "name" : "collateral", - "internalType" : "address", - "indexed" : false + "internalType" : "address" }, { "internalType" : "uint256", - "indexed" : false, + "type" : "uint256", "name" : "repay", - "type" : "uint256" + "indexed" : false }, { - "name" : "minYield", "type" : "uint256", "internalType" : "uint256", + "name" : "minYield", "indexed" : false } ], - "name" : "RequestLiquidate", - "type" : "event" + "type" : "event", + "anonymous" : false, + "name" : "RequestLiquidate" }, { - "type" : "event", - "name" : "RequestMint", "inputs" : [ { "internalType" : "address", - "indexed" : true, + "type" : "address", "name" : "account", - "type" : "address" + "indexed" : true }, { + "indexed" : false, "type" : "uint256", "name" : "amount", - "internalType" : "uint256", - "indexed" : false + "internalType" : "uint256" } ], + "type" : "event", + "name" : "RequestMint", "anonymous" : false }, { + "anonymous" : false, + "type" : "event", + "name" : "RequestRepay", "inputs" : [ { + "indexed" : true, + "type" : "address", "name" : "account", + "internalType" : "address" + }, + { + "indexed" : false, + "type" : "uint256", + "name" : "amount", + "internalType" : "uint256" + } + ] + }, + { + "anonymous" : false, + "type" : "event", + "name" : "RequestSwap", + "inputs" : [ + { "type" : "address", + "name" : "accountIn", + "internalType" : "address", + "indexed" : true + }, + { + "type" : "address", + "name" : "accountOut", "internalType" : "address", "indexed" : true }, + { + "type" : "address", + "name" : "underlyingIn", + "indexed" : true, + "internalType" : "address" + }, + { + "internalType" : "address", + "type" : "address", + "name" : "underlyingOut", + "indexed" : false + }, { "name" : "amount", "type" : "uint256", + "indexed" : false, + "internalType" : "uint256" + }, + { + "type" : "uint256", + "name" : "swapType", "internalType" : "uint256", "indexed" : false } - ], - "anonymous" : false, - "type" : "event", - "name" : "RequestRepay" + ] }, { - "name" : "RequestSwap", "type" : "event", "anonymous" : false, + "name" : "RequestSwapHub", "inputs" : [ { - "name" : "accountIn", "type" : "address", "internalType" : "address", + "name" : "accountIn", "indexed" : true }, { "type" : "address", "name" : "accountOut", + "indexed" : true, + "internalType" : "address" + }, + { + "name" : "underlyingIn", + "type" : "address", "internalType" : "address", "indexed" : true }, { "type" : "address", - "name" : "underlyingIn", - "indexed" : true, + "indexed" : false, + "name" : "underlyingOut", "internalType" : "address" }, { + "type" : "uint256", + "name" : "amountIn", "indexed" : false, - "internalType" : "address", - "name" : "underlyingOut", - "type" : "address" + "internalType" : "uint256" }, { "internalType" : "uint256", - "indexed" : false, "type" : "uint256", - "name" : "amount" + "name" : "amountOut", + "indexed" : false }, { - "internalType" : "uint256", - "indexed" : false, "type" : "uint256", - "name" : "swapType" + "indexed" : false, + "name" : "mode", + "internalType" : "uint256" + }, + { + "type" : "address", + "indexed" : false, + "name" : "swapHandler", + "internalType" : "address" } ] }, { - "anonymous" : false, "inputs" : [ { + "type" : "address", + "name" : "accountIn", "indexed" : true, - "internalType" : "address", - "name" : "from", - "type" : "address" + "internalType" : "address" + }, + { + "indexed" : true, + "type" : "address", + "name" : "accountOut", + "internalType" : "address" }, { - "name" : "to", "type" : "address", "indexed" : true, + "name" : "underlyingIn", "internalType" : "address" }, { - "name" : "amount", - "type" : "uint256", + "internalType" : "address", + "type" : "address", + "name" : "underlyingOut", + "indexed" : false + }, + { "indexed" : false, + "type" : "uint256", + "name" : "targetDebt", "internalType" : "uint256" + }, + { + "indexed" : false, + "type" : "address", + "name" : "swapHandler", + "internalType" : "address" } ], - "name" : "RequestTransferDToken", - "type" : "event" + "type" : "event", + "name" : "RequestSwapHubRepay", + "anonymous" : false }, { - "anonymous" : false, "inputs" : [ { - "indexed" : true, - "internalType" : "address", "type" : "address", - "name" : "from" + "name" : "from", + "internalType" : "address", + "indexed" : true }, { - "name" : "to", "type" : "address", "internalType" : "address", + "name" : "to", "indexed" : true }, { - "internalType" : "uint256", - "indexed" : false, "name" : "amount", - "type" : "uint256" + "type" : "uint256", + "internalType" : "uint256", + "indexed" : false } ], - "name" : "RequestTransferEToken", - "type" : "event" + "anonymous" : false, + "type" : "event", + "name" : "RequestTransferDToken" }, { "inputs" : [ { "type" : "address", - "name" : "account", - "indexed" : true, - "internalType" : "address" + "internalType" : "address", + "name" : "from", + "indexed" : true + }, + { + "name" : "to", + "type" : "address", + "internalType" : "address", + "indexed" : true }, { "name" : "amount", @@ -853,103 +932,121 @@ "internalType" : "uint256" } ], - "anonymous" : false, + "name" : "RequestTransferEToken", "type" : "event", - "name" : "RequestWithdraw" + "anonymous" : false }, { - "name" : "TrackAverageLiquidity", "type" : "event", "anonymous" : false, + "name" : "RequestWithdraw", "inputs" : [ { - "indexed" : true, + "type" : "address", + "name" : "account", "internalType" : "address", + "indexed" : true + }, + { + "internalType" : "uint256", + "type" : "uint256", + "name" : "amount", + "indexed" : false + } + ] + }, + { + "name" : "TrackAverageLiquidity", + "type" : "event", + "anonymous" : false, + "inputs" : [ + { "type" : "address", - "name" : "account" + "name" : "account", + "indexed" : true, + "internalType" : "address" } ] }, { + "name" : "UnTrackAverageLiquidity", + "type" : "event", "anonymous" : false, "inputs" : [ { "indexed" : true, - "internalType" : "address", + "type" : "address", "name" : "account", - "type" : "address" + "internalType" : "address" } - ], - "name" : "UnTrackAverageLiquidity", - "type" : "event" + ] }, { + "anonymous" : false, "type" : "event", "name" : "Withdraw", "inputs" : [ { - "type" : "address", "name" : "underlying", + "type" : "address", "indexed" : true, "internalType" : "address" }, { - "internalType" : "address", - "indexed" : true, "type" : "address", - "name" : "account" + "internalType" : "address", + "name" : "account", + "indexed" : true }, { - "indexed" : false, "internalType" : "uint256", + "type" : "uint256", "name" : "amount", - "type" : "uint256" + "indexed" : false } - ], - "anonymous" : false + ] }, { "name" : "DISCOUNT_BOOSTER_SLOPE", "type" : "function", + "stateMutability" : "view", "outputs" : [ { + "type" : "uint256", "internalType" : "uint256", - "name" : "", - "type" : "uint256" + "name" : "" } ], - "stateMutability" : "view", "inputs" : [] }, { "name" : "MAXIMUM_BOOSTER_DISCOUNT", "type" : "function", + "stateMutability" : "view", + "inputs" : [], "outputs" : [ { + "internalType" : "uint256", "type" : "uint256", - "name" : "", - "internalType" : "uint256" + "name" : "" } - ], - "stateMutability" : "view", - "inputs" : [] + ] }, { - "inputs" : [], - "stateMutability" : "view", "outputs" : [ { - "internalType" : "uint256", "type" : "uint256", + "internalType" : "uint256", "name" : "" } ], + "inputs" : [], "type" : "function", + "stateMutability" : "view", "name" : "MAXIMUM_DISCOUNT" }, { - "name" : "TARGET_HEALTH", - "type" : "function", + "inputs" : [], "outputs" : [ { "type" : "uint256", @@ -957,33 +1054,58 @@ "internalType" : "uint256" } ], + "type" : "function", "stateMutability" : "view", - "inputs" : [] + "name" : "TARGET_HEALTH" }, { "inputs" : [], - "stateMutability" : "view", "outputs" : [ { - "internalType" : "uint256", + "name" : "", "type" : "uint256", - "name" : "" + "internalType" : "uint256" } ], "type" : "function", - "name" : "UNDERLYING_RESERVES_FEE" + "name" : "UNDERLYING_RESERVES_FEE", + "stateMutability" : "view" }, { "name" : "checkLiquidation", "type" : "function", "stateMutability" : "nonpayable", + "inputs" : [ + { + "type" : "address", + "internalType" : "address", + "name" : "liquidator" + }, + { + "type" : "address", + "name" : "violator", + "internalType" : "address" + }, + { + "internalType" : "address", + "type" : "address", + "name" : "underlying" + }, + { + "name" : "collateral", + "type" : "address", + "internalType" : "address" + } + ], "outputs" : [ { + "name" : "liqOpp", "type" : "tuple", + "internalType" : "struct Liquidation.LiquidationOpportunity", "components" : [ { - "type" : "uint256", "name" : "repay", + "type" : "uint256", "internalType" : "uint256" }, { @@ -992,9 +1114,9 @@ "internalType" : "uint256" }, { - "internalType" : "uint256", "type" : "uint256", - "name" : "healthScore" + "name" : "healthScore", + "internalType" : "uint256" }, { "internalType" : "uint256", @@ -1002,101 +1124,77 @@ "name" : "baseDiscount" }, { + "type" : "uint256", "internalType" : "uint256", - "name" : "discount", - "type" : "uint256" + "name" : "discount" }, { - "internalType" : "uint256", "type" : "uint256", + "internalType" : "uint256", "name" : "conversionRate" } - ], - "name" : "liqOpp", - "internalType" : "struct Liquidation.LiquidationOpportunity" - } - ], - "inputs" : [ - { - "internalType" : "address", - "type" : "address", - "name" : "liquidator" - }, - { - "name" : "violator", - "type" : "address", - "internalType" : "address" - }, - { - "name" : "underlying", - "type" : "address", - "internalType" : "address" - }, - { - "internalType" : "address", - "name" : "collateral", - "type" : "address" + ] } ] }, { - "outputs" : [], + "name" : "liquidate", + "type" : "function", "stateMutability" : "nonpayable", "inputs" : [ { - "internalType" : "address", + "name" : "violator", "type" : "address", - "name" : "violator" + "internalType" : "address" }, { - "name" : "underlying", "type" : "address", - "internalType" : "address" + "internalType" : "address", + "name" : "underlying" }, { - "name" : "collateral", "type" : "address", - "internalType" : "address" + "internalType" : "address", + "name" : "collateral" }, { - "name" : "repay", "type" : "uint256", - "internalType" : "uint256" + "internalType" : "uint256", + "name" : "repay" }, { - "type" : "uint256", "name" : "minYield", + "type" : "uint256", "internalType" : "uint256" } ], - "name" : "liquidate", - "type" : "function" + "outputs" : [] }, { "name" : "moduleGitCommit", "type" : "function", + "stateMutability" : "view", "outputs" : [ { + "type" : "bytes32", "internalType" : "bytes32", - "name" : "", - "type" : "bytes32" + "name" : "" } ], - "stateMutability" : "view", "inputs" : [] }, { - "name" : "moduleId", - "type" : "function", - "stateMutability" : "view", + "inputs" : [], "outputs" : [ { "internalType" : "uint256", - "name" : "", - "type" : "uint256" + "type" : "uint256", + "name" : "" } ], - "inputs" : [] + "name" : "moduleId", + "type" : "function", + "stateMutability" : "view" } ] } diff --git a/abis/modules/Markets.json b/abis/modules/Markets.json index 314d940..a72999c 100644 --- a/abis/modules/Markets.json +++ b/abis/modules/Markets.json @@ -3,101 +3,101 @@ { "inputs" : [ { - "internalType" : "bytes32", "name" : "moduleGitCommit_", - "type" : "bytes32" + "type" : "bytes32", + "internalType" : "bytes32" } ], "stateMutability" : "nonpayable", "type" : "constructor" }, { - "name" : "AssetStatus", - "type" : "event", - "anonymous" : false, "inputs" : [ { "type" : "address", - "name" : "underlying", "indexed" : true, + "name" : "underlying", "internalType" : "address" }, { - "indexed" : false, - "internalType" : "uint256", "name" : "totalBalances", - "type" : "uint256" + "type" : "uint256", + "indexed" : false, + "internalType" : "uint256" }, { - "internalType" : "uint256", - "indexed" : false, + "name" : "totalBorrows", "type" : "uint256", - "name" : "totalBorrows" + "internalType" : "uint256", + "indexed" : false }, { - "name" : "reserveBalance", "type" : "uint96", "indexed" : false, + "name" : "reserveBalance", "internalType" : "uint96" }, { - "indexed" : false, - "internalType" : "uint256", + "name" : "poolSize", "type" : "uint256", - "name" : "poolSize" + "indexed" : false, + "internalType" : "uint256" }, { "type" : "uint256", + "indexed" : false, "name" : "interestAccumulator", - "internalType" : "uint256", - "indexed" : false + "internalType" : "uint256" }, { - "type" : "int96", "name" : "interestRate", + "type" : "int96", "indexed" : false, "internalType" : "int96" }, { "type" : "uint256", - "name" : "timestamp", "internalType" : "uint256", + "name" : "timestamp", "indexed" : false } - ] + ], + "type" : "event", + "anonymous" : false, + "name" : "AssetStatus" }, { - "name" : "Borrow", "type" : "event", "anonymous" : false, + "name" : "Borrow", "inputs" : [ { - "indexed" : true, + "type" : "address", "internalType" : "address", "name" : "underlying", - "type" : "address" + "indexed" : true }, { - "type" : "address", "name" : "account", - "indexed" : true, - "internalType" : "address" + "type" : "address", + "internalType" : "address", + "indexed" : true }, { - "type" : "uint256", "name" : "amount", - "indexed" : false, - "internalType" : "uint256" + "type" : "uint256", + "internalType" : "uint256", + "indexed" : false } ] }, { "inputs" : [ { - "indexed" : true, - "internalType" : "address", "type" : "address", - "name" : "account" + "name" : "account", + "internalType" : "address", + "indexed" : true }, { "name" : "delegate", @@ -106,23 +106,26 @@ "internalType" : "address" } ], - "anonymous" : false, "type" : "event", - "name" : "DelegateAverageLiquidity" + "name" : "DelegateAverageLiquidity", + "anonymous" : false }, { + "type" : "event", + "name" : "Deposit", + "anonymous" : false, "inputs" : [ { - "name" : "underlying", + "indexed" : true, "type" : "address", - "internalType" : "address", - "indexed" : true + "name" : "underlying", + "internalType" : "address" }, { - "internalType" : "address", "indexed" : true, "type" : "address", - "name" : "account" + "name" : "account", + "internalType" : "address" }, { "type" : "uint256", @@ -130,39 +133,36 @@ "internalType" : "uint256", "indexed" : false } - ], - "anonymous" : false, - "type" : "event", - "name" : "Deposit" + ] }, { - "name" : "EnterMarket", - "type" : "event", - "anonymous" : false, "inputs" : [ { "type" : "address", - "name" : "underlying", "indexed" : true, + "name" : "underlying", "internalType" : "address" }, { "type" : "address", - "name" : "account", "internalType" : "address", + "name" : "account", "indexed" : true } - ] + ], + "anonymous" : false, + "type" : "event", + "name" : "EnterMarket" }, { - "name" : "ExitMarket", "type" : "event", + "name" : "ExitMarket", "anonymous" : false, "inputs" : [ { "type" : "address", - "name" : "underlying", "indexed" : true, + "name" : "underlying", "internalType" : "address" }, { @@ -174,84 +174,83 @@ ] }, { - "name" : "Genesis", - "type" : "event", "anonymous" : false, + "type" : "event", + "name" : "Genesis", "inputs" : [] }, { "inputs" : [ { - "type" : "address", "name" : "underlying", + "type" : "address", "indexed" : true, "internalType" : "address" }, { + "internalType" : "address", "type" : "address", "name" : "recipient", - "internalType" : "address", "indexed" : true }, { "name" : "amount", "type" : "uint256", - "internalType" : "uint256", - "indexed" : false + "indexed" : false, + "internalType" : "uint256" } ], - "anonymous" : false, + "name" : "GovConvertReserves", "type" : "event", - "name" : "GovConvertReserves" + "anonymous" : false }, { - "name" : "GovSetAssetConfig", "type" : "event", + "name" : "GovSetAssetConfig", "anonymous" : false, "inputs" : [ { - "name" : "underlying", "type" : "address", - "indexed" : true, - "internalType" : "address" + "internalType" : "address", + "name" : "underlying", + "indexed" : true }, { "type" : "tuple", + "name" : "newConfig", "components" : [ { "type" : "address", - "name" : "eTokenAddress", - "internalType" : "address" + "internalType" : "address", + "name" : "eTokenAddress" }, { - "type" : "bool", "name" : "borrowIsolated", + "type" : "bool", "internalType" : "bool" }, { - "internalType" : "uint32", "type" : "uint32", - "name" : "collateralFactor" + "name" : "collateralFactor", + "internalType" : "uint32" }, { - "internalType" : "uint32", "name" : "borrowFactor", - "type" : "uint32" + "type" : "uint32", + "internalType" : "uint32" }, { - "internalType" : "uint24", + "type" : "uint24", "name" : "twapWindow", - "type" : "uint24" + "internalType" : "uint24" } ], - "name" : "newConfig", "internalType" : "struct Storage.AssetConfig", "indexed" : false } ] }, { - "anonymous" : false, "inputs" : [ { "name" : "underlying", @@ -260,100 +259,98 @@ "internalType" : "address" }, { - "indexed" : false, - "internalType" : "address", "name" : "chainlinkAggregator", - "type" : "address" + "type" : "address", + "internalType" : "address", + "indexed" : false } ], - "name" : "GovSetChainlinkPriceFeed", - "type" : "event" + "anonymous" : false, + "type" : "event", + "name" : "GovSetChainlinkPriceFeed" }, { - "name" : "GovSetIRM", "type" : "event", "anonymous" : false, + "name" : "GovSetIRM", "inputs" : [ { + "indexed" : true, "type" : "address", "name" : "underlying", - "internalType" : "address", - "indexed" : true + "internalType" : "address" }, { - "indexed" : false, - "internalType" : "uint256", + "type" : "uint256", "name" : "interestRateModel", - "type" : "uint256" + "internalType" : "uint256", + "indexed" : false }, { "name" : "resetParams", "type" : "bytes", - "indexed" : false, - "internalType" : "bytes" + "internalType" : "bytes", + "indexed" : false } ] }, { + "name" : "GovSetPricingConfig", + "type" : "event", + "anonymous" : false, "inputs" : [ { - "indexed" : true, - "internalType" : "address", "type" : "address", - "name" : "underlying" + "internalType" : "address", + "name" : "underlying", + "indexed" : true }, { - "internalType" : "uint16", "indexed" : false, "type" : "uint16", - "name" : "newPricingType" + "name" : "newPricingType", + "internalType" : "uint16" }, { "name" : "newPricingParameter", "type" : "uint32", - "internalType" : "uint32", - "indexed" : false + "indexed" : false, + "internalType" : "uint32" } - ], - "anonymous" : false, - "type" : "event", - "name" : "GovSetPricingConfig" + ] }, { + "type" : "event", + "anonymous" : false, + "name" : "GovSetReserveFee", "inputs" : [ { "name" : "underlying", "type" : "address", - "indexed" : true, - "internalType" : "address" + "internalType" : "address", + "indexed" : true }, { - "name" : "newReserveFee", "type" : "uint32", - "internalType" : "uint32", - "indexed" : false + "indexed" : false, + "name" : "newReserveFee", + "internalType" : "uint32" } - ], - "anonymous" : false, - "type" : "event", - "name" : "GovSetReserveFee" + ] }, { - "name" : "InstallerInstallModule", - "type" : "event", - "anonymous" : false, "inputs" : [ { + "indexed" : true, "type" : "uint256", "name" : "moduleId", - "indexed" : true, "internalType" : "uint256" }, { - "name" : "moduleImpl", "type" : "address", - "indexed" : true, - "internalType" : "address" + "internalType" : "address", + "name" : "moduleImpl", + "indexed" : true }, { "name" : "moduleGitCommit", @@ -361,18 +358,21 @@ "indexed" : false, "internalType" : "bytes32" } - ] + ], + "name" : "InstallerInstallModule", + "type" : "event", + "anonymous" : false }, { - "name" : "InstallerSetGovernorAdmin", "type" : "event", + "name" : "InstallerSetGovernorAdmin", "anonymous" : false, "inputs" : [ { - "internalType" : "address", - "indexed" : true, "name" : "newGovernorAdmin", - "type" : "address" + "type" : "address", + "internalType" : "address", + "indexed" : true } ] }, @@ -380,95 +380,95 @@ "inputs" : [ { "type" : "address", - "name" : "newUpgradeAdmin", "internalType" : "address", + "name" : "newUpgradeAdmin", "indexed" : true } ], - "anonymous" : false, + "name" : "InstallerSetUpgradeAdmin", "type" : "event", - "name" : "InstallerSetUpgradeAdmin" + "anonymous" : false }, { + "anonymous" : false, + "type" : "event", + "name" : "Liquidation", "inputs" : [ { - "internalType" : "address", - "indexed" : true, + "type" : "address", "name" : "liquidator", - "type" : "address" + "indexed" : true, + "internalType" : "address" }, { - "type" : "address", "name" : "violator", - "indexed" : true, - "internalType" : "address" + "type" : "address", + "internalType" : "address", + "indexed" : true }, { "type" : "address", - "name" : "underlying", "internalType" : "address", + "name" : "underlying", "indexed" : true }, { - "indexed" : false, "internalType" : "address", + "type" : "address", "name" : "collateral", - "type" : "address" + "indexed" : false }, { + "indexed" : false, "type" : "uint256", "name" : "repay", - "indexed" : false, "internalType" : "uint256" }, { - "indexed" : false, - "internalType" : "uint256", "type" : "uint256", - "name" : "yield" + "name" : "yield", + "indexed" : false, + "internalType" : "uint256" }, { "type" : "uint256", "name" : "healthScore", - "indexed" : false, - "internalType" : "uint256" + "internalType" : "uint256", + "indexed" : false }, { + "type" : "uint256", "indexed" : false, - "internalType" : "uint256", "name" : "baseDiscount", - "type" : "uint256" + "internalType" : "uint256" }, { "type" : "uint256", + "internalType" : "uint256", "name" : "discount", - "indexed" : false, - "internalType" : "uint256" + "indexed" : false } - ], - "anonymous" : false, - "type" : "event", - "name" : "Liquidation" + ] }, { "inputs" : [ { - "name" : "underlying", "type" : "address", - "internalType" : "address", - "indexed" : true + "indexed" : true, + "name" : "underlying", + "internalType" : "address" }, { - "type" : "address", "name" : "eToken", + "type" : "address", "indexed" : true, "internalType" : "address" }, { - "type" : "address", "name" : "dToken", - "indexed" : true, - "internalType" : "address" + "type" : "address", + "internalType" : "address", + "indexed" : true } ], "anonymous" : false, @@ -479,274 +479,316 @@ "inputs" : [ { "type" : "address", + "internalType" : "address", "name" : "underlying", - "indexed" : true, - "internalType" : "address" + "indexed" : true }, { "indexed" : true, - "internalType" : "address", "type" : "address", - "name" : "pToken" + "name" : "pToken", + "internalType" : "address" } ], - "anonymous" : false, + "name" : "PTokenActivated", "type" : "event", - "name" : "PTokenActivated" + "anonymous" : false }, { "type" : "event", "name" : "PTokenUnWrap", + "anonymous" : false, "inputs" : [ { - "indexed" : true, + "type" : "address", "internalType" : "address", "name" : "underlying", - "type" : "address" + "indexed" : true }, { - "indexed" : true, - "internalType" : "address", "name" : "account", - "type" : "address" + "type" : "address", + "indexed" : true, + "internalType" : "address" }, { - "internalType" : "uint256", - "indexed" : false, + "name" : "amount", "type" : "uint256", - "name" : "amount" + "internalType" : "uint256", + "indexed" : false } - ], - "anonymous" : false + ] }, { - "name" : "PTokenWrap", - "type" : "event", - "anonymous" : false, "inputs" : [ { "type" : "address", - "name" : "underlying", "internalType" : "address", + "name" : "underlying", "indexed" : true }, { - "indexed" : true, "internalType" : "address", + "type" : "address", "name" : "account", - "type" : "address" + "indexed" : true }, { - "internalType" : "uint256", - "indexed" : false, "type" : "uint256", - "name" : "amount" + "name" : "amount", + "internalType" : "uint256", + "indexed" : false } - ] + ], + "name" : "PTokenWrap", + "type" : "event", + "anonymous" : false }, { - "anonymous" : false, "inputs" : [ { - "indexed" : true, + "type" : "address", "internalType" : "address", "name" : "proxy", - "type" : "address" + "indexed" : true }, { - "indexed" : false, "internalType" : "uint256", + "type" : "uint256", "name" : "moduleId", - "type" : "uint256" + "indexed" : false } ], - "name" : "ProxyCreated", - "type" : "event" + "anonymous" : false, + "type" : "event", + "name" : "ProxyCreated" }, { - "type" : "event", - "name" : "Repay", "inputs" : [ { "type" : "address", - "name" : "underlying", "indexed" : true, + "name" : "underlying", "internalType" : "address" }, { - "indexed" : true, - "internalType" : "address", "type" : "address", - "name" : "account" + "name" : "account", + "internalType" : "address", + "indexed" : true }, { "internalType" : "uint256", - "indexed" : false, "type" : "uint256", - "name" : "amount" + "name" : "amount", + "indexed" : false } ], + "type" : "event", + "name" : "Repay", "anonymous" : false }, { - "anonymous" : false, "inputs" : [ { - "type" : "address", "name" : "account", - "internalType" : "address", - "indexed" : true + "type" : "address", + "indexed" : true, + "internalType" : "address" }, { - "name" : "amount", - "type" : "uint256", "indexed" : false, + "type" : "uint256", + "name" : "amount", "internalType" : "uint256" } ], "name" : "RequestBorrow", - "type" : "event" + "type" : "event", + "anonymous" : false }, { - "name" : "RequestBurn", "type" : "event", "anonymous" : false, + "name" : "RequestBurn", "inputs" : [ { - "indexed" : true, - "internalType" : "address", "type" : "address", - "name" : "account" + "internalType" : "address", + "name" : "account", + "indexed" : true }, { - "name" : "amount", + "internalType" : "uint256", "type" : "uint256", - "indexed" : false, - "internalType" : "uint256" + "name" : "amount", + "indexed" : false } ] }, { "type" : "event", + "anonymous" : false, "name" : "RequestDeposit", "inputs" : [ { - "indexed" : true, - "internalType" : "address", + "name" : "account", "type" : "address", - "name" : "account" + "indexed" : true, + "internalType" : "address" }, { + "type" : "uint256", "indexed" : false, - "internalType" : "uint256", "name" : "amount", - "type" : "uint256" + "internalType" : "uint256" } - ], - "anonymous" : false + ] }, { + "name" : "RequestDonate", + "type" : "event", + "anonymous" : false, "inputs" : [ { - "internalType" : "address", - "indexed" : true, + "name" : "account", "type" : "address", - "name" : "account" + "indexed" : true, + "internalType" : "address" }, { - "indexed" : false, + "type" : "uint256", "internalType" : "uint256", "name" : "amount", - "type" : "uint256" + "indexed" : false } - ], - "anonymous" : false, - "type" : "event", - "name" : "RequestDonate" + ] }, { + "anonymous" : false, + "type" : "event", + "name" : "RequestLiquidate", "inputs" : [ { - "indexed" : true, - "internalType" : "address", + "type" : "address", "name" : "liquidator", - "type" : "address" + "internalType" : "address", + "indexed" : true }, { - "internalType" : "address", - "indexed" : true, + "type" : "address", "name" : "violator", - "type" : "address" + "indexed" : true, + "internalType" : "address" }, { "type" : "address", + "indexed" : true, "name" : "underlying", - "internalType" : "address", - "indexed" : true + "internalType" : "address" }, { "type" : "address", "name" : "collateral", - "indexed" : false, - "internalType" : "address" + "internalType" : "address", + "indexed" : false }, { - "type" : "uint256", "name" : "repay", + "type" : "uint256", "indexed" : false, "internalType" : "uint256" }, { - "type" : "uint256", "name" : "minYield", + "type" : "uint256", "internalType" : "uint256", "indexed" : false } - ], - "anonymous" : false, - "type" : "event", - "name" : "RequestLiquidate" + ] }, { + "type" : "event", + "name" : "RequestMint", + "anonymous" : false, "inputs" : [ { "indexed" : true, - "internalType" : "address", + "type" : "address", "name" : "account", - "type" : "address" + "internalType" : "address" }, { + "type" : "uint256", + "name" : "amount", "internalType" : "uint256", - "indexed" : false, + "indexed" : false + } + ] + }, + { + "inputs" : [ + { + "type" : "address", + "indexed" : true, + "name" : "account", + "internalType" : "address" + }, + { "type" : "uint256", - "name" : "amount" + "internalType" : "uint256", + "name" : "amount", + "indexed" : false } ], "anonymous" : false, "type" : "event", - "name" : "RequestMint" + "name" : "RequestRepay" }, { + "type" : "event", + "anonymous" : false, + "name" : "RequestSwap", "inputs" : [ { + "type" : "address", + "indexed" : true, + "name" : "accountIn", + "internalType" : "address" + }, + { + "name" : "accountOut", + "type" : "address", "indexed" : true, + "internalType" : "address" + }, + { + "name" : "underlyingIn", + "type" : "address", "internalType" : "address", + "indexed" : true + }, + { "type" : "address", - "name" : "account" + "indexed" : false, + "name" : "underlyingOut", + "internalType" : "address" }, { "name" : "amount", "type" : "uint256", "indexed" : false, "internalType" : "uint256" + }, + { + "type" : "uint256", + "indexed" : false, + "name" : "swapType", + "internalType" : "uint256" } - ], - "anonymous" : false, - "type" : "event", - "name" : "RequestRepay" + ] }, { - "anonymous" : false, "inputs" : [ { "name" : "accountIn", @@ -755,329 +797,392 @@ "internalType" : "address" }, { - "indexed" : true, + "type" : "address", "internalType" : "address", "name" : "accountOut", - "type" : "address" + "indexed" : true }, { "type" : "address", + "internalType" : "address", "name" : "underlyingIn", - "indexed" : true, - "internalType" : "address" + "indexed" : true }, { - "type" : "address", "name" : "underlyingOut", - "indexed" : false, - "internalType" : "address" + "type" : "address", + "internalType" : "address", + "indexed" : false }, { + "name" : "amountIn", "type" : "uint256", - "name" : "amount", "internalType" : "uint256", "indexed" : false }, { "type" : "uint256", - "name" : "swapType", + "name" : "amountOut", "indexed" : false, "internalType" : "uint256" + }, + { + "name" : "mode", + "type" : "uint256", + "internalType" : "uint256", + "indexed" : false + }, + { + "type" : "address", + "internalType" : "address", + "name" : "swapHandler", + "indexed" : false } ], - "name" : "RequestSwap", - "type" : "event" + "name" : "RequestSwapHub", + "type" : "event", + "anonymous" : false }, { "anonymous" : false, + "type" : "event", + "name" : "RequestSwapHubRepay", "inputs" : [ { + "indexed" : true, "type" : "address", - "name" : "from", + "name" : "accountIn", + "internalType" : "address" + }, + { + "type" : "address", + "indexed" : true, + "name" : "accountOut", + "internalType" : "address" + }, + { + "type" : "address", + "name" : "underlyingIn", "internalType" : "address", "indexed" : true }, { "internalType" : "address", - "indexed" : true, - "name" : "to", - "type" : "address" + "type" : "address", + "name" : "underlyingOut", + "indexed" : false }, { + "name" : "targetDebt", + "type" : "uint256", "internalType" : "uint256", - "indexed" : false, - "name" : "amount", - "type" : "uint256" + "indexed" : false + }, + { + "internalType" : "address", + "type" : "address", + "name" : "swapHandler", + "indexed" : false } - ], - "name" : "RequestTransferDToken", - "type" : "event" + ] }, { "inputs" : [ { - "indexed" : true, + "type" : "address", "internalType" : "address", "name" : "from", - "type" : "address" + "indexed" : true }, { - "internalType" : "address", - "indexed" : true, + "type" : "address", "name" : "to", - "type" : "address" + "indexed" : true, + "internalType" : "address" }, { + "indexed" : false, "type" : "uint256", "name" : "amount", - "internalType" : "uint256", - "indexed" : false + "internalType" : "uint256" } ], - "anonymous" : false, + "name" : "RequestTransferDToken", "type" : "event", - "name" : "RequestTransferEToken" + "anonymous" : false }, { + "type" : "event", "anonymous" : false, + "name" : "RequestTransferEToken", "inputs" : [ { - "type" : "address", - "name" : "account", "internalType" : "address", + "type" : "address", + "name" : "from", "indexed" : true }, { - "indexed" : false, - "internalType" : "uint256", + "name" : "to", + "type" : "address", + "indexed" : true, + "internalType" : "address" + }, + { "type" : "uint256", - "name" : "amount" + "internalType" : "uint256", + "name" : "amount", + "indexed" : false } - ], - "name" : "RequestWithdraw", - "type" : "event" + ] }, { + "name" : "RequestWithdraw", + "type" : "event", "anonymous" : false, "inputs" : [ { - "name" : "account", "type" : "address", + "name" : "account", "indexed" : true, "internalType" : "address" + }, + { + "type" : "uint256", + "name" : "amount", + "indexed" : false, + "internalType" : "uint256" } - ], - "name" : "TrackAverageLiquidity", - "type" : "event" + ] }, { - "name" : "UnTrackAverageLiquidity", "type" : "event", "anonymous" : false, + "name" : "TrackAverageLiquidity", "inputs" : [ { + "name" : "account", + "type" : "address", "internalType" : "address", - "indexed" : true, + "indexed" : true + } + ] + }, + { + "inputs" : [ + { "type" : "address", - "name" : "account" + "name" : "account", + "internalType" : "address", + "indexed" : true } - ] - }, - { - "name" : "Withdraw", + ], "type" : "event", "anonymous" : false, + "name" : "UnTrackAverageLiquidity" + }, + { "inputs" : [ { - "internalType" : "address", - "indexed" : true, "type" : "address", - "name" : "underlying" + "name" : "underlying", + "indexed" : true, + "internalType" : "address" }, { + "indexed" : true, "type" : "address", "name" : "account", - "indexed" : true, "internalType" : "address" }, { - "internalType" : "uint256", "indexed" : false, + "type" : "uint256", "name" : "amount", - "type" : "uint256" + "internalType" : "uint256" } - ] + ], + "type" : "event", + "name" : "Withdraw", + "anonymous" : false }, { + "type" : "function", + "stateMutability" : "nonpayable", + "name" : "activateMarket", "inputs" : [ { - "internalType" : "address", + "type" : "address", "name" : "underlying", - "type" : "address" + "internalType" : "address" } ], - "stateMutability" : "nonpayable", "outputs" : [ { - "type" : "address", "name" : "", + "type" : "address", "internalType" : "address" } - ], - "type" : "function", - "name" : "activateMarket" + ] }, { - "outputs" : [ + "inputs" : [ { + "type" : "address", "internalType" : "address", - "name" : "", - "type" : "address" + "name" : "underlying" } ], - "stateMutability" : "nonpayable", - "inputs" : [ + "outputs" : [ { + "internalType" : "address", "type" : "address", - "name" : "underlying", - "internalType" : "address" + "name" : "" } ], + "type" : "function", "name" : "activatePToken", - "type" : "function" + "stateMutability" : "nonpayable" }, { - "inputs" : [ + "outputs" : [ { "type" : "address", - "name" : "dToken", - "internalType" : "address" + "internalType" : "address", + "name" : "underlying" } ], - "outputs" : [ + "inputs" : [ { "type" : "address", - "name" : "underlying", - "internalType" : "address" + "internalType" : "address", + "name" : "dToken" } ], - "stateMutability" : "view", + "name" : "dTokenToUnderlying", "type" : "function", - "name" : "dTokenToUnderlying" + "stateMutability" : "view" }, { "name" : "eTokenToDToken", "type" : "function", "stateMutability" : "view", - "outputs" : [ + "inputs" : [ { + "type" : "address", "internalType" : "address", - "name" : "dTokenAddr", - "type" : "address" + "name" : "eToken" } ], - "inputs" : [ + "outputs" : [ { + "type" : "address", "internalType" : "address", - "name" : "eToken", - "type" : "address" + "name" : "dTokenAddr" } ] }, { - "name" : "eTokenToUnderlying", "type" : "function", + "name" : "eTokenToUnderlying", "stateMutability" : "view", "outputs" : [ { - "internalType" : "address", "name" : "underlying", - "type" : "address" + "type" : "address", + "internalType" : "address" } ], "inputs" : [ { - "type" : "address", "name" : "eToken", + "type" : "address", "internalType" : "address" } ] }, { + "outputs" : [], "inputs" : [ { + "type" : "uint256", "internalType" : "uint256", - "name" : "subAccountId", - "type" : "uint256" + "name" : "subAccountId" }, { - "type" : "address", "name" : "newMarket", + "type" : "address", "internalType" : "address" } ], - "outputs" : [], - "stateMutability" : "nonpayable", "type" : "function", + "stateMutability" : "nonpayable", "name" : "enterMarket" }, { - "name" : "exitMarket", "type" : "function", - "outputs" : [], "stateMutability" : "nonpayable", + "name" : "exitMarket", "inputs" : [ { - "internalType" : "uint256", "type" : "uint256", + "internalType" : "uint256", "name" : "subAccountId" }, { - "internalType" : "address", + "name" : "oldMarket", "type" : "address", - "name" : "oldMarket" + "internalType" : "address" } - ] + ], + "outputs" : [] }, { - "name" : "getChainlinkPriceFeedConfig", - "type" : "function", - "outputs" : [ + "inputs" : [ { - "name" : "chainlinkAggregator", "type" : "address", + "name" : "underlying", "internalType" : "address" } ], - "stateMutability" : "view", - "inputs" : [ + "outputs" : [ { - "name" : "underlying", "type" : "address", - "internalType" : "address" + "internalType" : "address", + "name" : "chainlinkAggregator" } - ] + ], + "type" : "function", + "stateMutability" : "view", + "name" : "getChainlinkPriceFeedConfig" }, { "type" : "function", "name" : "getEnteredMarkets", + "stateMutability" : "view", "inputs" : [ { - "name" : "account", + "internalType" : "address", "type" : "address", - "internalType" : "address" + "name" : "account" } ], "outputs" : [ { + "internalType" : "address[]", "type" : "address[]", - "name" : "", - "internalType" : "address[]" + "name" : "" } - ], - "stateMutability" : "view" + ] }, { + "inputs" : [ + { + "type" : "address", + "name" : "underlying", + "internalType" : "address" + } + ], "outputs" : [ { "type" : "uint16", @@ -1090,67 +1195,59 @@ "name" : "pricingParameters" }, { - "internalType" : "address", - "name" : "pricingForwarded", - "type" : "address" - } - ], - "stateMutability" : "view", - "inputs" : [ - { - "name" : "underlying", "type" : "address", + "name" : "pricingForwarded", "internalType" : "address" } ], - "name" : "getPricingConfig", - "type" : "function" + "stateMutability" : "view", + "type" : "function", + "name" : "getPricingConfig" }, { "inputs" : [ { - "name" : "underlying", + "internalType" : "address", "type" : "address", - "internalType" : "address" + "name" : "underlying" } ], - "stateMutability" : "view", "outputs" : [ { - "internalType" : "uint256", "type" : "uint256", + "internalType" : "uint256", "name" : "" } ], + "stateMutability" : "view", "type" : "function", "name" : "interestAccumulator" }, { + "stateMutability" : "view", "type" : "function", "name" : "interestRate", "inputs" : [ { - "internalType" : "address", + "type" : "address", "name" : "underlying", - "type" : "address" + "internalType" : "address" } ], - "stateMutability" : "view", "outputs" : [ { + "internalType" : "int96", "type" : "int96", - "name" : "", - "internalType" : "int96" + "name" : "" } ] }, { - "stateMutability" : "view", "outputs" : [ { "internalType" : "uint256", - "name" : "", - "type" : "uint256" + "type" : "uint256", + "name" : "" } ], "inputs" : [ @@ -1160,36 +1257,40 @@ "internalType" : "address" } ], + "type" : "function", "name" : "interestRateModel", - "type" : "function" + "stateMutability" : "view" }, { + "stateMutability" : "view", + "type" : "function", + "name" : "moduleGitCommit", + "inputs" : [], "outputs" : [ { + "type" : "bytes32", "internalType" : "bytes32", - "name" : "", - "type" : "bytes32" + "name" : "" } - ], - "stateMutability" : "view", - "inputs" : [], - "name" : "moduleGitCommit", - "type" : "function" + ] }, { + "type" : "function", + "stateMutability" : "view", + "name" : "moduleId", "inputs" : [], "outputs" : [ { - "internalType" : "uint256", "type" : "uint256", - "name" : "" + "name" : "", + "internalType" : "uint256" } - ], - "stateMutability" : "view", - "type" : "function", - "name" : "moduleId" + ] }, { + "type" : "function", + "name" : "reserveFee", + "stateMutability" : "view", "inputs" : [ { "name" : "underlying", @@ -1199,37 +1300,31 @@ ], "outputs" : [ { - "internalType" : "uint32", + "type" : "uint32", "name" : "", - "type" : "uint32" + "internalType" : "uint32" } - ], - "stateMutability" : "view", - "type" : "function", - "name" : "reserveFee" + ] }, { - "name" : "underlyingToAssetConfig", - "type" : "function", - "stateMutability" : "view", "outputs" : [ { "type" : "tuple", "components" : [ { - "internalType" : "address", "name" : "eTokenAddress", - "type" : "address" + "type" : "address", + "internalType" : "address" }, { - "internalType" : "bool", + "name" : "borrowIsolated", "type" : "bool", - "name" : "borrowIsolated" + "internalType" : "bool" }, { - "internalType" : "uint32", + "type" : "uint32", "name" : "collateralFactor", - "type" : "uint32" + "internalType" : "uint32" }, { "internalType" : "uint32", @@ -1237,9 +1332,9 @@ "name" : "borrowFactor" }, { + "internalType" : "uint24", "type" : "uint24", - "name" : "twapWindow", - "internalType" : "uint24" + "name" : "twapWindow" } ], "name" : "", @@ -1248,29 +1343,33 @@ ], "inputs" : [ { - "internalType" : "address", + "type" : "address", "name" : "underlying", - "type" : "address" + "internalType" : "address" } - ] + ], + "type" : "function", + "stateMutability" : "view", + "name" : "underlyingToAssetConfig" }, { - "name" : "underlyingToAssetConfigUnresolved", - "type" : "function", "stateMutability" : "view", + "type" : "function", + "name" : "underlyingToAssetConfigUnresolved", "outputs" : [ { "name" : "config", + "type" : "tuple", "components" : [ { - "internalType" : "address", "type" : "address", + "internalType" : "address", "name" : "eTokenAddress" }, { - "internalType" : "bool", + "name" : "borrowIsolated", "type" : "bool", - "name" : "borrowIsolated" + "internalType" : "bool" }, { "name" : "collateralFactor", @@ -1283,20 +1382,19 @@ "name" : "borrowFactor" }, { + "type" : "uint24", "internalType" : "uint24", - "name" : "twapWindow", - "type" : "uint24" + "name" : "twapWindow" } ], - "type" : "tuple", "internalType" : "struct Storage.AssetConfig" } ], "inputs" : [ { - "internalType" : "address", + "name" : "underlying", "type" : "address", - "name" : "underlying" + "internalType" : "address" } ] }, @@ -1314,48 +1412,48 @@ "inputs" : [ { "internalType" : "address", - "name" : "underlying", - "type" : "address" + "type" : "address", + "name" : "underlying" } ] }, { + "stateMutability" : "view", + "type" : "function", + "name" : "underlyingToEToken", "inputs" : [ { "type" : "address", - "name" : "underlying", - "internalType" : "address" + "internalType" : "address", + "name" : "underlying" } ], - "stateMutability" : "view", "outputs" : [ { + "type" : "address", "internalType" : "address", - "name" : "", - "type" : "address" + "name" : "" } - ], - "type" : "function", - "name" : "underlyingToEToken" + ] }, { - "stateMutability" : "view", - "outputs" : [ + "inputs" : [ { - "internalType" : "address", - "name" : "", - "type" : "address" + "name" : "underlying", + "type" : "address", + "internalType" : "address" } ], - "inputs" : [ + "outputs" : [ { - "internalType" : "address", - "name" : "underlying", - "type" : "address" + "type" : "address", + "name" : "", + "internalType" : "address" } ], - "name" : "underlyingToPToken", - "type" : "function" + "type" : "function", + "stateMutability" : "view", + "name" : "underlyingToPToken" } ] } diff --git a/abis/modules/Swap.json b/abis/modules/Swap.json index c4d966d..865ec50 100644 --- a/abis/modules/Swap.json +++ b/abis/modules/Swap.json @@ -2,6 +2,7 @@ "abi" : [ { "type" : "constructor", + "stateMutability" : "nonpayable", "inputs" : [ { "type" : "bytes32", @@ -9,83 +10,79 @@ "internalType" : "bytes32" }, { + "type" : "address", "internalType" : "address", - "name" : "uniswapRouter_", - "type" : "address" + "name" : "uniswapRouter_" }, { - "name" : "oneInch_", "type" : "address", + "name" : "oneInch_", "internalType" : "address" } - ], - "stateMutability" : "nonpayable" + ] }, { "inputs" : [ { - "type" : "address", "name" : "underlying", + "type" : "address", "indexed" : true, "internalType" : "address" }, { - "indexed" : false, - "internalType" : "uint256", + "name" : "totalBalances", "type" : "uint256", - "name" : "totalBalances" + "indexed" : false, + "internalType" : "uint256" }, { - "internalType" : "uint256", - "indexed" : false, "name" : "totalBorrows", - "type" : "uint256" + "type" : "uint256", + "internalType" : "uint256", + "indexed" : false }, { "type" : "uint96", - "name" : "reserveBalance", "indexed" : false, + "name" : "reserveBalance", "internalType" : "uint96" }, { "type" : "uint256", + "indexed" : false, "name" : "poolSize", - "internalType" : "uint256", - "indexed" : false + "internalType" : "uint256" }, { + "type" : "uint256", "indexed" : false, - "internalType" : "uint256", "name" : "interestAccumulator", - "type" : "uint256" + "internalType" : "uint256" }, { - "indexed" : false, - "internalType" : "int96", "name" : "interestRate", - "type" : "int96" + "type" : "int96", + "internalType" : "int96", + "indexed" : false }, { - "internalType" : "uint256", - "indexed" : false, + "name" : "timestamp", "type" : "uint256", - "name" : "timestamp" + "internalType" : "uint256", + "indexed" : false } ], - "anonymous" : false, "type" : "event", + "anonymous" : false, "name" : "AssetStatus" }, { - "name" : "Borrow", - "type" : "event", - "anonymous" : false, "inputs" : [ { - "internalType" : "address", - "indexed" : true, + "type" : "address", "name" : "underlying", - "type" : "address" + "indexed" : true, + "internalType" : "address" }, { "name" : "account", @@ -94,15 +91,19 @@ "internalType" : "address" }, { - "name" : "amount", + "internalType" : "uint256", "type" : "uint256", - "indexed" : false, - "internalType" : "uint256" + "name" : "amount", + "indexed" : false } - ] + ], + "anonymous" : false, + "type" : "event", + "name" : "Borrow" }, { "type" : "event", + "anonymous" : false, "name" : "DelegateAverageLiquidity", "inputs" : [ { @@ -112,47 +113,48 @@ "indexed" : true }, { - "internalType" : "address", - "indexed" : true, + "name" : "delegate", "type" : "address", - "name" : "delegate" + "internalType" : "address", + "indexed" : true } - ], - "anonymous" : false + ] }, { - "name" : "Deposit", - "type" : "event", - "anonymous" : false, "inputs" : [ { "type" : "address", "name" : "underlying", - "internalType" : "address", - "indexed" : true + "indexed" : true, + "internalType" : "address" }, { - "indexed" : true, - "internalType" : "address", "type" : "address", - "name" : "account" + "internalType" : "address", + "name" : "account", + "indexed" : true }, { - "name" : "amount", "type" : "uint256", + "name" : "amount", "internalType" : "uint256", "indexed" : false } - ] + ], + "anonymous" : false, + "type" : "event", + "name" : "Deposit" }, { + "type" : "event", + "name" : "EnterMarket", "anonymous" : false, "inputs" : [ { "type" : "address", "name" : "underlying", - "indexed" : true, - "internalType" : "address" + "internalType" : "address", + "indexed" : true }, { "type" : "address", @@ -160,84 +162,83 @@ "indexed" : true, "internalType" : "address" } - ], - "name" : "EnterMarket", - "type" : "event" + ] }, { "type" : "event", "name" : "ExitMarket", + "anonymous" : false, "inputs" : [ { - "indexed" : true, - "internalType" : "address", "name" : "underlying", - "type" : "address" + "type" : "address", + "indexed" : true, + "internalType" : "address" }, { - "internalType" : "address", - "indexed" : true, "name" : "account", - "type" : "address" + "type" : "address", + "indexed" : true, + "internalType" : "address" } - ], - "anonymous" : false + ] }, { + "anonymous" : false, "type" : "event", "name" : "Genesis", - "inputs" : [], - "anonymous" : false + "inputs" : [] }, { + "name" : "GovConvertReserves", + "type" : "event", + "anonymous" : false, "inputs" : [ { "name" : "underlying", "type" : "address", - "internalType" : "address", - "indexed" : true + "indexed" : true, + "internalType" : "address" }, { "name" : "recipient", "type" : "address", - "internalType" : "address", - "indexed" : true + "indexed" : true, + "internalType" : "address" }, { "type" : "uint256", "name" : "amount", - "internalType" : "uint256", - "indexed" : false + "indexed" : false, + "internalType" : "uint256" } - ], - "anonymous" : false, - "type" : "event", - "name" : "GovConvertReserves" + ] }, { "inputs" : [ { - "type" : "address", "name" : "underlying", + "type" : "address", "internalType" : "address", "indexed" : true }, { + "type" : "tuple", "components" : [ { + "type" : "address", "internalType" : "address", - "name" : "eTokenAddress", - "type" : "address" + "name" : "eTokenAddress" }, { - "internalType" : "bool", "type" : "bool", + "internalType" : "bool", "name" : "borrowIsolated" }, { - "internalType" : "uint32", "name" : "collateralFactor", - "type" : "uint32" + "type" : "uint32", + "internalType" : "uint32" }, { "name" : "borrowFactor", @@ -250,111 +251,112 @@ "internalType" : "uint24" } ], - "type" : "tuple", "name" : "newConfig", - "indexed" : false, - "internalType" : "struct Storage.AssetConfig" + "internalType" : "struct Storage.AssetConfig", + "indexed" : false } ], - "anonymous" : false, + "name" : "GovSetAssetConfig", "type" : "event", - "name" : "GovSetAssetConfig" + "anonymous" : false }, { - "anonymous" : false, "inputs" : [ { - "internalType" : "address", - "indexed" : true, + "name" : "underlying", "type" : "address", - "name" : "underlying" + "internalType" : "address", + "indexed" : true }, { - "internalType" : "address", - "indexed" : false, + "name" : "chainlinkAggregator", "type" : "address", - "name" : "chainlinkAggregator" + "indexed" : false, + "internalType" : "address" } ], + "type" : "event", "name" : "GovSetChainlinkPriceFeed", - "type" : "event" + "anonymous" : false }, { - "type" : "event", - "name" : "GovSetIRM", "inputs" : [ { - "indexed" : true, - "internalType" : "address", "type" : "address", - "name" : "underlying" + "internalType" : "address", + "name" : "underlying", + "indexed" : true }, { - "internalType" : "uint256", - "indexed" : false, "type" : "uint256", - "name" : "interestRateModel" + "name" : "interestRateModel", + "internalType" : "uint256", + "indexed" : false }, { + "type" : "bytes", "indexed" : false, - "internalType" : "bytes", "name" : "resetParams", - "type" : "bytes" + "internalType" : "bytes" } ], + "type" : "event", + "name" : "GovSetIRM", "anonymous" : false }, { + "name" : "GovSetPricingConfig", + "type" : "event", "anonymous" : false, "inputs" : [ { - "internalType" : "address", - "indexed" : true, + "type" : "address", "name" : "underlying", - "type" : "address" + "indexed" : true, + "internalType" : "address" }, { - "type" : "uint16", "name" : "newPricingType", - "indexed" : false, - "internalType" : "uint16" + "type" : "uint16", + "internalType" : "uint16", + "indexed" : false }, { "internalType" : "uint32", - "indexed" : false, + "type" : "uint32", "name" : "newPricingParameter", - "type" : "uint32" + "indexed" : false } - ], - "name" : "GovSetPricingConfig", - "type" : "event" + ] }, { - "type" : "event", - "name" : "GovSetReserveFee", "inputs" : [ { - "indexed" : true, - "internalType" : "address", + "name" : "underlying", "type" : "address", - "name" : "underlying" + "internalType" : "address", + "indexed" : true }, { - "internalType" : "uint32", - "indexed" : false, "type" : "uint32", - "name" : "newReserveFee" + "indexed" : false, + "name" : "newReserveFee", + "internalType" : "uint32" } ], - "anonymous" : false + "anonymous" : false, + "type" : "event", + "name" : "GovSetReserveFee" }, { "anonymous" : false, + "type" : "event", + "name" : "InstallerInstallModule", "inputs" : [ { - "name" : "moduleId", - "type" : "uint256", "internalType" : "uint256", + "type" : "uint256", + "name" : "moduleId", "indexed" : true }, { @@ -364,35 +366,33 @@ "indexed" : true }, { - "internalType" : "bytes32", - "indexed" : false, + "type" : "bytes32", "name" : "moduleGitCommit", - "type" : "bytes32" + "indexed" : false, + "internalType" : "bytes32" } - ], - "name" : "InstallerInstallModule", - "type" : "event" + ] }, { - "type" : "event", - "name" : "InstallerSetGovernorAdmin", "inputs" : [ { + "type" : "address", "internalType" : "address", - "indexed" : true, "name" : "newGovernorAdmin", - "type" : "address" + "indexed" : true } ], + "name" : "InstallerSetGovernorAdmin", + "type" : "event", "anonymous" : false }, { "inputs" : [ { - "internalType" : "address", - "indexed" : true, "type" : "address", - "name" : "newUpgradeAdmin" + "internalType" : "address", + "name" : "newUpgradeAdmin", + "indexed" : true } ], "anonymous" : false, @@ -400,32 +400,30 @@ "name" : "InstallerSetUpgradeAdmin" }, { - "type" : "event", - "name" : "Liquidation", "inputs" : [ { + "type" : "address", "indexed" : true, - "internalType" : "address", "name" : "liquidator", - "type" : "address" + "internalType" : "address" }, { - "indexed" : true, - "internalType" : "address", "type" : "address", - "name" : "violator" + "internalType" : "address", + "name" : "violator", + "indexed" : true }, { "internalType" : "address", - "indexed" : true, + "type" : "address", "name" : "underlying", - "type" : "address" + "indexed" : true }, { - "internalType" : "address", - "indexed" : false, "type" : "address", - "name" : "collateral" + "internalType" : "address", + "name" : "collateral", + "indexed" : false }, { "name" : "repay", @@ -436,652 +434,753 @@ { "type" : "uint256", "name" : "yield", - "indexed" : false, - "internalType" : "uint256" + "internalType" : "uint256", + "indexed" : false }, { - "indexed" : false, "internalType" : "uint256", "type" : "uint256", - "name" : "healthScore" + "name" : "healthScore", + "indexed" : false }, { - "indexed" : false, - "internalType" : "uint256", + "type" : "uint256", "name" : "baseDiscount", - "type" : "uint256" + "internalType" : "uint256", + "indexed" : false }, { - "name" : "discount", "type" : "uint256", + "name" : "discount", "indexed" : false, "internalType" : "uint256" } ], + "type" : "event", + "name" : "Liquidation", "anonymous" : false }, { - "type" : "event", - "name" : "MarketActivated", "inputs" : [ { - "type" : "address", "name" : "underlying", + "type" : "address", "indexed" : true, "internalType" : "address" }, { - "type" : "address", "name" : "eToken", - "internalType" : "address", - "indexed" : true + "type" : "address", + "indexed" : true, + "internalType" : "address" }, { - "indexed" : true, - "internalType" : "address", + "name" : "dToken", "type" : "address", - "name" : "dToken" + "internalType" : "address", + "indexed" : true } ], - "anonymous" : false + "anonymous" : false, + "type" : "event", + "name" : "MarketActivated" }, { + "type" : "event", + "name" : "PTokenActivated", "anonymous" : false, "inputs" : [ { + "internalType" : "address", "type" : "address", "name" : "underlying", - "indexed" : true, - "internalType" : "address" + "indexed" : true }, { "internalType" : "address", - "indexed" : true, + "type" : "address", "name" : "pToken", - "type" : "address" + "indexed" : true } - ], - "name" : "PTokenActivated", - "type" : "event" + ] }, { + "name" : "PTokenUnWrap", + "type" : "event", + "anonymous" : false, "inputs" : [ { - "name" : "underlying", "type" : "address", "internalType" : "address", + "name" : "underlying", "indexed" : true }, { - "name" : "account", - "type" : "address", "internalType" : "address", + "type" : "address", + "name" : "account", "indexed" : true }, { - "internalType" : "uint256", - "indexed" : false, "type" : "uint256", - "name" : "amount" + "internalType" : "uint256", + "name" : "amount", + "indexed" : false } - ], - "anonymous" : false, - "type" : "event", - "name" : "PTokenUnWrap" + ] }, { "inputs" : [ { - "name" : "underlying", "type" : "address", - "indexed" : true, - "internalType" : "address" + "internalType" : "address", + "name" : "underlying", + "indexed" : true }, { - "internalType" : "address", "indexed" : true, + "type" : "address", "name" : "account", - "type" : "address" + "internalType" : "address" }, { - "indexed" : false, - "internalType" : "uint256", + "type" : "uint256", "name" : "amount", - "type" : "uint256" + "indexed" : false, + "internalType" : "uint256" } ], - "anonymous" : false, "type" : "event", + "anonymous" : false, "name" : "PTokenWrap" }, { + "type" : "event", + "name" : "ProxyCreated", + "anonymous" : false, "inputs" : [ { + "internalType" : "address", "type" : "address", "name" : "proxy", - "indexed" : true, - "internalType" : "address" + "indexed" : true }, { - "internalType" : "uint256", - "indexed" : false, "type" : "uint256", - "name" : "moduleId" + "internalType" : "uint256", + "name" : "moduleId", + "indexed" : false } - ], - "anonymous" : false, - "type" : "event", - "name" : "ProxyCreated" + ] }, { + "name" : "Repay", + "type" : "event", "anonymous" : false, "inputs" : [ { - "internalType" : "address", - "indexed" : true, + "type" : "address", "name" : "underlying", - "type" : "address" + "indexed" : true, + "internalType" : "address" }, { - "internalType" : "address", - "indexed" : true, + "name" : "account", "type" : "address", - "name" : "account" + "internalType" : "address", + "indexed" : true }, { - "indexed" : false, - "internalType" : "uint256", + "type" : "uint256", "name" : "amount", - "type" : "uint256" + "indexed" : false, + "internalType" : "uint256" } - ], - "name" : "Repay", - "type" : "event" + ] }, { "anonymous" : false, + "type" : "event", + "name" : "RequestBorrow", "inputs" : [ { "type" : "address", "name" : "account", - "indexed" : true, - "internalType" : "address" + "internalType" : "address", + "indexed" : true }, { - "internalType" : "uint256", - "indexed" : false, "type" : "uint256", - "name" : "amount" + "internalType" : "uint256", + "name" : "amount", + "indexed" : false } - ], - "name" : "RequestBorrow", - "type" : "event" + ] }, { + "type" : "event", + "anonymous" : false, + "name" : "RequestBurn", "inputs" : [ { "type" : "address", - "name" : "account", "internalType" : "address", + "name" : "account", "indexed" : true }, { - "name" : "amount", - "type" : "uint256", "internalType" : "uint256", + "type" : "uint256", + "name" : "amount", "indexed" : false } - ], - "anonymous" : false, - "type" : "event", - "name" : "RequestBurn" + ] }, { - "anonymous" : false, "inputs" : [ { "type" : "address", + "indexed" : true, "name" : "account", - "internalType" : "address", - "indexed" : true + "internalType" : "address" }, { - "name" : "amount", "type" : "uint256", - "internalType" : "uint256", - "indexed" : false + "indexed" : false, + "name" : "amount", + "internalType" : "uint256" } ], + "type" : "event", "name" : "RequestDeposit", - "type" : "event" + "anonymous" : false }, { "inputs" : [ { - "name" : "account", "type" : "address", - "internalType" : "address", - "indexed" : true + "name" : "account", + "indexed" : true, + "internalType" : "address" }, { "type" : "uint256", - "name" : "amount", "indexed" : false, + "name" : "amount", "internalType" : "uint256" } ], - "anonymous" : false, "type" : "event", + "anonymous" : false, "name" : "RequestDonate" }, { - "name" : "RequestLiquidate", "type" : "event", + "name" : "RequestLiquidate", "anonymous" : false, "inputs" : [ { - "name" : "liquidator", "type" : "address", "internalType" : "address", + "name" : "liquidator", "indexed" : true }, { - "type" : "address", "name" : "violator", + "type" : "address", "indexed" : true, "internalType" : "address" }, { + "indexed" : true, "type" : "address", "name" : "underlying", - "indexed" : true, "internalType" : "address" }, { - "indexed" : false, - "internalType" : "address", "name" : "collateral", - "type" : "address" + "type" : "address", + "internalType" : "address", + "indexed" : false }, { - "internalType" : "uint256", - "indexed" : false, + "name" : "repay", "type" : "uint256", - "name" : "repay" + "internalType" : "uint256", + "indexed" : false }, { "name" : "minYield", "type" : "uint256", + "indexed" : false, + "internalType" : "uint256" + } + ] + }, + { + "inputs" : [ + { + "type" : "address", + "internalType" : "address", + "name" : "account", + "indexed" : true + }, + { + "type" : "uint256", + "name" : "amount", "internalType" : "uint256", "indexed" : false } - ] + ], + "anonymous" : false, + "type" : "event", + "name" : "RequestMint" }, { - "name" : "RequestMint", "type" : "event", + "name" : "RequestRepay", "anonymous" : false, "inputs" : [ { - "name" : "account", "type" : "address", + "name" : "account", "internalType" : "address", "indexed" : true }, { - "indexed" : false, - "internalType" : "uint256", "type" : "uint256", - "name" : "amount" + "name" : "amount", + "indexed" : false, + "internalType" : "uint256" } ] }, { - "name" : "RequestRepay", - "type" : "event", - "anonymous" : false, "inputs" : [ { - "name" : "account", + "name" : "accountIn", + "type" : "address", + "indexed" : true, + "internalType" : "address" + }, + { + "name" : "accountOut", + "type" : "address", + "indexed" : true, + "internalType" : "address" + }, + { + "name" : "underlyingIn", "type" : "address", "internalType" : "address", "indexed" : true }, { + "type" : "address", "indexed" : false, - "internalType" : "uint256", + "name" : "underlyingOut", + "internalType" : "address" + }, + { "type" : "uint256", - "name" : "amount" + "indexed" : false, + "name" : "amount", + "internalType" : "uint256" + }, + { + "type" : "uint256", + "indexed" : false, + "name" : "swapType", + "internalType" : "uint256" } - ] + ], + "type" : "event", + "name" : "RequestSwap", + "anonymous" : false }, { - "name" : "RequestSwap", + "name" : "RequestSwapHub", "type" : "event", "anonymous" : false, "inputs" : [ { - "internalType" : "address", - "indexed" : true, + "type" : "address", "name" : "accountIn", - "type" : "address" + "indexed" : true, + "internalType" : "address" }, { - "internalType" : "address", + "type" : "address", "indexed" : true, "name" : "accountOut", - "type" : "address" + "internalType" : "address" }, { - "indexed" : true, - "internalType" : "address", "type" : "address", - "name" : "underlyingIn" + "name" : "underlyingIn", + "indexed" : true, + "internalType" : "address" }, { - "indexed" : false, - "internalType" : "address", "name" : "underlyingOut", - "type" : "address" + "type" : "address", + "indexed" : false, + "internalType" : "address" }, { - "indexed" : false, "internalType" : "uint256", "type" : "uint256", - "name" : "amount" + "name" : "amountIn", + "indexed" : false }, { + "type" : "uint256", "indexed" : false, - "internalType" : "uint256", + "name" : "amountOut", + "internalType" : "uint256" + }, + { "type" : "uint256", - "name" : "swapType" + "internalType" : "uint256", + "name" : "mode", + "indexed" : false + }, + { + "internalType" : "address", + "type" : "address", + "name" : "swapHandler", + "indexed" : false } ] }, { "inputs" : [ { + "type" : "address", + "name" : "accountIn", "internalType" : "address", + "indexed" : true + }, + { + "type" : "address", + "name" : "accountOut", "indexed" : true, - "name" : "from", - "type" : "address" + "internalType" : "address" }, { - "name" : "to", + "name" : "underlyingIn", "type" : "address", "internalType" : "address", "indexed" : true }, { - "internalType" : "uint256", + "type" : "address", + "name" : "underlyingOut", "indexed" : false, + "internalType" : "address" + }, + { "type" : "uint256", - "name" : "amount" + "internalType" : "uint256", + "name" : "targetDebt", + "indexed" : false + }, + { + "type" : "address", + "name" : "swapHandler", + "internalType" : "address", + "indexed" : false } ], - "anonymous" : false, "type" : "event", - "name" : "RequestTransferDToken" + "anonymous" : false, + "name" : "RequestSwapHubRepay" }, { + "name" : "RequestTransferDToken", "type" : "event", - "name" : "RequestTransferEToken", + "anonymous" : false, "inputs" : [ { - "internalType" : "address", - "indexed" : true, "type" : "address", - "name" : "from" + "indexed" : true, + "name" : "from", + "internalType" : "address" }, { "type" : "address", "name" : "to", - "internalType" : "address", - "indexed" : true + "indexed" : true, + "internalType" : "address" }, { - "internalType" : "uint256", "indexed" : false, "type" : "uint256", - "name" : "amount" + "name" : "amount", + "internalType" : "uint256" } - ], - "anonymous" : false + ] }, { "inputs" : [ { - "name" : "account", + "name" : "from", "type" : "address", - "internalType" : "address", - "indexed" : true + "indexed" : true, + "internalType" : "address" }, { - "indexed" : false, + "type" : "address", + "name" : "to", + "indexed" : true, + "internalType" : "address" + }, + { + "type" : "uint256", "internalType" : "uint256", "name" : "amount", - "type" : "uint256" + "indexed" : false } ], - "anonymous" : false, + "name" : "RequestTransferEToken", + "type" : "event", + "anonymous" : false + }, + { + "name" : "RequestWithdraw", "type" : "event", - "name" : "RequestWithdraw" + "anonymous" : false, + "inputs" : [ + { + "name" : "account", + "type" : "address", + "indexed" : true, + "internalType" : "address" + }, + { + "name" : "amount", + "type" : "uint256", + "internalType" : "uint256", + "indexed" : false + } + ] }, { + "anonymous" : false, "type" : "event", "name" : "TrackAverageLiquidity", "inputs" : [ { - "name" : "account", + "internalType" : "address", "type" : "address", - "indexed" : true, - "internalType" : "address" + "name" : "account", + "indexed" : true } - ], - "anonymous" : false + ] }, { - "anonymous" : false, "inputs" : [ { - "type" : "address", "name" : "account", + "type" : "address", "internalType" : "address", "indexed" : true } ], + "type" : "event", "name" : "UnTrackAverageLiquidity", - "type" : "event" + "anonymous" : false }, { - "type" : "event", - "name" : "Withdraw", "inputs" : [ { - "name" : "underlying", "type" : "address", - "internalType" : "address", - "indexed" : true + "indexed" : true, + "name" : "underlying", + "internalType" : "address" }, { "type" : "address", "name" : "account", - "internalType" : "address", - "indexed" : true + "indexed" : true, + "internalType" : "address" }, { "type" : "uint256", + "internalType" : "uint256", "name" : "amount", - "indexed" : false, - "internalType" : "uint256" + "indexed" : false } ], + "type" : "event", + "name" : "Withdraw", "anonymous" : false }, { - "name" : "moduleGitCommit", - "type" : "function", + "inputs" : [], "outputs" : [ { - "type" : "bytes32", "name" : "", + "type" : "bytes32", "internalType" : "bytes32" } ], + "type" : "function", "stateMutability" : "view", - "inputs" : [] + "name" : "moduleGitCommit" }, { - "name" : "moduleId", "type" : "function", + "stateMutability" : "view", + "name" : "moduleId", "outputs" : [ { - "internalType" : "uint256", + "name" : "", "type" : "uint256", - "name" : "" + "internalType" : "uint256" } ], - "stateMutability" : "view", "inputs" : [] }, { - "name" : "oneInch", - "type" : "function", - "stateMutability" : "view", "outputs" : [ { - "type" : "address", "name" : "", + "type" : "address", "internalType" : "address" } ], - "inputs" : [] + "inputs" : [], + "name" : "oneInch", + "type" : "function", + "stateMutability" : "view" }, { - "outputs" : [], "stateMutability" : "nonpayable", + "type" : "function", + "name" : "swap1Inch", + "outputs" : [], "inputs" : [ { "name" : "params", + "type" : "tuple", + "internalType" : "struct Swap.Swap1InchParams", "components" : [ { - "internalType" : "uint256", "name" : "subAccountIdIn", - "type" : "uint256" + "type" : "uint256", + "internalType" : "uint256" }, { - "name" : "subAccountIdOut", "type" : "uint256", + "name" : "subAccountIdOut", "internalType" : "uint256" }, { - "name" : "underlyingIn", + "internalType" : "address", "type" : "address", - "internalType" : "address" + "name" : "underlyingIn" }, { + "type" : "address", "internalType" : "address", - "name" : "underlyingOut", - "type" : "address" + "name" : "underlyingOut" }, { "internalType" : "uint256", - "name" : "amount", - "type" : "uint256" + "type" : "uint256", + "name" : "amount" }, { - "internalType" : "uint256", "name" : "amountOutMinimum", - "type" : "uint256" + "type" : "uint256", + "internalType" : "uint256" }, { - "name" : "payload", "type" : "bytes", - "internalType" : "bytes" + "internalType" : "bytes", + "name" : "payload" } - ], - "type" : "tuple", - "internalType" : "struct Swap.Swap1InchParams" + ] } - ], - "name" : "swap1Inch", - "type" : "function" + ] }, { - "outputs" : [], + "name" : "swapAndRepayUni", + "type" : "function", "stateMutability" : "nonpayable", + "outputs" : [], "inputs" : [ { + "type" : "tuple", + "name" : "params", "components" : [ { + "type" : "uint256", "internalType" : "uint256", - "name" : "subAccountIdIn", - "type" : "uint256" + "name" : "subAccountIdIn" }, { - "name" : "subAccountIdOut", "type" : "uint256", - "internalType" : "uint256" + "internalType" : "uint256", + "name" : "subAccountIdOut" }, { - "type" : "uint256", "name" : "amountOut", + "type" : "uint256", "internalType" : "uint256" }, { - "internalType" : "uint256", + "name" : "amountInMaximum", "type" : "uint256", - "name" : "amountInMaximum" + "internalType" : "uint256" }, { - "type" : "uint256", "name" : "deadline", + "type" : "uint256", "internalType" : "uint256" }, { + "internalType" : "bytes", "type" : "bytes", - "name" : "path", - "internalType" : "bytes" + "name" : "path" } ], - "type" : "tuple", - "name" : "params", "internalType" : "struct Swap.SwapUniExactOutputParams" }, { - "name" : "targetDebt", "type" : "uint256", - "internalType" : "uint256" + "internalType" : "uint256", + "name" : "targetDebt" } - ], - "name" : "swapAndRepayUni", - "type" : "function" + ] }, { "inputs" : [ { - "internalType" : "struct Swap.SwapUniExactOutputSingleParams", + "name" : "params", "type" : "tuple", + "internalType" : "struct Swap.SwapUniExactOutputSingleParams", "components" : [ { - "internalType" : "uint256", + "name" : "subAccountIdIn", "type" : "uint256", - "name" : "subAccountIdIn" + "internalType" : "uint256" }, { - "internalType" : "uint256", + "type" : "uint256", "name" : "subAccountIdOut", - "type" : "uint256" + "internalType" : "uint256" }, { - "internalType" : "address", + "name" : "underlyingIn", "type" : "address", - "name" : "underlyingIn" + "internalType" : "address" }, { - "internalType" : "address", + "type" : "address", "name" : "underlyingOut", - "type" : "address" + "internalType" : "address" }, { "type" : "uint256", @@ -1089,18 +1188,18 @@ "internalType" : "uint256" }, { - "name" : "amountInMaximum", + "internalType" : "uint256", "type" : "uint256", - "internalType" : "uint256" + "name" : "amountInMaximum" }, { - "name" : "deadline", "type" : "uint256", + "name" : "deadline", "internalType" : "uint256" }, { - "type" : "uint24", "name" : "fee", + "type" : "uint24", "internalType" : "uint24" }, { @@ -1108,27 +1207,29 @@ "name" : "sqrtPriceLimitX96", "internalType" : "uint160" } - ], - "name" : "params" + ] }, { - "internalType" : "uint256", "name" : "targetDebt", - "type" : "uint256" + "type" : "uint256", + "internalType" : "uint256" } ], - "stateMutability" : "nonpayable", "outputs" : [], + "stateMutability" : "nonpayable", "type" : "function", "name" : "swapAndRepayUniSingle" }, { + "stateMutability" : "nonpayable", "type" : "function", "name" : "swapUniExactInput", + "outputs" : [], "inputs" : [ { - "internalType" : "struct Swap.SwapUniExactInputParams", "name" : "params", + "type" : "tuple", + "internalType" : "struct Swap.SwapUniExactInputParams", "components" : [ { "type" : "uint256", @@ -1136,56 +1237,55 @@ "internalType" : "uint256" }, { + "internalType" : "uint256", "type" : "uint256", - "name" : "subAccountIdOut", - "internalType" : "uint256" + "name" : "subAccountIdOut" }, { "type" : "uint256", - "name" : "amountIn", - "internalType" : "uint256" + "internalType" : "uint256", + "name" : "amountIn" }, { + "internalType" : "uint256", "type" : "uint256", - "name" : "amountOutMinimum", - "internalType" : "uint256" + "name" : "amountOutMinimum" }, { - "internalType" : "uint256", "name" : "deadline", - "type" : "uint256" + "type" : "uint256", + "internalType" : "uint256" }, { "type" : "bytes", - "name" : "path", - "internalType" : "bytes" + "internalType" : "bytes", + "name" : "path" } - ], - "type" : "tuple" + ] } - ], - "outputs" : [], - "stateMutability" : "nonpayable" + ] }, { + "type" : "function", "stateMutability" : "nonpayable", - "outputs" : [], + "name" : "swapUniExactInputSingle", "inputs" : [ { + "type" : "tuple", "components" : [ { + "type" : "uint256", "internalType" : "uint256", - "name" : "subAccountIdIn", - "type" : "uint256" + "name" : "subAccountIdIn" }, { - "internalType" : "uint256", "type" : "uint256", + "internalType" : "uint256", "name" : "subAccountIdOut" }, { - "type" : "address", "name" : "underlyingIn", + "type" : "address", "internalType" : "address" }, { @@ -1194,63 +1294,62 @@ "internalType" : "address" }, { - "type" : "uint256", "name" : "amountIn", + "type" : "uint256", "internalType" : "uint256" }, { - "name" : "amountOutMinimum", + "internalType" : "uint256", "type" : "uint256", - "internalType" : "uint256" + "name" : "amountOutMinimum" }, { - "internalType" : "uint256", "type" : "uint256", + "internalType" : "uint256", "name" : "deadline" }, { - "internalType" : "uint24", "name" : "fee", - "type" : "uint24" + "type" : "uint24", + "internalType" : "uint24" }, { - "internalType" : "uint160", "type" : "uint160", - "name" : "sqrtPriceLimitX96" + "name" : "sqrtPriceLimitX96", + "internalType" : "uint160" } ], - "type" : "tuple", "name" : "params", "internalType" : "struct Swap.SwapUniExactInputSingleParams" } ], - "name" : "swapUniExactInputSingle", - "type" : "function" + "outputs" : [] }, { - "name" : "swapUniExactOutput", "type" : "function", + "name" : "swapUniExactOutput", "stateMutability" : "nonpayable", "outputs" : [], "inputs" : [ { - "internalType" : "struct Swap.SwapUniExactOutputParams", + "type" : "tuple", "name" : "params", + "internalType" : "struct Swap.SwapUniExactOutputParams", "components" : [ { - "internalType" : "uint256", "name" : "subAccountIdIn", - "type" : "uint256" + "type" : "uint256", + "internalType" : "uint256" }, { - "internalType" : "uint256", "type" : "uint256", - "name" : "subAccountIdOut" + "name" : "subAccountIdOut", + "internalType" : "uint256" }, { - "internalType" : "uint256", + "type" : "uint256", "name" : "amountOut", - "type" : "uint256" + "internalType" : "uint256" }, { "internalType" : "uint256", @@ -1258,25 +1357,27 @@ "name" : "amountInMaximum" }, { - "internalType" : "uint256", "type" : "uint256", - "name" : "deadline" + "name" : "deadline", + "internalType" : "uint256" }, { - "internalType" : "bytes", "name" : "path", - "type" : "bytes" + "type" : "bytes", + "internalType" : "bytes" } - ], - "type" : "tuple" + ] } ] }, { + "type" : "function", + "name" : "swapUniExactOutputSingle", "stateMutability" : "nonpayable", - "outputs" : [], "inputs" : [ { + "type" : "tuple", + "name" : "params", "components" : [ { "internalType" : "uint256", @@ -1289,61 +1390,58 @@ "internalType" : "uint256" }, { - "name" : "underlyingIn", "type" : "address", + "name" : "underlyingIn", "internalType" : "address" }, { + "internalType" : "address", "type" : "address", - "name" : "underlyingOut", - "internalType" : "address" + "name" : "underlyingOut" }, { - "internalType" : "uint256", "type" : "uint256", + "internalType" : "uint256", "name" : "amountOut" }, { - "name" : "amountInMaximum", + "internalType" : "uint256", "type" : "uint256", - "internalType" : "uint256" + "name" : "amountInMaximum" }, { - "type" : "uint256", "name" : "deadline", + "type" : "uint256", "internalType" : "uint256" }, { - "name" : "fee", "type" : "uint24", - "internalType" : "uint24" + "internalType" : "uint24", + "name" : "fee" }, { - "internalType" : "uint160", + "type" : "uint160", "name" : "sqrtPriceLimitX96", - "type" : "uint160" + "internalType" : "uint160" } ], - "type" : "tuple", - "name" : "params", "internalType" : "struct Swap.SwapUniExactOutputSingleParams" } ], - "name" : "swapUniExactOutputSingle", - "type" : "function" + "outputs" : [] }, { + "type" : "function", + "name" : "uniswapRouter", "stateMutability" : "view", "outputs" : [ { + "type" : "address", "internalType" : "address", - "name" : "", - "type" : "address" + "name" : "" } ], - "inputs" : [], - "name" : "uniswapRouter", - "type" : "function" + "inputs" : [] } ] } diff --git a/abis/modules/SwapHub.json b/abis/modules/SwapHub.json new file mode 100644 index 0000000..78726db --- /dev/null +++ b/abis/modules/SwapHub.json @@ -0,0 +1,1171 @@ +{ + "abi" : [ + { + "inputs" : [ + { + "type" : "bytes32", + "name" : "moduleGitCommit_", + "internalType" : "bytes32" + } + ], + "type" : "constructor", + "stateMutability" : "nonpayable" + }, + { + "type" : "event", + "anonymous" : false, + "name" : "AssetStatus", + "inputs" : [ + { + "name" : "underlying", + "type" : "address", + "internalType" : "address", + "indexed" : true + }, + { + "type" : "uint256", + "indexed" : false, + "name" : "totalBalances", + "internalType" : "uint256" + }, + { + "type" : "uint256", + "name" : "totalBorrows", + "indexed" : false, + "internalType" : "uint256" + }, + { + "internalType" : "uint96", + "type" : "uint96", + "name" : "reserveBalance", + "indexed" : false + }, + { + "name" : "poolSize", + "type" : "uint256", + "internalType" : "uint256", + "indexed" : false + }, + { + "internalType" : "uint256", + "type" : "uint256", + "name" : "interestAccumulator", + "indexed" : false + }, + { + "internalType" : "int96", + "type" : "int96", + "name" : "interestRate", + "indexed" : false + }, + { + "type" : "uint256", + "name" : "timestamp", + "indexed" : false, + "internalType" : "uint256" + } + ] + }, + { + "type" : "event", + "anonymous" : false, + "name" : "Borrow", + "inputs" : [ + { + "type" : "address", + "name" : "underlying", + "indexed" : true, + "internalType" : "address" + }, + { + "indexed" : true, + "type" : "address", + "name" : "account", + "internalType" : "address" + }, + { + "indexed" : false, + "type" : "uint256", + "name" : "amount", + "internalType" : "uint256" + } + ] + }, + { + "type" : "event", + "name" : "DelegateAverageLiquidity", + "anonymous" : false, + "inputs" : [ + { + "name" : "account", + "type" : "address", + "indexed" : true, + "internalType" : "address" + }, + { + "name" : "delegate", + "type" : "address", + "internalType" : "address", + "indexed" : true + } + ] + }, + { + "inputs" : [ + { + "type" : "address", + "indexed" : true, + "name" : "underlying", + "internalType" : "address" + }, + { + "type" : "address", + "internalType" : "address", + "name" : "account", + "indexed" : true + }, + { + "indexed" : false, + "type" : "uint256", + "name" : "amount", + "internalType" : "uint256" + } + ], + "type" : "event", + "anonymous" : false, + "name" : "Deposit" + }, + { + "type" : "event", + "name" : "EnterMarket", + "anonymous" : false, + "inputs" : [ + { + "name" : "underlying", + "type" : "address", + "indexed" : true, + "internalType" : "address" + }, + { + "type" : "address", + "indexed" : true, + "name" : "account", + "internalType" : "address" + } + ] + }, + { + "type" : "event", + "anonymous" : false, + "name" : "ExitMarket", + "inputs" : [ + { + "name" : "underlying", + "type" : "address", + "internalType" : "address", + "indexed" : true + }, + { + "type" : "address", + "indexed" : true, + "name" : "account", + "internalType" : "address" + } + ] + }, + { + "inputs" : [], + "type" : "event", + "name" : "Genesis", + "anonymous" : false + }, + { + "anonymous" : false, + "type" : "event", + "name" : "GovConvertReserves", + "inputs" : [ + { + "type" : "address", + "indexed" : true, + "name" : "underlying", + "internalType" : "address" + }, + { + "type" : "address", + "internalType" : "address", + "name" : "recipient", + "indexed" : true + }, + { + "type" : "uint256", + "indexed" : false, + "name" : "amount", + "internalType" : "uint256" + } + ] + }, + { + "name" : "GovSetAssetConfig", + "type" : "event", + "anonymous" : false, + "inputs" : [ + { + "type" : "address", + "name" : "underlying", + "indexed" : true, + "internalType" : "address" + }, + { + "name" : "newConfig", + "type" : "tuple", + "components" : [ + { + "type" : "address", + "internalType" : "address", + "name" : "eTokenAddress" + }, + { + "type" : "bool", + "internalType" : "bool", + "name" : "borrowIsolated" + }, + { + "name" : "collateralFactor", + "type" : "uint32", + "internalType" : "uint32" + }, + { + "internalType" : "uint32", + "type" : "uint32", + "name" : "borrowFactor" + }, + { + "internalType" : "uint24", + "type" : "uint24", + "name" : "twapWindow" + } + ], + "internalType" : "struct Storage.AssetConfig", + "indexed" : false + } + ] + }, + { + "inputs" : [ + { + "name" : "underlying", + "type" : "address", + "internalType" : "address", + "indexed" : true + }, + { + "name" : "chainlinkAggregator", + "type" : "address", + "internalType" : "address", + "indexed" : false + } + ], + "type" : "event", + "anonymous" : false, + "name" : "GovSetChainlinkPriceFeed" + }, + { + "inputs" : [ + { + "type" : "address", + "internalType" : "address", + "name" : "underlying", + "indexed" : true + }, + { + "indexed" : false, + "type" : "uint256", + "name" : "interestRateModel", + "internalType" : "uint256" + }, + { + "name" : "resetParams", + "type" : "bytes", + "indexed" : false, + "internalType" : "bytes" + } + ], + "name" : "GovSetIRM", + "type" : "event", + "anonymous" : false + }, + { + "inputs" : [ + { + "type" : "address", + "indexed" : true, + "name" : "underlying", + "internalType" : "address" + }, + { + "type" : "uint16", + "name" : "newPricingType", + "internalType" : "uint16", + "indexed" : false + }, + { + "internalType" : "uint32", + "type" : "uint32", + "name" : "newPricingParameter", + "indexed" : false + } + ], + "type" : "event", + "anonymous" : false, + "name" : "GovSetPricingConfig" + }, + { + "inputs" : [ + { + "type" : "address", + "name" : "underlying", + "indexed" : true, + "internalType" : "address" + }, + { + "internalType" : "uint32", + "type" : "uint32", + "name" : "newReserveFee", + "indexed" : false + } + ], + "type" : "event", + "name" : "GovSetReserveFee", + "anonymous" : false + }, + { + "name" : "InstallerInstallModule", + "type" : "event", + "anonymous" : false, + "inputs" : [ + { + "name" : "moduleId", + "type" : "uint256", + "indexed" : true, + "internalType" : "uint256" + }, + { + "name" : "moduleImpl", + "type" : "address", + "indexed" : true, + "internalType" : "address" + }, + { + "type" : "bytes32", + "indexed" : false, + "name" : "moduleGitCommit", + "internalType" : "bytes32" + } + ] + }, + { + "inputs" : [ + { + "type" : "address", + "internalType" : "address", + "name" : "newGovernorAdmin", + "indexed" : true + } + ], + "name" : "InstallerSetGovernorAdmin", + "type" : "event", + "anonymous" : false + }, + { + "anonymous" : false, + "type" : "event", + "name" : "InstallerSetUpgradeAdmin", + "inputs" : [ + { + "indexed" : true, + "type" : "address", + "name" : "newUpgradeAdmin", + "internalType" : "address" + } + ] + }, + { + "inputs" : [ + { + "name" : "liquidator", + "type" : "address", + "indexed" : true, + "internalType" : "address" + }, + { + "type" : "address", + "internalType" : "address", + "name" : "violator", + "indexed" : true + }, + { + "type" : "address", + "internalType" : "address", + "name" : "underlying", + "indexed" : true + }, + { + "internalType" : "address", + "type" : "address", + "name" : "collateral", + "indexed" : false + }, + { + "name" : "repay", + "type" : "uint256", + "internalType" : "uint256", + "indexed" : false + }, + { + "internalType" : "uint256", + "type" : "uint256", + "name" : "yield", + "indexed" : false + }, + { + "type" : "uint256", + "indexed" : false, + "name" : "healthScore", + "internalType" : "uint256" + }, + { + "name" : "baseDiscount", + "type" : "uint256", + "indexed" : false, + "internalType" : "uint256" + }, + { + "type" : "uint256", + "indexed" : false, + "name" : "discount", + "internalType" : "uint256" + } + ], + "type" : "event", + "name" : "Liquidation", + "anonymous" : false + }, + { + "name" : "MarketActivated", + "type" : "event", + "anonymous" : false, + "inputs" : [ + { + "name" : "underlying", + "type" : "address", + "internalType" : "address", + "indexed" : true + }, + { + "type" : "address", + "indexed" : true, + "name" : "eToken", + "internalType" : "address" + }, + { + "type" : "address", + "name" : "dToken", + "indexed" : true, + "internalType" : "address" + } + ] + }, + { + "inputs" : [ + { + "type" : "address", + "name" : "underlying", + "indexed" : true, + "internalType" : "address" + }, + { + "name" : "pToken", + "type" : "address", + "indexed" : true, + "internalType" : "address" + } + ], + "type" : "event", + "anonymous" : false, + "name" : "PTokenActivated" + }, + { + "name" : "PTokenUnWrap", + "type" : "event", + "anonymous" : false, + "inputs" : [ + { + "indexed" : true, + "type" : "address", + "name" : "underlying", + "internalType" : "address" + }, + { + "name" : "account", + "type" : "address", + "internalType" : "address", + "indexed" : true + }, + { + "type" : "uint256", + "internalType" : "uint256", + "name" : "amount", + "indexed" : false + } + ] + }, + { + "type" : "event", + "anonymous" : false, + "name" : "PTokenWrap", + "inputs" : [ + { + "indexed" : true, + "type" : "address", + "name" : "underlying", + "internalType" : "address" + }, + { + "indexed" : true, + "type" : "address", + "name" : "account", + "internalType" : "address" + }, + { + "type" : "uint256", + "internalType" : "uint256", + "name" : "amount", + "indexed" : false + } + ] + }, + { + "inputs" : [ + { + "type" : "address", + "internalType" : "address", + "name" : "proxy", + "indexed" : true + }, + { + "internalType" : "uint256", + "type" : "uint256", + "name" : "moduleId", + "indexed" : false + } + ], + "type" : "event", + "name" : "ProxyCreated", + "anonymous" : false + }, + { + "inputs" : [ + { + "name" : "underlying", + "type" : "address", + "indexed" : true, + "internalType" : "address" + }, + { + "indexed" : true, + "type" : "address", + "name" : "account", + "internalType" : "address" + }, + { + "type" : "uint256", + "internalType" : "uint256", + "name" : "amount", + "indexed" : false + } + ], + "anonymous" : false, + "type" : "event", + "name" : "Repay" + }, + { + "inputs" : [ + { + "type" : "address", + "name" : "account", + "indexed" : true, + "internalType" : "address" + }, + { + "type" : "uint256", + "name" : "amount", + "internalType" : "uint256", + "indexed" : false + } + ], + "anonymous" : false, + "type" : "event", + "name" : "RequestBorrow" + }, + { + "anonymous" : false, + "type" : "event", + "name" : "RequestBurn", + "inputs" : [ + { + "name" : "account", + "type" : "address", + "indexed" : true, + "internalType" : "address" + }, + { + "type" : "uint256", + "name" : "amount", + "internalType" : "uint256", + "indexed" : false + } + ] + }, + { + "inputs" : [ + { + "name" : "account", + "type" : "address", + "internalType" : "address", + "indexed" : true + }, + { + "internalType" : "uint256", + "type" : "uint256", + "name" : "amount", + "indexed" : false + } + ], + "name" : "RequestDeposit", + "type" : "event", + "anonymous" : false + }, + { + "type" : "event", + "anonymous" : false, + "name" : "RequestDonate", + "inputs" : [ + { + "type" : "address", + "indexed" : true, + "name" : "account", + "internalType" : "address" + }, + { + "type" : "uint256", + "internalType" : "uint256", + "name" : "amount", + "indexed" : false + } + ] + }, + { + "inputs" : [ + { + "internalType" : "address", + "type" : "address", + "name" : "liquidator", + "indexed" : true + }, + { + "indexed" : true, + "type" : "address", + "name" : "violator", + "internalType" : "address" + }, + { + "type" : "address", + "indexed" : true, + "name" : "underlying", + "internalType" : "address" + }, + { + "name" : "collateral", + "type" : "address", + "indexed" : false, + "internalType" : "address" + }, + { + "name" : "repay", + "type" : "uint256", + "internalType" : "uint256", + "indexed" : false + }, + { + "name" : "minYield", + "type" : "uint256", + "internalType" : "uint256", + "indexed" : false + } + ], + "type" : "event", + "anonymous" : false, + "name" : "RequestLiquidate" + }, + { + "type" : "event", + "anonymous" : false, + "name" : "RequestMint", + "inputs" : [ + { + "type" : "address", + "internalType" : "address", + "name" : "account", + "indexed" : true + }, + { + "indexed" : false, + "type" : "uint256", + "name" : "amount", + "internalType" : "uint256" + } + ] + }, + { + "type" : "event", + "name" : "RequestRepay", + "anonymous" : false, + "inputs" : [ + { + "name" : "account", + "type" : "address", + "indexed" : true, + "internalType" : "address" + }, + { + "type" : "uint256", + "indexed" : false, + "name" : "amount", + "internalType" : "uint256" + } + ] + }, + { + "name" : "RequestSwap", + "type" : "event", + "anonymous" : false, + "inputs" : [ + { + "name" : "accountIn", + "type" : "address", + "internalType" : "address", + "indexed" : true + }, + { + "type" : "address", + "indexed" : true, + "name" : "accountOut", + "internalType" : "address" + }, + { + "type" : "address", + "name" : "underlyingIn", + "indexed" : true, + "internalType" : "address" + }, + { + "internalType" : "address", + "type" : "address", + "name" : "underlyingOut", + "indexed" : false + }, + { + "name" : "amount", + "type" : "uint256", + "internalType" : "uint256", + "indexed" : false + }, + { + "internalType" : "uint256", + "type" : "uint256", + "name" : "swapType", + "indexed" : false + } + ] + }, + { + "inputs" : [ + { + "type" : "address", + "indexed" : true, + "name" : "accountIn", + "internalType" : "address" + }, + { + "type" : "address", + "internalType" : "address", + "name" : "accountOut", + "indexed" : true + }, + { + "type" : "address", + "name" : "underlyingIn", + "indexed" : true, + "internalType" : "address" + }, + { + "indexed" : false, + "type" : "address", + "name" : "underlyingOut", + "internalType" : "address" + }, + { + "indexed" : false, + "type" : "uint256", + "name" : "amountIn", + "internalType" : "uint256" + }, + { + "name" : "amountOut", + "type" : "uint256", + "indexed" : false, + "internalType" : "uint256" + }, + { + "type" : "uint256", + "internalType" : "uint256", + "name" : "mode", + "indexed" : false + }, + { + "type" : "address", + "internalType" : "address", + "name" : "swapHandler", + "indexed" : false + } + ], + "name" : "RequestSwapHub", + "type" : "event", + "anonymous" : false + }, + { + "type" : "event", + "name" : "RequestSwapHubRepay", + "anonymous" : false, + "inputs" : [ + { + "type" : "address", + "name" : "accountIn", + "indexed" : true, + "internalType" : "address" + }, + { + "name" : "accountOut", + "type" : "address", + "indexed" : true, + "internalType" : "address" + }, + { + "indexed" : true, + "type" : "address", + "name" : "underlyingIn", + "internalType" : "address" + }, + { + "type" : "address", + "internalType" : "address", + "name" : "underlyingOut", + "indexed" : false + }, + { + "indexed" : false, + "type" : "uint256", + "name" : "targetDebt", + "internalType" : "uint256" + }, + { + "type" : "address", + "name" : "swapHandler", + "internalType" : "address", + "indexed" : false + } + ] + }, + { + "inputs" : [ + { + "indexed" : true, + "type" : "address", + "name" : "from", + "internalType" : "address" + }, + { + "type" : "address", + "internalType" : "address", + "name" : "to", + "indexed" : true + }, + { + "name" : "amount", + "type" : "uint256", + "internalType" : "uint256", + "indexed" : false + } + ], + "type" : "event", + "anonymous" : false, + "name" : "RequestTransferDToken" + }, + { + "type" : "event", + "name" : "RequestTransferEToken", + "anonymous" : false, + "inputs" : [ + { + "type" : "address", + "internalType" : "address", + "name" : "from", + "indexed" : true + }, + { + "type" : "address", + "indexed" : true, + "name" : "to", + "internalType" : "address" + }, + { + "indexed" : false, + "type" : "uint256", + "name" : "amount", + "internalType" : "uint256" + } + ] + }, + { + "anonymous" : false, + "type" : "event", + "name" : "RequestWithdraw", + "inputs" : [ + { + "name" : "account", + "type" : "address", + "indexed" : true, + "internalType" : "address" + }, + { + "name" : "amount", + "type" : "uint256", + "internalType" : "uint256", + "indexed" : false + } + ] + }, + { + "inputs" : [ + { + "indexed" : true, + "type" : "address", + "name" : "account", + "internalType" : "address" + } + ], + "type" : "event", + "anonymous" : false, + "name" : "TrackAverageLiquidity" + }, + { + "inputs" : [ + { + "name" : "account", + "type" : "address", + "indexed" : true, + "internalType" : "address" + } + ], + "type" : "event", + "name" : "UnTrackAverageLiquidity", + "anonymous" : false + }, + { + "inputs" : [ + { + "type" : "address", + "name" : "underlying", + "indexed" : true, + "internalType" : "address" + }, + { + "type" : "address", + "indexed" : true, + "name" : "account", + "internalType" : "address" + }, + { + "type" : "uint256", + "internalType" : "uint256", + "name" : "amount", + "indexed" : false + } + ], + "anonymous" : false, + "type" : "event", + "name" : "Withdraw" + }, + { + "type" : "function", + "name" : "moduleGitCommit", + "stateMutability" : "view", + "outputs" : [ + { + "internalType" : "bytes32", + "type" : "bytes32", + "name" : "" + } + ], + "inputs" : [] + }, + { + "inputs" : [], + "outputs" : [ + { + "internalType" : "uint256", + "type" : "uint256", + "name" : "" + } + ], + "type" : "function", + "stateMutability" : "view", + "name" : "moduleId" + }, + { + "outputs" : [], + "inputs" : [ + { + "type" : "uint256", + "name" : "subAccountIdIn", + "internalType" : "uint256" + }, + { + "name" : "subAccountIdOut", + "type" : "uint256", + "internalType" : "uint256" + }, + { + "internalType" : "address", + "type" : "address", + "name" : "swapHandler" + }, + { + "components" : [ + { + "name" : "underlyingIn", + "type" : "address", + "internalType" : "address" + }, + { + "type" : "address", + "name" : "underlyingOut", + "internalType" : "address" + }, + { + "name" : "mode", + "type" : "uint256", + "internalType" : "uint256" + }, + { + "type" : "uint256", + "internalType" : "uint256", + "name" : "amountIn" + }, + { + "name" : "amountOut", + "type" : "uint256", + "internalType" : "uint256" + }, + { + "name" : "exactOutTolerance", + "type" : "uint256", + "internalType" : "uint256" + }, + { + "type" : "bytes", + "internalType" : "bytes", + "name" : "payload" + } + ], + "type" : "tuple", + "name" : "params", + "internalType" : "struct ISwapHandler.SwapParams" + } + ], + "stateMutability" : "nonpayable", + "type" : "function", + "name" : "swap" + }, + { + "name" : "swapAndRepay", + "type" : "function", + "stateMutability" : "nonpayable", + "outputs" : [], + "inputs" : [ + { + "name" : "subAccountIdIn", + "type" : "uint256", + "internalType" : "uint256" + }, + { + "type" : "uint256", + "name" : "subAccountIdOut", + "internalType" : "uint256" + }, + { + "internalType" : "address", + "type" : "address", + "name" : "swapHandler" + }, + { + "type" : "tuple", + "components" : [ + { + "internalType" : "address", + "type" : "address", + "name" : "underlyingIn" + }, + { + "internalType" : "address", + "type" : "address", + "name" : "underlyingOut" + }, + { + "type" : "uint256", + "internalType" : "uint256", + "name" : "mode" + }, + { + "type" : "uint256", + "internalType" : "uint256", + "name" : "amountIn" + }, + { + "type" : "uint256", + "internalType" : "uint256", + "name" : "amountOut" + }, + { + "name" : "exactOutTolerance", + "type" : "uint256", + "internalType" : "uint256" + }, + { + "type" : "bytes", + "name" : "payload", + "internalType" : "bytes" + } + ], + "name" : "params", + "internalType" : "struct ISwapHandler.SwapParams" + }, + { + "name" : "targetDebt", + "type" : "uint256", + "internalType" : "uint256" + } + ] + } + ] +} diff --git a/addresses/addresses-mainnet.json b/addresses/addresses-mainnet.json index 2daef07..c8435c2 100644 --- a/addresses/addresses-mainnet.json +++ b/addresses/addresses-mainnet.json @@ -18,9 +18,12 @@ } } }, + "swapHandler1Inch": "0x32673dAA164F4a290AE1f75DDc6aea5A2d343065", + "swapHandlerUniAutoRouter": "0xD1679029Ae81DA676d9b5850feb6C8EE68f9d04E", "markets" : "0x3520d5a913427E6F0D6A83E07ccD4A4da316e4d3", "euler" : "0x27182842E098f60e3D576794A5bFFb0777E025d3", "swap" : "0x7123C8cBBD76c5C7fCC9f7150f23179bec0bA341", + "swapHub" : "0x542ACC8E1db037d6008587aBfB1B7fB44014c629", "liquidation" : "0xf43ce1d09050BAfd6980dD43Cde2aB9F18C85b34", "eulerGeneralView" : "0xACC25c4d40651676FEEd43a3467F3169e3E68e42", "eulerSimpleLens": "0xc2d41d42939109CDCfa26C6965269D9C0220b38E", diff --git a/contracts/IEuler.sol b/contracts/IEuler.sol index faea354..57d0481 100644 --- a/contracts/IEuler.sol +++ b/contracts/IEuler.sol @@ -611,6 +611,36 @@ interface IEulerSwap { } +/// @notice Common logic for executing and processing trades through external swap handler contracts +interface IEulerSwapHub { + /// @notice Params defining a swap request + struct SwapParams { + address underlyingIn; + address underlyingOut; + uint mode; + uint amountIn; + uint amountOut; + uint exactOutTolerance; + bytes payload; + } + + /// @notice Execute a trade using the requested swap handler + /// @param subAccountIdIn sub-account holding the sold token. 0 for primary, 1-255 for a sub-account + /// @param subAccountIdOut sub-account to receive the bought token. 0 for primary, 1-255 for a sub-account + /// @param swapHandler address of a swap handler to use + /// @param params struct defining the requested trade + function swap(uint subAccountIdIn, uint subAccountIdOut, address swapHandler, SwapParams memory params) external; + + /// @notice Repay debt by selling another deposited token + /// @param subAccountIdIn sub-account holding the sold token. 0 for primary, 1-255 for a sub-account + /// @param subAccountIdOut sub-account to receive the bought token. 0 for primary, 1-255 for a sub-account + /// @param swapHandler address of a swap handler to use + /// @param params struct defining the requested trade + /// @param targetDebt how much debt should remain after calling the function + function swapAndRepay(uint subAccountIdIn, uint subAccountIdOut, address swapHandler, SwapParams memory params, uint targetDebt) external; +} + + /// @notice Protected Tokens are simple wrappers for tokens, allowing you to use tokens as collateral without permitting borrowing interface IEulerPToken { /// @notice PToken name, ie "Euler Protected DAI" diff --git a/package.json b/package.json index 9156970..4c21baf 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "version": "1.1.1", + "version": "1.1.3", "name": "@eulerxyz/euler-interfaces", "main": "index.js", "files": [ diff --git a/types/Euler.ts b/types/Euler.ts index 9dcf366..59e7bff 100644 --- a/types/Euler.ts +++ b/types/Euler.ts @@ -120,6 +120,8 @@ export interface EulerInterface extends utils.Interface { "RequestMint(address,uint256)": EventFragment; "RequestRepay(address,uint256)": EventFragment; "RequestSwap(address,address,address,address,uint256,uint256)": EventFragment; + "RequestSwapHub(address,address,address,address,uint256,uint256,uint256,address)": EventFragment; + "RequestSwapHubRepay(address,address,address,address,uint256,address)": EventFragment; "RequestTransferDToken(address,address,uint256)": EventFragment; "RequestTransferEToken(address,address,uint256)": EventFragment; "RequestWithdraw(address,uint256)": EventFragment; @@ -159,6 +161,8 @@ export interface EulerInterface extends utils.Interface { getEvent(nameOrSignatureOrTopic: "RequestMint"): EventFragment; getEvent(nameOrSignatureOrTopic: "RequestRepay"): EventFragment; getEvent(nameOrSignatureOrTopic: "RequestSwap"): EventFragment; + getEvent(nameOrSignatureOrTopic: "RequestSwapHub"): EventFragment; + getEvent(nameOrSignatureOrTopic: "RequestSwapHubRepay"): EventFragment; getEvent(nameOrSignatureOrTopic: "RequestTransferDToken"): EventFragment; getEvent(nameOrSignatureOrTopic: "RequestTransferEToken"): EventFragment; getEvent(nameOrSignatureOrTopic: "RequestWithdraw"): EventFragment; @@ -560,6 +564,39 @@ export type RequestSwapEvent = TypedEvent< export type RequestSwapEventFilter = TypedEventFilter; +export interface RequestSwapHubEventObject { + accountIn: string; + accountOut: string; + underlyingIn: string; + underlyingOut: string; + amountIn: BigNumber; + amountOut: BigNumber; + mode: BigNumber; + swapHandler: string; +} +export type RequestSwapHubEvent = TypedEvent< + [string, string, string, string, BigNumber, BigNumber, BigNumber, string], + RequestSwapHubEventObject +>; + +export type RequestSwapHubEventFilter = TypedEventFilter; + +export interface RequestSwapHubRepayEventObject { + accountIn: string; + accountOut: string; + underlyingIn: string; + underlyingOut: string; + targetDebt: BigNumber; + swapHandler: string; +} +export type RequestSwapHubRepayEvent = TypedEvent< + [string, string, string, string, BigNumber, string], + RequestSwapHubRepayEventObject +>; + +export type RequestSwapHubRepayEventFilter = + TypedEventFilter; + export interface RequestTransferDTokenEventObject { from: string; to: string; @@ -1033,6 +1070,44 @@ export interface Euler extends BaseContract { swapType?: null ): RequestSwapEventFilter; + "RequestSwapHub(address,address,address,address,uint256,uint256,uint256,address)"( + accountIn?: string | null, + accountOut?: string | null, + underlyingIn?: string | null, + underlyingOut?: null, + amountIn?: null, + amountOut?: null, + mode?: null, + swapHandler?: null + ): RequestSwapHubEventFilter; + RequestSwapHub( + accountIn?: string | null, + accountOut?: string | null, + underlyingIn?: string | null, + underlyingOut?: null, + amountIn?: null, + amountOut?: null, + mode?: null, + swapHandler?: null + ): RequestSwapHubEventFilter; + + "RequestSwapHubRepay(address,address,address,address,uint256,address)"( + accountIn?: string | null, + accountOut?: string | null, + underlyingIn?: string | null, + underlyingOut?: null, + targetDebt?: null, + swapHandler?: null + ): RequestSwapHubRepayEventFilter; + RequestSwapHubRepay( + accountIn?: string | null, + accountOut?: string | null, + underlyingIn?: string | null, + underlyingOut?: null, + targetDebt?: null, + swapHandler?: null + ): RequestSwapHubRepayEventFilter; + "RequestTransferDToken(address,address,uint256)"( from?: string | null, to?: string | null, diff --git a/types/factories/Euler__factory.ts b/types/factories/Euler__factory.ts index 732f1f7..dbefef6 100644 --- a/types/factories/Euler__factory.ts +++ b/types/factories/Euler__factory.ts @@ -8,84 +8,83 @@ import type { Euler, EulerInterface } from "../Euler"; const _abi = [ { - type: "constructor", inputs: [ { - internalType: "address", - name: "admin", type: "address", + name: "admin", + internalType: "address", }, { - name: "installerModule", - type: "address", internalType: "address", + type: "address", + name: "installerModule", }, ], stateMutability: "nonpayable", + type: "constructor", }, { inputs: [ { - name: "underlying", type: "address", - internalType: "address", indexed: true, + name: "underlying", + internalType: "address", }, { - internalType: "uint256", + type: "uint256", indexed: false, name: "totalBalances", - type: "uint256", + internalType: "uint256", }, { - name: "totalBorrows", type: "uint256", - internalType: "uint256", indexed: false, + name: "totalBorrows", + internalType: "uint256", }, { type: "uint96", - name: "reserveBalance", indexed: false, + name: "reserveBalance", internalType: "uint96", }, { - internalType: "uint256", indexed: false, - name: "poolSize", type: "uint256", + name: "poolSize", + internalType: "uint256", }, { - name: "interestAccumulator", - type: "uint256", indexed: false, + type: "uint256", + name: "interestAccumulator", internalType: "uint256", }, { - internalType: "int96", + type: "int96", indexed: false, name: "interestRate", - type: "int96", + internalType: "int96", }, { - internalType: "uint256", - indexed: false, type: "uint256", + internalType: "uint256", name: "timestamp", + indexed: false, }, ], - anonymous: false, type: "event", + anonymous: false, name: "AssetStatus", }, { - anonymous: false, inputs: [ { - internalType: "address", - indexed: true, type: "address", name: "underlying", + indexed: true, + internalType: "address", }, { type: "address", @@ -94,96 +93,97 @@ const _abi = [ indexed: true, }, { - name: "amount", type: "uint256", - indexed: false, internalType: "uint256", + name: "amount", + indexed: false, }, ], - name: "Borrow", + anonymous: false, type: "event", + name: "Borrow", }, { - name: "DelegateAverageLiquidity", - type: "event", anonymous: false, + type: "event", + name: "DelegateAverageLiquidity", inputs: [ { - type: "address", name: "account", + type: "address", indexed: true, internalType: "address", }, { indexed: true, - internalType: "address", - name: "delegate", type: "address", + name: "delegate", + internalType: "address", }, ], }, { - type: "event", - name: "Deposit", inputs: [ { - name: "underlying", - type: "address", internalType: "address", + type: "address", + name: "underlying", indexed: true, }, { - indexed: true, - internalType: "address", - name: "account", type: "address", + name: "account", + internalType: "address", + indexed: true, }, { - type: "uint256", name: "amount", - indexed: false, + type: "uint256", internalType: "uint256", + indexed: false, }, ], + type: "event", anonymous: false, + name: "Deposit", }, { + anonymous: false, type: "event", name: "EnterMarket", inputs: [ { - indexed: true, - internalType: "address", type: "address", + indexed: true, name: "underlying", + internalType: "address", }, { + name: "account", + type: "address", internalType: "address", indexed: true, - type: "address", - name: "account", }, ], - anonymous: false, }, { anonymous: false, + type: "event", + name: "ExitMarket", inputs: [ { - internalType: "address", + type: "address", indexed: true, name: "underlying", - type: "address", + internalType: "address", }, { type: "address", - name: "account", indexed: true, + name: "account", internalType: "address", }, ], - name: "ExitMarket", - type: "event", }, { name: "Genesis", @@ -192,240 +192,241 @@ const _abi = [ inputs: [], }, { - anonymous: false, inputs: [ { name: "underlying", type: "address", - internalType: "address", indexed: true, + internalType: "address", }, { + indexed: true, type: "address", name: "recipient", internalType: "address", - indexed: true, }, { indexed: false, - internalType: "uint256", type: "uint256", name: "amount", + internalType: "uint256", }, ], - name: "GovConvertReserves", type: "event", + anonymous: false, + name: "GovConvertReserves", }, { + name: "GovSetAssetConfig", + type: "event", + anonymous: false, inputs: [ { + type: "address", internalType: "address", - indexed: true, name: "underlying", - type: "address", + indexed: true, }, { + indexed: false, type: "tuple", + name: "newConfig", + internalType: "struct Storage.AssetConfig", components: [ { - name: "eTokenAddress", type: "address", internalType: "address", + name: "eTokenAddress", }, { + type: "bool", internalType: "bool", name: "borrowIsolated", - type: "bool", }, { - internalType: "uint32", - name: "collateralFactor", type: "uint32", + name: "collateralFactor", + internalType: "uint32", }, { - name: "borrowFactor", type: "uint32", + name: "borrowFactor", internalType: "uint32", }, { - type: "uint24", name: "twapWindow", + type: "uint24", internalType: "uint24", }, ], - name: "newConfig", - indexed: false, - internalType: "struct Storage.AssetConfig", }, ], - anonymous: false, - type: "event", - name: "GovSetAssetConfig", }, { - name: "GovSetChainlinkPriceFeed", - type: "event", anonymous: false, + type: "event", + name: "GovSetChainlinkPriceFeed", inputs: [ { - name: "underlying", + indexed: true, type: "address", + name: "underlying", internalType: "address", - indexed: true, }, { - internalType: "address", + type: "address", indexed: false, name: "chainlinkAggregator", - type: "address", + internalType: "address", }, ], }, { inputs: [ { - indexed: true, - internalType: "address", - name: "underlying", type: "address", + name: "underlying", + internalType: "address", + indexed: true, }, { - type: "uint256", name: "interestRateModel", + type: "uint256", internalType: "uint256", indexed: false, }, { + name: "resetParams", + type: "bytes", indexed: false, internalType: "bytes", - type: "bytes", - name: "resetParams", }, ], - anonymous: false, type: "event", + anonymous: false, name: "GovSetIRM", }, { - name: "GovSetPricingConfig", - type: "event", - anonymous: false, inputs: [ { - type: "address", name: "underlying", + type: "address", internalType: "address", indexed: true, }, { indexed: false, - internalType: "uint16", - name: "newPricingType", type: "uint16", + name: "newPricingType", + internalType: "uint16", }, { - internalType: "uint32", - indexed: false, name: "newPricingParameter", type: "uint32", + indexed: false, + internalType: "uint32", }, ], + type: "event", + anonymous: false, + name: "GovSetPricingConfig", }, { - anonymous: false, inputs: [ { type: "address", - name: "underlying", indexed: true, + name: "underlying", internalType: "address", }, { - name: "newReserveFee", type: "uint32", indexed: false, + name: "newReserveFee", internalType: "uint32", }, ], - name: "GovSetReserveFee", + anonymous: false, type: "event", + name: "GovSetReserveFee", }, { - type: "event", - name: "InstallerInstallModule", inputs: [ { indexed: true, - internalType: "uint256", type: "uint256", name: "moduleId", + internalType: "uint256", }, { + indexed: true, type: "address", name: "moduleImpl", internalType: "address", - indexed: true, }, { - type: "bytes32", name: "moduleGitCommit", - indexed: false, + type: "bytes32", internalType: "bytes32", + indexed: false, }, ], + name: "InstallerInstallModule", + type: "event", anonymous: false, }, { inputs: [ { - name: "newGovernorAdmin", type: "address", internalType: "address", + name: "newGovernorAdmin", indexed: true, }, ], - anonymous: false, type: "event", name: "InstallerSetGovernorAdmin", + anonymous: false, }, { - name: "InstallerSetUpgradeAdmin", type: "event", anonymous: false, + name: "InstallerSetUpgradeAdmin", inputs: [ { - name: "newUpgradeAdmin", type: "address", - indexed: true, + name: "newUpgradeAdmin", internalType: "address", + indexed: true, }, ], }, { + anonymous: false, type: "event", name: "Liquidation", inputs: [ { - name: "liquidator", - type: "address", indexed: true, + type: "address", + name: "liquidator", internalType: "address", }, { + internalType: "address", type: "address", name: "violator", - internalType: "address", indexed: true, }, { + indexed: true, type: "address", name: "underlying", - indexed: true, internalType: "address", }, { - type: "address", name: "collateral", + type: "address", indexed: false, internalType: "address", }, @@ -436,149 +437,145 @@ const _abi = [ internalType: "uint256", }, { - indexed: false, - internalType: "uint256", type: "uint256", name: "yield", + internalType: "uint256", + indexed: false, }, { - name: "healthScore", type: "uint256", - internalType: "uint256", indexed: false, + name: "healthScore", + internalType: "uint256", }, { - internalType: "uint256", - indexed: false, type: "uint256", + indexed: false, name: "baseDiscount", + internalType: "uint256", }, { - indexed: false, - internalType: "uint256", name: "discount", type: "uint256", + internalType: "uint256", + indexed: false, }, ], - anonymous: false, }, { - anonymous: false, inputs: [ { - internalType: "address", - indexed: true, type: "address", + indexed: true, name: "underlying", + internalType: "address", }, { - indexed: true, - internalType: "address", type: "address", + indexed: true, name: "eToken", + internalType: "address", }, { - internalType: "address", - indexed: true, type: "address", + indexed: true, name: "dToken", + internalType: "address", }, ], - name: "MarketActivated", + anonymous: false, type: "event", + name: "MarketActivated", }, { - name: "PTokenActivated", - type: "event", anonymous: false, + type: "event", + name: "PTokenActivated", inputs: [ { internalType: "address", - indexed: true, type: "address", name: "underlying", + indexed: true, }, { - name: "pToken", - type: "address", indexed: true, + type: "address", + name: "pToken", internalType: "address", }, ], }, { - type: "event", - name: "PTokenUnWrap", inputs: [ { - name: "underlying", type: "address", + name: "underlying", indexed: true, internalType: "address", }, { - internalType: "address", - indexed: true, name: "account", type: "address", + indexed: true, + internalType: "address", }, { type: "uint256", - name: "amount", internalType: "uint256", + name: "amount", indexed: false, }, ], + type: "event", + name: "PTokenUnWrap", anonymous: false, }, { - name: "PTokenWrap", - type: "event", - anonymous: false, inputs: [ { type: "address", name: "underlying", - indexed: true, internalType: "address", + indexed: true, }, { name: "account", type: "address", - internalType: "address", indexed: true, + internalType: "address", }, { type: "uint256", - name: "amount", indexed: false, + name: "amount", internalType: "uint256", }, ], + anonymous: false, + type: "event", + name: "PTokenWrap", }, { + type: "event", anonymous: false, + name: "ProxyCreated", inputs: [ { + indexed: true, type: "address", name: "proxy", - indexed: true, internalType: "address", }, { - indexed: false, - internalType: "uint256", name: "moduleId", type: "uint256", + indexed: false, + internalType: "uint256", }, ], - name: "ProxyCreated", - type: "event", }, { - name: "Repay", - type: "event", - anonymous: false, inputs: [ { type: "address", @@ -588,17 +585,20 @@ const _abi = [ }, { internalType: "address", - indexed: true, type: "address", name: "account", + indexed: true, }, { - name: "amount", - type: "uint256", internalType: "uint256", + type: "uint256", + name: "amount", indexed: false, }, ], + type: "event", + name: "Repay", + anonymous: false, }, { name: "RequestBorrow", @@ -606,15 +606,15 @@ const _abi = [ anonymous: false, inputs: [ { + internalType: "address", type: "address", name: "account", - internalType: "address", indexed: true, }, { + indexed: false, type: "uint256", name: "amount", - indexed: false, internalType: "uint256", }, ], @@ -622,145 +622,188 @@ const _abi = [ { inputs: [ { - internalType: "address", - indexed: true, - type: "address", name: "account", + type: "address", + indexed: true, + internalType: "address", }, { + name: "amount", + type: "uint256", indexed: false, internalType: "uint256", - type: "uint256", - name: "amount", }, ], - anonymous: false, type: "event", + anonymous: false, name: "RequestBurn", }, { - type: "event", - name: "RequestDeposit", inputs: [ { indexed: true, - internalType: "address", type: "address", name: "account", + internalType: "address", }, { - name: "amount", - type: "uint256", indexed: false, + type: "uint256", + name: "amount", internalType: "uint256", }, ], anonymous: false, + type: "event", + name: "RequestDeposit", }, { type: "event", + anonymous: false, name: "RequestDonate", inputs: [ { name: "account", type: "address", - indexed: true, internalType: "address", + indexed: true, }, { type: "uint256", + internalType: "uint256", name: "amount", indexed: false, - internalType: "uint256", }, ], - anonymous: false, }, { + anonymous: false, type: "event", name: "RequestLiquidate", inputs: [ { - name: "liquidator", type: "address", + name: "liquidator", internalType: "address", indexed: true, }, { - indexed: true, - internalType: "address", - type: "address", name: "violator", + type: "address", + internalType: "address", + indexed: true, }, { internalType: "address", - indexed: true, - name: "underlying", type: "address", + name: "underlying", + indexed: true, }, { - internalType: "address", - indexed: false, name: "collateral", type: "address", + indexed: false, + internalType: "address", }, { + indexed: false, type: "uint256", name: "repay", - indexed: false, internalType: "uint256", }, { - internalType: "uint256", - indexed: false, type: "uint256", + indexed: false, name: "minYield", + internalType: "uint256", }, ], - anonymous: false, }, { inputs: [ { - internalType: "address", - indexed: true, type: "address", name: "account", + internalType: "address", + indexed: true, }, { - indexed: false, - internalType: "uint256", - type: "uint256", name: "amount", + type: "uint256", + internalType: "uint256", + indexed: false, }, ], - anonymous: false, type: "event", + anonymous: false, name: "RequestMint", }, { + anonymous: false, + type: "event", + name: "RequestRepay", inputs: [ { type: "address", + indexed: true, name: "account", internalType: "address", - indexed: true, }, { - indexed: false, - internalType: "uint256", name: "amount", type: "uint256", + internalType: "uint256", + indexed: false, }, ], + }, + { anonymous: false, type: "event", - name: "RequestRepay", + name: "RequestSwap", + inputs: [ + { + type: "address", + indexed: true, + name: "accountIn", + internalType: "address", + }, + { + type: "address", + indexed: true, + name: "accountOut", + internalType: "address", + }, + { + type: "address", + indexed: true, + name: "underlyingIn", + internalType: "address", + }, + { + type: "address", + indexed: false, + name: "underlyingOut", + internalType: "address", + }, + { + indexed: false, + type: "uint256", + name: "amount", + internalType: "uint256", + }, + { + indexed: false, + type: "uint256", + name: "swapType", + internalType: "uint256", + }, + ], }, { - name: "RequestSwap", type: "event", anonymous: false, + name: "RequestSwapHub", inputs: [ { name: "accountIn", @@ -769,16 +812,16 @@ const _abi = [ indexed: true, }, { - indexed: true, + type: "address", internalType: "address", name: "accountOut", - type: "address", + indexed: true, }, { - internalType: "address", - indexed: true, - name: "underlyingIn", type: "address", + name: "underlyingIn", + indexed: true, + internalType: "address", }, { type: "address", @@ -788,185 +831,239 @@ const _abi = [ }, { type: "uint256", - name: "amount", internalType: "uint256", + name: "amountIn", indexed: false, }, { - name: "swapType", + indexed: false, type: "uint256", + name: "amountOut", internalType: "uint256", + }, + { + internalType: "uint256", + type: "uint256", + name: "mode", indexed: false, }, + { + indexed: false, + type: "address", + name: "swapHandler", + internalType: "address", + }, ], }, { anonymous: false, + type: "event", + name: "RequestSwapHubRepay", inputs: [ { type: "address", - name: "from", + indexed: true, + name: "accountIn", + internalType: "address", + }, + { + type: "address", + name: "accountOut", internalType: "address", indexed: true, }, { + internalType: "address", + type: "address", + name: "underlyingIn", indexed: true, + }, + { internalType: "address", - name: "to", type: "address", + name: "underlyingOut", + indexed: false, }, { type: "uint256", - name: "amount", - indexed: false, + name: "targetDebt", internalType: "uint256", + indexed: false, + }, + { + indexed: false, + type: "address", + name: "swapHandler", + internalType: "address", }, ], - name: "RequestTransferDToken", - type: "event", }, { + name: "RequestTransferDToken", type: "event", - name: "RequestTransferEToken", + anonymous: false, inputs: [ { - indexed: true, internalType: "address", type: "address", name: "from", + indexed: true, }, { internalType: "address", - indexed: true, - name: "to", type: "address", + name: "to", + indexed: true, }, { + internalType: "uint256", type: "uint256", name: "amount", - internalType: "uint256", indexed: false, }, ], - anonymous: false, }, { inputs: [ { + indexed: true, type: "address", - name: "account", + name: "from", internalType: "address", + }, + { indexed: true, + type: "address", + name: "to", + internalType: "address", }, { - name: "amount", type: "uint256", - internalType: "uint256", + name: "amount", indexed: false, + internalType: "uint256", }, ], - anonymous: false, type: "event", - name: "RequestWithdraw", + anonymous: false, + name: "RequestTransferEToken", }, { - name: "TrackAverageLiquidity", type: "event", + name: "RequestWithdraw", anonymous: false, inputs: [ { name: "account", type: "address", - internalType: "address", indexed: true, + internalType: "address", + }, + { + type: "uint256", + name: "amount", + internalType: "uint256", + indexed: false, }, ], }, { - anonymous: false, inputs: [ { - internalType: "address", - indexed: true, type: "address", + internalType: "address", name: "account", + indexed: true, }, ], - name: "UnTrackAverageLiquidity", + anonymous: false, type: "event", + name: "TrackAverageLiquidity", }, { + anonymous: false, + type: "event", + name: "UnTrackAverageLiquidity", inputs: [ { + name: "account", + type: "address", + indexed: true, internalType: "address", + }, + ], + }, + { + inputs: [ + { indexed: true, - name: "underlying", type: "address", + name: "underlying", + internalType: "address", }, { - name: "account", - type: "address", internalType: "address", + type: "address", + name: "account", indexed: true, }, { - indexed: false, - internalType: "uint256", - name: "amount", type: "uint256", + name: "amount", + internalType: "uint256", + indexed: false, }, ], - anonymous: false, type: "event", name: "Withdraw", + anonymous: false, }, { - name: "dispatch", type: "function", + name: "dispatch", stateMutability: "nonpayable", - outputs: [], inputs: [], + outputs: [], }, { - name: "moduleIdToImplementation", - type: "function", - stateMutability: "view", outputs: [ { - name: "", type: "address", + name: "", internalType: "address", }, ], inputs: [ { internalType: "uint256", - name: "moduleId", type: "uint256", + name: "moduleId", }, ], + name: "moduleIdToImplementation", + type: "function", + stateMutability: "view", }, { - stateMutability: "view", - outputs: [ - { - internalType: "address", - type: "address", - name: "", - }, - ], inputs: [ { internalType: "uint256", - name: "moduleId", type: "uint256", + name: "moduleId", + }, + ], + outputs: [ + { + type: "address", + internalType: "address", + name: "", }, ], - name: "moduleIdToProxy", type: "function", + name: "moduleIdToProxy", + stateMutability: "view", }, { - inputs: [], outputs: [ { internalType: "string", @@ -974,9 +1071,10 @@ const _abi = [ name: "", }, ], - stateMutability: "view", - type: "function", + inputs: [], name: "name", + type: "function", + stateMutability: "view", }, ]; diff --git a/types/factories/PToken__factory.ts b/types/factories/PToken__factory.ts index 92b46a7..99ef556 100644 --- a/types/factories/PToken__factory.ts +++ b/types/factories/PToken__factory.ts @@ -8,79 +8,87 @@ import type { PToken, PTokenInterface } from "../PToken"; const _abi = [ { - type: "constructor", inputs: [ { - type: "address", name: "euler_", + type: "address", internalType: "address", }, { - internalType: "address", name: "underlying_", type: "address", + internalType: "address", }, ], + type: "constructor", stateMutability: "nonpayable", }, { + type: "event", + name: "Approval", anonymous: false, inputs: [ { - indexed: true, internalType: "address", - name: "owner", type: "address", + name: "owner", + indexed: true, }, { name: "spender", type: "address", - internalType: "address", indexed: true, + internalType: "address", }, { - internalType: "uint256", - indexed: false, - type: "uint256", name: "value", + type: "uint256", + indexed: false, + internalType: "uint256", }, ], - name: "Approval", - type: "event", }, { type: "event", + anonymous: false, name: "Transfer", inputs: [ { name: "from", type: "address", - internalType: "address", indexed: true, + internalType: "address", }, { type: "address", name: "to", - indexed: true, internalType: "address", + indexed: true, }, { - indexed: false, - internalType: "uint256", - type: "uint256", name: "value", + type: "uint256", + internalType: "uint256", + indexed: false, }, ], - anonymous: false, }, { type: "function", + stateMutability: "view", name: "allowance", + outputs: [ + { + internalType: "uint256", + type: "uint256", + name: "", + }, + ], inputs: [ { internalType: "address", - name: "holder", type: "address", + name: "holder", }, { internalType: "address", @@ -88,166 +96,165 @@ const _abi = [ name: "spender", }, ], - stateMutability: "view", + }, + { outputs: [ { - internalType: "uint256", - type: "uint256", name: "", + type: "bool", + internalType: "bool", }, ], - }, - { - type: "function", - name: "approve", inputs: [ { - name: "spender", type: "address", internalType: "address", + name: "spender", }, { - name: "amount", type: "uint256", + name: "amount", internalType: "uint256", }, ], stateMutability: "nonpayable", - outputs: [ - { - internalType: "bool", - type: "bool", - name: "", - }, - ], + type: "function", + name: "approve", }, { stateMutability: "view", - outputs: [ - { - name: "", - type: "uint256", - internalType: "uint256", - }, - ], + type: "function", + name: "balanceOf", inputs: [ { type: "address", - name: "who", internalType: "address", + name: "who", + }, + ], + outputs: [ + { + internalType: "uint256", + type: "uint256", + name: "", }, ], - name: "balanceOf", - type: "function", }, { - name: "claimSurplus", + stateMutability: "nonpayable", type: "function", + name: "claimSurplus", outputs: [], - stateMutability: "nonpayable", inputs: [ { - name: "who", type: "address", internalType: "address", + name: "who", }, ], }, { + type: "function", + stateMutability: "view", + name: "decimals", inputs: [], outputs: [ { - type: "uint8", name: "", + type: "uint8", internalType: "uint8", }, ], - stateMutability: "view", - type: "function", - name: "decimals", }, { - type: "function", - name: "forceUnwrap", + outputs: [], inputs: [ { - internalType: "address", - type: "address", name: "who", + type: "address", + internalType: "address", }, { - internalType: "uint256", - type: "uint256", name: "amount", + type: "uint256", + internalType: "uint256", }, ], - outputs: [], + type: "function", + name: "forceUnwrap", stateMutability: "nonpayable", }, { + type: "function", + name: "name", + stateMutability: "view", + inputs: [], outputs: [ { - type: "string", name: "", + type: "string", internalType: "string", }, ], - stateMutability: "view", - inputs: [], - name: "name", - type: "function", }, { - name: "symbol", type: "function", + name: "symbol", + stateMutability: "view", outputs: [ { + internalType: "string", type: "string", name: "", - internalType: "string", }, ], - stateMutability: "view", inputs: [], }, { - inputs: [], - stateMutability: "view", outputs: [ { - type: "uint256", name: "", + type: "uint256", internalType: "uint256", }, ], + inputs: [], type: "function", name: "totalSupply", + stateMutability: "view", }, { + name: "transfer", + type: "function", + stateMutability: "nonpayable", + outputs: [ + { + internalType: "bool", + type: "bool", + name: "", + }, + ], inputs: [ { - internalType: "address", - name: "recipient", type: "address", + name: "recipient", + internalType: "address", }, { - internalType: "uint256", - name: "amount", type: "uint256", + name: "amount", + internalType: "uint256", }, ], - stateMutability: "nonpayable", + }, + { outputs: [ { - internalType: "bool", - type: "bool", name: "", + type: "bool", + internalType: "bool", }, ], - type: "function", - name: "transfer", - }, - { inputs: [ { internalType: "address", @@ -256,35 +263,28 @@ const _abi = [ }, { internalType: "address", - name: "recipient", type: "address", + name: "recipient", }, { - name: "amount", type: "uint256", + name: "amount", internalType: "uint256", }, ], - stateMutability: "nonpayable", - outputs: [ - { - name: "", - type: "bool", - internalType: "bool", - }, - ], type: "function", + stateMutability: "nonpayable", name: "transferFrom", }, { - inputs: [], outputs: [ { - type: "address", name: "", + type: "address", internalType: "address", }, ], + inputs: [], stateMutability: "view", type: "function", name: "underlying", @@ -293,18 +293,16 @@ const _abi = [ name: "unwrap", type: "function", stateMutability: "nonpayable", - outputs: [], inputs: [ { + type: "uint256", internalType: "uint256", name: "amount", - type: "uint256", }, ], + outputs: [], }, { - outputs: [], - stateMutability: "nonpayable", inputs: [ { name: "amount", @@ -312,8 +310,10 @@ const _abi = [ internalType: "uint256", }, ], - name: "wrap", + outputs: [], type: "function", + stateMutability: "nonpayable", + name: "wrap", }, ]; diff --git a/types/factories/mining/EulDistributor__factory.ts b/types/factories/mining/EulDistributor__factory.ts index 390b2a8..36f5687 100644 --- a/types/factories/mining/EulDistributor__factory.ts +++ b/types/factories/mining/EulDistributor__factory.ts @@ -11,13 +11,11 @@ import type { const _abi = [ { - type: "constructor", - stateMutability: "nonpayable", inputs: [ { - name: "eul_", type: "address", internalType: "address", + name: "eul_", }, { type: "address", @@ -25,92 +23,96 @@ const _abi = [ internalType: "address", }, ], + type: "constructor", + stateMutability: "nonpayable", }, { - anonymous: false, inputs: [ { - name: "newOwner", - type: "address", indexed: true, + type: "address", + name: "newOwner", internalType: "address", }, ], name: "OwnerChanged", type: "event", + anonymous: false, }, { - name: "claim", - type: "function", - stateMutability: "nonpayable", - outputs: [], inputs: [ { - internalType: "address", - type: "address", name: "account", + type: "address", + internalType: "address", }, { - name: "token", type: "address", internalType: "address", + name: "token", }, { - internalType: "uint256", - name: "claimable", type: "uint256", + name: "claimable", + internalType: "uint256", }, { - name: "proof", type: "bytes32[]", internalType: "bytes32[]", + name: "proof", }, { - internalType: "address", name: "stake", type: "address", + internalType: "address", }, ], + outputs: [], + type: "function", + name: "claim", + stateMutability: "nonpayable", }, { - inputs: [ + outputs: [ { + internalType: "uint256", + type: "uint256", name: "", - type: "address", - internalType: "address", }, + ], + inputs: [ { name: "", type: "address", internalType: "address", }, - ], - outputs: [ { - type: "uint256", + type: "address", + internalType: "address", name: "", - internalType: "uint256", }, ], - stateMutability: "view", type: "function", name: "claimed", + stateMutability: "view", }, { - type: "function", - name: "currRoot", - inputs: [], - stateMutability: "view", outputs: [ { - internalType: "bytes32", type: "bytes32", name: "", + internalType: "bytes32", }, ], + inputs: [], + type: "function", + name: "currRoot", + stateMutability: "view", }, { + type: "function", stateMutability: "view", + name: "eul", outputs: [ { internalType: "address", @@ -119,86 +121,84 @@ const _abi = [ }, ], inputs: [], - name: "eul", - type: "function", }, { - stateMutability: "view", outputs: [ { - name: "", type: "address", + name: "", internalType: "address", }, ], inputs: [], - name: "eulStakes", + stateMutability: "view", type: "function", + name: "eulStakes", }, { + inputs: [], outputs: [ { + type: "string", internalType: "string", name: "", - type: "string", }, ], + type: "function", stateMutability: "view", - inputs: [], name: "name", - type: "function", }, { - type: "function", - name: "owner", - inputs: [], - stateMutability: "view", outputs: [ { + internalType: "address", type: "address", name: "", - internalType: "address", }, ], + inputs: [], + name: "owner", + type: "function", + stateMutability: "view", }, { - inputs: [], + type: "function", stateMutability: "view", + name: "prevRoot", outputs: [ { - name: "", - type: "bytes32", internalType: "bytes32", + type: "bytes32", + name: "", }, ], - type: "function", - name: "prevRoot", + inputs: [], }, { - type: "function", - name: "transferOwnership", inputs: [ { - name: "newOwner", - type: "address", internalType: "address", + type: "address", + name: "newOwner", }, ], - stateMutability: "nonpayable", outputs: [], + type: "function", + stateMutability: "nonpayable", + name: "transferOwnership", }, { name: "updateRoot", type: "function", stateMutability: "nonpayable", - outputs: [], inputs: [ { - name: "newRoot", type: "bytes32", + name: "newRoot", internalType: "bytes32", }, ], + outputs: [], }, ]; diff --git a/types/factories/mining/EulStakes__factory.ts b/types/factories/mining/EulStakes__factory.ts index ed39a9a..e90845a 100644 --- a/types/factories/mining/EulStakes__factory.ts +++ b/types/factories/mining/EulStakes__factory.ts @@ -8,46 +8,46 @@ import type { EulStakes, EulStakesInterface } from "../../mining/EulStakes"; const _abi = [ { + stateMutability: "nonpayable", + type: "constructor", inputs: [ { - name: "eul_", type: "address", + name: "eul_", internalType: "address", }, ], - stateMutability: "nonpayable", - type: "constructor", }, { + anonymous: false, type: "event", name: "Stake", inputs: [ { + type: "address", indexed: true, - internalType: "address", name: "who", - type: "address", + internalType: "address", }, { - type: "address", name: "underlying", - internalType: "address", + type: "address", indexed: true, + internalType: "address", }, { + indexed: false, type: "address", name: "sender", - indexed: false, internalType: "address", }, { type: "uint256", name: "newAmount", - indexed: false, internalType: "uint256", + indexed: false, }, ], - anonymous: false, }, { name: "eul", @@ -55,18 +55,15 @@ const _abi = [ stateMutability: "view", outputs: [ { - internalType: "address", - name: "", type: "address", + name: "", + internalType: "address", }, ], inputs: [], }, { - type: "function", - name: "name", inputs: [], - stateMutability: "view", outputs: [ { name: "", @@ -74,128 +71,131 @@ const _abi = [ internalType: "string", }, ], + type: "function", + stateMutability: "view", + name: "name", }, { + stateMutability: "nonpayable", + type: "function", + name: "stake", inputs: [ { - type: "tuple[]", components: [ { - name: "underlying", - type: "address", internalType: "address", + type: "address", + name: "underlying", }, { - name: "amount", - type: "int256", internalType: "int256", + type: "int256", + name: "amount", }, ], + type: "tuple[]", name: "ops", internalType: "struct EulStakes.StakeOp[]", }, ], - stateMutability: "nonpayable", outputs: [], - type: "function", - name: "stake", }, { - outputs: [], - stateMutability: "nonpayable", inputs: [ { - internalType: "address", type: "address", + internalType: "address", name: "beneficiary", }, { - internalType: "address", type: "address", + internalType: "address", name: "underlying", }, { + type: "uint256", internalType: "uint256", name: "amount", - type: "uint256", }, ], - name: "stakeGift", + outputs: [], type: "function", + name: "stakeGift", + stateMutability: "nonpayable", }, { + type: "function", stateMutability: "nonpayable", - outputs: [], + name: "stakePermit", inputs: [ { - internalType: "struct EulStakes.StakeOp[]", - name: "ops", - type: "tuple[]", components: [ { + type: "address", internalType: "address", name: "underlying", - type: "address", }, { - type: "int256", name: "amount", + type: "int256", internalType: "int256", }, ], + type: "tuple[]", + name: "ops", + internalType: "struct EulStakes.StakeOp[]", }, { - internalType: "uint256", type: "uint256", name: "value", + internalType: "uint256", }, { - internalType: "uint256", name: "deadline", type: "uint256", + internalType: "uint256", }, { - internalType: "uint8", - name: "v", type: "uint8", + name: "v", + internalType: "uint8", }, { type: "bytes32", - name: "r", internalType: "bytes32", + name: "r", }, { - name: "s", type: "bytes32", internalType: "bytes32", + name: "s", }, ], - name: "stakePermit", - type: "function", + outputs: [], }, { inputs: [ { internalType: "address", - name: "account", type: "address", + name: "account", }, { type: "address", - name: "underlying", internalType: "address", + name: "underlying", }, ], outputs: [ { type: "uint256", - name: "", internalType: "uint256", + name: "", }, ], - stateMutability: "view", - type: "function", name: "staked", + type: "function", + stateMutability: "view", }, ]; diff --git a/types/factories/modules/DToken__factory.ts b/types/factories/modules/DToken__factory.ts index 1bc60c1..6afa6fd 100644 --- a/types/factories/modules/DToken__factory.ts +++ b/types/factories/modules/DToken__factory.ts @@ -10,8 +10,8 @@ const _abi = [ { inputs: [ { - type: "bytes32", name: "moduleGitCommit_", + type: "bytes32", internalType: "bytes32", }, ], @@ -19,21 +19,21 @@ const _abi = [ type: "constructor", }, { - name: "Approval", type: "event", + name: "Approval", anonymous: false, inputs: [ { - name: "owner", + internalType: "address", type: "address", + name: "owner", indexed: true, - internalType: "address", }, { - indexed: true, - internalType: "address", type: "address", name: "spender", + internalType: "address", + indexed: true, }, { type: "uint256", @@ -44,27 +44,27 @@ const _abi = [ ], }, { - name: "AssetStatus", type: "event", + name: "AssetStatus", anonymous: false, inputs: [ { + type: "address", + name: "underlying", internalType: "address", indexed: true, - name: "underlying", - type: "address", }, { - name: "totalBalances", type: "uint256", + name: "totalBalances", indexed: false, internalType: "uint256", }, { - internalType: "uint256", - indexed: false, type: "uint256", + internalType: "uint256", name: "totalBorrows", + indexed: false, }, { name: "reserveBalance", @@ -73,109 +73,107 @@ const _abi = [ internalType: "uint96", }, { - indexed: false, - internalType: "uint256", name: "poolSize", type: "uint256", + internalType: "uint256", + indexed: false, }, { - type: "uint256", name: "interestAccumulator", - internalType: "uint256", + type: "uint256", indexed: false, + internalType: "uint256", }, { - indexed: false, internalType: "int96", - name: "interestRate", type: "int96", + name: "interestRate", + indexed: false, }, { - name: "timestamp", type: "uint256", - indexed: false, + name: "timestamp", internalType: "uint256", + indexed: false, }, ], }, { + type: "event", anonymous: false, + name: "Borrow", inputs: [ { - indexed: true, internalType: "address", type: "address", name: "underlying", + indexed: true, }, { - internalType: "address", - indexed: true, type: "address", + indexed: true, name: "account", + internalType: "address", }, { - internalType: "uint256", - indexed: false, - type: "uint256", name: "amount", + type: "uint256", + indexed: false, + internalType: "uint256", }, ], - name: "Borrow", - type: "event", }, { - type: "event", - name: "DelegateAverageLiquidity", inputs: [ { - indexed: true, - internalType: "address", type: "address", name: "account", + internalType: "address", + indexed: true, }, { name: "delegate", type: "address", - internalType: "address", indexed: true, + internalType: "address", }, ], + type: "event", + name: "DelegateAverageLiquidity", anonymous: false, }, { + anonymous: false, + type: "event", + name: "Deposit", inputs: [ { internalType: "address", - indexed: true, - name: "underlying", type: "address", + name: "underlying", + indexed: true, }, { - internalType: "address", - indexed: true, - name: "account", type: "address", + name: "account", + indexed: true, + internalType: "address", }, { - name: "amount", type: "uint256", indexed: false, + name: "amount", internalType: "uint256", }, ], - anonymous: false, - type: "event", - name: "Deposit", }, { - type: "event", - name: "EnterMarket", inputs: [ { type: "address", name: "underlying", - indexed: true, internalType: "address", + indexed: true, }, { type: "address", @@ -184,111 +182,113 @@ const _abi = [ internalType: "address", }, ], + type: "event", + name: "EnterMarket", anonymous: false, }, { + name: "ExitMarket", + type: "event", + anonymous: false, inputs: [ { - name: "underlying", type: "address", - indexed: true, + name: "underlying", internalType: "address", + indexed: true, }, { + type: "address", + name: "account", indexed: true, internalType: "address", - name: "account", - type: "address", }, ], - anonymous: false, - type: "event", - name: "ExitMarket", }, { - type: "event", name: "Genesis", - inputs: [], + type: "event", anonymous: false, + inputs: [], }, { - name: "GovConvertReserves", - type: "event", - anonymous: false, inputs: [ { - name: "underlying", type: "address", - indexed: true, internalType: "address", + name: "underlying", + indexed: true, }, { - indexed: true, internalType: "address", type: "address", name: "recipient", + indexed: true, }, { type: "uint256", + internalType: "uint256", name: "amount", indexed: false, - internalType: "uint256", }, ], + anonymous: false, + type: "event", + name: "GovConvertReserves", }, { type: "event", name: "GovSetAssetConfig", + anonymous: false, inputs: [ { - name: "underlying", type: "address", - indexed: true, + name: "underlying", internalType: "address", + indexed: true, }, { type: "tuple", + name: "newConfig", components: [ { - name: "eTokenAddress", type: "address", + name: "eTokenAddress", internalType: "address", }, { - internalType: "bool", name: "borrowIsolated", type: "bool", + internalType: "bool", }, { + internalType: "uint32", type: "uint32", name: "collateralFactor", - internalType: "uint32", }, { - internalType: "uint32", type: "uint32", + internalType: "uint32", name: "borrowFactor", }, { type: "uint24", - name: "twapWindow", internalType: "uint24", + name: "twapWindow", }, ], - name: "newConfig", - indexed: false, internalType: "struct Storage.AssetConfig", + indexed: false, }, ], - anonymous: false, }, { inputs: [ { - internalType: "address", - indexed: true, name: "underlying", type: "address", + indexed: true, + internalType: "address", }, { type: "address", @@ -302,43 +302,44 @@ const _abi = [ name: "GovSetChainlinkPriceFeed", }, { - anonymous: false, inputs: [ { + type: "address", + name: "underlying", indexed: true, internalType: "address", - name: "underlying", - type: "address", }, { - indexed: false, - internalType: "uint256", type: "uint256", + indexed: false, name: "interestRateModel", + internalType: "uint256", }, { type: "bytes", + indexed: false, name: "resetParams", internalType: "bytes", - indexed: false, }, ], - name: "GovSetIRM", type: "event", + name: "GovSetIRM", + anonymous: false, }, { type: "event", name: "GovSetPricingConfig", + anonymous: false, inputs: [ { + type: "address", + name: "underlying", indexed: true, internalType: "address", - name: "underlying", - type: "address", }, { - name: "newPricingType", type: "uint16", + name: "newPricingType", internalType: "uint16", indexed: false, }, @@ -349,69 +350,65 @@ const _abi = [ indexed: false, }, ], - anonymous: false, }, { + type: "event", + name: "GovSetReserveFee", + anonymous: false, inputs: [ { + type: "address", internalType: "address", - indexed: true, name: "underlying", - type: "address", + indexed: true, }, { - internalType: "uint32", - indexed: false, name: "newReserveFee", type: "uint32", + indexed: false, + internalType: "uint32", }, ], - anonymous: false, - type: "event", - name: "GovSetReserveFee", }, { - name: "InstallerInstallModule", - type: "event", - anonymous: false, inputs: [ { - indexed: true, - internalType: "uint256", type: "uint256", + indexed: true, name: "moduleId", + internalType: "uint256", }, { - internalType: "address", - indexed: true, - type: "address", name: "moduleImpl", + type: "address", + indexed: true, + internalType: "address", }, { - internalType: "bytes32", - indexed: false, type: "bytes32", name: "moduleGitCommit", + indexed: false, + internalType: "bytes32", }, ], + type: "event", + name: "InstallerInstallModule", + anonymous: false, }, { + anonymous: false, type: "event", name: "InstallerSetGovernorAdmin", inputs: [ { + name: "newGovernorAdmin", + type: "address", internalType: "address", indexed: true, - type: "address", - name: "newGovernorAdmin", }, ], - anonymous: false, }, { - name: "InstallerSetUpgradeAdmin", - type: "event", - anonymous: false, inputs: [ { name: "newUpgradeAdmin", @@ -420,208 +417,210 @@ const _abi = [ internalType: "address", }, ], + name: "InstallerSetUpgradeAdmin", + type: "event", + anonymous: false, }, { - name: "Liquidation", type: "event", + name: "Liquidation", anonymous: false, inputs: [ { - name: "liquidator", type: "address", + name: "liquidator", indexed: true, internalType: "address", }, { name: "violator", type: "address", - indexed: true, internalType: "address", + indexed: true, }, { type: "address", - name: "underlying", internalType: "address", + name: "underlying", indexed: true, }, { name: "collateral", type: "address", - indexed: false, internalType: "address", + indexed: false, }, { - indexed: false, - internalType: "uint256", type: "uint256", + indexed: false, name: "repay", + internalType: "uint256", }, { - indexed: false, internalType: "uint256", type: "uint256", name: "yield", + indexed: false, }, { + internalType: "uint256", type: "uint256", name: "healthScore", indexed: false, - internalType: "uint256", }, { - name: "baseDiscount", type: "uint256", - indexed: false, + name: "baseDiscount", internalType: "uint256", + indexed: false, }, { - name: "discount", type: "uint256", - internalType: "uint256", + name: "discount", indexed: false, + internalType: "uint256", }, ], }, { - type: "event", - name: "MarketActivated", inputs: [ { - name: "underlying", type: "address", + name: "underlying", internalType: "address", indexed: true, }, { - internalType: "address", - indexed: true, - name: "eToken", type: "address", + name: "eToken", + indexed: true, + internalType: "address", }, { type: "address", + internalType: "address", name: "dToken", indexed: true, - internalType: "address", }, ], + type: "event", anonymous: false, + name: "MarketActivated", }, { type: "event", + anonymous: false, name: "PTokenActivated", inputs: [ { - indexed: true, - internalType: "address", - name: "underlying", type: "address", + name: "underlying", + indexed: true, + internalType: "address", }, { - name: "pToken", type: "address", indexed: true, + name: "pToken", internalType: "address", }, ], - anonymous: false, }, { anonymous: false, + type: "event", + name: "PTokenUnWrap", inputs: [ { - internalType: "address", + type: "address", indexed: true, name: "underlying", - type: "address", + internalType: "address", }, { - name: "account", type: "address", + name: "account", internalType: "address", indexed: true, }, { - type: "uint256", name: "amount", - indexed: false, + type: "uint256", internalType: "uint256", + indexed: false, }, ], - name: "PTokenUnWrap", - type: "event", }, { - anonymous: false, inputs: [ { + name: "underlying", + type: "address", indexed: true, internalType: "address", - type: "address", - name: "underlying", }, { - name: "account", + internalType: "address", type: "address", + name: "account", indexed: true, - internalType: "address", }, { type: "uint256", name: "amount", - indexed: false, internalType: "uint256", + indexed: false, }, ], name: "PTokenWrap", type: "event", + anonymous: false, }, { - type: "event", - name: "ProxyCreated", inputs: [ { type: "address", + internalType: "address", name: "proxy", indexed: true, - internalType: "address", }, { - indexed: false, - internalType: "uint256", - type: "uint256", name: "moduleId", + type: "uint256", + internalType: "uint256", + indexed: false, }, ], anonymous: false, + type: "event", + name: "ProxyCreated", }, { inputs: [ { - internalType: "address", - indexed: true, name: "underlying", type: "address", - }, - { internalType: "address", indexed: true, - type: "address", + }, + { name: "account", + type: "address", + indexed: true, + internalType: "address", }, { - internalType: "uint256", - indexed: false, type: "uint256", name: "amount", + indexed: false, + internalType: "uint256", }, ], - anonymous: false, - type: "event", name: "Repay", + type: "event", + anonymous: false, }, { - anonymous: false, inputs: [ { type: "address", @@ -630,104 +629,107 @@ const _abi = [ indexed: true, }, { - internalType: "uint256", - indexed: false, type: "uint256", name: "amount", + internalType: "uint256", + indexed: false, }, ], name: "RequestBorrow", type: "event", + anonymous: false, }, { - name: "RequestBurn", - type: "event", - anonymous: false, inputs: [ { - internalType: "address", - indexed: true, type: "address", name: "account", + internalType: "address", + indexed: true, }, { name: "amount", type: "uint256", - internalType: "uint256", indexed: false, + internalType: "uint256", }, ], + name: "RequestBurn", + type: "event", + anonymous: false, }, { - anonymous: false, inputs: [ { name: "account", type: "address", - indexed: true, internalType: "address", + indexed: true, }, { - type: "uint256", name: "amount", + type: "uint256", indexed: false, internalType: "uint256", }, ], name: "RequestDeposit", type: "event", + anonymous: false, }, { + name: "RequestDonate", + type: "event", + anonymous: false, inputs: [ { + type: "address", + name: "account", indexed: true, internalType: "address", - name: "account", - type: "address", }, { - indexed: false, - internalType: "uint256", type: "uint256", name: "amount", + internalType: "uint256", + indexed: false, }, ], - anonymous: false, - type: "event", - name: "RequestDonate", }, { anonymous: false, + type: "event", + name: "RequestLiquidate", inputs: [ { indexed: true, - internalType: "address", type: "address", name: "liquidator", + internalType: "address", }, { - indexed: true, - internalType: "address", type: "address", + internalType: "address", name: "violator", + indexed: true, }, { - internalType: "address", - indexed: true, type: "address", + indexed: true, name: "underlying", + internalType: "address", }, { - indexed: false, - internalType: "address", - name: "collateral", type: "address", + name: "collateral", + internalType: "address", + indexed: false, }, { - internalType: "uint256", - indexed: false, - type: "uint256", name: "repay", + type: "uint256", + indexed: false, + internalType: "uint256", }, { type: "uint256", @@ -736,79 +738,79 @@ const _abi = [ indexed: false, }, ], - name: "RequestLiquidate", - type: "event", }, { - type: "event", - name: "RequestMint", inputs: [ { - name: "account", type: "address", + name: "account", indexed: true, internalType: "address", }, { type: "uint256", + indexed: false, name: "amount", internalType: "uint256", - indexed: false, }, ], anonymous: false, + type: "event", + name: "RequestMint", }, { - anonymous: false, inputs: [ { + type: "address", + name: "account", internalType: "address", indexed: true, - name: "account", - type: "address", }, { - internalType: "uint256", - indexed: false, - name: "amount", type: "uint256", + name: "amount", + indexed: false, + internalType: "uint256", }, ], - name: "RequestRepay", type: "event", + name: "RequestRepay", + anonymous: false, }, { + name: "RequestSwap", + type: "event", anonymous: false, inputs: [ { + type: "address", + name: "accountIn", internalType: "address", indexed: true, - name: "accountIn", - type: "address", }, { + type: "address", + name: "accountOut", indexed: true, internalType: "address", - name: "accountOut", - type: "address", }, { - name: "underlyingIn", type: "address", internalType: "address", + name: "underlyingIn", indexed: true, }, { - indexed: false, - internalType: "address", name: "underlyingOut", type: "address", + indexed: false, + internalType: "address", }, { + name: "amount", + type: "uint256", internalType: "uint256", indexed: false, - type: "uint256", - name: "amount", }, { name: "swapType", @@ -817,110 +819,206 @@ const _abi = [ internalType: "uint256", }, ], - name: "RequestSwap", - type: "event", }, { - name: "RequestTransferDToken", type: "event", + name: "RequestSwapHub", anonymous: false, inputs: [ { type: "address", - name: "from", + name: "accountIn", indexed: true, internalType: "address", }, { + type: "address", + name: "accountOut", internalType: "address", indexed: true, - name: "to", + }, + { + internalType: "address", type: "address", + name: "underlyingIn", + indexed: true, }, { + type: "address", + indexed: false, + name: "underlyingOut", + internalType: "address", + }, + { + name: "amountIn", type: "uint256", - name: "amount", indexed: false, internalType: "uint256", }, + { + type: "uint256", + name: "amountOut", + indexed: false, + internalType: "uint256", + }, + { + name: "mode", + type: "uint256", + internalType: "uint256", + indexed: false, + }, + { + type: "address", + internalType: "address", + name: "swapHandler", + indexed: false, + }, ], }, { - anonymous: false, inputs: [ { + indexed: true, + type: "address", + name: "accountIn", + internalType: "address", + }, + { + name: "accountOut", type: "address", - name: "from", internalType: "address", indexed: true, }, { + name: "underlyingIn", type: "address", - name: "to", indexed: true, internalType: "address", }, { + type: "address", + name: "underlyingOut", indexed: false, + internalType: "address", + }, + { + type: "uint256", internalType: "uint256", - name: "amount", + name: "targetDebt", + indexed: false, + }, + { + type: "address", + name: "swapHandler", + internalType: "address", + indexed: false, + }, + ], + type: "event", + name: "RequestSwapHubRepay", + anonymous: false, + }, + { + inputs: [ + { + type: "address", + internalType: "address", + name: "from", + indexed: true, + }, + { + name: "to", + type: "address", + internalType: "address", + indexed: true, + }, + { type: "uint256", + internalType: "uint256", + name: "amount", + indexed: false, }, ], - name: "RequestTransferEToken", type: "event", + anonymous: false, + name: "RequestTransferDToken", }, { - name: "RequestWithdraw", type: "event", + name: "RequestTransferEToken", anonymous: false, inputs: [ { + internalType: "address", + type: "address", + name: "from", indexed: true, + }, + { + type: "address", internalType: "address", + name: "to", + indexed: true, + }, + { + type: "uint256", + indexed: false, + name: "amount", + internalType: "uint256", + }, + ], + }, + { + inputs: [ + { type: "address", name: "account", + internalType: "address", + indexed: true, }, { - internalType: "uint256", indexed: false, type: "uint256", name: "amount", + internalType: "uint256", }, ], + type: "event", + anonymous: false, + name: "RequestWithdraw", }, { - anonymous: false, inputs: [ { - indexed: true, - internalType: "address", name: "account", type: "address", + indexed: true, + internalType: "address", }, ], - name: "TrackAverageLiquidity", type: "event", + anonymous: false, + name: "TrackAverageLiquidity", }, { inputs: [ { + type: "address", + name: "from", internalType: "address", indexed: true, - name: "from", - type: "address", }, { - internalType: "address", - indexed: true, name: "to", type: "address", + indexed: true, + internalType: "address", }, { - name: "value", type: "uint256", - indexed: false, + name: "value", internalType: "uint256", + indexed: false, }, ], anonymous: false, @@ -928,31 +1026,31 @@ const _abi = [ name: "Transfer", }, { + anonymous: false, type: "event", name: "UnTrackAverageLiquidity", inputs: [ { type: "address", name: "account", - internalType: "address", indexed: true, + internalType: "address", }, ], - anonymous: false, }, { inputs: [ { - name: "underlying", - type: "address", internalType: "address", + type: "address", + name: "underlying", indexed: true, }, { - indexed: true, - internalType: "address", - name: "account", type: "address", + name: "account", + internalType: "address", + indexed: true, }, { type: "uint256", @@ -961,98 +1059,96 @@ const _abi = [ internalType: "uint256", }, ], - anonymous: false, type: "event", name: "Withdraw", + anonymous: false, }, { - stateMutability: "nonpayable", outputs: [ { - internalType: "bool", name: "", type: "bool", + internalType: "bool", }, ], inputs: [ { - name: "subAccountId", type: "uint256", + name: "subAccountId", internalType: "uint256", }, { - type: "address", name: "spender", + type: "address", internalType: "address", }, { - internalType: "uint256", - name: "amount", type: "uint256", + name: "amount", + internalType: "uint256", }, ], - name: "approveDebt", type: "function", + name: "approveDebt", + stateMutability: "nonpayable", }, { stateMutability: "view", - outputs: [ - { - internalType: "uint256", - name: "", - type: "uint256", - }, - ], + type: "function", + name: "balanceOf", inputs: [ { + type: "address", internalType: "address", name: "account", - type: "address", }, ], - name: "balanceOf", - type: "function", + outputs: [ + { + name: "", + type: "uint256", + internalType: "uint256", + }, + ], }, { - name: "balanceOfExact", type: "function", stateMutability: "view", + name: "balanceOfExact", outputs: [ { + type: "uint256", internalType: "uint256", name: "", - type: "uint256", }, ], inputs: [ { - internalType: "address", name: "account", type: "address", + internalType: "address", }, ], }, { - name: "borrow", type: "function", + name: "borrow", stateMutability: "nonpayable", - outputs: [], inputs: [ { - internalType: "uint256", type: "uint256", name: "subAccountId", + internalType: "uint256", }, { + internalType: "uint256", type: "uint256", name: "amount", - internalType: "uint256", }, ], + outputs: [], }, { - name: "debtAllowance", - type: "function", outputs: [ { type: "uint256", @@ -1060,31 +1156,33 @@ const _abi = [ internalType: "uint256", }, ], - stateMutability: "view", inputs: [ { + type: "address", internalType: "address", name: "holder", - type: "address", }, { + internalType: "address", type: "address", name: "spender", - internalType: "address", }, ], + stateMutability: "view", + type: "function", + name: "debtAllowance", }, { - name: "decimals", type: "function", + stateMutability: "view", + name: "decimals", outputs: [ { - internalType: "uint8", name: "", type: "uint8", + internalType: "uint8", }, ], - stateMutability: "view", inputs: [], }, { @@ -1095,21 +1193,18 @@ const _abi = [ inputs: [ { internalType: "uint256", - name: "amount", type: "uint256", + name: "amount", }, { - name: "data", type: "bytes", internalType: "bytes", + name: "data", }, ], }, { - type: "function", - name: "moduleGitCommit", inputs: [], - stateMutability: "view", outputs: [ { name: "", @@ -1117,36 +1212,38 @@ const _abi = [ internalType: "bytes32", }, ], + type: "function", + stateMutability: "view", + name: "moduleGitCommit", }, { + type: "function", + stateMutability: "view", + name: "moduleId", outputs: [ { - internalType: "uint256", name: "", type: "uint256", + internalType: "uint256", }, ], - stateMutability: "view", inputs: [], - name: "moduleId", - type: "function", }, { outputs: [ { - internalType: "string", - name: "", type: "string", + name: "", + internalType: "string", }, ], - stateMutability: "view", inputs: [], - name: "name", + stateMutability: "view", type: "function", + name: "name", }, { - type: "function", - name: "repay", + outputs: [], inputs: [ { type: "uint256", @@ -1154,26 +1251,27 @@ const _abi = [ internalType: "uint256", }, { - internalType: "uint256", - type: "uint256", name: "amount", + type: "uint256", + internalType: "uint256", }, ], - outputs: [], + type: "function", + name: "repay", stateMutability: "nonpayable", }, { - inputs: [], outputs: [ { type: "string", - name: "", internalType: "string", + name: "", }, ], - stateMutability: "view", - type: "function", + inputs: [], name: "symbol", + type: "function", + stateMutability: "view", }, { name: "totalSupply", @@ -1181,29 +1279,27 @@ const _abi = [ stateMutability: "view", outputs: [ { - type: "uint256", name: "", + type: "uint256", internalType: "uint256", }, ], inputs: [], }, { - name: "totalSupplyExact", type: "function", + stateMutability: "view", + name: "totalSupplyExact", outputs: [ { - name: "", type: "uint256", + name: "", internalType: "uint256", }, ], - stateMutability: "view", inputs: [], }, { - type: "function", - name: "transfer", inputs: [ { name: "to", @@ -1212,33 +1308,34 @@ const _abi = [ }, { internalType: "uint256", - name: "amount", type: "uint256", + name: "amount", }, ], outputs: [ { + type: "bool", internalType: "bool", name: "", - type: "bool", }, ], stateMutability: "nonpayable", + type: "function", + name: "transfer", }, { outputs: [ { - internalType: "bool", - type: "bool", name: "", + type: "bool", + internalType: "bool", }, ], - stateMutability: "nonpayable", inputs: [ { type: "address", - name: "from", internalType: "address", + name: "from", }, { type: "address", @@ -1246,19 +1343,20 @@ const _abi = [ internalType: "address", }, { - internalType: "uint256", - type: "uint256", name: "amount", + type: "uint256", + internalType: "uint256", }, ], - name: "transferFrom", type: "function", + stateMutability: "nonpayable", + name: "transferFrom", }, { type: "function", + stateMutability: "view", name: "underlyingAsset", inputs: [], - stateMutability: "view", outputs: [ { internalType: "address", diff --git a/types/factories/modules/EToken__factory.ts b/types/factories/modules/EToken__factory.ts index 29419f4..350b0c5 100644 --- a/types/factories/modules/EToken__factory.ts +++ b/types/factories/modules/EToken__factory.ts @@ -8,31 +8,29 @@ import type { EToken, ETokenInterface } from "../../modules/EToken"; const _abi = [ { + type: "constructor", + stateMutability: "nonpayable", inputs: [ { - name: "moduleGitCommit_", - type: "bytes32", internalType: "bytes32", + type: "bytes32", + name: "moduleGitCommit_", }, ], - stateMutability: "nonpayable", - type: "constructor", }, { - type: "event", - name: "Approval", inputs: [ { - internalType: "address", indexed: true, type: "address", name: "owner", + internalType: "address", }, { - internalType: "address", - indexed: true, type: "address", name: "spender", + internalType: "address", + indexed: true, }, { name: "value", @@ -42,22 +40,22 @@ const _abi = [ }, ], anonymous: false, + type: "event", + name: "Approval", }, { - type: "event", - name: "AssetStatus", inputs: [ { - internalType: "address", + type: "address", indexed: true, name: "underlying", - type: "address", + internalType: "address", }, { - indexed: false, - internalType: "uint256", type: "uint256", name: "totalBalances", + indexed: false, + internalType: "uint256", }, { type: "uint256", @@ -66,235 +64,237 @@ const _abi = [ internalType: "uint256", }, { + type: "uint96", indexed: false, - internalType: "uint96", name: "reserveBalance", - type: "uint96", + internalType: "uint96", }, { - type: "uint256", name: "poolSize", - indexed: false, + type: "uint256", internalType: "uint256", + indexed: false, }, { - indexed: false, - internalType: "uint256", name: "interestAccumulator", type: "uint256", + indexed: false, + internalType: "uint256", }, { - internalType: "int96", - indexed: false, type: "int96", name: "interestRate", + indexed: false, + internalType: "int96", }, { - name: "timestamp", type: "uint256", indexed: false, + name: "timestamp", internalType: "uint256", }, ], + name: "AssetStatus", + type: "event", anonymous: false, }, { anonymous: false, + type: "event", + name: "Borrow", inputs: [ { + internalType: "address", type: "address", name: "underlying", indexed: true, - internalType: "address", }, { - type: "address", name: "account", - indexed: true, + type: "address", internalType: "address", + indexed: true, }, { - name: "amount", type: "uint256", - internalType: "uint256", + name: "amount", indexed: false, + internalType: "uint256", }, ], - name: "Borrow", - type: "event", }, { - type: "event", - name: "DelegateAverageLiquidity", inputs: [ { + internalType: "address", type: "address", name: "account", indexed: true, - internalType: "address", }, { indexed: true, - internalType: "address", - name: "delegate", type: "address", + name: "delegate", + internalType: "address", }, ], anonymous: false, + type: "event", + name: "DelegateAverageLiquidity", }, { - anonymous: false, inputs: [ { indexed: true, - internalType: "address", - name: "underlying", type: "address", + name: "underlying", + internalType: "address", }, { indexed: true, - internalType: "address", - name: "account", type: "address", + name: "account", + internalType: "address", }, { - indexed: false, - internalType: "uint256", name: "amount", type: "uint256", + indexed: false, + internalType: "uint256", }, ], - name: "Deposit", + anonymous: false, type: "event", + name: "Deposit", }, { + anonymous: false, type: "event", name: "EnterMarket", inputs: [ { - indexed: true, - internalType: "address", type: "address", name: "underlying", + internalType: "address", + indexed: true, }, { - type: "address", name: "account", + type: "address", indexed: true, internalType: "address", }, ], - anonymous: false, }, { type: "event", + anonymous: false, name: "ExitMarket", inputs: [ { - name: "underlying", type: "address", indexed: true, + name: "underlying", internalType: "address", }, { - internalType: "address", - indexed: true, type: "address", name: "account", + indexed: true, + internalType: "address", }, ], - anonymous: false, }, { - anonymous: false, - inputs: [], name: "Genesis", type: "event", + anonymous: false, + inputs: [], }, { - type: "event", - name: "GovConvertReserves", inputs: [ { - name: "underlying", type: "address", - internalType: "address", + name: "underlying", indexed: true, + internalType: "address", }, { + internalType: "address", type: "address", name: "recipient", - internalType: "address", indexed: true, }, { - name: "amount", + internalType: "uint256", type: "uint256", + name: "amount", indexed: false, - internalType: "uint256", }, ], + type: "event", + name: "GovConvertReserves", anonymous: false, }, { + anonymous: false, + type: "event", + name: "GovSetAssetConfig", inputs: [ { type: "address", - name: "underlying", indexed: true, + name: "underlying", internalType: "address", }, { - name: "newConfig", type: "tuple", + indexed: false, + name: "newConfig", + internalType: "struct Storage.AssetConfig", components: [ { - type: "address", name: "eTokenAddress", + type: "address", internalType: "address", }, { - type: "bool", name: "borrowIsolated", + type: "bool", internalType: "bool", }, { - internalType: "uint32", type: "uint32", + internalType: "uint32", name: "collateralFactor", }, { - type: "uint32", name: "borrowFactor", + type: "uint32", internalType: "uint32", }, { type: "uint24", - name: "twapWindow", internalType: "uint24", + name: "twapWindow", }, ], - indexed: false, - internalType: "struct Storage.AssetConfig", }, ], - anonymous: false, - type: "event", - name: "GovSetAssetConfig", }, { inputs: [ { + indexed: true, type: "address", name: "underlying", internalType: "address", - indexed: true, }, { - name: "chainlinkAggregator", + indexed: false, type: "address", + name: "chainlinkAggregator", internalType: "address", - indexed: false, }, ], anonymous: false, @@ -302,13 +302,12 @@ const _abi = [ name: "GovSetChainlinkPriceFeed", }, { - anonymous: false, inputs: [ { - name: "underlying", + indexed: true, type: "address", + name: "underlying", internalType: "address", - indexed: true, }, { name: "interestRateModel", @@ -318,218 +317,219 @@ const _abi = [ }, { type: "bytes", + indexed: false, name: "resetParams", internalType: "bytes", - indexed: false, }, ], - name: "GovSetIRM", type: "event", + name: "GovSetIRM", + anonymous: false, }, { - anonymous: false, inputs: [ { - type: "address", name: "underlying", - internalType: "address", + type: "address", indexed: true, + internalType: "address", }, { - name: "newPricingType", - type: "uint16", indexed: false, + type: "uint16", + name: "newPricingType", internalType: "uint16", }, { - internalType: "uint32", - indexed: false, name: "newPricingParameter", type: "uint32", + indexed: false, + internalType: "uint32", }, ], - name: "GovSetPricingConfig", type: "event", + name: "GovSetPricingConfig", + anonymous: false, }, { + type: "event", + name: "GovSetReserveFee", + anonymous: false, inputs: [ { - internalType: "address", - indexed: true, - name: "underlying", type: "address", + name: "underlying", + indexed: true, + internalType: "address", }, { type: "uint32", - name: "newReserveFee", indexed: false, + name: "newReserveFee", internalType: "uint32", }, ], - anonymous: false, - type: "event", - name: "GovSetReserveFee", }, { type: "event", name: "InstallerInstallModule", + anonymous: false, inputs: [ { - internalType: "uint256", - indexed: true, type: "uint256", + indexed: true, name: "moduleId", + internalType: "uint256", }, { type: "address", + indexed: true, name: "moduleImpl", internalType: "address", - indexed: true, }, { + internalType: "bytes32", type: "bytes32", name: "moduleGitCommit", - internalType: "bytes32", indexed: false, }, ], - anonymous: false, }, { - type: "event", - name: "InstallerSetGovernorAdmin", inputs: [ { - type: "address", name: "newGovernorAdmin", - internalType: "address", + type: "address", indexed: true, + internalType: "address", }, ], + type: "event", anonymous: false, + name: "InstallerSetGovernorAdmin", }, { - anonymous: false, inputs: [ { - name: "newUpgradeAdmin", - type: "address", internalType: "address", + type: "address", + name: "newUpgradeAdmin", indexed: true, }, ], - name: "InstallerSetUpgradeAdmin", type: "event", + name: "InstallerSetUpgradeAdmin", + anonymous: false, }, { - name: "Liquidation", - type: "event", anonymous: false, + type: "event", + name: "Liquidation", inputs: [ { - name: "liquidator", type: "address", indexed: true, + name: "liquidator", internalType: "address", }, { indexed: true, - internalType: "address", - name: "violator", type: "address", + name: "violator", + internalType: "address", }, { - internalType: "address", indexed: true, - name: "underlying", type: "address", + name: "underlying", + internalType: "address", }, { - internalType: "address", indexed: false, - name: "collateral", type: "address", + name: "collateral", + internalType: "address", }, { - name: "repay", - type: "uint256", indexed: false, + type: "uint256", + name: "repay", internalType: "uint256", }, { type: "uint256", + indexed: false, name: "yield", internalType: "uint256", - indexed: false, }, { indexed: false, - internalType: "uint256", type: "uint256", name: "healthScore", + internalType: "uint256", }, { - internalType: "uint256", - indexed: false, type: "uint256", name: "baseDiscount", - }, - { internalType: "uint256", indexed: false, + }, + { name: "discount", type: "uint256", + indexed: false, + internalType: "uint256", }, ], }, { - name: "MarketActivated", - type: "event", anonymous: false, + type: "event", + name: "MarketActivated", inputs: [ { - name: "underlying", type: "address", indexed: true, + name: "underlying", internalType: "address", }, { - name: "eToken", type: "address", + name: "eToken", indexed: true, internalType: "address", }, { - indexed: true, - internalType: "address", type: "address", name: "dToken", + indexed: true, + internalType: "address", }, ], }, { - type: "event", - name: "PTokenActivated", inputs: [ { - name: "underlying", type: "address", + name: "underlying", internalType: "address", indexed: true, }, { - internalType: "address", + type: "address", indexed: true, name: "pToken", - type: "address", + internalType: "address", }, ], anonymous: false, + type: "event", + name: "PTokenActivated", }, { - name: "PTokenUnWrap", type: "event", anonymous: false, + name: "PTokenUnWrap", inputs: [ { name: "underlying", @@ -538,106 +538,106 @@ const _abi = [ indexed: true, }, { - indexed: true, - internalType: "address", type: "address", name: "account", + indexed: true, + internalType: "address", }, { - type: "uint256", name: "amount", - internalType: "uint256", + type: "uint256", indexed: false, + internalType: "uint256", }, ], }, { - type: "event", - name: "PTokenWrap", inputs: [ { - name: "underlying", + internalType: "address", type: "address", + name: "underlying", indexed: true, - internalType: "address", }, { name: "account", type: "address", - indexed: true, internalType: "address", + indexed: true, }, { - type: "uint256", name: "amount", + type: "uint256", indexed: false, internalType: "uint256", }, ], anonymous: false, + type: "event", + name: "PTokenWrap", }, { anonymous: false, + type: "event", + name: "ProxyCreated", inputs: [ { + indexed: true, type: "address", name: "proxy", - indexed: true, internalType: "address", }, { - internalType: "uint256", indexed: false, - name: "moduleId", type: "uint256", + name: "moduleId", + internalType: "uint256", }, ], - name: "ProxyCreated", - type: "event", }, { + name: "Repay", + type: "event", anonymous: false, inputs: [ { - internalType: "address", indexed: true, type: "address", name: "underlying", + internalType: "address", }, { internalType: "address", - indexed: true, type: "address", name: "account", + indexed: true, }, { type: "uint256", name: "amount", - internalType: "uint256", indexed: false, + internalType: "uint256", }, ], - name: "Repay", - type: "event", }, { - name: "RequestBorrow", - type: "event", - anonymous: false, inputs: [ { - indexed: true, internalType: "address", type: "address", name: "account", + indexed: true, }, { - internalType: "uint256", indexed: false, - name: "amount", type: "uint256", + name: "amount", + internalType: "uint256", }, ], + name: "RequestBorrow", + type: "event", + anonymous: false, }, { inputs: [ @@ -648,26 +648,23 @@ const _abi = [ indexed: true, }, { + name: "amount", + type: "uint256", internalType: "uint256", indexed: false, - type: "uint256", - name: "amount", }, ], - anonymous: false, type: "event", + anonymous: false, name: "RequestBurn", }, { - name: "RequestDeposit", - type: "event", - anonymous: false, inputs: [ { - type: "address", name: "account", - indexed: true, + type: "address", internalType: "address", + indexed: true, }, { name: "amount", @@ -676,206 +673,291 @@ const _abi = [ internalType: "uint256", }, ], + type: "event", + anonymous: false, + name: "RequestDeposit", }, { - type: "event", name: "RequestDonate", + type: "event", + anonymous: false, inputs: [ { internalType: "address", - indexed: true, - name: "account", type: "address", + name: "account", + indexed: true, }, { - internalType: "uint256", - indexed: false, name: "amount", type: "uint256", + internalType: "uint256", + indexed: false, }, ], - anonymous: false, }, { + anonymous: false, type: "event", name: "RequestLiquidate", inputs: [ { - name: "liquidator", type: "address", + name: "liquidator", indexed: true, internalType: "address", }, { type: "address", - name: "violator", indexed: true, + name: "violator", internalType: "address", }, { + internalType: "address", type: "address", name: "underlying", - internalType: "address", indexed: true, }, { - indexed: false, internalType: "address", - name: "collateral", type: "address", + name: "collateral", + indexed: false, }, { + indexed: false, type: "uint256", name: "repay", - indexed: false, internalType: "uint256", }, { + indexed: false, type: "uint256", name: "minYield", - indexed: false, internalType: "uint256", }, ], - anonymous: false, }, { - name: "RequestMint", - type: "event", - anonymous: false, inputs: [ { + indexed: true, type: "address", name: "account", - indexed: true, internalType: "address", }, { - type: "uint256", name: "amount", + type: "uint256", indexed: false, internalType: "uint256", }, ], + anonymous: false, + type: "event", + name: "RequestMint", }, { - type: "event", - name: "RequestRepay", inputs: [ { type: "address", name: "account", - indexed: true, internalType: "address", + indexed: true, }, { + name: "amount", + type: "uint256", indexed: false, internalType: "uint256", - type: "uint256", - name: "amount", }, ], anonymous: false, + type: "event", + name: "RequestRepay", }, { + type: "event", + anonymous: false, + name: "RequestSwap", inputs: [ { - name: "accountIn", type: "address", indexed: true, + name: "accountIn", internalType: "address", }, { type: "address", name: "accountOut", + indexed: true, internalType: "address", + }, + { + type: "address", + name: "underlyingIn", indexed: true, + internalType: "address", + }, + { + type: "address", + indexed: false, + name: "underlyingOut", + internalType: "address", + }, + { + name: "amount", + type: "uint256", + internalType: "uint256", + indexed: false, + }, + { + name: "swapType", + type: "uint256", + indexed: false, + internalType: "uint256", }, + ], + }, + { + anonymous: false, + type: "event", + name: "RequestSwapHub", + inputs: [ { internalType: "address", + type: "address", + name: "accountIn", indexed: true, - name: "underlyingIn", + }, + { + name: "accountOut", type: "address", + internalType: "address", + indexed: true, }, { internalType: "address", - indexed: false, type: "address", - name: "underlyingOut", + name: "underlyingIn", + indexed: true, }, { - internalType: "uint256", + name: "underlyingOut", + type: "address", + internalType: "address", indexed: false, + }, + { type: "uint256", - name: "amount", + name: "amountIn", + indexed: false, + internalType: "uint256", }, { + type: "uint256", indexed: false, + name: "amountOut", internalType: "uint256", - name: "swapType", + }, + { + indexed: false, type: "uint256", + name: "mode", + internalType: "uint256", + }, + { + indexed: false, + type: "address", + name: "swapHandler", + internalType: "address", }, ], - anonymous: false, - type: "event", - name: "RequestSwap", }, { - type: "event", - name: "RequestTransferDToken", inputs: [ { - internalType: "address", indexed: true, - name: "from", type: "address", + name: "accountIn", + internalType: "address", }, { - name: "to", + indexed: true, type: "address", + name: "accountOut", internalType: "address", + }, + { + internalType: "address", + type: "address", + name: "underlyingIn", indexed: true, }, + { + type: "address", + name: "underlyingOut", + indexed: false, + internalType: "address", + }, { type: "uint256", - name: "amount", internalType: "uint256", + name: "targetDebt", indexed: false, }, + { + indexed: false, + type: "address", + name: "swapHandler", + internalType: "address", + }, ], anonymous: false, + type: "event", + name: "RequestSwapHubRepay", }, { + type: "event", + name: "RequestTransferDToken", anonymous: false, inputs: [ { - name: "from", type: "address", - indexed: true, internalType: "address", + name: "from", + indexed: true, }, { - internalType: "address", - indexed: true, type: "address", + internalType: "address", name: "to", + indexed: true, }, { - indexed: false, internalType: "uint256", type: "uint256", name: "amount", + indexed: false, }, ], - name: "RequestTransferEToken", - type: "event", }, { + type: "event", + anonymous: false, + name: "RequestTransferEToken", inputs: [ { + internalType: "address", type: "address", - name: "account", + name: "from", + indexed: true, + }, + { internalType: "address", + type: "address", + name: "to", indexed: true, }, { @@ -885,116 +967,132 @@ const _abi = [ indexed: false, }, ], - anonymous: false, - type: "event", - name: "RequestWithdraw", }, { inputs: [ { - indexed: true, + type: "address", internalType: "address", name: "account", - type: "address", + indexed: true, + }, + { + type: "uint256", + indexed: false, + name: "amount", + internalType: "uint256", }, ], + name: "RequestWithdraw", + type: "event", + anonymous: false, + }, + { anonymous: false, type: "event", name: "TrackAverageLiquidity", + inputs: [ + { + type: "address", + name: "account", + indexed: true, + internalType: "address", + }, + ], }, { + anonymous: false, type: "event", name: "Transfer", inputs: [ { - indexed: true, internalType: "address", type: "address", name: "from", + indexed: true, }, { - name: "to", + indexed: true, type: "address", + name: "to", internalType: "address", - indexed: true, }, { - internalType: "uint256", indexed: false, type: "uint256", name: "value", + internalType: "uint256", }, ], - anonymous: false, }, { inputs: [ { - name: "account", + indexed: true, type: "address", + name: "account", internalType: "address", - indexed: true, }, ], - anonymous: false, type: "event", + anonymous: false, name: "UnTrackAverageLiquidity", }, { - name: "Withdraw", - type: "event", anonymous: false, + type: "event", + name: "Withdraw", inputs: [ { - internalType: "address", indexed: true, - name: "underlying", type: "address", + name: "underlying", + internalType: "address", }, { - indexed: true, - internalType: "address", - name: "account", type: "address", + name: "account", + internalType: "address", + indexed: true, }, { - indexed: false, - internalType: "uint256", name: "amount", type: "uint256", + indexed: false, + internalType: "uint256", }, ], }, { - name: "allowance", type: "function", - outputs: [ - { - internalType: "uint256", - type: "uint256", - name: "", - }, - ], stateMutability: "view", + name: "allowance", inputs: [ { + internalType: "address", type: "address", name: "holder", - internalType: "address", }, { - internalType: "address", - type: "address", name: "spender", + type: "address", + internalType: "address", + }, + ], + outputs: [ + { + type: "uint256", + name: "", + internalType: "uint256", }, ], }, { inputs: [ { + internalType: "address", type: "address", name: "spender", - internalType: "address", }, { type: "uint256", @@ -1004,8 +1102,8 @@ const _abi = [ ], outputs: [ { - type: "bool", name: "", + type: "bool", internalType: "bool", }, ], @@ -1014,93 +1112,91 @@ const _abi = [ name: "approve", }, { + name: "approveSubAccount", + type: "function", + stateMutability: "nonpayable", outputs: [ { - internalType: "bool", name: "", type: "bool", + internalType: "bool", }, ], - stateMutability: "nonpayable", inputs: [ { - name: "subAccountId", type: "uint256", internalType: "uint256", + name: "subAccountId", }, { - internalType: "address", name: "spender", type: "address", + internalType: "address", }, { type: "uint256", - name: "amount", internalType: "uint256", + name: "amount", }, ], - name: "approveSubAccount", - type: "function", }, { + stateMutability: "view", type: "function", name: "balanceOf", - inputs: [ - { - internalType: "address", - type: "address", - name: "account", - }, - ], - stateMutability: "view", outputs: [ { internalType: "uint256", - name: "", type: "uint256", + name: "", + }, + ], + inputs: [ + { + type: "address", + name: "account", + internalType: "address", }, ], }, { - type: "function", - name: "balanceOfUnderlying", inputs: [ { + type: "address", internalType: "address", name: "account", - type: "address", }, ], outputs: [ { + internalType: "uint256", type: "uint256", name: "", - internalType: "uint256", }, ], + name: "balanceOfUnderlying", + type: "function", stateMutability: "view", }, { + name: "burn", + type: "function", + stateMutability: "nonpayable", inputs: [ { internalType: "uint256", - name: "subAccountId", type: "uint256", + name: "subAccountId", }, { internalType: "uint256", - name: "amount", type: "uint256", + name: "amount", }, ], - stateMutability: "nonpayable", outputs: [], - type: "function", - name: "burn", }, { - type: "function", - name: "convertBalanceToUnderlying", inputs: [ { internalType: "uint256", @@ -1115,11 +1211,11 @@ const _abi = [ internalType: "uint256", }, ], + type: "function", + name: "convertBalanceToUnderlying", stateMutability: "view", }, { - type: "function", - name: "convertUnderlyingToBalance", inputs: [ { type: "uint256", @@ -1127,18 +1223,18 @@ const _abi = [ internalType: "uint256", }, ], - stateMutability: "view", outputs: [ { + type: "uint256", internalType: "uint256", name: "", - type: "uint256", }, ], + name: "convertUnderlyingToBalance", + type: "function", + stateMutability: "view", }, { - inputs: [], - stateMutability: "pure", outputs: [ { internalType: "uint8", @@ -1146,13 +1242,14 @@ const _abi = [ name: "", }, ], + inputs: [], type: "function", name: "decimals", + stateMutability: "pure", }, { - name: "deposit", type: "function", - outputs: [], + name: "deposit", stateMutability: "nonpayable", inputs: [ { @@ -1161,103 +1258,106 @@ const _abi = [ internalType: "uint256", }, { - internalType: "uint256", - name: "amount", type: "uint256", + name: "amount", + internalType: "uint256", }, ], + outputs: [], }, { - name: "donateToReserves", - type: "function", - stateMutability: "nonpayable", outputs: [], inputs: [ { - name: "subAccountId", type: "uint256", + name: "subAccountId", internalType: "uint256", }, { - name: "amount", - type: "uint256", internalType: "uint256", + type: "uint256", + name: "amount", }, ], + name: "donateToReserves", + type: "function", + stateMutability: "nonpayable", }, { - type: "function", - name: "mint", + outputs: [], inputs: [ { - internalType: "uint256", type: "uint256", name: "subAccountId", + internalType: "uint256", }, { + internalType: "uint256", type: "uint256", name: "amount", - internalType: "uint256", }, ], stateMutability: "nonpayable", - outputs: [], + type: "function", + name: "mint", }, { - inputs: [], + type: "function", stateMutability: "view", + name: "moduleGitCommit", + inputs: [], outputs: [ { - internalType: "bytes32", name: "", type: "bytes32", + internalType: "bytes32", }, ], - type: "function", - name: "moduleGitCommit", }, { - type: "function", - name: "moduleId", - inputs: [], outputs: [ { + internalType: "uint256", type: "uint256", name: "", - internalType: "uint256", }, ], + inputs: [], stateMutability: "view", + type: "function", + name: "moduleId", }, { - type: "function", - name: "name", inputs: [], outputs: [ { - internalType: "string", type: "string", + internalType: "string", name: "", }, ], + name: "name", + type: "function", stateMutability: "view", }, { + inputs: [], outputs: [ { - name: "", - type: "uint256", internalType: "uint256", + type: "uint256", + name: "", }, ], - stateMutability: "view", - inputs: [], name: "reserveBalance", type: "function", + stateMutability: "view", }, { name: "reserveBalanceUnderlying", type: "function", + stateMutability: "view", + inputs: [], outputs: [ { internalType: "uint256", @@ -1265,56 +1365,61 @@ const _abi = [ name: "", }, ], - stateMutability: "view", - inputs: [], }, { name: "symbol", type: "function", stateMutability: "view", + inputs: [], outputs: [ { + type: "string", internalType: "string", name: "", - type: "string", }, ], - inputs: [], }, { - inputs: [], + type: "function", + name: "totalSupply", + stateMutability: "view", outputs: [ { - name: "", type: "uint256", + name: "", internalType: "uint256", }, ], - stateMutability: "view", - type: "function", - name: "totalSupply", + inputs: [], }, { - name: "totalSupplyUnderlying", - type: "function", + inputs: [], outputs: [ { internalType: "uint256", - name: "", type: "uint256", + name: "", }, ], + name: "totalSupplyUnderlying", + type: "function", stateMutability: "view", - inputs: [], }, { - outputs: [], + type: "function", + name: "touch", stateMutability: "nonpayable", + outputs: [], inputs: [], - name: "touch", - type: "function", }, { + outputs: [ + { + internalType: "bool", + type: "bool", + name: "", + }, + ], inputs: [ { name: "to", @@ -1322,67 +1427,53 @@ const _abi = [ internalType: "address", }, { - internalType: "uint256", - name: "amount", type: "uint256", - }, - ], - stateMutability: "nonpayable", - outputs: [ - { - name: "", - type: "bool", - internalType: "bool", + name: "amount", + internalType: "uint256", }, ], type: "function", + stateMutability: "nonpayable", name: "transfer", }, { inputs: [ { + internalType: "address", type: "address", name: "from", - internalType: "address", }, { - internalType: "address", - type: "address", name: "to", + type: "address", + internalType: "address", }, { + type: "uint256", internalType: "uint256", name: "amount", - type: "uint256", }, ], - stateMutability: "nonpayable", outputs: [ { - type: "bool", name: "", + type: "bool", internalType: "bool", }, ], type: "function", + stateMutability: "nonpayable", name: "transferFrom", }, { - name: "transferFromMax", type: "function", - outputs: [ - { - name: "", - type: "bool", - internalType: "bool", - }, - ], + name: "transferFromMax", stateMutability: "nonpayable", inputs: [ { - name: "from", type: "address", internalType: "address", + name: "from", }, { internalType: "address", @@ -1390,36 +1481,43 @@ const _abi = [ name: "to", }, ], + outputs: [ + { + type: "bool", + name: "", + internalType: "bool", + }, + ], }, { - type: "function", - name: "underlyingAsset", inputs: [], outputs: [ { - internalType: "address", name: "", type: "address", + internalType: "address", }, ], stateMutability: "view", + type: "function", + name: "underlyingAsset", }, { - type: "function", name: "withdraw", + type: "function", + stateMutability: "nonpayable", inputs: [ { + internalType: "uint256", type: "uint256", name: "subAccountId", - internalType: "uint256", }, { - name: "amount", - type: "uint256", internalType: "uint256", + type: "uint256", + name: "amount", }, ], - stateMutability: "nonpayable", outputs: [], }, ]; diff --git a/types/factories/modules/Exec__factory.ts b/types/factories/modules/Exec__factory.ts index dccb9b1..e6154a9 100644 --- a/types/factories/modules/Exec__factory.ts +++ b/types/factories/modules/Exec__factory.ts @@ -8,6 +8,7 @@ import type { Exec, ExecInterface } from "../../modules/Exec"; const _abi = [ { + stateMutability: "nonpayable", type: "constructor", inputs: [ { @@ -16,15 +17,13 @@ const _abi = [ internalType: "bytes32", }, ], - stateMutability: "nonpayable", }, { - type: "error", - name: "BatchDispatchSimulation", inputs: [ { - internalType: "struct Exec.EulerBatchItemResponse[]", type: "tuple[]", + name: "simulation", + internalType: "struct Exec.EulerBatchItemResponse[]", components: [ { type: "bool", @@ -37,35 +36,39 @@ const _abi = [ internalType: "bytes", }, ], - name: "simulation", }, ], + name: "BatchDispatchSimulation", + type: "error", }, { + type: "event", + name: "AssetStatus", + anonymous: false, inputs: [ { - name: "underlying", type: "address", + name: "underlying", internalType: "address", indexed: true, }, { - name: "totalBalances", type: "uint256", - indexed: false, + name: "totalBalances", internalType: "uint256", + indexed: false, }, { + type: "uint256", internalType: "uint256", - indexed: false, name: "totalBorrows", - type: "uint256", + indexed: false, }, { type: "uint96", name: "reserveBalance", - indexed: false, internalType: "uint96", + indexed: false, }, { type: "uint256", @@ -76,69 +79,66 @@ const _abi = [ { name: "interestAccumulator", type: "uint256", - internalType: "uint256", indexed: false, + internalType: "uint256", }, { - internalType: "int96", + type: "int96", indexed: false, name: "interestRate", - type: "int96", + internalType: "int96", }, { - indexed: false, internalType: "uint256", - name: "timestamp", type: "uint256", + name: "timestamp", + indexed: false, }, ], - anonymous: false, - type: "event", - name: "AssetStatus", }, { anonymous: false, + type: "event", + name: "Borrow", inputs: [ { - indexed: true, - internalType: "address", - name: "underlying", type: "address", + name: "underlying", + internalType: "address", + indexed: true, }, { type: "address", name: "account", - indexed: true, internalType: "address", + indexed: true, }, { - internalType: "uint256", - indexed: false, type: "uint256", name: "amount", + indexed: false, + internalType: "uint256", }, ], - name: "Borrow", - type: "event", }, { inputs: [ { - name: "account", + indexed: true, type: "address", + name: "account", internalType: "address", - indexed: true, }, { + indexed: true, type: "address", name: "delegate", internalType: "address", - indexed: true, }, ], - anonymous: false, type: "event", name: "DelegateAverageLiquidity", + anonymous: false, }, { name: "Deposit", @@ -147,198 +147,199 @@ const _abi = [ inputs: [ { internalType: "address", - indexed: true, type: "address", name: "underlying", + indexed: true, }, { name: "account", type: "address", - indexed: true, internalType: "address", + indexed: true, }, { - name: "amount", type: "uint256", - indexed: false, + name: "amount", internalType: "uint256", + indexed: false, }, ], }, { + name: "EnterMarket", + type: "event", anonymous: false, inputs: [ { + type: "address", + name: "underlying", internalType: "address", indexed: true, - name: "underlying", - type: "address", }, { type: "address", name: "account", - internalType: "address", indexed: true, + internalType: "address", }, ], - name: "EnterMarket", - type: "event", }, { - name: "ExitMarket", - type: "event", - anonymous: false, inputs: [ { + type: "address", + name: "underlying", internalType: "address", indexed: true, - name: "underlying", - type: "address", }, { - name: "account", type: "address", + name: "account", internalType: "address", indexed: true, }, ], + name: "ExitMarket", + type: "event", + anonymous: false, }, { + type: "event", + name: "Genesis", anonymous: false, inputs: [], - name: "Genesis", - type: "event", }, { + type: "event", anonymous: false, + name: "GovConvertReserves", inputs: [ { - name: "underlying", type: "address", - indexed: true, + name: "underlying", internalType: "address", + indexed: true, }, { - internalType: "address", - indexed: true, name: "recipient", type: "address", + internalType: "address", + indexed: true, }, { - name: "amount", - type: "uint256", internalType: "uint256", + type: "uint256", + name: "amount", indexed: false, }, ], - name: "GovConvertReserves", - type: "event", }, { + anonymous: false, + type: "event", + name: "GovSetAssetConfig", inputs: [ { - indexed: true, internalType: "address", type: "address", name: "underlying", + indexed: true, }, { indexed: false, + type: "tuple", + name: "newConfig", internalType: "struct Storage.AssetConfig", components: [ { - internalType: "address", type: "address", name: "eTokenAddress", + internalType: "address", }, { - internalType: "bool", type: "bool", name: "borrowIsolated", + internalType: "bool", }, { - name: "collateralFactor", type: "uint32", + name: "collateralFactor", internalType: "uint32", }, { - internalType: "uint32", - name: "borrowFactor", type: "uint32", + name: "borrowFactor", + internalType: "uint32", }, { - internalType: "uint24", type: "uint24", + internalType: "uint24", name: "twapWindow", }, ], - type: "tuple", - name: "newConfig", }, ], - anonymous: false, - type: "event", - name: "GovSetAssetConfig", }, { + anonymous: false, + type: "event", + name: "GovSetChainlinkPriceFeed", inputs: [ { - name: "underlying", + indexed: true, type: "address", + name: "underlying", internalType: "address", - indexed: true, }, { type: "address", name: "chainlinkAggregator", - indexed: false, internalType: "address", + indexed: false, }, ], - anonymous: false, - type: "event", - name: "GovSetChainlinkPriceFeed", }, { + type: "event", + name: "GovSetIRM", anonymous: false, inputs: [ { name: "underlying", type: "address", - indexed: true, internalType: "address", + indexed: true, }, { - indexed: false, - internalType: "uint256", type: "uint256", name: "interestRateModel", + internalType: "uint256", + indexed: false, }, { - name: "resetParams", type: "bytes", internalType: "bytes", + name: "resetParams", indexed: false, }, ], - name: "GovSetIRM", - type: "event", }, { type: "event", name: "GovSetPricingConfig", + anonymous: false, inputs: [ { + type: "address", + name: "underlying", indexed: true, internalType: "address", - name: "underlying", - type: "address", }, { - indexed: false, + type: "uint16", internalType: "uint16", name: "newPricingType", - type: "uint16", + indexed: false, }, { type: "uint32", @@ -347,40 +348,39 @@ const _abi = [ indexed: false, }, ], - anonymous: false, }, { - anonymous: false, inputs: [ { type: "address", + internalType: "address", name: "underlying", indexed: true, - internalType: "address", }, { + type: "uint32", + name: "newReserveFee", internalType: "uint32", indexed: false, - name: "newReserveFee", - type: "uint32", }, ], - name: "GovSetReserveFee", type: "event", + name: "GovSetReserveFee", + anonymous: false, }, { inputs: [ { type: "uint256", - name: "moduleId", internalType: "uint256", + name: "moduleId", indexed: true, }, { indexed: true, - internalType: "address", - name: "moduleImpl", type: "address", + name: "moduleImpl", + internalType: "address", }, { name: "moduleGitCommit", @@ -389,75 +389,73 @@ const _abi = [ indexed: false, }, ], - anonymous: false, type: "event", + anonymous: false, name: "InstallerInstallModule", }, { - name: "InstallerSetGovernorAdmin", type: "event", + name: "InstallerSetGovernorAdmin", anonymous: false, inputs: [ { type: "address", name: "newGovernorAdmin", - indexed: true, internalType: "address", + indexed: true, }, ], }, { + type: "event", + name: "InstallerSetUpgradeAdmin", + anonymous: false, inputs: [ { - type: "address", name: "newUpgradeAdmin", + type: "address", internalType: "address", indexed: true, }, ], - anonymous: false, - type: "event", - name: "InstallerSetUpgradeAdmin", }, { - type: "event", - name: "Liquidation", inputs: [ { - name: "liquidator", + indexed: true, type: "address", + name: "liquidator", internalType: "address", - indexed: true, }, { + indexed: true, type: "address", name: "violator", internalType: "address", - indexed: true, }, { - name: "underlying", type: "address", indexed: true, + name: "underlying", internalType: "address", }, { - internalType: "address", - indexed: false, name: "collateral", type: "address", + internalType: "address", + indexed: false, }, { - name: "repay", type: "uint256", - internalType: "uint256", + name: "repay", indexed: false, + internalType: "uint256", }, { - name: "yield", type: "uint256", - internalType: "uint256", + name: "yield", indexed: false, + internalType: "uint256", }, { name: "healthScore", @@ -466,107 +464,109 @@ const _abi = [ indexed: false, }, { - name: "baseDiscount", type: "uint256", - indexed: false, + name: "baseDiscount", internalType: "uint256", + indexed: false, }, { type: "uint256", name: "discount", - internalType: "uint256", indexed: false, + internalType: "uint256", }, ], + name: "Liquidation", + type: "event", anonymous: false, }, { type: "event", name: "MarketActivated", + anonymous: false, inputs: [ { - indexed: true, - internalType: "address", type: "address", name: "underlying", + internalType: "address", + indexed: true, }, { - name: "eToken", type: "address", - indexed: true, + name: "eToken", internalType: "address", + indexed: true, }, { + type: "address", internalType: "address", - indexed: true, name: "dToken", - type: "address", + indexed: true, }, ], - anonymous: false, }, { - anonymous: false, inputs: [ { type: "address", name: "underlying", - indexed: true, internalType: "address", + indexed: true, }, { - indexed: true, - internalType: "address", type: "address", + internalType: "address", name: "pToken", + indexed: true, }, ], - name: "PTokenActivated", + anonymous: false, type: "event", + name: "PTokenActivated", }, { - name: "PTokenUnWrap", - type: "event", - anonymous: false, inputs: [ { + type: "address", + name: "underlying", indexed: true, internalType: "address", - name: "underlying", - type: "address", }, { - internalType: "address", - indexed: true, type: "address", + indexed: true, name: "account", + internalType: "address", }, { - name: "amount", type: "uint256", - indexed: false, + name: "amount", internalType: "uint256", + indexed: false, }, ], + type: "event", + name: "PTokenUnWrap", + anonymous: false, }, { inputs: [ { - type: "address", name: "underlying", + type: "address", internalType: "address", indexed: true, }, { name: "account", type: "address", - indexed: true, internalType: "address", + indexed: true, }, { - name: "amount", - type: "uint256", indexed: false, + type: "uint256", + name: "amount", internalType: "uint256", }, ], @@ -576,128 +576,125 @@ const _abi = [ }, { type: "event", + anonymous: false, name: "ProxyCreated", inputs: [ { - indexed: true, - internalType: "address", type: "address", + indexed: true, name: "proxy", + internalType: "address", }, { - type: "uint256", name: "moduleId", + type: "uint256", internalType: "uint256", indexed: false, }, ], - anonymous: false, }, { - type: "event", - name: "Repay", inputs: [ { + type: "address", internalType: "address", - indexed: true, name: "underlying", - type: "address", + indexed: true, }, { - indexed: true, - internalType: "address", type: "address", name: "account", + internalType: "address", + indexed: true, }, { - internalType: "uint256", - indexed: false, type: "uint256", name: "amount", + indexed: false, + internalType: "uint256", }, ], + name: "Repay", + type: "event", anonymous: false, }, { + type: "event", + name: "RequestBorrow", anonymous: false, inputs: [ { - name: "account", type: "address", - indexed: true, + name: "account", internalType: "address", + indexed: true, }, { - name: "amount", type: "uint256", - internalType: "uint256", + name: "amount", indexed: false, + internalType: "uint256", }, ], - name: "RequestBorrow", - type: "event", }, { - anonymous: false, inputs: [ { - indexed: true, - internalType: "address", - name: "account", type: "address", + name: "account", + internalType: "address", + indexed: true, }, { - name: "amount", type: "uint256", - internalType: "uint256", + name: "amount", indexed: false, + internalType: "uint256", }, ], - name: "RequestBurn", type: "event", + name: "RequestBurn", + anonymous: false, }, { anonymous: false, + type: "event", + name: "RequestDeposit", inputs: [ { - name: "account", type: "address", - indexed: true, + name: "account", internalType: "address", + indexed: true, }, { - type: "uint256", name: "amount", - internalType: "uint256", + type: "uint256", indexed: false, + internalType: "uint256", }, ], - name: "RequestDeposit", - type: "event", }, { - name: "RequestDonate", type: "event", + name: "RequestDonate", anonymous: false, inputs: [ { + name: "account", + type: "address", internalType: "address", indexed: true, - type: "address", - name: "account", }, { - name: "amount", type: "uint256", - internalType: "uint256", + name: "amount", indexed: false, + internalType: "uint256", }, ], }, { - name: "RequestLiquidate", - type: "event", - anonymous: false, inputs: [ { type: "address", @@ -706,100 +703,103 @@ const _abi = [ indexed: true, }, { - name: "violator", type: "address", internalType: "address", + name: "violator", indexed: true, }, { internalType: "address", - indexed: true, type: "address", name: "underlying", + indexed: true, }, { indexed: false, - internalType: "address", - name: "collateral", type: "address", + name: "collateral", + internalType: "address", }, { + indexed: false, type: "uint256", name: "repay", - indexed: false, internalType: "uint256", }, { - name: "minYield", type: "uint256", - indexed: false, + name: "minYield", internalType: "uint256", + indexed: false, }, ], + anonymous: false, + type: "event", + name: "RequestLiquidate", }, { - type: "event", name: "RequestMint", + type: "event", + anonymous: false, inputs: [ { - indexed: true, - internalType: "address", - type: "address", name: "account", + type: "address", + internalType: "address", + indexed: true, }, { - name: "amount", type: "uint256", + name: "amount", internalType: "uint256", indexed: false, }, ], - anonymous: false, }, { inputs: [ { - indexed: true, - internalType: "address", type: "address", name: "account", + internalType: "address", + indexed: true, }, { - name: "amount", type: "uint256", - internalType: "uint256", + name: "amount", indexed: false, + internalType: "uint256", }, ], - anonymous: false, - type: "event", name: "RequestRepay", + type: "event", + anonymous: false, }, { inputs: [ { - name: "accountIn", type: "address", - indexed: true, + name: "accountIn", internalType: "address", + indexed: true, }, { - name: "accountOut", type: "address", - indexed: true, + name: "accountOut", internalType: "address", + indexed: true, }, { - name: "underlyingIn", type: "address", internalType: "address", + name: "underlyingIn", indexed: true, }, { type: "address", name: "underlyingOut", - indexed: false, internalType: "address", + indexed: false, }, { type: "uint256", @@ -819,79 +819,177 @@ const _abi = [ name: "RequestSwap", }, { + type: "event", + name: "RequestSwapHub", + anonymous: false, inputs: [ { + name: "accountIn", + type: "address", internalType: "address", indexed: true, - name: "from", + }, + { type: "address", + name: "accountOut", + indexed: true, + internalType: "address", }, { + type: "address", + name: "underlyingIn", internalType: "address", indexed: true, - name: "to", + }, + { type: "address", + name: "underlyingOut", + internalType: "address", + indexed: false, }, { + type: "uint256", + name: "amountIn", + indexed: false, internalType: "uint256", + }, + { + indexed: false, + type: "uint256", + name: "amountOut", + internalType: "uint256", + }, + { indexed: false, - name: "amount", type: "uint256", + name: "mode", + internalType: "uint256", + }, + { + type: "address", + indexed: false, + name: "swapHandler", + internalType: "address", }, ], - anonymous: false, - type: "event", - name: "RequestTransferDToken", }, { + type: "event", + name: "RequestSwapHubRepay", anonymous: false, inputs: [ { + type: "address", indexed: true, + name: "accountIn", internalType: "address", + }, + { type: "address", - name: "from", + internalType: "address", + name: "accountOut", + indexed: true, }, { + type: "address", + name: "underlyingIn", internalType: "address", indexed: true, - name: "to", + }, + { type: "address", + name: "underlyingOut", + indexed: false, + internalType: "address", }, { - name: "amount", type: "uint256", + internalType: "uint256", + name: "targetDebt", + indexed: false, + }, + { + name: "swapHandler", + type: "address", + internalType: "address", indexed: false, + }, + ], + }, + { + inputs: [ + { + type: "address", + name: "from", + internalType: "address", + indexed: true, + }, + { + name: "to", + type: "address", + internalType: "address", + indexed: true, + }, + { + type: "uint256", + name: "amount", internalType: "uint256", + indexed: false, }, ], - name: "RequestTransferEToken", type: "event", + name: "RequestTransferDToken", + anonymous: false, }, { - name: "RequestWithdraw", - type: "event", anonymous: false, + type: "event", + name: "RequestTransferEToken", inputs: [ { - name: "account", + name: "from", type: "address", internalType: "address", indexed: true, }, { - name: "amount", + internalType: "address", + type: "address", + name: "to", + indexed: true, + }, + { type: "uint256", + name: "amount", indexed: false, internalType: "uint256", }, ], }, { + type: "event", + name: "RequestWithdraw", + anonymous: false, inputs: [ { + type: "address", name: "account", + internalType: "address", + indexed: true, + }, + { + type: "uint256", + name: "amount", + internalType: "uint256", + indexed: false, + }, + ], + }, + { + inputs: [ + { type: "address", + name: "account", indexed: true, internalType: "address", }, @@ -901,59 +999,61 @@ const _abi = [ name: "TrackAverageLiquidity", }, { - name: "UnTrackAverageLiquidity", - type: "event", anonymous: false, + type: "event", + name: "UnTrackAverageLiquidity", inputs: [ { + indexed: true, type: "address", name: "account", internalType: "address", - indexed: true, }, ], }, { + type: "event", + name: "Withdraw", + anonymous: false, inputs: [ { + type: "address", + name: "underlying", indexed: true, internalType: "address", - name: "underlying", - type: "address", }, { + internalType: "address", type: "address", name: "account", indexed: true, - internalType: "address", }, { - type: "uint256", name: "amount", + type: "uint256", internalType: "uint256", indexed: false, }, ], - anonymous: false, - type: "event", - name: "Withdraw", }, { type: "function", + stateMutability: "nonpayable", name: "batchDispatch", + outputs: [], inputs: [ { - name: "items", type: "tuple[]", + name: "items", components: [ { - internalType: "bool", - name: "allowError", type: "bool", + name: "allowError", + internalType: "bool", }, { - internalType: "address", type: "address", + internalType: "address", name: "proxyAddr", }, { @@ -965,20 +1065,22 @@ const _abi = [ internalType: "struct Exec.EulerBatchItem[]", }, { - internalType: "address[]", name: "deferLiquidityChecks", type: "address[]", + internalType: "address[]", }, ], - stateMutability: "nonpayable", - outputs: [], }, { type: "function", name: "batchDispatchSimulate", + stateMutability: "nonpayable", + outputs: [], inputs: [ { + type: "tuple[]", name: "items", + internalType: "struct Exec.EulerBatchItem[]", components: [ { type: "bool", @@ -986,18 +1088,16 @@ const _abi = [ internalType: "bool", }, { - internalType: "address", - name: "proxyAddr", type: "address", + name: "proxyAddr", + internalType: "address", }, { - internalType: "bytes", type: "bytes", + internalType: "bytes", name: "data", }, ], - type: "tuple[]", - internalType: "struct Exec.EulerBatchItem[]", }, { type: "address[]", @@ -1005,14 +1105,9 @@ const _abi = [ internalType: "address[]", }, ], - stateMutability: "nonpayable", - outputs: [], }, { - name: "deferLiquidityCheck", - type: "function", outputs: [], - stateMutability: "nonpayable", inputs: [ { internalType: "address", @@ -1020,98 +1115,103 @@ const _abi = [ name: "account", }, { - internalType: "bytes", type: "bytes", + internalType: "bytes", name: "data", }, ], + name: "deferLiquidityCheck", + type: "function", + stateMutability: "nonpayable", }, { + type: "function", + stateMutability: "view", + name: "detailedLiquidity", inputs: [ { - internalType: "address", - name: "account", type: "address", + name: "account", + internalType: "address", }, ], outputs: [ { - name: "assets", - type: "tuple[]", components: [ { - internalType: "address", type: "address", name: "underlying", + internalType: "address", }, { - internalType: "struct IRiskManager.LiquidityStatus", - name: "status", components: [ { - name: "collateralValue", type: "uint256", + name: "collateralValue", internalType: "uint256", }, { - internalType: "uint256", - name: "liabilityValue", type: "uint256", + name: "liabilityValue", + internalType: "uint256", }, { - name: "numBorrows", type: "uint256", internalType: "uint256", + name: "numBorrows", }, { - internalType: "bool", - type: "bool", name: "borrowIsolated", + type: "bool", + internalType: "bool", }, ], type: "tuple", + name: "status", + internalType: "struct IRiskManager.LiquidityStatus", }, ], + type: "tuple[]", + name: "assets", internalType: "struct IRiskManager.AssetLiquidity[]", }, ], - stateMutability: "view", - type: "function", - name: "detailedLiquidity", }, { + outputs: [ + { + name: "", + type: "bytes", + internalType: "bytes", + }, + ], inputs: [ { - type: "address", name: "contractAddress", + type: "address", internalType: "address", }, { - internalType: "bytes", - name: "payload", type: "bytes", - }, - ], - stateMutability: "view", - outputs: [ - { internalType: "bytes", - type: "bytes", - name: "", + name: "payload", }, ], type: "function", + stateMutability: "view", name: "doStaticCall", }, { + type: "function", + name: "getAverageLiquidity", + stateMutability: "nonpayable", outputs: [ { - name: "", type: "uint256", + name: "", internalType: "uint256", }, ], - stateMutability: "nonpayable", inputs: [ { name: "account", @@ -1119,37 +1219,30 @@ const _abi = [ internalType: "address", }, ], - name: "getAverageLiquidity", - type: "function", }, { + type: "function", stateMutability: "view", + name: "getAverageLiquidityDelegateAccount", outputs: [ { - internalType: "address", type: "address", + internalType: "address", name: "", }, ], inputs: [ { - name: "account", type: "address", + name: "account", internalType: "address", }, ], - name: "getAverageLiquidityDelegateAccount", - type: "function", }, { - inputs: [ - { - name: "account", - type: "address", - internalType: "address", - }, - ], + type: "function", stateMutability: "nonpayable", + name: "getAverageLiquidityWithDelegate", outputs: [ { name: "", @@ -1157,15 +1250,20 @@ const _abi = [ internalType: "uint256", }, ], - type: "function", - name: "getAverageLiquidityWithDelegate", + inputs: [ + { + type: "address", + name: "account", + internalType: "address", + }, + ], }, { inputs: [ { - internalType: "address", - name: "underlying", type: "address", + name: "underlying", + internalType: "address", }, ], outputs: [ @@ -1175,23 +1273,19 @@ const _abi = [ internalType: "uint256", }, { + type: "uint256", internalType: "uint256", name: "twapPeriod", - type: "uint256", }, ], - stateMutability: "view", - type: "function", name: "getPrice", + type: "function", + stateMutability: "view", }, { - inputs: [ - { - internalType: "address", - name: "underlying", - type: "address", - }, - ], + type: "function", + stateMutability: "view", + name: "getPriceFull", outputs: [ { internalType: "uint256", @@ -1199,22 +1293,25 @@ const _abi = [ name: "twap", }, { - internalType: "uint256", - name: "twapPeriod", type: "uint256", + name: "twapPeriod", + internalType: "uint256", }, { - internalType: "uint256", type: "uint256", name: "currPrice", + internalType: "uint256", + }, + ], + inputs: [ + { + type: "address", + name: "underlying", + internalType: "address", }, ], - stateMutability: "view", - type: "function", - name: "getPriceFull", }, { - stateMutability: "view", outputs: [ { type: "tuple", @@ -1225,14 +1322,14 @@ const _abi = [ internalType: "uint256", }, { + internalType: "uint256", type: "uint256", name: "liabilityValue", - internalType: "uint256", }, { internalType: "uint256", - name: "numBorrows", type: "uint256", + name: "numBorrows", }, { internalType: "bool", @@ -1246,87 +1343,89 @@ const _abi = [ ], inputs: [ { - internalType: "address", - type: "address", name: "account", + type: "address", + internalType: "address", }, ], - name: "liquidity", + stateMutability: "view", type: "function", + name: "liquidity", }, { - inputs: [], + type: "function", + name: "moduleGitCommit", + stateMutability: "view", outputs: [ { - name: "", type: "bytes32", internalType: "bytes32", + name: "", }, ], - stateMutability: "view", - type: "function", - name: "moduleGitCommit", + inputs: [], }, { - type: "function", - name: "moduleId", - inputs: [], outputs: [ { - name: "", type: "uint256", + name: "", internalType: "uint256", }, ], + inputs: [], + type: "function", + name: "moduleId", stateMutability: "view", }, { - name: "pTokenUnWrap", - type: "function", stateMutability: "nonpayable", + type: "function", + name: "pTokenUnWrap", outputs: [], inputs: [ { - internalType: "address", - name: "underlying", type: "address", + name: "underlying", + internalType: "address", }, { + type: "uint256", internalType: "uint256", name: "amount", - type: "uint256", }, ], }, { - name: "pTokenWrap", type: "function", - outputs: [], stateMutability: "nonpayable", + name: "pTokenWrap", + outputs: [], inputs: [ { - internalType: "address", - name: "underlying", type: "address", + name: "underlying", + internalType: "address", }, { - name: "amount", type: "uint256", + name: "amount", internalType: "uint256", }, ], }, { + outputs: [], inputs: [ { + type: "uint256", internalType: "uint256", name: "subAccountId", - type: "uint256", }, { - internalType: "address", type: "address", name: "delegate", + internalType: "address", }, { type: "bool", @@ -1334,16 +1433,11 @@ const _abi = [ internalType: "bool", }, ], - outputs: [], stateMutability: "nonpayable", type: "function", name: "trackAverageLiquidity", }, { - name: "unTrackAverageLiquidity", - type: "function", - outputs: [], - stateMutability: "nonpayable", inputs: [ { name: "subAccountId", @@ -1351,18 +1445,23 @@ const _abi = [ internalType: "uint256", }, ], + outputs: [], + type: "function", + name: "unTrackAverageLiquidity", + stateMutability: "nonpayable", }, { + outputs: [], inputs: [ { - type: "address", name: "token", + type: "address", internalType: "address", }, { type: "uint256", - name: "value", internalType: "uint256", + name: "value", }, { type: "uint256", @@ -1370,14 +1469,14 @@ const _abi = [ internalType: "uint256", }, { - internalType: "uint8", - name: "v", type: "uint8", + name: "v", + internalType: "uint8", }, { - internalType: "bytes32", - name: "r", type: "bytes32", + name: "r", + internalType: "bytes32", }, { name: "s", @@ -1385,35 +1484,33 @@ const _abi = [ internalType: "bytes32", }, ], - outputs: [], stateMutability: "nonpayable", type: "function", name: "usePermit", }, { - name: "usePermitAllowed", type: "function", stateMutability: "nonpayable", - outputs: [], + name: "usePermitAllowed", inputs: [ { internalType: "address", - name: "token", type: "address", + name: "token", }, { + internalType: "uint256", type: "uint256", name: "nonce", - internalType: "uint256", }, { internalType: "uint256", - name: "expiry", type: "uint256", + name: "expiry", }, { - internalType: "bool", type: "bool", + internalType: "bool", name: "allowed", }, { @@ -1422,9 +1519,9 @@ const _abi = [ internalType: "uint8", }, { + internalType: "bytes32", type: "bytes32", name: "r", - internalType: "bytes32", }, { type: "bytes32", @@ -1432,10 +1529,13 @@ const _abi = [ internalType: "bytes32", }, ], + outputs: [], }, { - outputs: [], stateMutability: "nonpayable", + type: "function", + name: "usePermitPacked", + outputs: [], inputs: [ { type: "address", @@ -1443,23 +1543,21 @@ const _abi = [ internalType: "address", }, { + type: "uint256", internalType: "uint256", name: "value", - type: "uint256", }, { - internalType: "uint256", type: "uint256", name: "deadline", + internalType: "uint256", }, { + type: "bytes", internalType: "bytes", name: "signature", - type: "bytes", }, ], - name: "usePermitPacked", - type: "function", }, ]; diff --git a/types/factories/modules/Liquidation__factory.ts b/types/factories/modules/Liquidation__factory.ts index 43e3bbc..abdf2e4 100644 --- a/types/factories/modules/Liquidation__factory.ts +++ b/types/factories/modules/Liquidation__factory.ts @@ -11,8 +11,6 @@ import type { const _abi = [ { - type: "constructor", - stateMutability: "nonpayable", inputs: [ { internalType: "bytes32", @@ -20,34 +18,34 @@ const _abi = [ name: "moduleGitCommit_", }, ], + stateMutability: "nonpayable", + type: "constructor", }, { - type: "event", - name: "AssetStatus", inputs: [ { - indexed: true, - internalType: "address", - name: "underlying", type: "address", + name: "underlying", + internalType: "address", + indexed: true, }, { - indexed: false, - internalType: "uint256", - name: "totalBalances", type: "uint256", - }, - { + name: "totalBalances", internalType: "uint256", indexed: false, - name: "totalBorrows", + }, + { type: "uint256", + name: "totalBorrows", + indexed: false, + internalType: "uint256", }, { internalType: "uint96", - indexed: false, - name: "reserveBalance", type: "uint96", + name: "reserveBalance", + indexed: false, }, { name: "poolSize", @@ -56,27 +54,31 @@ const _abi = [ internalType: "uint256", }, { - internalType: "uint256", - indexed: false, type: "uint256", name: "interestAccumulator", + internalType: "uint256", + indexed: false, }, { + type: "int96", indexed: false, - internalType: "int96", name: "interestRate", - type: "int96", + internalType: "int96", }, { - internalType: "uint256", - indexed: false, name: "timestamp", type: "uint256", + indexed: false, + internalType: "uint256", }, ], + type: "event", + name: "AssetStatus", anonymous: false, }, { + name: "Borrow", + type: "event", anonymous: false, inputs: [ { @@ -86,146 +88,148 @@ const _abi = [ indexed: true, }, { - indexed: true, - internalType: "address", type: "address", + indexed: true, name: "account", + internalType: "address", }, { - name: "amount", type: "uint256", - internalType: "uint256", + name: "amount", indexed: false, + internalType: "uint256", }, ], - name: "Borrow", - type: "event", }, { - anonymous: false, inputs: [ { indexed: true, - internalType: "address", type: "address", name: "account", + internalType: "address", }, { + internalType: "address", type: "address", name: "delegate", indexed: true, - internalType: "address", }, ], name: "DelegateAverageLiquidity", type: "event", + anonymous: false, }, { inputs: [ { type: "address", - name: "underlying", internalType: "address", + name: "underlying", indexed: true, }, { internalType: "address", - indexed: true, - name: "account", type: "address", + name: "account", + indexed: true, }, { - internalType: "uint256", indexed: false, - name: "amount", type: "uint256", + name: "amount", + internalType: "uint256", }, ], - anonymous: false, type: "event", name: "Deposit", + anonymous: false, }, { - name: "EnterMarket", - type: "event", - anonymous: false, inputs: [ { + indexed: true, type: "address", name: "underlying", internalType: "address", - indexed: true, }, { - internalType: "address", indexed: true, type: "address", name: "account", + internalType: "address", }, ], + anonymous: false, + type: "event", + name: "EnterMarket", }, { inputs: [ { - indexed: true, - internalType: "address", - name: "underlying", type: "address", + name: "underlying", + internalType: "address", + indexed: true, }, { - indexed: true, - internalType: "address", - name: "account", type: "address", + name: "account", + internalType: "address", + indexed: true, }, ], - anonymous: false, type: "event", + anonymous: false, name: "ExitMarket", }, { + inputs: [], type: "event", name: "Genesis", - inputs: [], anonymous: false, }, { + type: "event", anonymous: false, + name: "GovConvertReserves", inputs: [ { indexed: true, - internalType: "address", type: "address", name: "underlying", + internalType: "address", }, { - indexed: true, - internalType: "address", type: "address", + internalType: "address", name: "recipient", + indexed: true, }, { - type: "uint256", name: "amount", - indexed: false, + type: "uint256", internalType: "uint256", + indexed: false, }, ], - name: "GovConvertReserves", - type: "event", }, { + anonymous: false, type: "event", name: "GovSetAssetConfig", inputs: [ { - internalType: "address", - indexed: true, - type: "address", name: "underlying", + type: "address", + indexed: true, + internalType: "address", }, { + internalType: "struct Storage.AssetConfig", + type: "tuple", name: "newConfig", + indexed: false, components: [ { type: "address", @@ -233,67 +237,61 @@ const _abi = [ internalType: "address", }, { - internalType: "bool", type: "bool", name: "borrowIsolated", + internalType: "bool", }, { + internalType: "uint32", type: "uint32", name: "collateralFactor", - internalType: "uint32", }, { - internalType: "uint32", type: "uint32", + internalType: "uint32", name: "borrowFactor", }, { - internalType: "uint24", type: "uint24", + internalType: "uint24", name: "twapWindow", }, ], - type: "tuple", - indexed: false, - internalType: "struct Storage.AssetConfig", }, ], - anonymous: false, }, { - type: "event", - name: "GovSetChainlinkPriceFeed", inputs: [ { - indexed: true, internalType: "address", - name: "underlying", type: "address", + name: "underlying", + indexed: true, }, { type: "address", - name: "chainlinkAggregator", internalType: "address", + name: "chainlinkAggregator", indexed: false, }, ], + type: "event", anonymous: false, + name: "GovSetChainlinkPriceFeed", }, { - type: "event", - name: "GovSetIRM", inputs: [ { - name: "underlying", + internalType: "address", type: "address", + name: "underlying", indexed: true, - internalType: "address", }, { - name: "interestRateModel", + indexed: false, type: "uint256", + name: "interestRateModel", internalType: "uint256", - indexed: false, }, { name: "resetParams", @@ -303,34 +301,35 @@ const _abi = [ }, ], anonymous: false, + type: "event", + name: "GovSetIRM", }, { inputs: [ { + indexed: true, type: "address", name: "underlying", internalType: "address", - indexed: true, }, { type: "uint16", - name: "newPricingType", indexed: false, + name: "newPricingType", internalType: "uint16", }, { - internalType: "uint32", - indexed: false, type: "uint32", name: "newPricingParameter", + internalType: "uint32", + indexed: false, }, ], - anonymous: false, type: "event", name: "GovSetPricingConfig", + anonymous: false, }, { - anonymous: false, inputs: [ { type: "address", @@ -339,92 +338,95 @@ const _abi = [ internalType: "address", }, { - indexed: false, internalType: "uint32", type: "uint32", name: "newReserveFee", + indexed: false, }, ], - name: "GovSetReserveFee", type: "event", + anonymous: false, + name: "GovSetReserveFee", }, { - name: "InstallerInstallModule", - type: "event", - anonymous: false, inputs: [ { - name: "moduleId", type: "uint256", + name: "moduleId", indexed: true, internalType: "uint256", }, { + internalType: "address", type: "address", name: "moduleImpl", indexed: true, - internalType: "address", }, { type: "bytes32", - name: "moduleGitCommit", internalType: "bytes32", + name: "moduleGitCommit", indexed: false, }, ], + type: "event", + anonymous: false, + name: "InstallerInstallModule", }, { - type: "event", - name: "InstallerSetGovernorAdmin", inputs: [ { - indexed: true, - internalType: "address", type: "address", name: "newGovernorAdmin", + internalType: "address", + indexed: true, }, ], anonymous: false, + type: "event", + name: "InstallerSetGovernorAdmin", }, { inputs: [ { - internalType: "address", - indexed: true, name: "newUpgradeAdmin", type: "address", + indexed: true, + internalType: "address", }, ], - anonymous: false, type: "event", name: "InstallerSetUpgradeAdmin", + anonymous: false, }, { anonymous: false, + type: "event", + name: "Liquidation", inputs: [ { - indexed: true, internalType: "address", type: "address", name: "liquidator", + indexed: true, }, { - internalType: "address", - indexed: true, type: "address", + indexed: true, name: "violator", + internalType: "address", }, { - name: "underlying", type: "address", indexed: true, + name: "underlying", internalType: "address", }, { - indexed: false, - internalType: "address", name: "collateral", type: "address", + indexed: false, + internalType: "address", }, { name: "repay", @@ -433,336 +435,334 @@ const _abi = [ indexed: false, }, { - name: "yield", + indexed: false, type: "uint256", + name: "yield", internalType: "uint256", - indexed: false, }, { + type: "uint256", + name: "healthScore", indexed: false, internalType: "uint256", - name: "healthScore", - type: "uint256", }, { - name: "baseDiscount", - type: "uint256", indexed: false, + type: "uint256", + name: "baseDiscount", internalType: "uint256", }, { indexed: false, - internalType: "uint256", type: "uint256", name: "discount", + internalType: "uint256", }, ], - name: "Liquidation", - type: "event", }, { - type: "event", - name: "MarketActivated", inputs: [ { - name: "underlying", type: "address", - indexed: true, + name: "underlying", internalType: "address", + indexed: true, }, { - name: "eToken", type: "address", - indexed: true, + name: "eToken", internalType: "address", + indexed: true, }, { - internalType: "address", - indexed: true, type: "address", name: "dToken", + indexed: true, + internalType: "address", }, ], + name: "MarketActivated", + type: "event", anonymous: false, }, { + name: "PTokenActivated", + type: "event", + anonymous: false, inputs: [ { + type: "address", indexed: true, - internalType: "address", name: "underlying", - type: "address", + internalType: "address", }, { - indexed: true, - internalType: "address", type: "address", name: "pToken", + indexed: true, + internalType: "address", }, ], - anonymous: false, - type: "event", - name: "PTokenActivated", }, { - anonymous: false, inputs: [ { - indexed: true, - internalType: "address", name: "underlying", type: "address", + indexed: true, + internalType: "address", }, { - indexed: true, + type: "address", internalType: "address", name: "account", - type: "address", + indexed: true, }, { - name: "amount", type: "uint256", + name: "amount", internalType: "uint256", indexed: false, }, ], - name: "PTokenUnWrap", + anonymous: false, type: "event", + name: "PTokenUnWrap", }, { inputs: [ { - internalType: "address", - indexed: true, - type: "address", name: "underlying", + type: "address", + indexed: true, + internalType: "address", }, { - name: "account", type: "address", + name: "account", internalType: "address", indexed: true, }, { - internalType: "uint256", indexed: false, type: "uint256", name: "amount", + internalType: "uint256", }, ], - anonymous: false, type: "event", + anonymous: false, name: "PTokenWrap", }, { - name: "ProxyCreated", type: "event", + name: "ProxyCreated", anonymous: false, inputs: [ { - internalType: "address", + type: "address", indexed: true, name: "proxy", - type: "address", + internalType: "address", }, { + name: "moduleId", + type: "uint256", indexed: false, internalType: "uint256", - type: "uint256", - name: "moduleId", }, ], }, { - type: "event", - name: "Repay", inputs: [ { indexed: true, - internalType: "address", - name: "underlying", type: "address", + name: "underlying", + internalType: "address", }, { type: "address", + indexed: true, name: "account", internalType: "address", - indexed: true, }, { internalType: "uint256", - indexed: false, - name: "amount", type: "uint256", + name: "amount", + indexed: false, }, ], anonymous: false, + type: "event", + name: "Repay", }, { + type: "event", + name: "RequestBorrow", anonymous: false, inputs: [ { + indexed: true, type: "address", name: "account", internalType: "address", - indexed: true, }, { - name: "amount", type: "uint256", + name: "amount", indexed: false, internalType: "uint256", }, ], - name: "RequestBorrow", - type: "event", }, { - name: "RequestBurn", - type: "event", anonymous: false, + type: "event", + name: "RequestBurn", inputs: [ { - indexed: true, - internalType: "address", - type: "address", name: "account", + type: "address", + internalType: "address", + indexed: true, }, { - name: "amount", type: "uint256", - indexed: false, + name: "amount", internalType: "uint256", + indexed: false, }, ], }, { - name: "RequestDeposit", - type: "event", - anonymous: false, inputs: [ { - type: "address", name: "account", - internalType: "address", + type: "address", indexed: true, + internalType: "address", }, { - indexed: false, - internalType: "uint256", type: "uint256", name: "amount", + internalType: "uint256", + indexed: false, }, ], + anonymous: false, + type: "event", + name: "RequestDeposit", }, { + type: "event", + name: "RequestDonate", + anonymous: false, inputs: [ { - indexed: true, + type: "address", internalType: "address", name: "account", - type: "address", + indexed: true, }, { - name: "amount", type: "uint256", - internalType: "uint256", + name: "amount", indexed: false, + internalType: "uint256", }, ], - anonymous: false, - type: "event", - name: "RequestDonate", }, { - anonymous: false, inputs: [ { indexed: true, - internalType: "address", type: "address", name: "liquidator", + internalType: "address", }, { type: "address", - name: "violator", internalType: "address", + name: "violator", indexed: true, }, { + name: "underlying", + type: "address", internalType: "address", indexed: true, - type: "address", - name: "underlying", }, { + indexed: false, type: "address", name: "collateral", internalType: "address", - indexed: false, }, { internalType: "uint256", - indexed: false, - name: "repay", type: "uint256", + name: "repay", + indexed: false, }, { - name: "minYield", type: "uint256", internalType: "uint256", + name: "minYield", indexed: false, }, ], - name: "RequestLiquidate", type: "event", + anonymous: false, + name: "RequestLiquidate", }, { - type: "event", - name: "RequestMint", inputs: [ { internalType: "address", - indexed: true, - name: "account", type: "address", + name: "account", + indexed: true, }, { + indexed: false, type: "uint256", name: "amount", internalType: "uint256", - indexed: false, }, ], + type: "event", + name: "RequestMint", anonymous: false, }, { + anonymous: false, + type: "event", + name: "RequestRepay", inputs: [ { - name: "account", + indexed: true, type: "address", + name: "account", internalType: "address", - indexed: true, }, { - name: "amount", + indexed: false, type: "uint256", + name: "amount", internalType: "uint256", - indexed: false, }, ], - anonymous: false, - type: "event", - name: "RequestRepay", }, { - name: "RequestSwap", - type: "event", anonymous: false, + type: "event", + name: "RequestSwap", inputs: [ { - name: "accountIn", type: "address", + name: "accountIn", internalType: "address", indexed: true, }, @@ -779,82 +779,161 @@ const _abi = [ internalType: "address", }, { - indexed: false, internalType: "address", - name: "underlyingOut", type: "address", + name: "underlyingOut", + indexed: false, + }, + { + name: "amount", + type: "uint256", + indexed: false, + internalType: "uint256", }, { + type: "uint256", + name: "swapType", internalType: "uint256", indexed: false, + }, + ], + }, + { + type: "event", + anonymous: false, + name: "RequestSwapHub", + inputs: [ + { + type: "address", + internalType: "address", + name: "accountIn", + indexed: true, + }, + { + type: "address", + name: "accountOut", + indexed: true, + internalType: "address", + }, + { + name: "underlyingIn", + type: "address", + internalType: "address", + indexed: true, + }, + { + type: "address", + indexed: false, + name: "underlyingOut", + internalType: "address", + }, + { type: "uint256", - name: "amount", + name: "amountIn", + indexed: false, + internalType: "uint256", }, { internalType: "uint256", + type: "uint256", + name: "amountOut", indexed: false, + }, + { type: "uint256", - name: "swapType", + indexed: false, + name: "mode", + internalType: "uint256", + }, + { + type: "address", + indexed: false, + name: "swapHandler", + internalType: "address", }, ], }, { - anonymous: false, inputs: [ { + type: "address", + name: "accountIn", indexed: true, internalType: "address", - name: "from", + }, + { + indexed: true, type: "address", + name: "accountOut", + internalType: "address", }, { - name: "to", type: "address", indexed: true, + name: "underlyingIn", internalType: "address", }, { - name: "amount", - type: "uint256", + internalType: "address", + type: "address", + name: "underlyingOut", indexed: false, + }, + { + indexed: false, + type: "uint256", + name: "targetDebt", internalType: "uint256", }, + { + indexed: false, + type: "address", + name: "swapHandler", + internalType: "address", + }, ], - name: "RequestTransferDToken", type: "event", + name: "RequestSwapHubRepay", + anonymous: false, }, { - anonymous: false, inputs: [ { - indexed: true, - internalType: "address", type: "address", name: "from", + internalType: "address", + indexed: true, }, { - name: "to", type: "address", internalType: "address", + name: "to", indexed: true, }, { - internalType: "uint256", - indexed: false, name: "amount", type: "uint256", + internalType: "uint256", + indexed: false, }, ], - name: "RequestTransferEToken", + anonymous: false, type: "event", + name: "RequestTransferDToken", }, { inputs: [ { type: "address", - name: "account", + internalType: "address", + name: "from", indexed: true, + }, + { + name: "to", + type: "address", internalType: "address", + indexed: true, }, { name: "amount", @@ -863,9 +942,28 @@ const _abi = [ internalType: "uint256", }, ], + name: "RequestTransferEToken", + type: "event", anonymous: false, + }, + { type: "event", + anonymous: false, name: "RequestWithdraw", + inputs: [ + { + type: "address", + name: "account", + internalType: "address", + indexed: true, + }, + { + internalType: "uint256", + type: "uint256", + name: "amount", + indexed: false, + }, + ], }, { name: "TrackAverageLiquidity", @@ -873,93 +971,92 @@ const _abi = [ anonymous: false, inputs: [ { - indexed: true, - internalType: "address", type: "address", name: "account", + indexed: true, + internalType: "address", }, ], }, { + name: "UnTrackAverageLiquidity", + type: "event", anonymous: false, inputs: [ { indexed: true, - internalType: "address", - name: "account", type: "address", + name: "account", + internalType: "address", }, ], - name: "UnTrackAverageLiquidity", - type: "event", }, { + anonymous: false, type: "event", name: "Withdraw", inputs: [ { - type: "address", name: "underlying", + type: "address", indexed: true, internalType: "address", }, { - internalType: "address", - indexed: true, type: "address", + internalType: "address", name: "account", + indexed: true, }, { - indexed: false, internalType: "uint256", - name: "amount", type: "uint256", + name: "amount", + indexed: false, }, ], - anonymous: false, }, { name: "DISCOUNT_BOOSTER_SLOPE", type: "function", + stateMutability: "view", outputs: [ { + type: "uint256", internalType: "uint256", name: "", - type: "uint256", }, ], - stateMutability: "view", inputs: [], }, { name: "MAXIMUM_BOOSTER_DISCOUNT", type: "function", + stateMutability: "view", + inputs: [], outputs: [ { + internalType: "uint256", type: "uint256", name: "", - internalType: "uint256", }, ], - stateMutability: "view", - inputs: [], }, { - inputs: [], - stateMutability: "view", outputs: [ { - internalType: "uint256", type: "uint256", + internalType: "uint256", name: "", }, ], + inputs: [], type: "function", + stateMutability: "view", name: "MAXIMUM_DISCOUNT", }, { - name: "TARGET_HEALTH", - type: "function", + inputs: [], outputs: [ { type: "uint256", @@ -967,33 +1064,58 @@ const _abi = [ internalType: "uint256", }, ], + type: "function", stateMutability: "view", - inputs: [], + name: "TARGET_HEALTH", }, { inputs: [], - stateMutability: "view", outputs: [ { - internalType: "uint256", - type: "uint256", name: "", + type: "uint256", + internalType: "uint256", }, ], type: "function", name: "UNDERLYING_RESERVES_FEE", + stateMutability: "view", }, { name: "checkLiquidation", type: "function", stateMutability: "nonpayable", + inputs: [ + { + type: "address", + internalType: "address", + name: "liquidator", + }, + { + type: "address", + name: "violator", + internalType: "address", + }, + { + internalType: "address", + type: "address", + name: "underlying", + }, + { + name: "collateral", + type: "address", + internalType: "address", + }, + ], outputs: [ { + name: "liqOpp", type: "tuple", + internalType: "struct Liquidation.LiquidationOpportunity", components: [ { - type: "uint256", name: "repay", + type: "uint256", internalType: "uint256", }, { @@ -1002,9 +1124,9 @@ const _abi = [ internalType: "uint256", }, { - internalType: "uint256", type: "uint256", name: "healthScore", + internalType: "uint256", }, { internalType: "uint256", @@ -1012,101 +1134,77 @@ const _abi = [ name: "baseDiscount", }, { + type: "uint256", internalType: "uint256", name: "discount", - type: "uint256", }, { - internalType: "uint256", type: "uint256", + internalType: "uint256", name: "conversionRate", }, ], - name: "liqOpp", - internalType: "struct Liquidation.LiquidationOpportunity", - }, - ], - inputs: [ - { - internalType: "address", - type: "address", - name: "liquidator", - }, - { - name: "violator", - type: "address", - internalType: "address", - }, - { - name: "underlying", - type: "address", - internalType: "address", - }, - { - internalType: "address", - name: "collateral", - type: "address", }, ], }, { - outputs: [], + name: "liquidate", + type: "function", stateMutability: "nonpayable", inputs: [ { - internalType: "address", - type: "address", name: "violator", + type: "address", + internalType: "address", }, { - name: "underlying", type: "address", internalType: "address", + name: "underlying", }, { - name: "collateral", type: "address", internalType: "address", + name: "collateral", }, { - name: "repay", type: "uint256", internalType: "uint256", + name: "repay", }, { - type: "uint256", name: "minYield", + type: "uint256", internalType: "uint256", }, ], - name: "liquidate", - type: "function", + outputs: [], }, { name: "moduleGitCommit", type: "function", + stateMutability: "view", outputs: [ { + type: "bytes32", internalType: "bytes32", name: "", - type: "bytes32", }, ], - stateMutability: "view", inputs: [], }, { - name: "moduleId", - type: "function", - stateMutability: "view", + inputs: [], outputs: [ { internalType: "uint256", - name: "", type: "uint256", + name: "", }, ], - inputs: [], + name: "moduleId", + type: "function", + stateMutability: "view", }, ]; diff --git a/types/factories/modules/Markets__factory.ts b/types/factories/modules/Markets__factory.ts index 915eaa3..21cae56 100644 --- a/types/factories/modules/Markets__factory.ts +++ b/types/factories/modules/Markets__factory.ts @@ -10,101 +10,101 @@ const _abi = [ { inputs: [ { - internalType: "bytes32", name: "moduleGitCommit_", type: "bytes32", + internalType: "bytes32", }, ], stateMutability: "nonpayable", type: "constructor", }, { - name: "AssetStatus", - type: "event", - anonymous: false, inputs: [ { type: "address", - name: "underlying", indexed: true, + name: "underlying", internalType: "address", }, { - indexed: false, - internalType: "uint256", name: "totalBalances", type: "uint256", + indexed: false, + internalType: "uint256", }, { + name: "totalBorrows", + type: "uint256", internalType: "uint256", indexed: false, - type: "uint256", - name: "totalBorrows", }, { - name: "reserveBalance", type: "uint96", indexed: false, + name: "reserveBalance", internalType: "uint96", }, { + name: "poolSize", + type: "uint256", indexed: false, internalType: "uint256", - type: "uint256", - name: "poolSize", }, { type: "uint256", + indexed: false, name: "interestAccumulator", internalType: "uint256", - indexed: false, }, { - type: "int96", name: "interestRate", + type: "int96", indexed: false, internalType: "int96", }, { type: "uint256", - name: "timestamp", internalType: "uint256", + name: "timestamp", indexed: false, }, ], + type: "event", + anonymous: false, + name: "AssetStatus", }, { - name: "Borrow", type: "event", anonymous: false, + name: "Borrow", inputs: [ { - indexed: true, + type: "address", internalType: "address", name: "underlying", - type: "address", + indexed: true, }, { - type: "address", name: "account", - indexed: true, + type: "address", internalType: "address", + indexed: true, }, { - type: "uint256", name: "amount", - indexed: false, + type: "uint256", internalType: "uint256", + indexed: false, }, ], }, { inputs: [ { - indexed: true, - internalType: "address", type: "address", name: "account", + internalType: "address", + indexed: true, }, { name: "delegate", @@ -113,23 +113,26 @@ const _abi = [ internalType: "address", }, ], - anonymous: false, type: "event", name: "DelegateAverageLiquidity", + anonymous: false, }, { + type: "event", + name: "Deposit", + anonymous: false, inputs: [ { - name: "underlying", + indexed: true, type: "address", + name: "underlying", internalType: "address", - indexed: true, }, { - internalType: "address", indexed: true, type: "address", name: "account", + internalType: "address", }, { type: "uint256", @@ -138,38 +141,35 @@ const _abi = [ indexed: false, }, ], - anonymous: false, - type: "event", - name: "Deposit", }, { - name: "EnterMarket", - type: "event", - anonymous: false, inputs: [ { type: "address", - name: "underlying", indexed: true, + name: "underlying", internalType: "address", }, { type: "address", - name: "account", internalType: "address", + name: "account", indexed: true, }, ], + anonymous: false, + type: "event", + name: "EnterMarket", }, { - name: "ExitMarket", type: "event", + name: "ExitMarket", anonymous: false, inputs: [ { type: "address", - name: "underlying", indexed: true, + name: "underlying", internalType: "address", }, { @@ -181,84 +181,83 @@ const _abi = [ ], }, { - name: "Genesis", - type: "event", anonymous: false, + type: "event", + name: "Genesis", inputs: [], }, { inputs: [ { - type: "address", name: "underlying", + type: "address", indexed: true, internalType: "address", }, { + internalType: "address", type: "address", name: "recipient", - internalType: "address", indexed: true, }, { name: "amount", type: "uint256", - internalType: "uint256", indexed: false, + internalType: "uint256", }, ], - anonymous: false, - type: "event", name: "GovConvertReserves", + type: "event", + anonymous: false, }, { - name: "GovSetAssetConfig", type: "event", + name: "GovSetAssetConfig", anonymous: false, inputs: [ { - name: "underlying", type: "address", - indexed: true, internalType: "address", + name: "underlying", + indexed: true, }, { type: "tuple", + name: "newConfig", components: [ { type: "address", - name: "eTokenAddress", internalType: "address", + name: "eTokenAddress", }, { - type: "bool", name: "borrowIsolated", + type: "bool", internalType: "bool", }, { - internalType: "uint32", type: "uint32", name: "collateralFactor", + internalType: "uint32", }, { - internalType: "uint32", name: "borrowFactor", type: "uint32", + internalType: "uint32", }, { - internalType: "uint24", - name: "twapWindow", type: "uint24", + name: "twapWindow", + internalType: "uint24", }, ], - name: "newConfig", internalType: "struct Storage.AssetConfig", indexed: false, }, ], }, { - anonymous: false, inputs: [ { name: "underlying", @@ -267,100 +266,98 @@ const _abi = [ internalType: "address", }, { - indexed: false, - internalType: "address", name: "chainlinkAggregator", type: "address", + internalType: "address", + indexed: false, }, ], - name: "GovSetChainlinkPriceFeed", + anonymous: false, type: "event", + name: "GovSetChainlinkPriceFeed", }, { - name: "GovSetIRM", type: "event", anonymous: false, + name: "GovSetIRM", inputs: [ { + indexed: true, type: "address", name: "underlying", internalType: "address", - indexed: true, }, { - indexed: false, - internalType: "uint256", - name: "interestRateModel", type: "uint256", + name: "interestRateModel", + internalType: "uint256", + indexed: false, }, { name: "resetParams", type: "bytes", - indexed: false, internalType: "bytes", + indexed: false, }, ], }, { + name: "GovSetPricingConfig", + type: "event", + anonymous: false, inputs: [ { - indexed: true, - internalType: "address", type: "address", + internalType: "address", name: "underlying", + indexed: true, }, { - internalType: "uint16", indexed: false, type: "uint16", name: "newPricingType", + internalType: "uint16", }, { name: "newPricingParameter", type: "uint32", - internalType: "uint32", indexed: false, + internalType: "uint32", }, ], - anonymous: false, - type: "event", - name: "GovSetPricingConfig", }, { + type: "event", + anonymous: false, + name: "GovSetReserveFee", inputs: [ { name: "underlying", type: "address", - indexed: true, internalType: "address", + indexed: true, }, { - name: "newReserveFee", type: "uint32", - internalType: "uint32", indexed: false, + name: "newReserveFee", + internalType: "uint32", }, ], - anonymous: false, - type: "event", - name: "GovSetReserveFee", }, { - name: "InstallerInstallModule", - type: "event", - anonymous: false, inputs: [ { + indexed: true, type: "uint256", name: "moduleId", - indexed: true, internalType: "uint256", }, { - name: "moduleImpl", type: "address", - indexed: true, internalType: "address", + name: "moduleImpl", + indexed: true, }, { name: "moduleGitCommit", @@ -369,17 +366,20 @@ const _abi = [ internalType: "bytes32", }, ], + name: "InstallerInstallModule", + type: "event", + anonymous: false, }, { - name: "InstallerSetGovernorAdmin", type: "event", + name: "InstallerSetGovernorAdmin", anonymous: false, inputs: [ { - internalType: "address", - indexed: true, name: "newGovernorAdmin", type: "address", + internalType: "address", + indexed: true, }, ], }, @@ -387,95 +387,95 @@ const _abi = [ inputs: [ { type: "address", - name: "newUpgradeAdmin", internalType: "address", + name: "newUpgradeAdmin", indexed: true, }, ], - anonymous: false, - type: "event", name: "InstallerSetUpgradeAdmin", + type: "event", + anonymous: false, }, { + anonymous: false, + type: "event", + name: "Liquidation", inputs: [ { - internalType: "address", - indexed: true, - name: "liquidator", type: "address", + name: "liquidator", + indexed: true, + internalType: "address", }, { - type: "address", name: "violator", - indexed: true, + type: "address", internalType: "address", + indexed: true, }, { type: "address", - name: "underlying", internalType: "address", + name: "underlying", indexed: true, }, { - indexed: false, internalType: "address", - name: "collateral", type: "address", + name: "collateral", + indexed: false, }, { + indexed: false, type: "uint256", name: "repay", - indexed: false, internalType: "uint256", }, { - indexed: false, - internalType: "uint256", type: "uint256", name: "yield", + indexed: false, + internalType: "uint256", }, { type: "uint256", name: "healthScore", - indexed: false, internalType: "uint256", + indexed: false, }, { + type: "uint256", indexed: false, - internalType: "uint256", name: "baseDiscount", - type: "uint256", + internalType: "uint256", }, { type: "uint256", + internalType: "uint256", name: "discount", indexed: false, - internalType: "uint256", }, ], - anonymous: false, - type: "event", - name: "Liquidation", }, { inputs: [ { - name: "underlying", type: "address", - internalType: "address", indexed: true, + name: "underlying", + internalType: "address", }, { - type: "address", name: "eToken", + type: "address", indexed: true, internalType: "address", }, { - type: "address", name: "dToken", - indexed: true, + type: "address", internalType: "address", + indexed: true, }, ], anonymous: false, @@ -486,266 +486,266 @@ const _abi = [ inputs: [ { type: "address", + internalType: "address", name: "underlying", indexed: true, - internalType: "address", }, { indexed: true, - internalType: "address", type: "address", name: "pToken", + internalType: "address", }, ], - anonymous: false, - type: "event", name: "PTokenActivated", + type: "event", + anonymous: false, }, { type: "event", name: "PTokenUnWrap", + anonymous: false, inputs: [ { - indexed: true, + type: "address", internalType: "address", name: "underlying", - type: "address", + indexed: true, }, { - indexed: true, - internalType: "address", name: "account", type: "address", + indexed: true, + internalType: "address", }, { + name: "amount", + type: "uint256", internalType: "uint256", indexed: false, - type: "uint256", - name: "amount", }, ], - anonymous: false, }, { - name: "PTokenWrap", - type: "event", - anonymous: false, inputs: [ { type: "address", - name: "underlying", internalType: "address", + name: "underlying", indexed: true, }, { - indexed: true, internalType: "address", - name: "account", type: "address", - }, + name: "account", + indexed: true, + }, { - internalType: "uint256", - indexed: false, type: "uint256", name: "amount", + internalType: "uint256", + indexed: false, }, ], + name: "PTokenWrap", + type: "event", + anonymous: false, }, { - anonymous: false, inputs: [ { - indexed: true, + type: "address", internalType: "address", name: "proxy", - type: "address", + indexed: true, }, { - indexed: false, internalType: "uint256", - name: "moduleId", type: "uint256", + name: "moduleId", + indexed: false, }, ], - name: "ProxyCreated", + anonymous: false, type: "event", + name: "ProxyCreated", }, { - type: "event", - name: "Repay", inputs: [ { type: "address", - name: "underlying", indexed: true, + name: "underlying", internalType: "address", }, { - indexed: true, - internalType: "address", type: "address", name: "account", + internalType: "address", + indexed: true, }, { internalType: "uint256", - indexed: false, type: "uint256", name: "amount", + indexed: false, }, ], + type: "event", + name: "Repay", anonymous: false, }, { - anonymous: false, inputs: [ { - type: "address", name: "account", - internalType: "address", + type: "address", indexed: true, + internalType: "address", }, { - name: "amount", - type: "uint256", indexed: false, + type: "uint256", + name: "amount", internalType: "uint256", }, ], name: "RequestBorrow", type: "event", + anonymous: false, }, { - name: "RequestBurn", type: "event", anonymous: false, + name: "RequestBurn", inputs: [ { - indexed: true, - internalType: "address", type: "address", + internalType: "address", name: "account", + indexed: true, }, { - name: "amount", + internalType: "uint256", type: "uint256", + name: "amount", indexed: false, - internalType: "uint256", }, ], }, { type: "event", + anonymous: false, name: "RequestDeposit", inputs: [ { + name: "account", + type: "address", indexed: true, internalType: "address", - type: "address", - name: "account", }, { + type: "uint256", indexed: false, - internalType: "uint256", name: "amount", - type: "uint256", + internalType: "uint256", }, ], - anonymous: false, }, { + name: "RequestDonate", + type: "event", + anonymous: false, inputs: [ { - internalType: "address", - indexed: true, - type: "address", name: "account", + type: "address", + indexed: true, + internalType: "address", }, { - indexed: false, + type: "uint256", internalType: "uint256", name: "amount", - type: "uint256", + indexed: false, }, ], - anonymous: false, - type: "event", - name: "RequestDonate", }, { + anonymous: false, + type: "event", + name: "RequestLiquidate", inputs: [ { - indexed: true, - internalType: "address", - name: "liquidator", type: "address", - }, - { + name: "liquidator", internalType: "address", indexed: true, - name: "violator", + }, + { type: "address", + name: "violator", + indexed: true, + internalType: "address", }, { type: "address", + indexed: true, name: "underlying", internalType: "address", - indexed: true, }, { type: "address", name: "collateral", - indexed: false, internalType: "address", + indexed: false, }, { - type: "uint256", name: "repay", + type: "uint256", indexed: false, internalType: "uint256", }, { - type: "uint256", name: "minYield", + type: "uint256", internalType: "uint256", indexed: false, }, ], - anonymous: false, - type: "event", - name: "RequestLiquidate", }, { + type: "event", + name: "RequestMint", + anonymous: false, inputs: [ { indexed: true, - internalType: "address", - name: "account", type: "address", + name: "account", + internalType: "address", }, { - internalType: "uint256", - indexed: false, type: "uint256", name: "amount", + internalType: "uint256", + indexed: false, }, ], - anonymous: false, - type: "event", - name: "RequestMint", }, { inputs: [ { - indexed: true, - internalType: "address", type: "address", + indexed: true, name: "account", + internalType: "address", }, { - name: "amount", type: "uint256", - indexed: false, internalType: "uint256", + name: "amount", + indexed: false, }, ], anonymous: false, @@ -753,338 +753,443 @@ const _abi = [ name: "RequestRepay", }, { + type: "event", anonymous: false, + name: "RequestSwap", inputs: [ { - name: "accountIn", type: "address", indexed: true, + name: "accountIn", internalType: "address", }, { - indexed: true, - internalType: "address", name: "accountOut", type: "address", + indexed: true, + internalType: "address", }, { - type: "address", name: "underlyingIn", - indexed: true, + type: "address", internalType: "address", + indexed: true, }, { type: "address", - name: "underlyingOut", indexed: false, + name: "underlyingOut", internalType: "address", }, { - type: "uint256", name: "amount", - internalType: "uint256", + type: "uint256", indexed: false, + internalType: "uint256", }, { type: "uint256", - name: "swapType", indexed: false, + name: "swapType", internalType: "uint256", }, ], - name: "RequestSwap", - type: "event", }, { - anonymous: false, inputs: [ + { + name: "accountIn", + type: "address", + indexed: true, + internalType: "address", + }, { type: "address", - name: "from", internalType: "address", + name: "accountOut", indexed: true, }, { + type: "address", internalType: "address", + name: "underlyingIn", indexed: true, - name: "to", + }, + { + name: "underlyingOut", type: "address", + internalType: "address", + indexed: false, }, { + name: "amountIn", + type: "uint256", internalType: "uint256", indexed: false, - name: "amount", + }, + { type: "uint256", + name: "amountOut", + indexed: false, + internalType: "uint256", + }, + { + name: "mode", + type: "uint256", + internalType: "uint256", + indexed: false, + }, + { + type: "address", + internalType: "address", + name: "swapHandler", + indexed: false, }, ], - name: "RequestTransferDToken", + name: "RequestSwapHub", type: "event", + anonymous: false, }, { + anonymous: false, + type: "event", + name: "RequestSwapHubRepay", inputs: [ { indexed: true, + type: "address", + name: "accountIn", internalType: "address", - name: "from", + }, + { type: "address", + indexed: true, + name: "accountOut", + internalType: "address", }, { + type: "address", + name: "underlyingIn", internalType: "address", indexed: true, - name: "to", + }, + { + internalType: "address", type: "address", + name: "underlyingOut", + indexed: false, }, { + name: "targetDebt", type: "uint256", - name: "amount", internalType: "uint256", indexed: false, }, + { + internalType: "address", + type: "address", + name: "swapHandler", + indexed: false, + }, ], - anonymous: false, - type: "event", - name: "RequestTransferEToken", }, { - anonymous: false, inputs: [ { type: "address", - name: "account", internalType: "address", + name: "from", + indexed: true, + }, + { + type: "address", + name: "to", indexed: true, + internalType: "address", }, { indexed: false, - internalType: "uint256", type: "uint256", name: "amount", + internalType: "uint256", }, ], - name: "RequestWithdraw", + name: "RequestTransferDToken", type: "event", + anonymous: false, }, { + type: "event", anonymous: false, + name: "RequestTransferEToken", inputs: [ { - name: "account", + internalType: "address", + type: "address", + name: "from", + indexed: true, + }, + { + name: "to", type: "address", indexed: true, internalType: "address", }, + { + type: "uint256", + internalType: "uint256", + name: "amount", + indexed: false, + }, ], - name: "TrackAverageLiquidity", + }, + { + name: "RequestWithdraw", type: "event", + anonymous: false, + inputs: [ + { + type: "address", + name: "account", + indexed: true, + internalType: "address", + }, + { + type: "uint256", + name: "amount", + indexed: false, + internalType: "uint256", + }, + ], }, { - name: "UnTrackAverageLiquidity", type: "event", anonymous: false, + name: "TrackAverageLiquidity", inputs: [ { + name: "account", + type: "address", internalType: "address", indexed: true, + }, + ], + }, + { + inputs: [ + { type: "address", name: "account", + internalType: "address", + indexed: true, }, ], - }, - { - name: "Withdraw", type: "event", anonymous: false, + name: "UnTrackAverageLiquidity", + }, + { inputs: [ { - internalType: "address", - indexed: true, type: "address", name: "underlying", + indexed: true, + internalType: "address", }, { + indexed: true, type: "address", name: "account", - indexed: true, internalType: "address", }, { - internalType: "uint256", indexed: false, - name: "amount", type: "uint256", + name: "amount", + internalType: "uint256", }, ], + type: "event", + name: "Withdraw", + anonymous: false, }, { + type: "function", + stateMutability: "nonpayable", + name: "activateMarket", inputs: [ { - internalType: "address", - name: "underlying", type: "address", + name: "underlying", + internalType: "address", }, ], - stateMutability: "nonpayable", outputs: [ { - type: "address", name: "", + type: "address", internalType: "address", }, ], - type: "function", - name: "activateMarket", }, { - outputs: [ + inputs: [ { - internalType: "address", - name: "", type: "address", + internalType: "address", + name: "underlying", }, ], - stateMutability: "nonpayable", - inputs: [ + outputs: [ { - type: "address", - name: "underlying", internalType: "address", + type: "address", + name: "", }, ], - name: "activatePToken", type: "function", + name: "activatePToken", + stateMutability: "nonpayable", }, { - inputs: [ + outputs: [ { type: "address", - name: "dToken", internalType: "address", + name: "underlying", }, ], - outputs: [ + inputs: [ { type: "address", - name: "underlying", internalType: "address", + name: "dToken", }, ], - stateMutability: "view", - type: "function", name: "dTokenToUnderlying", + type: "function", + stateMutability: "view", }, { name: "eTokenToDToken", type: "function", stateMutability: "view", - outputs: [ + inputs: [ { - internalType: "address", - name: "dTokenAddr", type: "address", + internalType: "address", + name: "eToken", }, ], - inputs: [ + outputs: [ { - internalType: "address", - name: "eToken", type: "address", + internalType: "address", + name: "dTokenAddr", }, ], }, { - name: "eTokenToUnderlying", type: "function", + name: "eTokenToUnderlying", stateMutability: "view", outputs: [ { - internalType: "address", name: "underlying", type: "address", + internalType: "address", }, ], inputs: [ { - type: "address", name: "eToken", + type: "address", internalType: "address", }, ], }, { + outputs: [], inputs: [ { + type: "uint256", internalType: "uint256", name: "subAccountId", - type: "uint256", }, { - type: "address", name: "newMarket", + type: "address", internalType: "address", }, ], - outputs: [], - stateMutability: "nonpayable", type: "function", + stateMutability: "nonpayable", name: "enterMarket", }, { - name: "exitMarket", type: "function", - outputs: [], stateMutability: "nonpayable", + name: "exitMarket", inputs: [ { - internalType: "uint256", type: "uint256", + internalType: "uint256", name: "subAccountId", }, { - internalType: "address", - type: "address", name: "oldMarket", + type: "address", + internalType: "address", }, ], + outputs: [], }, { - name: "getChainlinkPriceFeedConfig", - type: "function", - outputs: [ + inputs: [ { - name: "chainlinkAggregator", type: "address", + name: "underlying", internalType: "address", }, ], - stateMutability: "view", - inputs: [ + outputs: [ { - name: "underlying", type: "address", internalType: "address", + name: "chainlinkAggregator", }, ], + type: "function", + stateMutability: "view", + name: "getChainlinkPriceFeedConfig", }, { type: "function", name: "getEnteredMarkets", + stateMutability: "view", inputs: [ { - name: "account", - type: "address", internalType: "address", + type: "address", + name: "account", }, ], outputs: [ { + internalType: "address[]", type: "address[]", name: "", - internalType: "address[]", }, ], - stateMutability: "view", }, { + inputs: [ + { + type: "address", + name: "underlying", + internalType: "address", + }, + ], outputs: [ { type: "uint16", @@ -1097,67 +1202,59 @@ const _abi = [ name: "pricingParameters", }, { - internalType: "address", - name: "pricingForwarded", - type: "address", - }, - ], - stateMutability: "view", - inputs: [ - { - name: "underlying", type: "address", + name: "pricingForwarded", internalType: "address", }, ], - name: "getPricingConfig", + stateMutability: "view", type: "function", + name: "getPricingConfig", }, { inputs: [ { - name: "underlying", - type: "address", internalType: "address", + type: "address", + name: "underlying", }, ], - stateMutability: "view", outputs: [ { - internalType: "uint256", type: "uint256", + internalType: "uint256", name: "", }, ], + stateMutability: "view", type: "function", name: "interestAccumulator", }, { + stateMutability: "view", type: "function", name: "interestRate", inputs: [ { - internalType: "address", - name: "underlying", type: "address", + name: "underlying", + internalType: "address", }, ], - stateMutability: "view", outputs: [ { + internalType: "int96", type: "int96", name: "", - internalType: "int96", }, ], }, { - stateMutability: "view", outputs: [ { internalType: "uint256", - name: "", type: "uint256", + name: "", }, ], inputs: [ @@ -1167,36 +1264,40 @@ const _abi = [ internalType: "address", }, ], - name: "interestRateModel", type: "function", + name: "interestRateModel", + stateMutability: "view", }, { + stateMutability: "view", + type: "function", + name: "moduleGitCommit", + inputs: [], outputs: [ { + type: "bytes32", internalType: "bytes32", name: "", - type: "bytes32", }, ], - stateMutability: "view", - inputs: [], - name: "moduleGitCommit", - type: "function", }, { + type: "function", + stateMutability: "view", + name: "moduleId", inputs: [], outputs: [ { - internalType: "uint256", type: "uint256", name: "", + internalType: "uint256", }, ], - stateMutability: "view", - type: "function", - name: "moduleId", }, { + type: "function", + name: "reserveFee", + stateMutability: "view", inputs: [ { name: "underlying", @@ -1206,37 +1307,31 @@ const _abi = [ ], outputs: [ { - internalType: "uint32", - name: "", type: "uint32", + name: "", + internalType: "uint32", }, ], - stateMutability: "view", - type: "function", - name: "reserveFee", }, { - name: "underlyingToAssetConfig", - type: "function", - stateMutability: "view", outputs: [ { type: "tuple", components: [ { - internalType: "address", name: "eTokenAddress", type: "address", + internalType: "address", }, { - internalType: "bool", - type: "bool", name: "borrowIsolated", + type: "bool", + internalType: "bool", }, { - internalType: "uint32", - name: "collateralFactor", type: "uint32", + name: "collateralFactor", + internalType: "uint32", }, { internalType: "uint32", @@ -1244,9 +1339,9 @@ const _abi = [ name: "borrowFactor", }, { + internalType: "uint24", type: "uint24", name: "twapWindow", - internalType: "uint24", }, ], name: "", @@ -1255,29 +1350,33 @@ const _abi = [ ], inputs: [ { - internalType: "address", - name: "underlying", type: "address", + name: "underlying", + internalType: "address", }, ], + type: "function", + stateMutability: "view", + name: "underlyingToAssetConfig", }, { - name: "underlyingToAssetConfigUnresolved", - type: "function", stateMutability: "view", + type: "function", + name: "underlyingToAssetConfigUnresolved", outputs: [ { name: "config", + type: "tuple", components: [ { - internalType: "address", type: "address", + internalType: "address", name: "eTokenAddress", }, { - internalType: "bool", - type: "bool", name: "borrowIsolated", + type: "bool", + internalType: "bool", }, { name: "collateralFactor", @@ -1290,20 +1389,19 @@ const _abi = [ name: "borrowFactor", }, { + type: "uint24", internalType: "uint24", name: "twapWindow", - type: "uint24", }, ], - type: "tuple", internalType: "struct Storage.AssetConfig", }, ], inputs: [ { - internalType: "address", - type: "address", name: "underlying", + type: "address", + internalType: "address", }, ], }, @@ -1321,48 +1419,48 @@ const _abi = [ inputs: [ { internalType: "address", - name: "underlying", type: "address", + name: "underlying", }, ], }, { + stateMutability: "view", + type: "function", + name: "underlyingToEToken", inputs: [ { type: "address", - name: "underlying", internalType: "address", + name: "underlying", }, ], - stateMutability: "view", outputs: [ { + type: "address", internalType: "address", name: "", - type: "address", }, ], - type: "function", - name: "underlyingToEToken", }, { - stateMutability: "view", - outputs: [ + inputs: [ { - internalType: "address", - name: "", + name: "underlying", type: "address", + internalType: "address", }, ], - inputs: [ + outputs: [ { - internalType: "address", - name: "underlying", type: "address", + name: "", + internalType: "address", }, ], - name: "underlyingToPToken", type: "function", + stateMutability: "view", + name: "underlyingToPToken", }, ]; diff --git a/types/factories/modules/SwapHub__factory.ts b/types/factories/modules/SwapHub__factory.ts new file mode 100644 index 0000000..c83ca0b --- /dev/null +++ b/types/factories/modules/SwapHub__factory.ts @@ -0,0 +1,1190 @@ +/* Autogenerated file. Do not edit manually. */ +/* tslint:disable */ +/* eslint-disable */ + +import { Contract, Signer, utils } from "ethers"; +import type { Provider } from "@ethersproject/providers"; +import type { SwapHub, SwapHubInterface } from "../../modules/SwapHub"; + +const _abi = [ + { + inputs: [ + { + type: "bytes32", + name: "moduleGitCommit_", + internalType: "bytes32", + }, + ], + type: "constructor", + stateMutability: "nonpayable", + }, + { + type: "event", + anonymous: false, + name: "AssetStatus", + inputs: [ + { + name: "underlying", + type: "address", + internalType: "address", + indexed: true, + }, + { + type: "uint256", + indexed: false, + name: "totalBalances", + internalType: "uint256", + }, + { + type: "uint256", + name: "totalBorrows", + indexed: false, + internalType: "uint256", + }, + { + internalType: "uint96", + type: "uint96", + name: "reserveBalance", + indexed: false, + }, + { + name: "poolSize", + type: "uint256", + internalType: "uint256", + indexed: false, + }, + { + internalType: "uint256", + type: "uint256", + name: "interestAccumulator", + indexed: false, + }, + { + internalType: "int96", + type: "int96", + name: "interestRate", + indexed: false, + }, + { + type: "uint256", + name: "timestamp", + indexed: false, + internalType: "uint256", + }, + ], + }, + { + type: "event", + anonymous: false, + name: "Borrow", + inputs: [ + { + type: "address", + name: "underlying", + indexed: true, + internalType: "address", + }, + { + indexed: true, + type: "address", + name: "account", + internalType: "address", + }, + { + indexed: false, + type: "uint256", + name: "amount", + internalType: "uint256", + }, + ], + }, + { + type: "event", + name: "DelegateAverageLiquidity", + anonymous: false, + inputs: [ + { + name: "account", + type: "address", + indexed: true, + internalType: "address", + }, + { + name: "delegate", + type: "address", + internalType: "address", + indexed: true, + }, + ], + }, + { + inputs: [ + { + type: "address", + indexed: true, + name: "underlying", + internalType: "address", + }, + { + type: "address", + internalType: "address", + name: "account", + indexed: true, + }, + { + indexed: false, + type: "uint256", + name: "amount", + internalType: "uint256", + }, + ], + type: "event", + anonymous: false, + name: "Deposit", + }, + { + type: "event", + name: "EnterMarket", + anonymous: false, + inputs: [ + { + name: "underlying", + type: "address", + indexed: true, + internalType: "address", + }, + { + type: "address", + indexed: true, + name: "account", + internalType: "address", + }, + ], + }, + { + type: "event", + anonymous: false, + name: "ExitMarket", + inputs: [ + { + name: "underlying", + type: "address", + internalType: "address", + indexed: true, + }, + { + type: "address", + indexed: true, + name: "account", + internalType: "address", + }, + ], + }, + { + inputs: [], + type: "event", + name: "Genesis", + anonymous: false, + }, + { + anonymous: false, + type: "event", + name: "GovConvertReserves", + inputs: [ + { + type: "address", + indexed: true, + name: "underlying", + internalType: "address", + }, + { + type: "address", + internalType: "address", + name: "recipient", + indexed: true, + }, + { + type: "uint256", + indexed: false, + name: "amount", + internalType: "uint256", + }, + ], + }, + { + name: "GovSetAssetConfig", + type: "event", + anonymous: false, + inputs: [ + { + type: "address", + name: "underlying", + indexed: true, + internalType: "address", + }, + { + name: "newConfig", + type: "tuple", + components: [ + { + type: "address", + internalType: "address", + name: "eTokenAddress", + }, + { + type: "bool", + internalType: "bool", + name: "borrowIsolated", + }, + { + name: "collateralFactor", + type: "uint32", + internalType: "uint32", + }, + { + internalType: "uint32", + type: "uint32", + name: "borrowFactor", + }, + { + internalType: "uint24", + type: "uint24", + name: "twapWindow", + }, + ], + internalType: "struct Storage.AssetConfig", + indexed: false, + }, + ], + }, + { + inputs: [ + { + name: "underlying", + type: "address", + internalType: "address", + indexed: true, + }, + { + name: "chainlinkAggregator", + type: "address", + internalType: "address", + indexed: false, + }, + ], + type: "event", + anonymous: false, + name: "GovSetChainlinkPriceFeed", + }, + { + inputs: [ + { + type: "address", + internalType: "address", + name: "underlying", + indexed: true, + }, + { + indexed: false, + type: "uint256", + name: "interestRateModel", + internalType: "uint256", + }, + { + name: "resetParams", + type: "bytes", + indexed: false, + internalType: "bytes", + }, + ], + name: "GovSetIRM", + type: "event", + anonymous: false, + }, + { + inputs: [ + { + type: "address", + indexed: true, + name: "underlying", + internalType: "address", + }, + { + type: "uint16", + name: "newPricingType", + internalType: "uint16", + indexed: false, + }, + { + internalType: "uint32", + type: "uint32", + name: "newPricingParameter", + indexed: false, + }, + ], + type: "event", + anonymous: false, + name: "GovSetPricingConfig", + }, + { + inputs: [ + { + type: "address", + name: "underlying", + indexed: true, + internalType: "address", + }, + { + internalType: "uint32", + type: "uint32", + name: "newReserveFee", + indexed: false, + }, + ], + type: "event", + name: "GovSetReserveFee", + anonymous: false, + }, + { + name: "InstallerInstallModule", + type: "event", + anonymous: false, + inputs: [ + { + name: "moduleId", + type: "uint256", + indexed: true, + internalType: "uint256", + }, + { + name: "moduleImpl", + type: "address", + indexed: true, + internalType: "address", + }, + { + type: "bytes32", + indexed: false, + name: "moduleGitCommit", + internalType: "bytes32", + }, + ], + }, + { + inputs: [ + { + type: "address", + internalType: "address", + name: "newGovernorAdmin", + indexed: true, + }, + ], + name: "InstallerSetGovernorAdmin", + type: "event", + anonymous: false, + }, + { + anonymous: false, + type: "event", + name: "InstallerSetUpgradeAdmin", + inputs: [ + { + indexed: true, + type: "address", + name: "newUpgradeAdmin", + internalType: "address", + }, + ], + }, + { + inputs: [ + { + name: "liquidator", + type: "address", + indexed: true, + internalType: "address", + }, + { + type: "address", + internalType: "address", + name: "violator", + indexed: true, + }, + { + type: "address", + internalType: "address", + name: "underlying", + indexed: true, + }, + { + internalType: "address", + type: "address", + name: "collateral", + indexed: false, + }, + { + name: "repay", + type: "uint256", + internalType: "uint256", + indexed: false, + }, + { + internalType: "uint256", + type: "uint256", + name: "yield", + indexed: false, + }, + { + type: "uint256", + indexed: false, + name: "healthScore", + internalType: "uint256", + }, + { + name: "baseDiscount", + type: "uint256", + indexed: false, + internalType: "uint256", + }, + { + type: "uint256", + indexed: false, + name: "discount", + internalType: "uint256", + }, + ], + type: "event", + name: "Liquidation", + anonymous: false, + }, + { + name: "MarketActivated", + type: "event", + anonymous: false, + inputs: [ + { + name: "underlying", + type: "address", + internalType: "address", + indexed: true, + }, + { + type: "address", + indexed: true, + name: "eToken", + internalType: "address", + }, + { + type: "address", + name: "dToken", + indexed: true, + internalType: "address", + }, + ], + }, + { + inputs: [ + { + type: "address", + name: "underlying", + indexed: true, + internalType: "address", + }, + { + name: "pToken", + type: "address", + indexed: true, + internalType: "address", + }, + ], + type: "event", + anonymous: false, + name: "PTokenActivated", + }, + { + name: "PTokenUnWrap", + type: "event", + anonymous: false, + inputs: [ + { + indexed: true, + type: "address", + name: "underlying", + internalType: "address", + }, + { + name: "account", + type: "address", + internalType: "address", + indexed: true, + }, + { + type: "uint256", + internalType: "uint256", + name: "amount", + indexed: false, + }, + ], + }, + { + type: "event", + anonymous: false, + name: "PTokenWrap", + inputs: [ + { + indexed: true, + type: "address", + name: "underlying", + internalType: "address", + }, + { + indexed: true, + type: "address", + name: "account", + internalType: "address", + }, + { + type: "uint256", + internalType: "uint256", + name: "amount", + indexed: false, + }, + ], + }, + { + inputs: [ + { + type: "address", + internalType: "address", + name: "proxy", + indexed: true, + }, + { + internalType: "uint256", + type: "uint256", + name: "moduleId", + indexed: false, + }, + ], + type: "event", + name: "ProxyCreated", + anonymous: false, + }, + { + inputs: [ + { + name: "underlying", + type: "address", + indexed: true, + internalType: "address", + }, + { + indexed: true, + type: "address", + name: "account", + internalType: "address", + }, + { + type: "uint256", + internalType: "uint256", + name: "amount", + indexed: false, + }, + ], + anonymous: false, + type: "event", + name: "Repay", + }, + { + inputs: [ + { + type: "address", + name: "account", + indexed: true, + internalType: "address", + }, + { + type: "uint256", + name: "amount", + internalType: "uint256", + indexed: false, + }, + ], + anonymous: false, + type: "event", + name: "RequestBorrow", + }, + { + anonymous: false, + type: "event", + name: "RequestBurn", + inputs: [ + { + name: "account", + type: "address", + indexed: true, + internalType: "address", + }, + { + type: "uint256", + name: "amount", + internalType: "uint256", + indexed: false, + }, + ], + }, + { + inputs: [ + { + name: "account", + type: "address", + internalType: "address", + indexed: true, + }, + { + internalType: "uint256", + type: "uint256", + name: "amount", + indexed: false, + }, + ], + name: "RequestDeposit", + type: "event", + anonymous: false, + }, + { + type: "event", + anonymous: false, + name: "RequestDonate", + inputs: [ + { + type: "address", + indexed: true, + name: "account", + internalType: "address", + }, + { + type: "uint256", + internalType: "uint256", + name: "amount", + indexed: false, + }, + ], + }, + { + inputs: [ + { + internalType: "address", + type: "address", + name: "liquidator", + indexed: true, + }, + { + indexed: true, + type: "address", + name: "violator", + internalType: "address", + }, + { + type: "address", + indexed: true, + name: "underlying", + internalType: "address", + }, + { + name: "collateral", + type: "address", + indexed: false, + internalType: "address", + }, + { + name: "repay", + type: "uint256", + internalType: "uint256", + indexed: false, + }, + { + name: "minYield", + type: "uint256", + internalType: "uint256", + indexed: false, + }, + ], + type: "event", + anonymous: false, + name: "RequestLiquidate", + }, + { + type: "event", + anonymous: false, + name: "RequestMint", + inputs: [ + { + type: "address", + internalType: "address", + name: "account", + indexed: true, + }, + { + indexed: false, + type: "uint256", + name: "amount", + internalType: "uint256", + }, + ], + }, + { + type: "event", + name: "RequestRepay", + anonymous: false, + inputs: [ + { + name: "account", + type: "address", + indexed: true, + internalType: "address", + }, + { + type: "uint256", + indexed: false, + name: "amount", + internalType: "uint256", + }, + ], + }, + { + name: "RequestSwap", + type: "event", + anonymous: false, + inputs: [ + { + name: "accountIn", + type: "address", + internalType: "address", + indexed: true, + }, + { + type: "address", + indexed: true, + name: "accountOut", + internalType: "address", + }, + { + type: "address", + name: "underlyingIn", + indexed: true, + internalType: "address", + }, + { + internalType: "address", + type: "address", + name: "underlyingOut", + indexed: false, + }, + { + name: "amount", + type: "uint256", + internalType: "uint256", + indexed: false, + }, + { + internalType: "uint256", + type: "uint256", + name: "swapType", + indexed: false, + }, + ], + }, + { + inputs: [ + { + type: "address", + indexed: true, + name: "accountIn", + internalType: "address", + }, + { + type: "address", + internalType: "address", + name: "accountOut", + indexed: true, + }, + { + type: "address", + name: "underlyingIn", + indexed: true, + internalType: "address", + }, + { + indexed: false, + type: "address", + name: "underlyingOut", + internalType: "address", + }, + { + indexed: false, + type: "uint256", + name: "amountIn", + internalType: "uint256", + }, + { + name: "amountOut", + type: "uint256", + indexed: false, + internalType: "uint256", + }, + { + type: "uint256", + internalType: "uint256", + name: "mode", + indexed: false, + }, + { + type: "address", + internalType: "address", + name: "swapHandler", + indexed: false, + }, + ], + name: "RequestSwapHub", + type: "event", + anonymous: false, + }, + { + type: "event", + name: "RequestSwapHubRepay", + anonymous: false, + inputs: [ + { + type: "address", + name: "accountIn", + indexed: true, + internalType: "address", + }, + { + name: "accountOut", + type: "address", + indexed: true, + internalType: "address", + }, + { + indexed: true, + type: "address", + name: "underlyingIn", + internalType: "address", + }, + { + type: "address", + internalType: "address", + name: "underlyingOut", + indexed: false, + }, + { + indexed: false, + type: "uint256", + name: "targetDebt", + internalType: "uint256", + }, + { + type: "address", + name: "swapHandler", + internalType: "address", + indexed: false, + }, + ], + }, + { + inputs: [ + { + indexed: true, + type: "address", + name: "from", + internalType: "address", + }, + { + type: "address", + internalType: "address", + name: "to", + indexed: true, + }, + { + name: "amount", + type: "uint256", + internalType: "uint256", + indexed: false, + }, + ], + type: "event", + anonymous: false, + name: "RequestTransferDToken", + }, + { + type: "event", + name: "RequestTransferEToken", + anonymous: false, + inputs: [ + { + type: "address", + internalType: "address", + name: "from", + indexed: true, + }, + { + type: "address", + indexed: true, + name: "to", + internalType: "address", + }, + { + indexed: false, + type: "uint256", + name: "amount", + internalType: "uint256", + }, + ], + }, + { + anonymous: false, + type: "event", + name: "RequestWithdraw", + inputs: [ + { + name: "account", + type: "address", + indexed: true, + internalType: "address", + }, + { + name: "amount", + type: "uint256", + internalType: "uint256", + indexed: false, + }, + ], + }, + { + inputs: [ + { + indexed: true, + type: "address", + name: "account", + internalType: "address", + }, + ], + type: "event", + anonymous: false, + name: "TrackAverageLiquidity", + }, + { + inputs: [ + { + name: "account", + type: "address", + indexed: true, + internalType: "address", + }, + ], + type: "event", + name: "UnTrackAverageLiquidity", + anonymous: false, + }, + { + inputs: [ + { + type: "address", + name: "underlying", + indexed: true, + internalType: "address", + }, + { + type: "address", + indexed: true, + name: "account", + internalType: "address", + }, + { + type: "uint256", + internalType: "uint256", + name: "amount", + indexed: false, + }, + ], + anonymous: false, + type: "event", + name: "Withdraw", + }, + { + type: "function", + name: "moduleGitCommit", + stateMutability: "view", + outputs: [ + { + internalType: "bytes32", + type: "bytes32", + name: "", + }, + ], + inputs: [], + }, + { + inputs: [], + outputs: [ + { + internalType: "uint256", + type: "uint256", + name: "", + }, + ], + type: "function", + stateMutability: "view", + name: "moduleId", + }, + { + outputs: [], + inputs: [ + { + type: "uint256", + name: "subAccountIdIn", + internalType: "uint256", + }, + { + name: "subAccountIdOut", + type: "uint256", + internalType: "uint256", + }, + { + internalType: "address", + type: "address", + name: "swapHandler", + }, + { + components: [ + { + name: "underlyingIn", + type: "address", + internalType: "address", + }, + { + type: "address", + name: "underlyingOut", + internalType: "address", + }, + { + name: "mode", + type: "uint256", + internalType: "uint256", + }, + { + type: "uint256", + internalType: "uint256", + name: "amountIn", + }, + { + name: "amountOut", + type: "uint256", + internalType: "uint256", + }, + { + name: "exactOutTolerance", + type: "uint256", + internalType: "uint256", + }, + { + type: "bytes", + internalType: "bytes", + name: "payload", + }, + ], + type: "tuple", + name: "params", + internalType: "struct ISwapHandler.SwapParams", + }, + ], + stateMutability: "nonpayable", + type: "function", + name: "swap", + }, + { + name: "swapAndRepay", + type: "function", + stateMutability: "nonpayable", + outputs: [], + inputs: [ + { + name: "subAccountIdIn", + type: "uint256", + internalType: "uint256", + }, + { + type: "uint256", + name: "subAccountIdOut", + internalType: "uint256", + }, + { + internalType: "address", + type: "address", + name: "swapHandler", + }, + { + type: "tuple", + components: [ + { + internalType: "address", + type: "address", + name: "underlyingIn", + }, + { + internalType: "address", + type: "address", + name: "underlyingOut", + }, + { + type: "uint256", + internalType: "uint256", + name: "mode", + }, + { + type: "uint256", + internalType: "uint256", + name: "amountIn", + }, + { + type: "uint256", + internalType: "uint256", + name: "amountOut", + }, + { + name: "exactOutTolerance", + type: "uint256", + internalType: "uint256", + }, + { + type: "bytes", + name: "payload", + internalType: "bytes", + }, + ], + name: "params", + internalType: "struct ISwapHandler.SwapParams", + }, + { + name: "targetDebt", + type: "uint256", + internalType: "uint256", + }, + ], + }, +]; + +export class SwapHub__factory { + static readonly abi = _abi; + static createInterface(): SwapHubInterface { + return new utils.Interface(_abi) as SwapHubInterface; + } + static connect( + address: string, + signerOrProvider: Signer | Provider + ): SwapHub { + return new Contract(address, _abi, signerOrProvider) as SwapHub; + } +} diff --git a/types/factories/modules/Swap__factory.ts b/types/factories/modules/Swap__factory.ts index 5920648..2cef9f6 100644 --- a/types/factories/modules/Swap__factory.ts +++ b/types/factories/modules/Swap__factory.ts @@ -9,6 +9,7 @@ import type { Swap, SwapInterface } from "../../modules/Swap"; const _abi = [ { type: "constructor", + stateMutability: "nonpayable", inputs: [ { type: "bytes32", @@ -16,83 +17,79 @@ const _abi = [ internalType: "bytes32", }, { + type: "address", internalType: "address", name: "uniswapRouter_", - type: "address", }, { - name: "oneInch_", type: "address", + name: "oneInch_", internalType: "address", }, ], - stateMutability: "nonpayable", }, { inputs: [ { - type: "address", name: "underlying", + type: "address", indexed: true, internalType: "address", }, { + name: "totalBalances", + type: "uint256", indexed: false, internalType: "uint256", - type: "uint256", - name: "totalBalances", }, { - internalType: "uint256", - indexed: false, name: "totalBorrows", type: "uint256", + internalType: "uint256", + indexed: false, }, { type: "uint96", - name: "reserveBalance", indexed: false, + name: "reserveBalance", internalType: "uint96", }, { type: "uint256", + indexed: false, name: "poolSize", internalType: "uint256", - indexed: false, }, { + type: "uint256", indexed: false, - internalType: "uint256", name: "interestAccumulator", - type: "uint256", + internalType: "uint256", }, { - indexed: false, - internalType: "int96", name: "interestRate", type: "int96", + internalType: "int96", + indexed: false, }, { + name: "timestamp", + type: "uint256", internalType: "uint256", indexed: false, - type: "uint256", - name: "timestamp", }, ], - anonymous: false, type: "event", + anonymous: false, name: "AssetStatus", }, { - name: "Borrow", - type: "event", - anonymous: false, inputs: [ { - internalType: "address", - indexed: true, - name: "underlying", type: "address", + name: "underlying", + indexed: true, + internalType: "address", }, { name: "account", @@ -101,15 +98,19 @@ const _abi = [ internalType: "address", }, { - name: "amount", + internalType: "uint256", type: "uint256", + name: "amount", indexed: false, - internalType: "uint256", }, ], + anonymous: false, + type: "event", + name: "Borrow", }, { type: "event", + anonymous: false, name: "DelegateAverageLiquidity", inputs: [ { @@ -119,47 +120,48 @@ const _abi = [ indexed: true, }, { + name: "delegate", + type: "address", internalType: "address", indexed: true, - type: "address", - name: "delegate", }, ], - anonymous: false, }, { - name: "Deposit", - type: "event", - anonymous: false, inputs: [ { type: "address", name: "underlying", - internalType: "address", indexed: true, + internalType: "address", }, { - indexed: true, - internalType: "address", type: "address", + internalType: "address", name: "account", + indexed: true, }, { - name: "amount", type: "uint256", + name: "amount", internalType: "uint256", indexed: false, }, ], + anonymous: false, + type: "event", + name: "Deposit", }, { + type: "event", + name: "EnterMarket", anonymous: false, inputs: [ { type: "address", name: "underlying", - indexed: true, internalType: "address", + indexed: true, }, { type: "address", @@ -168,83 +170,82 @@ const _abi = [ internalType: "address", }, ], - name: "EnterMarket", - type: "event", }, { type: "event", name: "ExitMarket", + anonymous: false, inputs: [ { - indexed: true, - internalType: "address", name: "underlying", type: "address", + indexed: true, + internalType: "address", }, { - internalType: "address", - indexed: true, name: "account", type: "address", + indexed: true, + internalType: "address", }, ], - anonymous: false, }, { + anonymous: false, type: "event", name: "Genesis", inputs: [], - anonymous: false, }, { + name: "GovConvertReserves", + type: "event", + anonymous: false, inputs: [ { name: "underlying", type: "address", - internalType: "address", indexed: true, + internalType: "address", }, { name: "recipient", type: "address", - internalType: "address", indexed: true, + internalType: "address", }, { type: "uint256", name: "amount", - internalType: "uint256", indexed: false, + internalType: "uint256", }, ], - anonymous: false, - type: "event", - name: "GovConvertReserves", }, { inputs: [ { - type: "address", name: "underlying", + type: "address", internalType: "address", indexed: true, }, { + type: "tuple", components: [ { + type: "address", internalType: "address", name: "eTokenAddress", - type: "address", }, { - internalType: "bool", type: "bool", + internalType: "bool", name: "borrowIsolated", }, { - internalType: "uint32", name: "collateralFactor", type: "uint32", + internalType: "uint32", }, { name: "borrowFactor", @@ -257,111 +258,112 @@ const _abi = [ internalType: "uint24", }, ], - type: "tuple", name: "newConfig", - indexed: false, internalType: "struct Storage.AssetConfig", + indexed: false, }, ], - anonymous: false, - type: "event", name: "GovSetAssetConfig", + type: "event", + anonymous: false, }, { - anonymous: false, inputs: [ { + name: "underlying", + type: "address", internalType: "address", indexed: true, - type: "address", - name: "underlying", }, { - internalType: "address", - indexed: false, - type: "address", name: "chainlinkAggregator", + type: "address", + indexed: false, + internalType: "address", }, ], - name: "GovSetChainlinkPriceFeed", type: "event", + name: "GovSetChainlinkPriceFeed", + anonymous: false, }, { - type: "event", - name: "GovSetIRM", inputs: [ { - indexed: true, - internalType: "address", type: "address", + internalType: "address", name: "underlying", + indexed: true, }, { - internalType: "uint256", - indexed: false, type: "uint256", name: "interestRateModel", + internalType: "uint256", + indexed: false, }, { + type: "bytes", indexed: false, - internalType: "bytes", name: "resetParams", - type: "bytes", + internalType: "bytes", }, ], + type: "event", + name: "GovSetIRM", anonymous: false, }, { + name: "GovSetPricingConfig", + type: "event", anonymous: false, inputs: [ { - internalType: "address", - indexed: true, - name: "underlying", type: "address", + name: "underlying", + indexed: true, + internalType: "address", }, { - type: "uint16", name: "newPricingType", - indexed: false, + type: "uint16", internalType: "uint16", + indexed: false, }, { internalType: "uint32", - indexed: false, - name: "newPricingParameter", type: "uint32", + name: "newPricingParameter", + indexed: false, }, ], - name: "GovSetPricingConfig", - type: "event", }, { - type: "event", - name: "GovSetReserveFee", inputs: [ { - indexed: true, - internalType: "address", - type: "address", name: "underlying", + type: "address", + internalType: "address", + indexed: true, }, { - internalType: "uint32", - indexed: false, type: "uint32", + indexed: false, name: "newReserveFee", + internalType: "uint32", }, ], anonymous: false, + type: "event", + name: "GovSetReserveFee", }, { anonymous: false, + type: "event", + name: "InstallerInstallModule", inputs: [ { - name: "moduleId", - type: "uint256", internalType: "uint256", + type: "uint256", + name: "moduleId", indexed: true, }, { @@ -371,35 +373,33 @@ const _abi = [ indexed: true, }, { - internalType: "bytes32", - indexed: false, - name: "moduleGitCommit", type: "bytes32", + name: "moduleGitCommit", + indexed: false, + internalType: "bytes32", }, ], - name: "InstallerInstallModule", - type: "event", }, { - type: "event", - name: "InstallerSetGovernorAdmin", inputs: [ { + type: "address", internalType: "address", - indexed: true, name: "newGovernorAdmin", - type: "address", + indexed: true, }, ], + name: "InstallerSetGovernorAdmin", + type: "event", anonymous: false, }, { inputs: [ { - internalType: "address", - indexed: true, type: "address", + internalType: "address", name: "newUpgradeAdmin", + indexed: true, }, ], anonymous: false, @@ -407,32 +407,30 @@ const _abi = [ name: "InstallerSetUpgradeAdmin", }, { - type: "event", - name: "Liquidation", inputs: [ { + type: "address", indexed: true, - internalType: "address", name: "liquidator", - type: "address", + internalType: "address", }, { - indexed: true, - internalType: "address", type: "address", + internalType: "address", name: "violator", + indexed: true, }, { internalType: "address", - indexed: true, - name: "underlying", type: "address", + name: "underlying", + indexed: true, }, { - internalType: "address", - indexed: false, type: "address", + internalType: "address", name: "collateral", + indexed: false, }, { name: "repay", @@ -443,652 +441,753 @@ const _abi = [ { type: "uint256", name: "yield", - indexed: false, internalType: "uint256", + indexed: false, }, { - indexed: false, internalType: "uint256", type: "uint256", name: "healthScore", + indexed: false, }, { - indexed: false, - internalType: "uint256", - name: "baseDiscount", type: "uint256", + name: "baseDiscount", + internalType: "uint256", + indexed: false, }, { - name: "discount", type: "uint256", + name: "discount", indexed: false, internalType: "uint256", }, ], + type: "event", + name: "Liquidation", anonymous: false, }, { - type: "event", - name: "MarketActivated", inputs: [ { - type: "address", name: "underlying", + type: "address", indexed: true, internalType: "address", }, { - type: "address", name: "eToken", - internalType: "address", + type: "address", indexed: true, + internalType: "address", }, { - indexed: true, - internalType: "address", - type: "address", name: "dToken", + type: "address", + internalType: "address", + indexed: true, }, ], anonymous: false, + type: "event", + name: "MarketActivated", }, { + type: "event", + name: "PTokenActivated", anonymous: false, inputs: [ { + internalType: "address", type: "address", name: "underlying", indexed: true, - internalType: "address", }, { internalType: "address", - indexed: true, - name: "pToken", type: "address", + name: "pToken", + indexed: true, }, ], - name: "PTokenActivated", - type: "event", }, { + name: "PTokenUnWrap", + type: "event", + anonymous: false, inputs: [ { - name: "underlying", type: "address", internalType: "address", + name: "underlying", indexed: true, }, { - name: "account", - type: "address", internalType: "address", + type: "address", + name: "account", indexed: true, }, { - internalType: "uint256", - indexed: false, type: "uint256", + internalType: "uint256", name: "amount", + indexed: false, }, ], - anonymous: false, - type: "event", - name: "PTokenUnWrap", }, { inputs: [ { - name: "underlying", type: "address", - indexed: true, internalType: "address", + name: "underlying", + indexed: true, }, { - internalType: "address", indexed: true, - name: "account", type: "address", + name: "account", + internalType: "address", }, { + type: "uint256", + name: "amount", indexed: false, internalType: "uint256", - name: "amount", - type: "uint256", }, ], - anonymous: false, type: "event", + anonymous: false, name: "PTokenWrap", }, { + type: "event", + name: "ProxyCreated", + anonymous: false, inputs: [ { + internalType: "address", type: "address", name: "proxy", indexed: true, - internalType: "address", }, { - internalType: "uint256", - indexed: false, type: "uint256", + internalType: "uint256", name: "moduleId", + indexed: false, }, ], - anonymous: false, - type: "event", - name: "ProxyCreated", }, { + name: "Repay", + type: "event", anonymous: false, inputs: [ { - internalType: "address", - indexed: true, - name: "underlying", type: "address", + name: "underlying", + indexed: true, + internalType: "address", }, { + name: "account", + type: "address", internalType: "address", indexed: true, - type: "address", - name: "account", }, { + type: "uint256", + name: "amount", indexed: false, internalType: "uint256", - name: "amount", - type: "uint256", }, ], - name: "Repay", - type: "event", }, { anonymous: false, + type: "event", + name: "RequestBorrow", inputs: [ { type: "address", name: "account", - indexed: true, internalType: "address", + indexed: true, }, { - internalType: "uint256", - indexed: false, type: "uint256", + internalType: "uint256", name: "amount", + indexed: false, }, ], - name: "RequestBorrow", - type: "event", }, { + type: "event", + anonymous: false, + name: "RequestBurn", inputs: [ { type: "address", - name: "account", internalType: "address", + name: "account", indexed: true, }, { - name: "amount", - type: "uint256", internalType: "uint256", + type: "uint256", + name: "amount", indexed: false, }, ], - anonymous: false, - type: "event", - name: "RequestBurn", }, { - anonymous: false, inputs: [ { type: "address", + indexed: true, name: "account", internalType: "address", - indexed: true, }, { - name: "amount", type: "uint256", - internalType: "uint256", indexed: false, + name: "amount", + internalType: "uint256", }, ], - name: "RequestDeposit", type: "event", + name: "RequestDeposit", + anonymous: false, }, { inputs: [ { - name: "account", type: "address", - internalType: "address", + name: "account", indexed: true, + internalType: "address", }, { type: "uint256", - name: "amount", indexed: false, + name: "amount", internalType: "uint256", }, ], - anonymous: false, type: "event", + anonymous: false, name: "RequestDonate", }, { - name: "RequestLiquidate", type: "event", + name: "RequestLiquidate", anonymous: false, inputs: [ { - name: "liquidator", type: "address", internalType: "address", + name: "liquidator", indexed: true, }, { - type: "address", name: "violator", + type: "address", indexed: true, internalType: "address", }, { + indexed: true, type: "address", name: "underlying", - indexed: true, internalType: "address", }, { - indexed: false, - internalType: "address", name: "collateral", type: "address", + internalType: "address", + indexed: false, }, { + name: "repay", + type: "uint256", internalType: "uint256", indexed: false, - type: "uint256", - name: "repay", }, { name: "minYield", type: "uint256", - internalType: "uint256", indexed: false, + internalType: "uint256", }, ], }, { - name: "RequestMint", - type: "event", - anonymous: false, inputs: [ { - name: "account", type: "address", internalType: "address", + name: "account", indexed: true, }, { - indexed: false, - internalType: "uint256", type: "uint256", name: "amount", + internalType: "uint256", + indexed: false, }, ], + anonymous: false, + type: "event", + name: "RequestMint", }, { - name: "RequestRepay", type: "event", + name: "RequestRepay", anonymous: false, inputs: [ { - name: "account", type: "address", + name: "account", internalType: "address", indexed: true, }, { - indexed: false, - internalType: "uint256", type: "uint256", name: "amount", + indexed: false, + internalType: "uint256", }, ], }, { - name: "RequestSwap", - type: "event", - anonymous: false, inputs: [ { - internalType: "address", - indexed: true, name: "accountIn", type: "address", + indexed: true, + internalType: "address", + }, + { + name: "accountOut", + type: "address", + indexed: true, + internalType: "address", }, { + name: "underlyingIn", + type: "address", internalType: "address", indexed: true, - name: "accountOut", + }, + { type: "address", + indexed: false, + name: "underlyingOut", + internalType: "address", }, { + type: "uint256", + indexed: false, + name: "amount", + internalType: "uint256", + }, + { + type: "uint256", + indexed: false, + name: "swapType", + internalType: "uint256", + }, + ], + type: "event", + name: "RequestSwap", + anonymous: false, + }, + { + name: "RequestSwapHub", + type: "event", + anonymous: false, + inputs: [ + { + type: "address", + name: "accountIn", indexed: true, internalType: "address", + }, + { type: "address", - name: "underlyingIn", + indexed: true, + name: "accountOut", + internalType: "address", }, { - indexed: false, + type: "address", + name: "underlyingIn", + indexed: true, internalType: "address", + }, + { name: "underlyingOut", type: "address", + indexed: false, + internalType: "address", }, { - indexed: false, internalType: "uint256", type: "uint256", - name: "amount", + name: "amountIn", + indexed: false, }, { + type: "uint256", indexed: false, + name: "amountOut", internalType: "uint256", + }, + { type: "uint256", - name: "swapType", + internalType: "uint256", + name: "mode", + indexed: false, + }, + { + internalType: "address", + type: "address", + name: "swapHandler", + indexed: false, }, ], }, { inputs: [ { + type: "address", + name: "accountIn", internalType: "address", indexed: true, - name: "from", + }, + { type: "address", + name: "accountOut", + indexed: true, + internalType: "address", }, { - name: "to", + name: "underlyingIn", type: "address", internalType: "address", indexed: true, }, { - internalType: "uint256", + type: "address", + name: "underlyingOut", indexed: false, + internalType: "address", + }, + { type: "uint256", - name: "amount", + internalType: "uint256", + name: "targetDebt", + indexed: false, + }, + { + type: "address", + name: "swapHandler", + internalType: "address", + indexed: false, }, ], - anonymous: false, type: "event", + anonymous: false, + name: "RequestSwapHubRepay", + }, + { name: "RequestTransferDToken", + type: "event", + anonymous: false, + inputs: [ + { + type: "address", + indexed: true, + name: "from", + internalType: "address", + }, + { + type: "address", + name: "to", + indexed: true, + internalType: "address", + }, + { + indexed: false, + type: "uint256", + name: "amount", + internalType: "uint256", + }, + ], }, { - type: "event", - name: "RequestTransferEToken", inputs: [ { - internalType: "address", - indexed: true, - type: "address", name: "from", + type: "address", + indexed: true, + internalType: "address", }, { type: "address", name: "to", - internalType: "address", indexed: true, + internalType: "address", }, { - internalType: "uint256", - indexed: false, type: "uint256", + internalType: "uint256", name: "amount", + indexed: false, }, ], + name: "RequestTransferEToken", + type: "event", anonymous: false, }, { + name: "RequestWithdraw", + type: "event", + anonymous: false, inputs: [ { name: "account", type: "address", - internalType: "address", indexed: true, + internalType: "address", }, { - indexed: false, - internalType: "uint256", name: "amount", type: "uint256", + internalType: "uint256", + indexed: false, }, ], - anonymous: false, - type: "event", - name: "RequestWithdraw", }, { + anonymous: false, type: "event", name: "TrackAverageLiquidity", inputs: [ { - name: "account", + internalType: "address", type: "address", + name: "account", indexed: true, - internalType: "address", }, ], - anonymous: false, }, { - anonymous: false, inputs: [ { - type: "address", name: "account", + type: "address", internalType: "address", indexed: true, }, ], - name: "UnTrackAverageLiquidity", type: "event", + name: "UnTrackAverageLiquidity", + anonymous: false, }, { - type: "event", - name: "Withdraw", inputs: [ { - name: "underlying", type: "address", - internalType: "address", indexed: true, + name: "underlying", + internalType: "address", }, { type: "address", name: "account", - internalType: "address", indexed: true, + internalType: "address", }, { type: "uint256", + internalType: "uint256", name: "amount", indexed: false, - internalType: "uint256", }, ], + type: "event", + name: "Withdraw", anonymous: false, }, { - name: "moduleGitCommit", - type: "function", + inputs: [], outputs: [ { - type: "bytes32", name: "", + type: "bytes32", internalType: "bytes32", }, ], + type: "function", stateMutability: "view", - inputs: [], + name: "moduleGitCommit", }, { - name: "moduleId", type: "function", + stateMutability: "view", + name: "moduleId", outputs: [ { - internalType: "uint256", - type: "uint256", name: "", + type: "uint256", + internalType: "uint256", }, ], - stateMutability: "view", inputs: [], }, { - name: "oneInch", - type: "function", - stateMutability: "view", outputs: [ { - type: "address", name: "", + type: "address", internalType: "address", }, ], inputs: [], + name: "oneInch", + type: "function", + stateMutability: "view", }, { - outputs: [], stateMutability: "nonpayable", + type: "function", + name: "swap1Inch", + outputs: [], inputs: [ { name: "params", + type: "tuple", + internalType: "struct Swap.Swap1InchParams", components: [ { - internalType: "uint256", name: "subAccountIdIn", type: "uint256", + internalType: "uint256", }, { - name: "subAccountIdOut", type: "uint256", + name: "subAccountIdOut", internalType: "uint256", }, { - name: "underlyingIn", - type: "address", internalType: "address", + type: "address", + name: "underlyingIn", }, { + type: "address", internalType: "address", name: "underlyingOut", - type: "address", }, { internalType: "uint256", - name: "amount", type: "uint256", + name: "amount", }, { - internalType: "uint256", name: "amountOutMinimum", type: "uint256", + internalType: "uint256", }, { - name: "payload", type: "bytes", internalType: "bytes", + name: "payload", }, ], - type: "tuple", - internalType: "struct Swap.Swap1InchParams", }, ], - name: "swap1Inch", - type: "function", }, { - outputs: [], + name: "swapAndRepayUni", + type: "function", stateMutability: "nonpayable", + outputs: [], inputs: [ { + type: "tuple", + name: "params", components: [ { + type: "uint256", internalType: "uint256", name: "subAccountIdIn", - type: "uint256", }, { - name: "subAccountIdOut", type: "uint256", internalType: "uint256", + name: "subAccountIdOut", }, { - type: "uint256", name: "amountOut", + type: "uint256", internalType: "uint256", }, { - internalType: "uint256", - type: "uint256", name: "amountInMaximum", + type: "uint256", + internalType: "uint256", }, { - type: "uint256", name: "deadline", + type: "uint256", internalType: "uint256", }, { + internalType: "bytes", type: "bytes", name: "path", - internalType: "bytes", }, ], - type: "tuple", - name: "params", internalType: "struct Swap.SwapUniExactOutputParams", }, { - name: "targetDebt", type: "uint256", internalType: "uint256", + name: "targetDebt", }, ], - name: "swapAndRepayUni", - type: "function", }, { inputs: [ { - internalType: "struct Swap.SwapUniExactOutputSingleParams", + name: "params", type: "tuple", + internalType: "struct Swap.SwapUniExactOutputSingleParams", components: [ { - internalType: "uint256", - type: "uint256", name: "subAccountIdIn", + type: "uint256", + internalType: "uint256", }, { - internalType: "uint256", - name: "subAccountIdOut", type: "uint256", + name: "subAccountIdOut", + internalType: "uint256", }, { - internalType: "address", - type: "address", name: "underlyingIn", + type: "address", + internalType: "address", }, { - internalType: "address", - name: "underlyingOut", type: "address", + name: "underlyingOut", + internalType: "address", }, { type: "uint256", @@ -1096,18 +1195,18 @@ const _abi = [ internalType: "uint256", }, { - name: "amountInMaximum", - type: "uint256", internalType: "uint256", + type: "uint256", + name: "amountInMaximum", }, { - name: "deadline", type: "uint256", + name: "deadline", internalType: "uint256", }, { - type: "uint24", name: "fee", + type: "uint24", internalType: "uint24", }, { @@ -1116,26 +1215,28 @@ const _abi = [ internalType: "uint160", }, ], - name: "params", }, { - internalType: "uint256", name: "targetDebt", type: "uint256", + internalType: "uint256", }, ], - stateMutability: "nonpayable", outputs: [], + stateMutability: "nonpayable", type: "function", name: "swapAndRepayUniSingle", }, { + stateMutability: "nonpayable", type: "function", name: "swapUniExactInput", + outputs: [], inputs: [ { - internalType: "struct Swap.SwapUniExactInputParams", name: "params", + type: "tuple", + internalType: "struct Swap.SwapUniExactInputParams", components: [ { type: "uint256", @@ -1143,56 +1244,55 @@ const _abi = [ internalType: "uint256", }, { + internalType: "uint256", type: "uint256", name: "subAccountIdOut", - internalType: "uint256", }, { type: "uint256", - name: "amountIn", internalType: "uint256", + name: "amountIn", }, { + internalType: "uint256", type: "uint256", name: "amountOutMinimum", - internalType: "uint256", }, { - internalType: "uint256", name: "deadline", type: "uint256", + internalType: "uint256", }, { type: "bytes", - name: "path", internalType: "bytes", + name: "path", }, ], - type: "tuple", }, ], - outputs: [], - stateMutability: "nonpayable", }, { + type: "function", stateMutability: "nonpayable", - outputs: [], + name: "swapUniExactInputSingle", inputs: [ { + type: "tuple", components: [ { + type: "uint256", internalType: "uint256", name: "subAccountIdIn", - type: "uint256", }, { - internalType: "uint256", type: "uint256", + internalType: "uint256", name: "subAccountIdOut", }, { - type: "address", name: "underlyingIn", + type: "address", internalType: "address", }, { @@ -1201,63 +1301,62 @@ const _abi = [ internalType: "address", }, { - type: "uint256", name: "amountIn", + type: "uint256", internalType: "uint256", }, { - name: "amountOutMinimum", - type: "uint256", internalType: "uint256", + type: "uint256", + name: "amountOutMinimum", }, { - internalType: "uint256", type: "uint256", + internalType: "uint256", name: "deadline", }, { - internalType: "uint24", name: "fee", type: "uint24", + internalType: "uint24", }, { - internalType: "uint160", type: "uint160", name: "sqrtPriceLimitX96", + internalType: "uint160", }, ], - type: "tuple", name: "params", internalType: "struct Swap.SwapUniExactInputSingleParams", }, ], - name: "swapUniExactInputSingle", - type: "function", + outputs: [], }, { - name: "swapUniExactOutput", type: "function", + name: "swapUniExactOutput", stateMutability: "nonpayable", outputs: [], inputs: [ { - internalType: "struct Swap.SwapUniExactOutputParams", + type: "tuple", name: "params", + internalType: "struct Swap.SwapUniExactOutputParams", components: [ { - internalType: "uint256", name: "subAccountIdIn", type: "uint256", + internalType: "uint256", }, { - internalType: "uint256", type: "uint256", name: "subAccountIdOut", + internalType: "uint256", }, { - internalType: "uint256", - name: "amountOut", type: "uint256", + name: "amountOut", + internalType: "uint256", }, { internalType: "uint256", @@ -1265,25 +1364,27 @@ const _abi = [ name: "amountInMaximum", }, { - internalType: "uint256", type: "uint256", name: "deadline", + internalType: "uint256", }, { - internalType: "bytes", name: "path", type: "bytes", + internalType: "bytes", }, ], - type: "tuple", }, ], }, { + type: "function", + name: "swapUniExactOutputSingle", stateMutability: "nonpayable", - outputs: [], inputs: [ { + type: "tuple", + name: "params", components: [ { internalType: "uint256", @@ -1296,61 +1397,58 @@ const _abi = [ internalType: "uint256", }, { - name: "underlyingIn", type: "address", + name: "underlyingIn", internalType: "address", }, { + internalType: "address", type: "address", name: "underlyingOut", - internalType: "address", }, { - internalType: "uint256", type: "uint256", + internalType: "uint256", name: "amountOut", }, { - name: "amountInMaximum", - type: "uint256", internalType: "uint256", + type: "uint256", + name: "amountInMaximum", }, { - type: "uint256", name: "deadline", + type: "uint256", internalType: "uint256", }, { - name: "fee", type: "uint24", internalType: "uint24", + name: "fee", }, { - internalType: "uint160", - name: "sqrtPriceLimitX96", type: "uint160", + name: "sqrtPriceLimitX96", + internalType: "uint160", }, ], - type: "tuple", - name: "params", internalType: "struct Swap.SwapUniExactOutputSingleParams", }, ], - name: "swapUniExactOutputSingle", - type: "function", + outputs: [], }, { + type: "function", + name: "uniswapRouter", stateMutability: "view", outputs: [ { + type: "address", internalType: "address", name: "", - type: "address", }, ], inputs: [], - name: "uniswapRouter", - type: "function", }, ]; diff --git a/types/factories/modules/index.ts b/types/factories/modules/index.ts index c9f758e..83e5975 100644 --- a/types/factories/modules/index.ts +++ b/types/factories/modules/index.ts @@ -7,3 +7,4 @@ export { Exec__factory } from "./Exec__factory"; export { Liquidation__factory } from "./Liquidation__factory"; export { Markets__factory } from "./Markets__factory"; export { Swap__factory } from "./Swap__factory"; +export { SwapHub__factory } from "./SwapHub__factory"; diff --git a/types/index.ts b/types/index.ts index d17d681..9334dc9 100644 --- a/types/index.ts +++ b/types/index.ts @@ -29,6 +29,8 @@ export type { Markets } from "./modules/Markets"; export { Markets__factory } from "./factories/modules/Markets__factory"; export type { Swap } from "./modules/Swap"; export { Swap__factory } from "./factories/modules/Swap__factory"; +export type { SwapHub } from "./modules/SwapHub"; +export { SwapHub__factory } from "./factories/modules/SwapHub__factory"; export { PToken__factory } from "./factories/PToken__factory"; export type { EulerGeneralView } from "./views/EulerGeneralView"; export { EulerGeneralView__factory } from "./factories/views/EulerGeneralView__factory"; diff --git a/types/modules/DToken.ts b/types/modules/DToken.ts index 4665f5e..dbbefeb 100644 --- a/types/modules/DToken.ts +++ b/types/modules/DToken.ts @@ -221,6 +221,8 @@ export interface DTokenInterface extends utils.Interface { "RequestMint(address,uint256)": EventFragment; "RequestRepay(address,uint256)": EventFragment; "RequestSwap(address,address,address,address,uint256,uint256)": EventFragment; + "RequestSwapHub(address,address,address,address,uint256,uint256,uint256,address)": EventFragment; + "RequestSwapHubRepay(address,address,address,address,uint256,address)": EventFragment; "RequestTransferDToken(address,address,uint256)": EventFragment; "RequestTransferEToken(address,address,uint256)": EventFragment; "RequestWithdraw(address,uint256)": EventFragment; @@ -262,6 +264,8 @@ export interface DTokenInterface extends utils.Interface { getEvent(nameOrSignatureOrTopic: "RequestMint"): EventFragment; getEvent(nameOrSignatureOrTopic: "RequestRepay"): EventFragment; getEvent(nameOrSignatureOrTopic: "RequestSwap"): EventFragment; + getEvent(nameOrSignatureOrTopic: "RequestSwapHub"): EventFragment; + getEvent(nameOrSignatureOrTopic: "RequestSwapHubRepay"): EventFragment; getEvent(nameOrSignatureOrTopic: "RequestTransferDToken"): EventFragment; getEvent(nameOrSignatureOrTopic: "RequestTransferEToken"): EventFragment; getEvent(nameOrSignatureOrTopic: "RequestWithdraw"): EventFragment; @@ -676,6 +680,39 @@ export type RequestSwapEvent = TypedEvent< export type RequestSwapEventFilter = TypedEventFilter; +export interface RequestSwapHubEventObject { + accountIn: string; + accountOut: string; + underlyingIn: string; + underlyingOut: string; + amountIn: BigNumber; + amountOut: BigNumber; + mode: BigNumber; + swapHandler: string; +} +export type RequestSwapHubEvent = TypedEvent< + [string, string, string, string, BigNumber, BigNumber, BigNumber, string], + RequestSwapHubEventObject +>; + +export type RequestSwapHubEventFilter = TypedEventFilter; + +export interface RequestSwapHubRepayEventObject { + accountIn: string; + accountOut: string; + underlyingIn: string; + underlyingOut: string; + targetDebt: BigNumber; + swapHandler: string; +} +export type RequestSwapHubRepayEvent = TypedEvent< + [string, string, string, string, BigNumber, string], + RequestSwapHubRepayEventObject +>; + +export type RequestSwapHubRepayEventFilter = + TypedEventFilter; + export interface RequestTransferDTokenEventObject { from: string; to: string; @@ -1327,6 +1364,44 @@ export interface DToken extends BaseContract { swapType?: null ): RequestSwapEventFilter; + "RequestSwapHub(address,address,address,address,uint256,uint256,uint256,address)"( + accountIn?: string | null, + accountOut?: string | null, + underlyingIn?: string | null, + underlyingOut?: null, + amountIn?: null, + amountOut?: null, + mode?: null, + swapHandler?: null + ): RequestSwapHubEventFilter; + RequestSwapHub( + accountIn?: string | null, + accountOut?: string | null, + underlyingIn?: string | null, + underlyingOut?: null, + amountIn?: null, + amountOut?: null, + mode?: null, + swapHandler?: null + ): RequestSwapHubEventFilter; + + "RequestSwapHubRepay(address,address,address,address,uint256,address)"( + accountIn?: string | null, + accountOut?: string | null, + underlyingIn?: string | null, + underlyingOut?: null, + targetDebt?: null, + swapHandler?: null + ): RequestSwapHubRepayEventFilter; + RequestSwapHubRepay( + accountIn?: string | null, + accountOut?: string | null, + underlyingIn?: string | null, + underlyingOut?: null, + targetDebt?: null, + swapHandler?: null + ): RequestSwapHubRepayEventFilter; + "RequestTransferDToken(address,address,uint256)"( from?: string | null, to?: string | null, diff --git a/types/modules/EToken.ts b/types/modules/EToken.ts index 0128b8b..0743815 100644 --- a/types/modules/EToken.ts +++ b/types/modules/EToken.ts @@ -296,6 +296,8 @@ export interface ETokenInterface extends utils.Interface { "RequestMint(address,uint256)": EventFragment; "RequestRepay(address,uint256)": EventFragment; "RequestSwap(address,address,address,address,uint256,uint256)": EventFragment; + "RequestSwapHub(address,address,address,address,uint256,uint256,uint256,address)": EventFragment; + "RequestSwapHubRepay(address,address,address,address,uint256,address)": EventFragment; "RequestTransferDToken(address,address,uint256)": EventFragment; "RequestTransferEToken(address,address,uint256)": EventFragment; "RequestWithdraw(address,uint256)": EventFragment; @@ -337,6 +339,8 @@ export interface ETokenInterface extends utils.Interface { getEvent(nameOrSignatureOrTopic: "RequestMint"): EventFragment; getEvent(nameOrSignatureOrTopic: "RequestRepay"): EventFragment; getEvent(nameOrSignatureOrTopic: "RequestSwap"): EventFragment; + getEvent(nameOrSignatureOrTopic: "RequestSwapHub"): EventFragment; + getEvent(nameOrSignatureOrTopic: "RequestSwapHubRepay"): EventFragment; getEvent(nameOrSignatureOrTopic: "RequestTransferDToken"): EventFragment; getEvent(nameOrSignatureOrTopic: "RequestTransferEToken"): EventFragment; getEvent(nameOrSignatureOrTopic: "RequestWithdraw"): EventFragment; @@ -751,6 +755,39 @@ export type RequestSwapEvent = TypedEvent< export type RequestSwapEventFilter = TypedEventFilter; +export interface RequestSwapHubEventObject { + accountIn: string; + accountOut: string; + underlyingIn: string; + underlyingOut: string; + amountIn: BigNumber; + amountOut: BigNumber; + mode: BigNumber; + swapHandler: string; +} +export type RequestSwapHubEvent = TypedEvent< + [string, string, string, string, BigNumber, BigNumber, BigNumber, string], + RequestSwapHubEventObject +>; + +export type RequestSwapHubEventFilter = TypedEventFilter; + +export interface RequestSwapHubRepayEventObject { + accountIn: string; + accountOut: string; + underlyingIn: string; + underlyingOut: string; + targetDebt: BigNumber; + swapHandler: string; +} +export type RequestSwapHubRepayEvent = TypedEvent< + [string, string, string, string, BigNumber, string], + RequestSwapHubRepayEventObject +>; + +export type RequestSwapHubRepayEventFilter = + TypedEventFilter; + export interface RequestTransferDTokenEventObject { from: string; to: string; @@ -1526,6 +1563,44 @@ export interface EToken extends BaseContract { swapType?: null ): RequestSwapEventFilter; + "RequestSwapHub(address,address,address,address,uint256,uint256,uint256,address)"( + accountIn?: string | null, + accountOut?: string | null, + underlyingIn?: string | null, + underlyingOut?: null, + amountIn?: null, + amountOut?: null, + mode?: null, + swapHandler?: null + ): RequestSwapHubEventFilter; + RequestSwapHub( + accountIn?: string | null, + accountOut?: string | null, + underlyingIn?: string | null, + underlyingOut?: null, + amountIn?: null, + amountOut?: null, + mode?: null, + swapHandler?: null + ): RequestSwapHubEventFilter; + + "RequestSwapHubRepay(address,address,address,address,uint256,address)"( + accountIn?: string | null, + accountOut?: string | null, + underlyingIn?: string | null, + underlyingOut?: null, + targetDebt?: null, + swapHandler?: null + ): RequestSwapHubRepayEventFilter; + RequestSwapHubRepay( + accountIn?: string | null, + accountOut?: string | null, + underlyingIn?: string | null, + underlyingOut?: null, + targetDebt?: null, + swapHandler?: null + ): RequestSwapHubRepayEventFilter; + "RequestTransferDToken(address,address,uint256)"( from?: string | null, to?: string | null, diff --git a/types/modules/Exec.ts b/types/modules/Exec.ts index d50bfb1..290dcc1 100644 --- a/types/modules/Exec.ts +++ b/types/modules/Exec.ts @@ -328,6 +328,8 @@ export interface ExecInterface extends utils.Interface { "RequestMint(address,uint256)": EventFragment; "RequestRepay(address,uint256)": EventFragment; "RequestSwap(address,address,address,address,uint256,uint256)": EventFragment; + "RequestSwapHub(address,address,address,address,uint256,uint256,uint256,address)": EventFragment; + "RequestSwapHubRepay(address,address,address,address,uint256,address)": EventFragment; "RequestTransferDToken(address,address,uint256)": EventFragment; "RequestTransferEToken(address,address,uint256)": EventFragment; "RequestWithdraw(address,uint256)": EventFragment; @@ -367,6 +369,8 @@ export interface ExecInterface extends utils.Interface { getEvent(nameOrSignatureOrTopic: "RequestMint"): EventFragment; getEvent(nameOrSignatureOrTopic: "RequestRepay"): EventFragment; getEvent(nameOrSignatureOrTopic: "RequestSwap"): EventFragment; + getEvent(nameOrSignatureOrTopic: "RequestSwapHub"): EventFragment; + getEvent(nameOrSignatureOrTopic: "RequestSwapHubRepay"): EventFragment; getEvent(nameOrSignatureOrTopic: "RequestTransferDToken"): EventFragment; getEvent(nameOrSignatureOrTopic: "RequestTransferEToken"): EventFragment; getEvent(nameOrSignatureOrTopic: "RequestWithdraw"): EventFragment; @@ -768,6 +772,39 @@ export type RequestSwapEvent = TypedEvent< export type RequestSwapEventFilter = TypedEventFilter; +export interface RequestSwapHubEventObject { + accountIn: string; + accountOut: string; + underlyingIn: string; + underlyingOut: string; + amountIn: BigNumber; + amountOut: BigNumber; + mode: BigNumber; + swapHandler: string; +} +export type RequestSwapHubEvent = TypedEvent< + [string, string, string, string, BigNumber, BigNumber, BigNumber, string], + RequestSwapHubEventObject +>; + +export type RequestSwapHubEventFilter = TypedEventFilter; + +export interface RequestSwapHubRepayEventObject { + accountIn: string; + accountOut: string; + underlyingIn: string; + underlyingOut: string; + targetDebt: BigNumber; + swapHandler: string; +} +export type RequestSwapHubRepayEvent = TypedEvent< + [string, string, string, string, BigNumber, string], + RequestSwapHubRepayEventObject +>; + +export type RequestSwapHubRepayEventFilter = + TypedEventFilter; + export interface RequestTransferDTokenEventObject { from: string; to: string; @@ -1575,6 +1612,44 @@ export interface Exec extends BaseContract { swapType?: null ): RequestSwapEventFilter; + "RequestSwapHub(address,address,address,address,uint256,uint256,uint256,address)"( + accountIn?: string | null, + accountOut?: string | null, + underlyingIn?: string | null, + underlyingOut?: null, + amountIn?: null, + amountOut?: null, + mode?: null, + swapHandler?: null + ): RequestSwapHubEventFilter; + RequestSwapHub( + accountIn?: string | null, + accountOut?: string | null, + underlyingIn?: string | null, + underlyingOut?: null, + amountIn?: null, + amountOut?: null, + mode?: null, + swapHandler?: null + ): RequestSwapHubEventFilter; + + "RequestSwapHubRepay(address,address,address,address,uint256,address)"( + accountIn?: string | null, + accountOut?: string | null, + underlyingIn?: string | null, + underlyingOut?: null, + targetDebt?: null, + swapHandler?: null + ): RequestSwapHubRepayEventFilter; + RequestSwapHubRepay( + accountIn?: string | null, + accountOut?: string | null, + underlyingIn?: string | null, + underlyingOut?: null, + targetDebt?: null, + swapHandler?: null + ): RequestSwapHubRepayEventFilter; + "RequestTransferDToken(address,address,uint256)"( from?: string | null, to?: string | null, diff --git a/types/modules/Liquidation.ts b/types/modules/Liquidation.ts index bcd5565..9703894 100644 --- a/types/modules/Liquidation.ts +++ b/types/modules/Liquidation.ts @@ -200,6 +200,8 @@ export interface LiquidationInterface extends utils.Interface { "RequestMint(address,uint256)": EventFragment; "RequestRepay(address,uint256)": EventFragment; "RequestSwap(address,address,address,address,uint256,uint256)": EventFragment; + "RequestSwapHub(address,address,address,address,uint256,uint256,uint256,address)": EventFragment; + "RequestSwapHubRepay(address,address,address,address,uint256,address)": EventFragment; "RequestTransferDToken(address,address,uint256)": EventFragment; "RequestTransferEToken(address,address,uint256)": EventFragment; "RequestWithdraw(address,uint256)": EventFragment; @@ -239,6 +241,8 @@ export interface LiquidationInterface extends utils.Interface { getEvent(nameOrSignatureOrTopic: "RequestMint"): EventFragment; getEvent(nameOrSignatureOrTopic: "RequestRepay"): EventFragment; getEvent(nameOrSignatureOrTopic: "RequestSwap"): EventFragment; + getEvent(nameOrSignatureOrTopic: "RequestSwapHub"): EventFragment; + getEvent(nameOrSignatureOrTopic: "RequestSwapHubRepay"): EventFragment; getEvent(nameOrSignatureOrTopic: "RequestTransferDToken"): EventFragment; getEvent(nameOrSignatureOrTopic: "RequestTransferEToken"): EventFragment; getEvent(nameOrSignatureOrTopic: "RequestWithdraw"): EventFragment; @@ -640,6 +644,39 @@ export type RequestSwapEvent = TypedEvent< export type RequestSwapEventFilter = TypedEventFilter; +export interface RequestSwapHubEventObject { + accountIn: string; + accountOut: string; + underlyingIn: string; + underlyingOut: string; + amountIn: BigNumber; + amountOut: BigNumber; + mode: BigNumber; + swapHandler: string; +} +export type RequestSwapHubEvent = TypedEvent< + [string, string, string, string, BigNumber, BigNumber, BigNumber, string], + RequestSwapHubEventObject +>; + +export type RequestSwapHubEventFilter = TypedEventFilter; + +export interface RequestSwapHubRepayEventObject { + accountIn: string; + accountOut: string; + underlyingIn: string; + underlyingOut: string; + targetDebt: BigNumber; + swapHandler: string; +} +export type RequestSwapHubRepayEvent = TypedEvent< + [string, string, string, string, BigNumber, string], + RequestSwapHubRepayEventObject +>; + +export type RequestSwapHubRepayEventFilter = + TypedEventFilter; + export interface RequestTransferDTokenEventObject { from: string; to: string; @@ -1160,6 +1197,44 @@ export interface Liquidation extends BaseContract { swapType?: null ): RequestSwapEventFilter; + "RequestSwapHub(address,address,address,address,uint256,uint256,uint256,address)"( + accountIn?: string | null, + accountOut?: string | null, + underlyingIn?: string | null, + underlyingOut?: null, + amountIn?: null, + amountOut?: null, + mode?: null, + swapHandler?: null + ): RequestSwapHubEventFilter; + RequestSwapHub( + accountIn?: string | null, + accountOut?: string | null, + underlyingIn?: string | null, + underlyingOut?: null, + amountIn?: null, + amountOut?: null, + mode?: null, + swapHandler?: null + ): RequestSwapHubEventFilter; + + "RequestSwapHubRepay(address,address,address,address,uint256,address)"( + accountIn?: string | null, + accountOut?: string | null, + underlyingIn?: string | null, + underlyingOut?: null, + targetDebt?: null, + swapHandler?: null + ): RequestSwapHubRepayEventFilter; + RequestSwapHubRepay( + accountIn?: string | null, + accountOut?: string | null, + underlyingIn?: string | null, + underlyingOut?: null, + targetDebt?: null, + swapHandler?: null + ): RequestSwapHubRepayEventFilter; + "RequestTransferDToken(address,address,uint256)"( from?: string | null, to?: string | null, diff --git a/types/modules/Markets.ts b/types/modules/Markets.ts index 17f87b6..bf550e7 100644 --- a/types/modules/Markets.ts +++ b/types/modules/Markets.ts @@ -287,6 +287,8 @@ export interface MarketsInterface extends utils.Interface { "RequestMint(address,uint256)": EventFragment; "RequestRepay(address,uint256)": EventFragment; "RequestSwap(address,address,address,address,uint256,uint256)": EventFragment; + "RequestSwapHub(address,address,address,address,uint256,uint256,uint256,address)": EventFragment; + "RequestSwapHubRepay(address,address,address,address,uint256,address)": EventFragment; "RequestTransferDToken(address,address,uint256)": EventFragment; "RequestTransferEToken(address,address,uint256)": EventFragment; "RequestWithdraw(address,uint256)": EventFragment; @@ -326,6 +328,8 @@ export interface MarketsInterface extends utils.Interface { getEvent(nameOrSignatureOrTopic: "RequestMint"): EventFragment; getEvent(nameOrSignatureOrTopic: "RequestRepay"): EventFragment; getEvent(nameOrSignatureOrTopic: "RequestSwap"): EventFragment; + getEvent(nameOrSignatureOrTopic: "RequestSwapHub"): EventFragment; + getEvent(nameOrSignatureOrTopic: "RequestSwapHubRepay"): EventFragment; getEvent(nameOrSignatureOrTopic: "RequestTransferDToken"): EventFragment; getEvent(nameOrSignatureOrTopic: "RequestTransferEToken"): EventFragment; getEvent(nameOrSignatureOrTopic: "RequestWithdraw"): EventFragment; @@ -727,6 +731,39 @@ export type RequestSwapEvent = TypedEvent< export type RequestSwapEventFilter = TypedEventFilter; +export interface RequestSwapHubEventObject { + accountIn: string; + accountOut: string; + underlyingIn: string; + underlyingOut: string; + amountIn: BigNumber; + amountOut: BigNumber; + mode: BigNumber; + swapHandler: string; +} +export type RequestSwapHubEvent = TypedEvent< + [string, string, string, string, BigNumber, BigNumber, BigNumber, string], + RequestSwapHubEventObject +>; + +export type RequestSwapHubEventFilter = TypedEventFilter; + +export interface RequestSwapHubRepayEventObject { + accountIn: string; + accountOut: string; + underlyingIn: string; + underlyingOut: string; + targetDebt: BigNumber; + swapHandler: string; +} +export type RequestSwapHubRepayEvent = TypedEvent< + [string, string, string, string, BigNumber, string], + RequestSwapHubRepayEventObject +>; + +export type RequestSwapHubRepayEventFilter = + TypedEventFilter; + export interface RequestTransferDTokenEventObject { from: string; to: string; @@ -1467,6 +1504,44 @@ export interface Markets extends BaseContract { swapType?: null ): RequestSwapEventFilter; + "RequestSwapHub(address,address,address,address,uint256,uint256,uint256,address)"( + accountIn?: string | null, + accountOut?: string | null, + underlyingIn?: string | null, + underlyingOut?: null, + amountIn?: null, + amountOut?: null, + mode?: null, + swapHandler?: null + ): RequestSwapHubEventFilter; + RequestSwapHub( + accountIn?: string | null, + accountOut?: string | null, + underlyingIn?: string | null, + underlyingOut?: null, + amountIn?: null, + amountOut?: null, + mode?: null, + swapHandler?: null + ): RequestSwapHubEventFilter; + + "RequestSwapHubRepay(address,address,address,address,uint256,address)"( + accountIn?: string | null, + accountOut?: string | null, + underlyingIn?: string | null, + underlyingOut?: null, + targetDebt?: null, + swapHandler?: null + ): RequestSwapHubRepayEventFilter; + RequestSwapHubRepay( + accountIn?: string | null, + accountOut?: string | null, + underlyingIn?: string | null, + underlyingOut?: null, + targetDebt?: null, + swapHandler?: null + ): RequestSwapHubRepayEventFilter; + "RequestTransferDToken(address,address,uint256)"( from?: string | null, to?: string | null, diff --git a/types/modules/Swap.ts b/types/modules/Swap.ts index 3ce95da..f8248d8 100644 --- a/types/modules/Swap.ts +++ b/types/modules/Swap.ts @@ -335,6 +335,8 @@ export interface SwapInterface extends utils.Interface { "RequestMint(address,uint256)": EventFragment; "RequestRepay(address,uint256)": EventFragment; "RequestSwap(address,address,address,address,uint256,uint256)": EventFragment; + "RequestSwapHub(address,address,address,address,uint256,uint256,uint256,address)": EventFragment; + "RequestSwapHubRepay(address,address,address,address,uint256,address)": EventFragment; "RequestTransferDToken(address,address,uint256)": EventFragment; "RequestTransferEToken(address,address,uint256)": EventFragment; "RequestWithdraw(address,uint256)": EventFragment; @@ -374,6 +376,8 @@ export interface SwapInterface extends utils.Interface { getEvent(nameOrSignatureOrTopic: "RequestMint"): EventFragment; getEvent(nameOrSignatureOrTopic: "RequestRepay"): EventFragment; getEvent(nameOrSignatureOrTopic: "RequestSwap"): EventFragment; + getEvent(nameOrSignatureOrTopic: "RequestSwapHub"): EventFragment; + getEvent(nameOrSignatureOrTopic: "RequestSwapHubRepay"): EventFragment; getEvent(nameOrSignatureOrTopic: "RequestTransferDToken"): EventFragment; getEvent(nameOrSignatureOrTopic: "RequestTransferEToken"): EventFragment; getEvent(nameOrSignatureOrTopic: "RequestWithdraw"): EventFragment; @@ -775,6 +779,39 @@ export type RequestSwapEvent = TypedEvent< export type RequestSwapEventFilter = TypedEventFilter; +export interface RequestSwapHubEventObject { + accountIn: string; + accountOut: string; + underlyingIn: string; + underlyingOut: string; + amountIn: BigNumber; + amountOut: BigNumber; + mode: BigNumber; + swapHandler: string; +} +export type RequestSwapHubEvent = TypedEvent< + [string, string, string, string, BigNumber, BigNumber, BigNumber, string], + RequestSwapHubEventObject +>; + +export type RequestSwapHubEventFilter = TypedEventFilter; + +export interface RequestSwapHubRepayEventObject { + accountIn: string; + accountOut: string; + underlyingIn: string; + underlyingOut: string; + targetDebt: BigNumber; + swapHandler: string; +} +export type RequestSwapHubRepayEvent = TypedEvent< + [string, string, string, string, BigNumber, string], + RequestSwapHubRepayEventObject +>; + +export type RequestSwapHubRepayEventFilter = + TypedEventFilter; + export interface RequestTransferDTokenEventObject { from: string; to: string; @@ -1337,6 +1374,44 @@ export interface Swap extends BaseContract { swapType?: null ): RequestSwapEventFilter; + "RequestSwapHub(address,address,address,address,uint256,uint256,uint256,address)"( + accountIn?: string | null, + accountOut?: string | null, + underlyingIn?: string | null, + underlyingOut?: null, + amountIn?: null, + amountOut?: null, + mode?: null, + swapHandler?: null + ): RequestSwapHubEventFilter; + RequestSwapHub( + accountIn?: string | null, + accountOut?: string | null, + underlyingIn?: string | null, + underlyingOut?: null, + amountIn?: null, + amountOut?: null, + mode?: null, + swapHandler?: null + ): RequestSwapHubEventFilter; + + "RequestSwapHubRepay(address,address,address,address,uint256,address)"( + accountIn?: string | null, + accountOut?: string | null, + underlyingIn?: string | null, + underlyingOut?: null, + targetDebt?: null, + swapHandler?: null + ): RequestSwapHubRepayEventFilter; + RequestSwapHubRepay( + accountIn?: string | null, + accountOut?: string | null, + underlyingIn?: string | null, + underlyingOut?: null, + targetDebt?: null, + swapHandler?: null + ): RequestSwapHubRepayEventFilter; + "RequestTransferDToken(address,address,uint256)"( from?: string | null, to?: string | null, diff --git a/types/modules/SwapHub.ts b/types/modules/SwapHub.ts new file mode 100644 index 0000000..df7377c --- /dev/null +++ b/types/modules/SwapHub.ts @@ -0,0 +1,1269 @@ +/* Autogenerated file. Do not edit manually. */ +/* tslint:disable */ +/* eslint-disable */ +import type { + BaseContract, + BigNumber, + BigNumberish, + BytesLike, + CallOverrides, + ContractTransaction, + Overrides, + PopulatedTransaction, + Signer, + utils, +} from "ethers"; +import type { + FunctionFragment, + Result, + EventFragment, +} from "@ethersproject/abi"; +import type { Listener, Provider } from "@ethersproject/providers"; +import type { + TypedEventFilter, + TypedEvent, + TypedListener, + OnEvent, +} from "../common"; + +export declare namespace Storage { + export type AssetConfigStruct = { + eTokenAddress: string; + borrowIsolated: boolean; + collateralFactor: BigNumberish; + borrowFactor: BigNumberish; + twapWindow: BigNumberish; + }; + + export type AssetConfigStructOutput = [ + string, + boolean, + number, + number, + number + ] & { + eTokenAddress: string; + borrowIsolated: boolean; + collateralFactor: number; + borrowFactor: number; + twapWindow: number; + }; +} + +export declare namespace ISwapHandler { + export type SwapParamsStruct = { + underlyingIn: string; + underlyingOut: string; + mode: BigNumberish; + amountIn: BigNumberish; + amountOut: BigNumberish; + exactOutTolerance: BigNumberish; + payload: BytesLike; + }; + + export type SwapParamsStructOutput = [ + string, + string, + BigNumber, + BigNumber, + BigNumber, + BigNumber, + string + ] & { + underlyingIn: string; + underlyingOut: string; + mode: BigNumber; + amountIn: BigNumber; + amountOut: BigNumber; + exactOutTolerance: BigNumber; + payload: string; + }; +} + +export interface SwapHubInterface extends utils.Interface { + functions: { + "moduleGitCommit()": FunctionFragment; + "moduleId()": FunctionFragment; + "swap(uint256,uint256,address,(address,address,uint256,uint256,uint256,uint256,bytes))": FunctionFragment; + "swapAndRepay(uint256,uint256,address,(address,address,uint256,uint256,uint256,uint256,bytes),uint256)": FunctionFragment; + }; + + getFunction( + nameOrSignatureOrTopic: + | "moduleGitCommit" + | "moduleId" + | "swap" + | "swapAndRepay" + ): FunctionFragment; + + encodeFunctionData( + functionFragment: "moduleGitCommit", + values?: undefined + ): string; + encodeFunctionData(functionFragment: "moduleId", values?: undefined): string; + encodeFunctionData( + functionFragment: "swap", + values: [BigNumberish, BigNumberish, string, ISwapHandler.SwapParamsStruct] + ): string; + encodeFunctionData( + functionFragment: "swapAndRepay", + values: [ + BigNumberish, + BigNumberish, + string, + ISwapHandler.SwapParamsStruct, + BigNumberish + ] + ): string; + + decodeFunctionResult( + functionFragment: "moduleGitCommit", + data: BytesLike + ): Result; + decodeFunctionResult(functionFragment: "moduleId", data: BytesLike): Result; + decodeFunctionResult(functionFragment: "swap", data: BytesLike): Result; + decodeFunctionResult( + functionFragment: "swapAndRepay", + data: BytesLike + ): Result; + + events: { + "AssetStatus(address,uint256,uint256,uint96,uint256,uint256,int96,uint256)": EventFragment; + "Borrow(address,address,uint256)": EventFragment; + "DelegateAverageLiquidity(address,address)": EventFragment; + "Deposit(address,address,uint256)": EventFragment; + "EnterMarket(address,address)": EventFragment; + "ExitMarket(address,address)": EventFragment; + "Genesis()": EventFragment; + "GovConvertReserves(address,address,uint256)": EventFragment; + "GovSetAssetConfig(address,tuple)": EventFragment; + "GovSetChainlinkPriceFeed(address,address)": EventFragment; + "GovSetIRM(address,uint256,bytes)": EventFragment; + "GovSetPricingConfig(address,uint16,uint32)": EventFragment; + "GovSetReserveFee(address,uint32)": EventFragment; + "InstallerInstallModule(uint256,address,bytes32)": EventFragment; + "InstallerSetGovernorAdmin(address)": EventFragment; + "InstallerSetUpgradeAdmin(address)": EventFragment; + "Liquidation(address,address,address,address,uint256,uint256,uint256,uint256,uint256)": EventFragment; + "MarketActivated(address,address,address)": EventFragment; + "PTokenActivated(address,address)": EventFragment; + "PTokenUnWrap(address,address,uint256)": EventFragment; + "PTokenWrap(address,address,uint256)": EventFragment; + "ProxyCreated(address,uint256)": EventFragment; + "Repay(address,address,uint256)": EventFragment; + "RequestBorrow(address,uint256)": EventFragment; + "RequestBurn(address,uint256)": EventFragment; + "RequestDeposit(address,uint256)": EventFragment; + "RequestDonate(address,uint256)": EventFragment; + "RequestLiquidate(address,address,address,address,uint256,uint256)": EventFragment; + "RequestMint(address,uint256)": EventFragment; + "RequestRepay(address,uint256)": EventFragment; + "RequestSwap(address,address,address,address,uint256,uint256)": EventFragment; + "RequestSwapHub(address,address,address,address,uint256,uint256,uint256,address)": EventFragment; + "RequestSwapHubRepay(address,address,address,address,uint256,address)": EventFragment; + "RequestTransferDToken(address,address,uint256)": EventFragment; + "RequestTransferEToken(address,address,uint256)": EventFragment; + "RequestWithdraw(address,uint256)": EventFragment; + "TrackAverageLiquidity(address)": EventFragment; + "UnTrackAverageLiquidity(address)": EventFragment; + "Withdraw(address,address,uint256)": EventFragment; + }; + + getEvent(nameOrSignatureOrTopic: "AssetStatus"): EventFragment; + getEvent(nameOrSignatureOrTopic: "Borrow"): EventFragment; + getEvent(nameOrSignatureOrTopic: "DelegateAverageLiquidity"): EventFragment; + getEvent(nameOrSignatureOrTopic: "Deposit"): EventFragment; + getEvent(nameOrSignatureOrTopic: "EnterMarket"): EventFragment; + getEvent(nameOrSignatureOrTopic: "ExitMarket"): EventFragment; + getEvent(nameOrSignatureOrTopic: "Genesis"): EventFragment; + getEvent(nameOrSignatureOrTopic: "GovConvertReserves"): EventFragment; + getEvent(nameOrSignatureOrTopic: "GovSetAssetConfig"): EventFragment; + getEvent(nameOrSignatureOrTopic: "GovSetChainlinkPriceFeed"): EventFragment; + getEvent(nameOrSignatureOrTopic: "GovSetIRM"): EventFragment; + getEvent(nameOrSignatureOrTopic: "GovSetPricingConfig"): EventFragment; + getEvent(nameOrSignatureOrTopic: "GovSetReserveFee"): EventFragment; + getEvent(nameOrSignatureOrTopic: "InstallerInstallModule"): EventFragment; + getEvent(nameOrSignatureOrTopic: "InstallerSetGovernorAdmin"): EventFragment; + getEvent(nameOrSignatureOrTopic: "InstallerSetUpgradeAdmin"): EventFragment; + getEvent(nameOrSignatureOrTopic: "Liquidation"): EventFragment; + getEvent(nameOrSignatureOrTopic: "MarketActivated"): EventFragment; + getEvent(nameOrSignatureOrTopic: "PTokenActivated"): EventFragment; + getEvent(nameOrSignatureOrTopic: "PTokenUnWrap"): EventFragment; + getEvent(nameOrSignatureOrTopic: "PTokenWrap"): EventFragment; + getEvent(nameOrSignatureOrTopic: "ProxyCreated"): EventFragment; + getEvent(nameOrSignatureOrTopic: "Repay"): EventFragment; + getEvent(nameOrSignatureOrTopic: "RequestBorrow"): EventFragment; + getEvent(nameOrSignatureOrTopic: "RequestBurn"): EventFragment; + getEvent(nameOrSignatureOrTopic: "RequestDeposit"): EventFragment; + getEvent(nameOrSignatureOrTopic: "RequestDonate"): EventFragment; + getEvent(nameOrSignatureOrTopic: "RequestLiquidate"): EventFragment; + getEvent(nameOrSignatureOrTopic: "RequestMint"): EventFragment; + getEvent(nameOrSignatureOrTopic: "RequestRepay"): EventFragment; + getEvent(nameOrSignatureOrTopic: "RequestSwap"): EventFragment; + getEvent(nameOrSignatureOrTopic: "RequestSwapHub"): EventFragment; + getEvent(nameOrSignatureOrTopic: "RequestSwapHubRepay"): EventFragment; + getEvent(nameOrSignatureOrTopic: "RequestTransferDToken"): EventFragment; + getEvent(nameOrSignatureOrTopic: "RequestTransferEToken"): EventFragment; + getEvent(nameOrSignatureOrTopic: "RequestWithdraw"): EventFragment; + getEvent(nameOrSignatureOrTopic: "TrackAverageLiquidity"): EventFragment; + getEvent(nameOrSignatureOrTopic: "UnTrackAverageLiquidity"): EventFragment; + getEvent(nameOrSignatureOrTopic: "Withdraw"): EventFragment; +} + +export interface AssetStatusEventObject { + underlying: string; + totalBalances: BigNumber; + totalBorrows: BigNumber; + reserveBalance: BigNumber; + poolSize: BigNumber; + interestAccumulator: BigNumber; + interestRate: BigNumber; + timestamp: BigNumber; +} +export type AssetStatusEvent = TypedEvent< + [ + string, + BigNumber, + BigNumber, + BigNumber, + BigNumber, + BigNumber, + BigNumber, + BigNumber + ], + AssetStatusEventObject +>; + +export type AssetStatusEventFilter = TypedEventFilter; + +export interface BorrowEventObject { + underlying: string; + account: string; + amount: BigNumber; +} +export type BorrowEvent = TypedEvent< + [string, string, BigNumber], + BorrowEventObject +>; + +export type BorrowEventFilter = TypedEventFilter; + +export interface DelegateAverageLiquidityEventObject { + account: string; + delegate: string; +} +export type DelegateAverageLiquidityEvent = TypedEvent< + [string, string], + DelegateAverageLiquidityEventObject +>; + +export type DelegateAverageLiquidityEventFilter = + TypedEventFilter; + +export interface DepositEventObject { + underlying: string; + account: string; + amount: BigNumber; +} +export type DepositEvent = TypedEvent< + [string, string, BigNumber], + DepositEventObject +>; + +export type DepositEventFilter = TypedEventFilter; + +export interface EnterMarketEventObject { + underlying: string; + account: string; +} +export type EnterMarketEvent = TypedEvent< + [string, string], + EnterMarketEventObject +>; + +export type EnterMarketEventFilter = TypedEventFilter; + +export interface ExitMarketEventObject { + underlying: string; + account: string; +} +export type ExitMarketEvent = TypedEvent< + [string, string], + ExitMarketEventObject +>; + +export type ExitMarketEventFilter = TypedEventFilter; + +export interface GenesisEventObject {} +export type GenesisEvent = TypedEvent<[], GenesisEventObject>; + +export type GenesisEventFilter = TypedEventFilter; + +export interface GovConvertReservesEventObject { + underlying: string; + recipient: string; + amount: BigNumber; +} +export type GovConvertReservesEvent = TypedEvent< + [string, string, BigNumber], + GovConvertReservesEventObject +>; + +export type GovConvertReservesEventFilter = + TypedEventFilter; + +export interface GovSetAssetConfigEventObject { + underlying: string; + newConfig: Storage.AssetConfigStructOutput; +} +export type GovSetAssetConfigEvent = TypedEvent< + [string, Storage.AssetConfigStructOutput], + GovSetAssetConfigEventObject +>; + +export type GovSetAssetConfigEventFilter = + TypedEventFilter; + +export interface GovSetChainlinkPriceFeedEventObject { + underlying: string; + chainlinkAggregator: string; +} +export type GovSetChainlinkPriceFeedEvent = TypedEvent< + [string, string], + GovSetChainlinkPriceFeedEventObject +>; + +export type GovSetChainlinkPriceFeedEventFilter = + TypedEventFilter; + +export interface GovSetIRMEventObject { + underlying: string; + interestRateModel: BigNumber; + resetParams: string; +} +export type GovSetIRMEvent = TypedEvent< + [string, BigNumber, string], + GovSetIRMEventObject +>; + +export type GovSetIRMEventFilter = TypedEventFilter; + +export interface GovSetPricingConfigEventObject { + underlying: string; + newPricingType: number; + newPricingParameter: number; +} +export type GovSetPricingConfigEvent = TypedEvent< + [string, number, number], + GovSetPricingConfigEventObject +>; + +export type GovSetPricingConfigEventFilter = + TypedEventFilter; + +export interface GovSetReserveFeeEventObject { + underlying: string; + newReserveFee: number; +} +export type GovSetReserveFeeEvent = TypedEvent< + [string, number], + GovSetReserveFeeEventObject +>; + +export type GovSetReserveFeeEventFilter = + TypedEventFilter; + +export interface InstallerInstallModuleEventObject { + moduleId: BigNumber; + moduleImpl: string; + moduleGitCommit: string; +} +export type InstallerInstallModuleEvent = TypedEvent< + [BigNumber, string, string], + InstallerInstallModuleEventObject +>; + +export type InstallerInstallModuleEventFilter = + TypedEventFilter; + +export interface InstallerSetGovernorAdminEventObject { + newGovernorAdmin: string; +} +export type InstallerSetGovernorAdminEvent = TypedEvent< + [string], + InstallerSetGovernorAdminEventObject +>; + +export type InstallerSetGovernorAdminEventFilter = + TypedEventFilter; + +export interface InstallerSetUpgradeAdminEventObject { + newUpgradeAdmin: string; +} +export type InstallerSetUpgradeAdminEvent = TypedEvent< + [string], + InstallerSetUpgradeAdminEventObject +>; + +export type InstallerSetUpgradeAdminEventFilter = + TypedEventFilter; + +export interface LiquidationEventObject { + liquidator: string; + violator: string; + underlying: string; + collateral: string; + repay: BigNumber; + yield: BigNumber; + healthScore: BigNumber; + baseDiscount: BigNumber; + discount: BigNumber; +} +export type LiquidationEvent = TypedEvent< + [ + string, + string, + string, + string, + BigNumber, + BigNumber, + BigNumber, + BigNumber, + BigNumber + ], + LiquidationEventObject +>; + +export type LiquidationEventFilter = TypedEventFilter; + +export interface MarketActivatedEventObject { + underlying: string; + eToken: string; + dToken: string; +} +export type MarketActivatedEvent = TypedEvent< + [string, string, string], + MarketActivatedEventObject +>; + +export type MarketActivatedEventFilter = TypedEventFilter; + +export interface PTokenActivatedEventObject { + underlying: string; + pToken: string; +} +export type PTokenActivatedEvent = TypedEvent< + [string, string], + PTokenActivatedEventObject +>; + +export type PTokenActivatedEventFilter = TypedEventFilter; + +export interface PTokenUnWrapEventObject { + underlying: string; + account: string; + amount: BigNumber; +} +export type PTokenUnWrapEvent = TypedEvent< + [string, string, BigNumber], + PTokenUnWrapEventObject +>; + +export type PTokenUnWrapEventFilter = TypedEventFilter; + +export interface PTokenWrapEventObject { + underlying: string; + account: string; + amount: BigNumber; +} +export type PTokenWrapEvent = TypedEvent< + [string, string, BigNumber], + PTokenWrapEventObject +>; + +export type PTokenWrapEventFilter = TypedEventFilter; + +export interface ProxyCreatedEventObject { + proxy: string; + moduleId: BigNumber; +} +export type ProxyCreatedEvent = TypedEvent< + [string, BigNumber], + ProxyCreatedEventObject +>; + +export type ProxyCreatedEventFilter = TypedEventFilter; + +export interface RepayEventObject { + underlying: string; + account: string; + amount: BigNumber; +} +export type RepayEvent = TypedEvent< + [string, string, BigNumber], + RepayEventObject +>; + +export type RepayEventFilter = TypedEventFilter; + +export interface RequestBorrowEventObject { + account: string; + amount: BigNumber; +} +export type RequestBorrowEvent = TypedEvent< + [string, BigNumber], + RequestBorrowEventObject +>; + +export type RequestBorrowEventFilter = TypedEventFilter; + +export interface RequestBurnEventObject { + account: string; + amount: BigNumber; +} +export type RequestBurnEvent = TypedEvent< + [string, BigNumber], + RequestBurnEventObject +>; + +export type RequestBurnEventFilter = TypedEventFilter; + +export interface RequestDepositEventObject { + account: string; + amount: BigNumber; +} +export type RequestDepositEvent = TypedEvent< + [string, BigNumber], + RequestDepositEventObject +>; + +export type RequestDepositEventFilter = TypedEventFilter; + +export interface RequestDonateEventObject { + account: string; + amount: BigNumber; +} +export type RequestDonateEvent = TypedEvent< + [string, BigNumber], + RequestDonateEventObject +>; + +export type RequestDonateEventFilter = TypedEventFilter; + +export interface RequestLiquidateEventObject { + liquidator: string; + violator: string; + underlying: string; + collateral: string; + repay: BigNumber; + minYield: BigNumber; +} +export type RequestLiquidateEvent = TypedEvent< + [string, string, string, string, BigNumber, BigNumber], + RequestLiquidateEventObject +>; + +export type RequestLiquidateEventFilter = + TypedEventFilter; + +export interface RequestMintEventObject { + account: string; + amount: BigNumber; +} +export type RequestMintEvent = TypedEvent< + [string, BigNumber], + RequestMintEventObject +>; + +export type RequestMintEventFilter = TypedEventFilter; + +export interface RequestRepayEventObject { + account: string; + amount: BigNumber; +} +export type RequestRepayEvent = TypedEvent< + [string, BigNumber], + RequestRepayEventObject +>; + +export type RequestRepayEventFilter = TypedEventFilter; + +export interface RequestSwapEventObject { + accountIn: string; + accountOut: string; + underlyingIn: string; + underlyingOut: string; + amount: BigNumber; + swapType: BigNumber; +} +export type RequestSwapEvent = TypedEvent< + [string, string, string, string, BigNumber, BigNumber], + RequestSwapEventObject +>; + +export type RequestSwapEventFilter = TypedEventFilter; + +export interface RequestSwapHubEventObject { + accountIn: string; + accountOut: string; + underlyingIn: string; + underlyingOut: string; + amountIn: BigNumber; + amountOut: BigNumber; + mode: BigNumber; + swapHandler: string; +} +export type RequestSwapHubEvent = TypedEvent< + [string, string, string, string, BigNumber, BigNumber, BigNumber, string], + RequestSwapHubEventObject +>; + +export type RequestSwapHubEventFilter = TypedEventFilter; + +export interface RequestSwapHubRepayEventObject { + accountIn: string; + accountOut: string; + underlyingIn: string; + underlyingOut: string; + targetDebt: BigNumber; + swapHandler: string; +} +export type RequestSwapHubRepayEvent = TypedEvent< + [string, string, string, string, BigNumber, string], + RequestSwapHubRepayEventObject +>; + +export type RequestSwapHubRepayEventFilter = + TypedEventFilter; + +export interface RequestTransferDTokenEventObject { + from: string; + to: string; + amount: BigNumber; +} +export type RequestTransferDTokenEvent = TypedEvent< + [string, string, BigNumber], + RequestTransferDTokenEventObject +>; + +export type RequestTransferDTokenEventFilter = + TypedEventFilter; + +export interface RequestTransferETokenEventObject { + from: string; + to: string; + amount: BigNumber; +} +export type RequestTransferETokenEvent = TypedEvent< + [string, string, BigNumber], + RequestTransferETokenEventObject +>; + +export type RequestTransferETokenEventFilter = + TypedEventFilter; + +export interface RequestWithdrawEventObject { + account: string; + amount: BigNumber; +} +export type RequestWithdrawEvent = TypedEvent< + [string, BigNumber], + RequestWithdrawEventObject +>; + +export type RequestWithdrawEventFilter = TypedEventFilter; + +export interface TrackAverageLiquidityEventObject { + account: string; +} +export type TrackAverageLiquidityEvent = TypedEvent< + [string], + TrackAverageLiquidityEventObject +>; + +export type TrackAverageLiquidityEventFilter = + TypedEventFilter; + +export interface UnTrackAverageLiquidityEventObject { + account: string; +} +export type UnTrackAverageLiquidityEvent = TypedEvent< + [string], + UnTrackAverageLiquidityEventObject +>; + +export type UnTrackAverageLiquidityEventFilter = + TypedEventFilter; + +export interface WithdrawEventObject { + underlying: string; + account: string; + amount: BigNumber; +} +export type WithdrawEvent = TypedEvent< + [string, string, BigNumber], + WithdrawEventObject +>; + +export type WithdrawEventFilter = TypedEventFilter; + +export interface SwapHub extends BaseContract { + connect(signerOrProvider: Signer | Provider | string): this; + attach(addressOrName: string): this; + deployed(): Promise; + + interface: SwapHubInterface; + + queryFilter( + event: TypedEventFilter, + fromBlockOrBlockhash?: string | number | undefined, + toBlock?: string | number | undefined + ): Promise>; + + listeners( + eventFilter?: TypedEventFilter + ): Array>; + listeners(eventName?: string): Array; + removeAllListeners( + eventFilter: TypedEventFilter + ): this; + removeAllListeners(eventName?: string): this; + off: OnEvent; + on: OnEvent; + once: OnEvent; + removeListener: OnEvent; + + functions: { + moduleGitCommit(overrides?: CallOverrides): Promise<[string]>; + + moduleId(overrides?: CallOverrides): Promise<[BigNumber]>; + + swap( + subAccountIdIn: BigNumberish, + subAccountIdOut: BigNumberish, + swapHandler: string, + params: ISwapHandler.SwapParamsStruct, + overrides?: Overrides & { from?: string | Promise } + ): Promise; + + swapAndRepay( + subAccountIdIn: BigNumberish, + subAccountIdOut: BigNumberish, + swapHandler: string, + params: ISwapHandler.SwapParamsStruct, + targetDebt: BigNumberish, + overrides?: Overrides & { from?: string | Promise } + ): Promise; + }; + + moduleGitCommit(overrides?: CallOverrides): Promise; + + moduleId(overrides?: CallOverrides): Promise; + + swap( + subAccountIdIn: BigNumberish, + subAccountIdOut: BigNumberish, + swapHandler: string, + params: ISwapHandler.SwapParamsStruct, + overrides?: Overrides & { from?: string | Promise } + ): Promise; + + swapAndRepay( + subAccountIdIn: BigNumberish, + subAccountIdOut: BigNumberish, + swapHandler: string, + params: ISwapHandler.SwapParamsStruct, + targetDebt: BigNumberish, + overrides?: Overrides & { from?: string | Promise } + ): Promise; + + callStatic: { + moduleGitCommit(overrides?: CallOverrides): Promise; + + moduleId(overrides?: CallOverrides): Promise; + + swap( + subAccountIdIn: BigNumberish, + subAccountIdOut: BigNumberish, + swapHandler: string, + params: ISwapHandler.SwapParamsStruct, + overrides?: CallOverrides + ): Promise; + + swapAndRepay( + subAccountIdIn: BigNumberish, + subAccountIdOut: BigNumberish, + swapHandler: string, + params: ISwapHandler.SwapParamsStruct, + targetDebt: BigNumberish, + overrides?: CallOverrides + ): Promise; + }; + + filters: { + "AssetStatus(address,uint256,uint256,uint96,uint256,uint256,int96,uint256)"( + underlying?: string | null, + totalBalances?: null, + totalBorrows?: null, + reserveBalance?: null, + poolSize?: null, + interestAccumulator?: null, + interestRate?: null, + timestamp?: null + ): AssetStatusEventFilter; + AssetStatus( + underlying?: string | null, + totalBalances?: null, + totalBorrows?: null, + reserveBalance?: null, + poolSize?: null, + interestAccumulator?: null, + interestRate?: null, + timestamp?: null + ): AssetStatusEventFilter; + + "Borrow(address,address,uint256)"( + underlying?: string | null, + account?: string | null, + amount?: null + ): BorrowEventFilter; + Borrow( + underlying?: string | null, + account?: string | null, + amount?: null + ): BorrowEventFilter; + + "DelegateAverageLiquidity(address,address)"( + account?: string | null, + delegate?: string | null + ): DelegateAverageLiquidityEventFilter; + DelegateAverageLiquidity( + account?: string | null, + delegate?: string | null + ): DelegateAverageLiquidityEventFilter; + + "Deposit(address,address,uint256)"( + underlying?: string | null, + account?: string | null, + amount?: null + ): DepositEventFilter; + Deposit( + underlying?: string | null, + account?: string | null, + amount?: null + ): DepositEventFilter; + + "EnterMarket(address,address)"( + underlying?: string | null, + account?: string | null + ): EnterMarketEventFilter; + EnterMarket( + underlying?: string | null, + account?: string | null + ): EnterMarketEventFilter; + + "ExitMarket(address,address)"( + underlying?: string | null, + account?: string | null + ): ExitMarketEventFilter; + ExitMarket( + underlying?: string | null, + account?: string | null + ): ExitMarketEventFilter; + + "Genesis()"(): GenesisEventFilter; + Genesis(): GenesisEventFilter; + + "GovConvertReserves(address,address,uint256)"( + underlying?: string | null, + recipient?: string | null, + amount?: null + ): GovConvertReservesEventFilter; + GovConvertReserves( + underlying?: string | null, + recipient?: string | null, + amount?: null + ): GovConvertReservesEventFilter; + + "GovSetAssetConfig(address,tuple)"( + underlying?: string | null, + newConfig?: null + ): GovSetAssetConfigEventFilter; + GovSetAssetConfig( + underlying?: string | null, + newConfig?: null + ): GovSetAssetConfigEventFilter; + + "GovSetChainlinkPriceFeed(address,address)"( + underlying?: string | null, + chainlinkAggregator?: null + ): GovSetChainlinkPriceFeedEventFilter; + GovSetChainlinkPriceFeed( + underlying?: string | null, + chainlinkAggregator?: null + ): GovSetChainlinkPriceFeedEventFilter; + + "GovSetIRM(address,uint256,bytes)"( + underlying?: string | null, + interestRateModel?: null, + resetParams?: null + ): GovSetIRMEventFilter; + GovSetIRM( + underlying?: string | null, + interestRateModel?: null, + resetParams?: null + ): GovSetIRMEventFilter; + + "GovSetPricingConfig(address,uint16,uint32)"( + underlying?: string | null, + newPricingType?: null, + newPricingParameter?: null + ): GovSetPricingConfigEventFilter; + GovSetPricingConfig( + underlying?: string | null, + newPricingType?: null, + newPricingParameter?: null + ): GovSetPricingConfigEventFilter; + + "GovSetReserveFee(address,uint32)"( + underlying?: string | null, + newReserveFee?: null + ): GovSetReserveFeeEventFilter; + GovSetReserveFee( + underlying?: string | null, + newReserveFee?: null + ): GovSetReserveFeeEventFilter; + + "InstallerInstallModule(uint256,address,bytes32)"( + moduleId?: BigNumberish | null, + moduleImpl?: string | null, + moduleGitCommit?: null + ): InstallerInstallModuleEventFilter; + InstallerInstallModule( + moduleId?: BigNumberish | null, + moduleImpl?: string | null, + moduleGitCommit?: null + ): InstallerInstallModuleEventFilter; + + "InstallerSetGovernorAdmin(address)"( + newGovernorAdmin?: string | null + ): InstallerSetGovernorAdminEventFilter; + InstallerSetGovernorAdmin( + newGovernorAdmin?: string | null + ): InstallerSetGovernorAdminEventFilter; + + "InstallerSetUpgradeAdmin(address)"( + newUpgradeAdmin?: string | null + ): InstallerSetUpgradeAdminEventFilter; + InstallerSetUpgradeAdmin( + newUpgradeAdmin?: string | null + ): InstallerSetUpgradeAdminEventFilter; + + "Liquidation(address,address,address,address,uint256,uint256,uint256,uint256,uint256)"( + liquidator?: string | null, + violator?: string | null, + underlying?: string | null, + collateral?: null, + repay?: null, + _yield?: null, + healthScore?: null, + baseDiscount?: null, + discount?: null + ): LiquidationEventFilter; + Liquidation( + liquidator?: string | null, + violator?: string | null, + underlying?: string | null, + collateral?: null, + repay?: null, + _yield?: null, + healthScore?: null, + baseDiscount?: null, + discount?: null + ): LiquidationEventFilter; + + "MarketActivated(address,address,address)"( + underlying?: string | null, + eToken?: string | null, + dToken?: string | null + ): MarketActivatedEventFilter; + MarketActivated( + underlying?: string | null, + eToken?: string | null, + dToken?: string | null + ): MarketActivatedEventFilter; + + "PTokenActivated(address,address)"( + underlying?: string | null, + pToken?: string | null + ): PTokenActivatedEventFilter; + PTokenActivated( + underlying?: string | null, + pToken?: string | null + ): PTokenActivatedEventFilter; + + "PTokenUnWrap(address,address,uint256)"( + underlying?: string | null, + account?: string | null, + amount?: null + ): PTokenUnWrapEventFilter; + PTokenUnWrap( + underlying?: string | null, + account?: string | null, + amount?: null + ): PTokenUnWrapEventFilter; + + "PTokenWrap(address,address,uint256)"( + underlying?: string | null, + account?: string | null, + amount?: null + ): PTokenWrapEventFilter; + PTokenWrap( + underlying?: string | null, + account?: string | null, + amount?: null + ): PTokenWrapEventFilter; + + "ProxyCreated(address,uint256)"( + proxy?: string | null, + moduleId?: null + ): ProxyCreatedEventFilter; + ProxyCreated( + proxy?: string | null, + moduleId?: null + ): ProxyCreatedEventFilter; + + "Repay(address,address,uint256)"( + underlying?: string | null, + account?: string | null, + amount?: null + ): RepayEventFilter; + Repay( + underlying?: string | null, + account?: string | null, + amount?: null + ): RepayEventFilter; + + "RequestBorrow(address,uint256)"( + account?: string | null, + amount?: null + ): RequestBorrowEventFilter; + RequestBorrow( + account?: string | null, + amount?: null + ): RequestBorrowEventFilter; + + "RequestBurn(address,uint256)"( + account?: string | null, + amount?: null + ): RequestBurnEventFilter; + RequestBurn(account?: string | null, amount?: null): RequestBurnEventFilter; + + "RequestDeposit(address,uint256)"( + account?: string | null, + amount?: null + ): RequestDepositEventFilter; + RequestDeposit( + account?: string | null, + amount?: null + ): RequestDepositEventFilter; + + "RequestDonate(address,uint256)"( + account?: string | null, + amount?: null + ): RequestDonateEventFilter; + RequestDonate( + account?: string | null, + amount?: null + ): RequestDonateEventFilter; + + "RequestLiquidate(address,address,address,address,uint256,uint256)"( + liquidator?: string | null, + violator?: string | null, + underlying?: string | null, + collateral?: null, + repay?: null, + minYield?: null + ): RequestLiquidateEventFilter; + RequestLiquidate( + liquidator?: string | null, + violator?: string | null, + underlying?: string | null, + collateral?: null, + repay?: null, + minYield?: null + ): RequestLiquidateEventFilter; + + "RequestMint(address,uint256)"( + account?: string | null, + amount?: null + ): RequestMintEventFilter; + RequestMint(account?: string | null, amount?: null): RequestMintEventFilter; + + "RequestRepay(address,uint256)"( + account?: string | null, + amount?: null + ): RequestRepayEventFilter; + RequestRepay( + account?: string | null, + amount?: null + ): RequestRepayEventFilter; + + "RequestSwap(address,address,address,address,uint256,uint256)"( + accountIn?: string | null, + accountOut?: string | null, + underlyingIn?: string | null, + underlyingOut?: null, + amount?: null, + swapType?: null + ): RequestSwapEventFilter; + RequestSwap( + accountIn?: string | null, + accountOut?: string | null, + underlyingIn?: string | null, + underlyingOut?: null, + amount?: null, + swapType?: null + ): RequestSwapEventFilter; + + "RequestSwapHub(address,address,address,address,uint256,uint256,uint256,address)"( + accountIn?: string | null, + accountOut?: string | null, + underlyingIn?: string | null, + underlyingOut?: null, + amountIn?: null, + amountOut?: null, + mode?: null, + swapHandler?: null + ): RequestSwapHubEventFilter; + RequestSwapHub( + accountIn?: string | null, + accountOut?: string | null, + underlyingIn?: string | null, + underlyingOut?: null, + amountIn?: null, + amountOut?: null, + mode?: null, + swapHandler?: null + ): RequestSwapHubEventFilter; + + "RequestSwapHubRepay(address,address,address,address,uint256,address)"( + accountIn?: string | null, + accountOut?: string | null, + underlyingIn?: string | null, + underlyingOut?: null, + targetDebt?: null, + swapHandler?: null + ): RequestSwapHubRepayEventFilter; + RequestSwapHubRepay( + accountIn?: string | null, + accountOut?: string | null, + underlyingIn?: string | null, + underlyingOut?: null, + targetDebt?: null, + swapHandler?: null + ): RequestSwapHubRepayEventFilter; + + "RequestTransferDToken(address,address,uint256)"( + from?: string | null, + to?: string | null, + amount?: null + ): RequestTransferDTokenEventFilter; + RequestTransferDToken( + from?: string | null, + to?: string | null, + amount?: null + ): RequestTransferDTokenEventFilter; + + "RequestTransferEToken(address,address,uint256)"( + from?: string | null, + to?: string | null, + amount?: null + ): RequestTransferETokenEventFilter; + RequestTransferEToken( + from?: string | null, + to?: string | null, + amount?: null + ): RequestTransferETokenEventFilter; + + "RequestWithdraw(address,uint256)"( + account?: string | null, + amount?: null + ): RequestWithdrawEventFilter; + RequestWithdraw( + account?: string | null, + amount?: null + ): RequestWithdrawEventFilter; + + "TrackAverageLiquidity(address)"( + account?: string | null + ): TrackAverageLiquidityEventFilter; + TrackAverageLiquidity( + account?: string | null + ): TrackAverageLiquidityEventFilter; + + "UnTrackAverageLiquidity(address)"( + account?: string | null + ): UnTrackAverageLiquidityEventFilter; + UnTrackAverageLiquidity( + account?: string | null + ): UnTrackAverageLiquidityEventFilter; + + "Withdraw(address,address,uint256)"( + underlying?: string | null, + account?: string | null, + amount?: null + ): WithdrawEventFilter; + Withdraw( + underlying?: string | null, + account?: string | null, + amount?: null + ): WithdrawEventFilter; + }; + + estimateGas: { + moduleGitCommit(overrides?: CallOverrides): Promise; + + moduleId(overrides?: CallOverrides): Promise; + + swap( + subAccountIdIn: BigNumberish, + subAccountIdOut: BigNumberish, + swapHandler: string, + params: ISwapHandler.SwapParamsStruct, + overrides?: Overrides & { from?: string | Promise } + ): Promise; + + swapAndRepay( + subAccountIdIn: BigNumberish, + subAccountIdOut: BigNumberish, + swapHandler: string, + params: ISwapHandler.SwapParamsStruct, + targetDebt: BigNumberish, + overrides?: Overrides & { from?: string | Promise } + ): Promise; + }; + + populateTransaction: { + moduleGitCommit(overrides?: CallOverrides): Promise; + + moduleId(overrides?: CallOverrides): Promise; + + swap( + subAccountIdIn: BigNumberish, + subAccountIdOut: BigNumberish, + swapHandler: string, + params: ISwapHandler.SwapParamsStruct, + overrides?: Overrides & { from?: string | Promise } + ): Promise; + + swapAndRepay( + subAccountIdIn: BigNumberish, + subAccountIdOut: BigNumberish, + swapHandler: string, + params: ISwapHandler.SwapParamsStruct, + targetDebt: BigNumberish, + overrides?: Overrides & { from?: string | Promise } + ): Promise; + }; +} diff --git a/types/modules/index.ts b/types/modules/index.ts index 90056d8..97794ab 100644 --- a/types/modules/index.ts +++ b/types/modules/index.ts @@ -7,3 +7,4 @@ export type { Exec } from "./Exec"; export type { Liquidation } from "./Liquidation"; export type { Markets } from "./Markets"; export type { Swap } from "./Swap"; +export type { SwapHub } from "./SwapHub"; From a4bab5e57fc1c1b35ae882fcd7a793ad0a7ca6ca Mon Sep 17 00:00:00 2001 From: darek Date: Thu, 20 Oct 2022 15:08:05 +0200 Subject: [PATCH 2/2] correct version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4c21baf..4eb588e 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "version": "1.1.3", + "version": "1.1.2", "name": "@eulerxyz/euler-interfaces", "main": "index.js", "files": [