From 5302c53fa409c82a3d6f624255c6d38a4735afe6 Mon Sep 17 00:00:00 2001 From: Adrian Li Date: Tue, 2 Jun 2020 22:51:57 -0400 Subject: [PATCH 1/4] add EMP into whitelist for script --- scripts/getAbisFromUMA.js | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/getAbisFromUMA.js b/scripts/getAbisFromUMA.js index e3b7058..013edb0 100644 --- a/scripts/getAbisFromUMA.js +++ b/scripts/getAbisFromUMA.js @@ -16,6 +16,7 @@ const fileFilter = [ "DesignatedVotingFactory", "WETH9", "ExpiringMultiPartyLib", + "ExpiringMultiParty", "TokenFactory", "AddressWhitelist", "ExpiringMultiPartyCreator", From 86b3db89581bc3936291284f429e38fc121c161b Mon Sep 17 00:00:00 2001 From: Adrian Li Date: Tue, 2 Jun 2020 22:52:06 -0400 Subject: [PATCH 2/4] add ABI back in --- src/uma/abi/ExpiringMultiParty.json | 1641 +++++++++++++++++++++++++++ 1 file changed, 1641 insertions(+) create mode 100644 src/uma/abi/ExpiringMultiParty.json diff --git a/src/uma/abi/ExpiringMultiParty.json b/src/uma/abi/ExpiringMultiParty.json new file mode 100644 index 0000000..ba2cc36 --- /dev/null +++ b/src/uma/abi/ExpiringMultiParty.json @@ -0,0 +1,1641 @@ +[ + { + "inputs": [ + { + "components": [ + { + "internalType": "uint256", + "name": "expirationTimestamp", + "type": "uint256" + }, + { + "internalType": "uint256", + "name": "withdrawalLiveness", + "type": "uint256" + }, + { + "internalType": "address", + "name": "collateralAddress", + "type": "address" + }, + { + "internalType": "address", + "name": "finderAddress", + "type": "address" + }, + { + "internalType": "address", + "name": "tokenFactoryAddress", + "type": "address" + }, + { + "internalType": "address", + "name": "timerAddress", + "type": "address" + }, + { + "internalType": "bytes32", + "name": "priceFeedIdentifier", + "type": "bytes32" + }, + { + "internalType": "string", + "name": "syntheticName", + "type": "string" + }, + { + "internalType": "string", + "name": "syntheticSymbol", + "type": "string" + }, + { + "components": [ + { + "internalType": "uint256", + "name": "rawValue", + "type": "uint256" + } + ], + "internalType": "struct FixedPoint.Unsigned", + "name": "minSponsorTokens", + "type": "tuple" + }, + { + "internalType": "uint256", + "name": "liquidationLiveness", + "type": "uint256" + }, + { + "components": [ + { + "internalType": "uint256", + "name": "rawValue", + "type": "uint256" + } + ], + "internalType": "struct FixedPoint.Unsigned", + "name": "collateralRequirement", + "type": "tuple" + }, + { + "components": [ + { + "internalType": "uint256", + "name": "rawValue", + "type": "uint256" + } + ], + "internalType": "struct FixedPoint.Unsigned", + "name": "disputeBondPct", + "type": "tuple" + }, + { + "components": [ + { + "internalType": "uint256", + "name": "rawValue", + "type": "uint256" + } + ], + "internalType": "struct FixedPoint.Unsigned", + "name": "sponsorDisputeRewardPct", + "type": "tuple" + }, + { + "components": [ + { + "internalType": "uint256", + "name": "rawValue", + "type": "uint256" + } + ], + "internalType": "struct FixedPoint.Unsigned", + "name": "disputerDisputeRewardPct", + "type": "tuple" + } + ], + "internalType": "struct Liquidatable.ConstructorParams", + "name": "params", + "type": "tuple" + } + ], + "stateMutability": "nonpayable", + "type": "constructor" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "address", + "name": "caller", + "type": "address" + } + ], + "name": "ContractExpired", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "address", + "name": "sponsor", + "type": "address" + }, + { + "indexed": true, + "internalType": "uint256", + "name": "collateralAmount", + "type": "uint256" + } + ], + "name": "Deposit", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "address", + "name": "caller", + "type": "address" + }, + { + "indexed": true, + "internalType": "address", + "name": "sponsor", + "type": "address" + }, + { + "indexed": true, + "internalType": "address", + "name": "liquidator", + "type": "address" + }, + { + "indexed": false, + "internalType": "address", + "name": "disputer", + "type": "address" + }, + { + "indexed": false, + "internalType": "uint256", + "name": "liquidationId", + "type": "uint256" + }, + { + "indexed": false, + "internalType": "bool", + "name": "disputeSucceeded", + "type": "bool" + } + ], + "name": "DisputeSettled", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "address", + "name": "caller", + "type": "address" + }, + { + "indexed": false, + "internalType": "uint256", + "name": "originalExpirationTimestamp", + "type": "uint256" + }, + { + "indexed": false, + "internalType": "uint256", + "name": "shutdownTimestamp", + "type": "uint256" + } + ], + "name": "EmergencyShutdown", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "address", + "name": "sponsor", + "type": "address" + } + ], + "name": "EndedSponsorPosition", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "uint256", + "name": "amount", + "type": "uint256" + } + ], + "name": "FinalFeesPaid", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "address", + "name": "sponsor", + "type": "address" + }, + { + "indexed": true, + "internalType": "address", + "name": "liquidator", + "type": "address" + }, + { + "indexed": true, + "internalType": "uint256", + "name": "liquidationId", + "type": "uint256" + }, + { + "indexed": false, + "internalType": "uint256", + "name": "tokensOutstanding", + "type": "uint256" + }, + { + "indexed": false, + "internalType": "uint256", + "name": "lockedCollateral", + "type": "uint256" + }, + { + "indexed": false, + "internalType": "uint256", + "name": "liquidatedCollateral", + "type": "uint256" + } + ], + "name": "LiquidationCreated", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "address", + "name": "sponsor", + "type": "address" + }, + { + "indexed": true, + "internalType": "address", + "name": "liquidator", + "type": "address" + }, + { + "indexed": true, + "internalType": "address", + "name": "disputer", + "type": "address" + }, + { + "indexed": false, + "internalType": "uint256", + "name": "liquidationId", + "type": "uint256" + }, + { + "indexed": false, + "internalType": "uint256", + "name": "disputeBondAmount", + "type": "uint256" + } + ], + "name": "LiquidationDisputed", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "address", + "name": "caller", + "type": "address" + }, + { + "indexed": false, + "internalType": "uint256", + "name": "withdrawalAmount", + "type": "uint256" + }, + { + "indexed": true, + "internalType": "enum Liquidatable.Status", + "name": "liquidationStatus", + "type": "uint8" + } + ], + "name": "LiquidationWithdrawn", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "address", + "name": "sponsor", + "type": "address" + } + ], + "name": "NewSponsor", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "address", + "name": "sponsor", + "type": "address" + }, + { + "indexed": true, + "internalType": "uint256", + "name": "collateralAmount", + "type": "uint256" + }, + { + "indexed": true, + "internalType": "uint256", + "name": "tokenAmount", + "type": "uint256" + } + ], + "name": "PositionCreated", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "address", + "name": "sponsor", + "type": "address" + }, + { + "indexed": true, + "internalType": "uint256", + "name": "collateralAmount", + "type": "uint256" + }, + { + "indexed": true, + "internalType": "uint256", + "name": "tokenAmount", + "type": "uint256" + } + ], + "name": "Redeem", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "uint256", + "name": "regularFee", + "type": "uint256" + }, + { + "indexed": true, + "internalType": "uint256", + "name": "lateFee", + "type": "uint256" + } + ], + "name": "RegularFeesPaid", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "address", + "name": "oldSponsor", + "type": "address" + } + ], + "name": "RequestTransferPosition", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "address", + "name": "oldSponsor", + "type": "address" + } + ], + "name": "RequestTransferPositionCanceled", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "address", + "name": "oldSponsor", + "type": "address" + }, + { + "indexed": true, + "internalType": "address", + "name": "newSponsor", + "type": "address" + } + ], + "name": "RequestTransferPositionExecuted", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "address", + "name": "sponsor", + "type": "address" + }, + { + "indexed": true, + "internalType": "uint256", + "name": "collateralAmount", + "type": "uint256" + } + ], + "name": "RequestWithdrawal", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "address", + "name": "sponsor", + "type": "address" + }, + { + "indexed": true, + "internalType": "uint256", + "name": "collateralAmount", + "type": "uint256" + } + ], + "name": "RequestWithdrawalCanceled", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "address", + "name": "sponsor", + "type": "address" + }, + { + "indexed": true, + "internalType": "uint256", + "name": "collateralAmount", + "type": "uint256" + } + ], + "name": "RequestWithdrawalExecuted", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "address", + "name": "caller", + "type": "address" + }, + { + "indexed": true, + "internalType": "uint256", + "name": "collateralReturned", + "type": "uint256" + }, + { + "indexed": true, + "internalType": "uint256", + "name": "tokensBurned", + "type": "uint256" + } + ], + "name": "SettleExpiredPosition", + "type": "event" + }, + { + "anonymous": false, + "inputs": [ + { + "indexed": true, + "internalType": "address", + "name": "sponsor", + "type": "address" + }, + { + "indexed": true, + "internalType": "uint256", + "name": "collateralAmount", + "type": "uint256" + } + ], + "name": "Withdrawal", + "type": "event" + }, + { + "inputs": [], + "name": "cancelTransferPosition", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [], + "name": "cancelWithdrawal", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [], + "name": "collateralCurrency", + "outputs": [ + { + "internalType": "contract IERC20", + "name": "", + "type": "address" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [], + "name": "collateralRequirement", + "outputs": [ + { + "internalType": "uint256", + "name": "rawValue", + "type": "uint256" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [], + "name": "contractState", + "outputs": [ + { + "internalType": "enum PricelessPositionManager.ContractState", + "name": "", + "type": "uint8" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [ + { + "components": [ + { + "internalType": "uint256", + "name": "rawValue", + "type": "uint256" + } + ], + "internalType": "struct FixedPoint.Unsigned", + "name": "collateralAmount", + "type": "tuple" + }, + { + "components": [ + { + "internalType": "uint256", + "name": "rawValue", + "type": "uint256" + } + ], + "internalType": "struct FixedPoint.Unsigned", + "name": "numTokens", + "type": "tuple" + } + ], + "name": "create", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "address", + "name": "sponsor", + "type": "address" + }, + { + "components": [ + { + "internalType": "uint256", + "name": "rawValue", + "type": "uint256" + } + ], + "internalType": "struct FixedPoint.Unsigned", + "name": "minCollateralPerToken", + "type": "tuple" + }, + { + "components": [ + { + "internalType": "uint256", + "name": "rawValue", + "type": "uint256" + } + ], + "internalType": "struct FixedPoint.Unsigned", + "name": "maxCollateralPerToken", + "type": "tuple" + }, + { + "components": [ + { + "internalType": "uint256", + "name": "rawValue", + "type": "uint256" + } + ], + "internalType": "struct FixedPoint.Unsigned", + "name": "maxTokensToLiquidate", + "type": "tuple" + }, + { + "internalType": "uint256", + "name": "deadline", + "type": "uint256" + } + ], + "name": "createLiquidation", + "outputs": [ + { + "internalType": "uint256", + "name": "liquidationId", + "type": "uint256" + }, + { + "components": [ + { + "internalType": "uint256", + "name": "rawValue", + "type": "uint256" + } + ], + "internalType": "struct FixedPoint.Unsigned", + "name": "tokensLiquidated", + "type": "tuple" + }, + { + "components": [ + { + "internalType": "uint256", + "name": "rawValue", + "type": "uint256" + } + ], + "internalType": "struct FixedPoint.Unsigned", + "name": "finalFeeBond", + "type": "tuple" + } + ], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [], + "name": "cumulativeFeeMultiplier", + "outputs": [ + { + "internalType": "uint256", + "name": "rawValue", + "type": "uint256" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [ + { + "components": [ + { + "internalType": "uint256", + "name": "rawValue", + "type": "uint256" + } + ], + "internalType": "struct FixedPoint.Unsigned", + "name": "collateralAmount", + "type": "tuple" + } + ], + "name": "deposit", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "address", + "name": "sponsor", + "type": "address" + }, + { + "components": [ + { + "internalType": "uint256", + "name": "rawValue", + "type": "uint256" + } + ], + "internalType": "struct FixedPoint.Unsigned", + "name": "collateralAmount", + "type": "tuple" + } + ], + "name": "depositTo", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "uint256", + "name": "liquidationId", + "type": "uint256" + }, + { + "internalType": "address", + "name": "sponsor", + "type": "address" + } + ], + "name": "dispute", + "outputs": [ + { + "components": [ + { + "internalType": "uint256", + "name": "rawValue", + "type": "uint256" + } + ], + "internalType": "struct FixedPoint.Unsigned", + "name": "totalPaid", + "type": "tuple" + } + ], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [], + "name": "disputeBondPct", + "outputs": [ + { + "internalType": "uint256", + "name": "rawValue", + "type": "uint256" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [], + "name": "disputerDisputeRewardPct", + "outputs": [ + { + "internalType": "uint256", + "name": "rawValue", + "type": "uint256" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [], + "name": "emergencyShutdown", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [], + "name": "expirationTimestamp", + "outputs": [ + { + "internalType": "uint256", + "name": "", + "type": "uint256" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [], + "name": "expire", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [], + "name": "expiryPrice", + "outputs": [ + { + "internalType": "uint256", + "name": "rawValue", + "type": "uint256" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [], + "name": "finder", + "outputs": [ + { + "internalType": "contract FinderInterface", + "name": "", + "type": "address" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "address", + "name": "sponsor", + "type": "address" + } + ], + "name": "getCollateral", + "outputs": [ + { + "components": [ + { + "internalType": "uint256", + "name": "rawValue", + "type": "uint256" + } + ], + "internalType": "struct FixedPoint.Unsigned", + "name": "collateralAmount", + "type": "tuple" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [], + "name": "getCurrentTime", + "outputs": [ + { + "internalType": "uint256", + "name": "", + "type": "uint256" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "address", + "name": "sponsor", + "type": "address" + } + ], + "name": "getLiquidations", + "outputs": [ + { + "components": [ + { + "internalType": "address", + "name": "sponsor", + "type": "address" + }, + { + "internalType": "address", + "name": "liquidator", + "type": "address" + }, + { + "internalType": "enum Liquidatable.Status", + "name": "state", + "type": "uint8" + }, + { + "internalType": "uint256", + "name": "liquidationTime", + "type": "uint256" + }, + { + "components": [ + { + "internalType": "uint256", + "name": "rawValue", + "type": "uint256" + } + ], + "internalType": "struct FixedPoint.Unsigned", + "name": "tokensOutstanding", + "type": "tuple" + }, + { + "components": [ + { + "internalType": "uint256", + "name": "rawValue", + "type": "uint256" + } + ], + "internalType": "struct FixedPoint.Unsigned", + "name": "lockedCollateral", + "type": "tuple" + }, + { + "components": [ + { + "internalType": "uint256", + "name": "rawValue", + "type": "uint256" + } + ], + "internalType": "struct FixedPoint.Unsigned", + "name": "liquidatedCollateral", + "type": "tuple" + }, + { + "components": [ + { + "internalType": "uint256", + "name": "rawValue", + "type": "uint256" + } + ], + "internalType": "struct FixedPoint.Unsigned", + "name": "rawUnitCollateral", + "type": "tuple" + }, + { + "internalType": "address", + "name": "disputer", + "type": "address" + }, + { + "components": [ + { + "internalType": "uint256", + "name": "rawValue", + "type": "uint256" + } + ], + "internalType": "struct FixedPoint.Unsigned", + "name": "settlementPrice", + "type": "tuple" + }, + { + "components": [ + { + "internalType": "uint256", + "name": "rawValue", + "type": "uint256" + } + ], + "internalType": "struct FixedPoint.Unsigned", + "name": "finalFee", + "type": "tuple" + } + ], + "internalType": "struct Liquidatable.LiquidationData[]", + "name": "liquidationData", + "type": "tuple[]" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [], + "name": "liquidationLiveness", + "outputs": [ + { + "internalType": "uint256", + "name": "", + "type": "uint256" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "address", + "name": "", + "type": "address" + }, + { + "internalType": "uint256", + "name": "", + "type": "uint256" + } + ], + "name": "liquidations", + "outputs": [ + { + "internalType": "address", + "name": "sponsor", + "type": "address" + }, + { + "internalType": "address", + "name": "liquidator", + "type": "address" + }, + { + "internalType": "enum Liquidatable.Status", + "name": "state", + "type": "uint8" + }, + { + "internalType": "uint256", + "name": "liquidationTime", + "type": "uint256" + }, + { + "components": [ + { + "internalType": "uint256", + "name": "rawValue", + "type": "uint256" + } + ], + "internalType": "struct FixedPoint.Unsigned", + "name": "tokensOutstanding", + "type": "tuple" + }, + { + "components": [ + { + "internalType": "uint256", + "name": "rawValue", + "type": "uint256" + } + ], + "internalType": "struct FixedPoint.Unsigned", + "name": "lockedCollateral", + "type": "tuple" + }, + { + "components": [ + { + "internalType": "uint256", + "name": "rawValue", + "type": "uint256" + } + ], + "internalType": "struct FixedPoint.Unsigned", + "name": "liquidatedCollateral", + "type": "tuple" + }, + { + "components": [ + { + "internalType": "uint256", + "name": "rawValue", + "type": "uint256" + } + ], + "internalType": "struct FixedPoint.Unsigned", + "name": "rawUnitCollateral", + "type": "tuple" + }, + { + "internalType": "address", + "name": "disputer", + "type": "address" + }, + { + "components": [ + { + "internalType": "uint256", + "name": "rawValue", + "type": "uint256" + } + ], + "internalType": "struct FixedPoint.Unsigned", + "name": "settlementPrice", + "type": "tuple" + }, + { + "components": [ + { + "internalType": "uint256", + "name": "rawValue", + "type": "uint256" + } + ], + "internalType": "struct FixedPoint.Unsigned", + "name": "finalFee", + "type": "tuple" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [], + "name": "minSponsorTokens", + "outputs": [ + { + "internalType": "uint256", + "name": "rawValue", + "type": "uint256" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [], + "name": "payRegularFees", + "outputs": [ + { + "components": [ + { + "internalType": "uint256", + "name": "rawValue", + "type": "uint256" + } + ], + "internalType": "struct FixedPoint.Unsigned", + "name": "totalPaid", + "type": "tuple" + } + ], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [], + "name": "pfc", + "outputs": [ + { + "components": [ + { + "internalType": "uint256", + "name": "rawValue", + "type": "uint256" + } + ], + "internalType": "struct FixedPoint.Unsigned", + "name": "", + "type": "tuple" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "address", + "name": "", + "type": "address" + } + ], + "name": "positions", + "outputs": [ + { + "components": [ + { + "internalType": "uint256", + "name": "rawValue", + "type": "uint256" + } + ], + "internalType": "struct FixedPoint.Unsigned", + "name": "tokensOutstanding", + "type": "tuple" + }, + { + "internalType": "uint256", + "name": "withdrawalRequestPassTimestamp", + "type": "uint256" + }, + { + "components": [ + { + "internalType": "uint256", + "name": "rawValue", + "type": "uint256" + } + ], + "internalType": "struct FixedPoint.Unsigned", + "name": "withdrawalRequestAmount", + "type": "tuple" + }, + { + "components": [ + { + "internalType": "uint256", + "name": "rawValue", + "type": "uint256" + } + ], + "internalType": "struct FixedPoint.Unsigned", + "name": "rawCollateral", + "type": "tuple" + }, + { + "internalType": "uint256", + "name": "transferPositionRequestPassTimestamp", + "type": "uint256" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [], + "name": "priceIdentifier", + "outputs": [ + { + "internalType": "bytes32", + "name": "", + "type": "bytes32" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [], + "name": "rawLiquidationCollateral", + "outputs": [ + { + "internalType": "uint256", + "name": "rawValue", + "type": "uint256" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [], + "name": "rawTotalPositionCollateral", + "outputs": [ + { + "internalType": "uint256", + "name": "rawValue", + "type": "uint256" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [ + { + "components": [ + { + "internalType": "uint256", + "name": "rawValue", + "type": "uint256" + } + ], + "internalType": "struct FixedPoint.Unsigned", + "name": "numTokens", + "type": "tuple" + } + ], + "name": "redeem", + "outputs": [ + { + "components": [ + { + "internalType": "uint256", + "name": "rawValue", + "type": "uint256" + } + ], + "internalType": "struct FixedPoint.Unsigned", + "name": "amountWithdrawn", + "type": "tuple" + } + ], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [], + "name": "remargin", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [], + "name": "requestTransferPosition", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [ + { + "components": [ + { + "internalType": "uint256", + "name": "rawValue", + "type": "uint256" + } + ], + "internalType": "struct FixedPoint.Unsigned", + "name": "collateralAmount", + "type": "tuple" + } + ], + "name": "requestWithdrawal", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "uint256", + "name": "time", + "type": "uint256" + } + ], + "name": "setCurrentTime", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [], + "name": "settleExpired", + "outputs": [ + { + "components": [ + { + "internalType": "uint256", + "name": "rawValue", + "type": "uint256" + } + ], + "internalType": "struct FixedPoint.Unsigned", + "name": "amountWithdrawn", + "type": "tuple" + } + ], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [], + "name": "sponsorDisputeRewardPct", + "outputs": [ + { + "internalType": "uint256", + "name": "rawValue", + "type": "uint256" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [], + "name": "timerAddress", + "outputs": [ + { + "internalType": "address", + "name": "", + "type": "address" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [], + "name": "tokenCurrency", + "outputs": [ + { + "internalType": "contract ExpandedIERC20", + "name": "", + "type": "address" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [], + "name": "totalPositionCollateral", + "outputs": [ + { + "components": [ + { + "internalType": "uint256", + "name": "rawValue", + "type": "uint256" + } + ], + "internalType": "struct FixedPoint.Unsigned", + "name": "totalCollateral", + "type": "tuple" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [], + "name": "totalTokensOutstanding", + "outputs": [ + { + "internalType": "uint256", + "name": "rawValue", + "type": "uint256" + } + ], + "stateMutability": "view", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "address", + "name": "newSponsorAddress", + "type": "address" + } + ], + "name": "transferPositionPassedRequest", + "outputs": [], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [ + { + "components": [ + { + "internalType": "uint256", + "name": "rawValue", + "type": "uint256" + } + ], + "internalType": "struct FixedPoint.Unsigned", + "name": "collateralAmount", + "type": "tuple" + } + ], + "name": "withdraw", + "outputs": [ + { + "components": [ + { + "internalType": "uint256", + "name": "rawValue", + "type": "uint256" + } + ], + "internalType": "struct FixedPoint.Unsigned", + "name": "amountWithdrawn", + "type": "tuple" + } + ], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [ + { + "internalType": "uint256", + "name": "liquidationId", + "type": "uint256" + }, + { + "internalType": "address", + "name": "sponsor", + "type": "address" + } + ], + "name": "withdrawLiquidation", + "outputs": [ + { + "components": [ + { + "internalType": "uint256", + "name": "rawValue", + "type": "uint256" + } + ], + "internalType": "struct FixedPoint.Unsigned", + "name": "amountWithdrawn", + "type": "tuple" + } + ], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [], + "name": "withdrawPassedRequest", + "outputs": [ + { + "components": [ + { + "internalType": "uint256", + "name": "rawValue", + "type": "uint256" + } + ], + "internalType": "struct FixedPoint.Unsigned", + "name": "amountWithdrawn", + "type": "tuple" + } + ], + "stateMutability": "nonpayable", + "type": "function" + }, + { + "inputs": [], + "name": "withdrawalLiveness", + "outputs": [ + { + "internalType": "uint256", + "name": "", + "type": "uint256" + } + ], + "stateMutability": "view", + "type": "function" + } +] \ No newline at end of file From 81a40d646578c7769df87c0fea3c32c6a8b4b76a Mon Sep 17 00:00:00 2001 From: Adrian Li Date: Tue, 2 Jun 2020 22:53:22 -0400 Subject: [PATCH 3/4] link ABI for EMP --- src/uma/contracts.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/uma/contracts.ts b/src/uma/contracts.ts index 1797e32..156b51f 100644 --- a/src/uma/contracts.ts +++ b/src/uma/contracts.ts @@ -1,5 +1,6 @@ import addressWhitelistAbi from "./abi/AddressWhitelist.json"; import designatedVotingFactoryAbi from "./abi/DesignatedVotingFactory.json"; +import expiringMultiPartyAbi from "./abi/ExpiringMultiParty.json"; import expiringMultiPartyCreatorAbi from "./abi/ExpiringMultiPartyCreator.json"; import financialContractsAdminAbi from "./abi/FinancialContractsAdmin.json"; import finderAbi from "./abi/Finder.json"; @@ -7,10 +8,10 @@ import governorAbi from "./abi/Governor.json"; import identifierWhitelistAbi from "./abi/IdentifierWhitelist.json"; import registryAbi from "./abi/Registry.json"; import storeAbi from "./abi/Store.json"; +import tokenFactoryAbi from "./abi/TokenFactory.json"; import votingAbi from "./abi/Voting.json"; import votingTokenAbi from "./abi/VotingToken.json"; import weth9Abi from "./abi/WETH9.json"; -import tokenFactoryAbi from "./abi/TokenFactory.json"; const contracts = { addressWhitelist: { @@ -21,6 +22,9 @@ const contracts = { abi: designatedVotingFactoryAbi, address: "0xE81EeE5Da165fA6863bBc82dF66E62d18625d592", }, + expiringMultiParty: { + abi: expiringMultiPartyAbi, + }, expiringMultiPartyLib: { abi: [], address: "0x09AFD24Acc170c16f4fF64BDf2A4818C515440e8", From 3f758e3bc793682bfa269b19f4090dfcbddfe14d Mon Sep 17 00:00:00 2001 From: Adrian Li Date: Tue, 2 Jun 2020 22:53:58 -0400 Subject: [PATCH 4/4] bump version for missing EMP hotfix --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8604664..519efea 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@studydefi/money-legos", - "version": "2.3.1", + "version": "2.3.2", "main": "index.js", "types": "index.d.ts", "repository": "git@github.com:studydefi/money-legos.git",