diff --git a/packages/hardhat/contracts/mocks/OwnableCelesteMock.sol b/packages/hardhat/contracts/mocks/OwnableCelesteMock.sol index a7db05a1..87f1e9eb 100644 --- a/packages/hardhat/contracts/mocks/OwnableCelesteMock.sol +++ b/packages/hardhat/contracts/mocks/OwnableCelesteMock.sol @@ -56,7 +56,6 @@ interface IArbitrator { * @param _evidence Data submitted for the evidence related to the dispute */ function submitEvidence( - IArbitrable _subject, uint256 _disputeId, address _submitter, bytes calldata _evidence @@ -64,6 +63,7 @@ interface IArbitrator { /** * @dev Close the evidence period of a dispute + * @param _subject Arbitrable instance submitting the dispute * @param _disputeId Identification number of the dispute to close its evidence submitting period */ function closeEvidencePeriod( @@ -395,7 +395,6 @@ contract OwnableCeleste is IArbitrator { /** * @notice Submit evidence for a dispute #`_disputeId` - * @param _subject Arbitrable instance submitting the dispute * @param _disputeId Identification number of the dispute receiving new evidence * @param _submitter Address of the account submitting the evidence * @param _evidence Data submitted for the evidence of the dispute @@ -405,9 +404,11 @@ contract OwnableCeleste is IArbitrator { address _submitter, bytes calldata _evidence ) external disputeExists(_disputeId) { - IArbitrable _subject = IArbitrable(msg.sender); Dispute storage dispute = disputes[_disputeId]; - require(dispute.subject == _subject, "DM_SUBJECT_NOT_DISPUTE_SUBJECT"); + require( + dispute.subject == IArbitrable(msg.sender), + "DM_SUBJECT_NOT_DISPUTE_SUBJECT" + ); emit EvidenceSubmitted(_disputeId, _submitter, _evidence); } diff --git a/packages/hardhat/hardhat.config.ts b/packages/hardhat/hardhat.config.ts index 630c01a3..d3593d1e 100644 --- a/packages/hardhat/hardhat.config.ts +++ b/packages/hardhat/hardhat.config.ts @@ -2,7 +2,6 @@ import { config as dotenvConfig } from "dotenv"; import "hardhat-deploy"; import fs from "fs"; import chalk from "chalk"; -import "@tenderly/hardhat-tenderly"; import "@nomiclabs/hardhat-etherscan"; import "@openzeppelin/hardhat-upgrades"; import "@nomiclabs/hardhat-ethers"; diff --git a/packages/hardhat/package.json b/packages/hardhat/package.json index e8761a46..d6dfa944 100644 --- a/packages/hardhat/package.json +++ b/packages/hardhat/package.json @@ -15,7 +15,6 @@ "@openzeppelin/contracts": "^4.9.2", "@openzeppelin/contracts-upgradeable": "^4.9.3", "@openzeppelin/hardhat-upgrades": "^1.0.0", - "@tenderly/hardhat-tenderly": "^1.7.7", "@typechain/ethers-v5": "^5.0.0", "@types/chai": "^4.2.21", "@types/mocha": "^9.0.0", diff --git a/packages/hardhat/typechain/IArbitrable.d.ts b/packages/hardhat/typechain/IArbitrable.d.ts new file mode 100644 index 00000000..0d780088 --- /dev/null +++ b/packages/hardhat/typechain/IArbitrable.d.ts @@ -0,0 +1,56 @@ +/* Autogenerated file. Do not edit manually. */ +/* tslint:disable */ +/* eslint-disable */ + +import { + ethers, + EventFilter, + Signer, + BigNumber, + BigNumberish, + PopulatedTransaction, +} from "ethers"; +import { Contract, ContractTransaction } from "@ethersproject/contracts"; +import { BytesLike } from "@ethersproject/bytes"; +import { Listener, Provider } from "@ethersproject/providers"; +import { FunctionFragment, EventFragment, Result } from "@ethersproject/abi"; + +interface IArbitrableInterface extends ethers.utils.Interface { + functions: {}; + + events: { + "Ruled(address,uint256,uint256)": EventFragment; + }; + + getEvent(nameOrSignatureOrTopic: "Ruled"): EventFragment; +} + +export class IArbitrable extends Contract { + connect(signerOrProvider: Signer | Provider | string): this; + attach(addressOrName: string): this; + deployed(): Promise; + + on(event: EventFilter | string, listener: Listener): this; + once(event: EventFilter | string, listener: Listener): this; + addListener(eventName: EventFilter | string, listener: Listener): this; + removeAllListeners(eventName: EventFilter | string): this; + removeListener(eventName: any, listener: Listener): this; + + interface: IArbitrableInterface; + + functions: {}; + + callStatic: {}; + + filters: { + Ruled( + arbitrator: string | null, + disputeId: BigNumberish | null, + ruling: null + ): EventFilter; + }; + + estimateGas: {}; + + populateTransaction: {}; +} diff --git a/packages/hardhat/typechain/IArbitrator.d.ts b/packages/hardhat/typechain/IArbitrator.d.ts index 120a60f0..f6f4fd4e 100644 --- a/packages/hardhat/typechain/IArbitrator.d.ts +++ b/packages/hardhat/typechain/IArbitrator.d.ts @@ -24,8 +24,8 @@ interface IArbitratorInterface extends ethers.utils.Interface { functions: { "getDisputeFees()": FunctionFragment; "submitEvidence(uint256,address,bytes)": FunctionFragment; - "closeEvidencePeriod(uint256)": FunctionFragment; "createDispute(uint256,bytes)": FunctionFragment; + "closeEvidencePeriod(address,uint256)": FunctionFragment; "rule(uint256)": FunctionFragment; }; @@ -37,14 +37,14 @@ interface IArbitratorInterface extends ethers.utils.Interface { functionFragment: "submitEvidence", values: [BigNumberish, string, BytesLike] ): string; - encodeFunctionData( - functionFragment: "closeEvidencePeriod", - values: [BigNumberish] - ): string; encodeFunctionData( functionFragment: "createDispute", values: [BigNumberish, BytesLike] ): string; + encodeFunctionData( + functionFragment: "closeEvidencePeriod", + values: [string, BigNumberish] + ): string; encodeFunctionData(functionFragment: "rule", values: [BigNumberish]): string; decodeFunctionResult( @@ -56,11 +56,11 @@ interface IArbitratorInterface extends ethers.utils.Interface { data: BytesLike ): Result; decodeFunctionResult( - functionFragment: "closeEvidencePeriod", + functionFragment: "createDispute", data: BytesLike ): Result; decodeFunctionResult( - functionFragment: "createDispute", + functionFragment: "closeEvidencePeriod", data: BytesLike ): Result; decodeFunctionResult(functionFragment: "rule", data: BytesLike): Result; @@ -116,16 +116,6 @@ export class IArbitrator extends Contract { overrides?: Overrides ): Promise; - closeEvidencePeriod( - _disputeId: BigNumberish, - overrides?: Overrides - ): Promise; - - "closeEvidencePeriod(uint256)"( - _disputeId: BigNumberish, - overrides?: Overrides - ): Promise; - createDispute( _possibleRulings: BigNumberish, _metadata: BytesLike, @@ -138,6 +128,18 @@ export class IArbitrator extends Contract { overrides?: Overrides ): Promise; + closeEvidencePeriod( + _subject: string, + _disputeId: BigNumberish, + overrides?: Overrides + ): Promise; + + "closeEvidencePeriod(address,uint256)"( + _subject: string, + _disputeId: BigNumberish, + overrides?: Overrides + ): Promise; + rule( _disputeId: BigNumberish, overrides?: Overrides @@ -183,16 +185,6 @@ export class IArbitrator extends Contract { overrides?: Overrides ): Promise; - closeEvidencePeriod( - _disputeId: BigNumberish, - overrides?: Overrides - ): Promise; - - "closeEvidencePeriod(uint256)"( - _disputeId: BigNumberish, - overrides?: Overrides - ): Promise; - createDispute( _possibleRulings: BigNumberish, _metadata: BytesLike, @@ -205,6 +197,18 @@ export class IArbitrator extends Contract { overrides?: Overrides ): Promise; + closeEvidencePeriod( + _subject: string, + _disputeId: BigNumberish, + overrides?: Overrides + ): Promise; + + "closeEvidencePeriod(address,uint256)"( + _subject: string, + _disputeId: BigNumberish, + overrides?: Overrides + ): Promise; + rule( _disputeId: BigNumberish, overrides?: Overrides @@ -250,16 +254,6 @@ export class IArbitrator extends Contract { overrides?: CallOverrides ): Promise; - closeEvidencePeriod( - _disputeId: BigNumberish, - overrides?: CallOverrides - ): Promise; - - "closeEvidencePeriod(uint256)"( - _disputeId: BigNumberish, - overrides?: CallOverrides - ): Promise; - createDispute( _possibleRulings: BigNumberish, _metadata: BytesLike, @@ -272,6 +266,18 @@ export class IArbitrator extends Contract { overrides?: CallOverrides ): Promise; + closeEvidencePeriod( + _subject: string, + _disputeId: BigNumberish, + overrides?: CallOverrides + ): Promise; + + "closeEvidencePeriod(address,uint256)"( + _subject: string, + _disputeId: BigNumberish, + overrides?: CallOverrides + ): Promise; + rule( _disputeId: BigNumberish, overrides?: CallOverrides @@ -304,16 +310,6 @@ export class IArbitrator extends Contract { overrides?: Overrides ): Promise; - closeEvidencePeriod( - _disputeId: BigNumberish, - overrides?: Overrides - ): Promise; - - "closeEvidencePeriod(uint256)"( - _disputeId: BigNumberish, - overrides?: Overrides - ): Promise; - createDispute( _possibleRulings: BigNumberish, _metadata: BytesLike, @@ -326,6 +322,18 @@ export class IArbitrator extends Contract { overrides?: Overrides ): Promise; + closeEvidencePeriod( + _subject: string, + _disputeId: BigNumberish, + overrides?: Overrides + ): Promise; + + "closeEvidencePeriod(address,uint256)"( + _subject: string, + _disputeId: BigNumberish, + overrides?: Overrides + ): Promise; + rule(_disputeId: BigNumberish, overrides?: Overrides): Promise; "rule(uint256)"( @@ -355,16 +363,6 @@ export class IArbitrator extends Contract { overrides?: Overrides ): Promise; - closeEvidencePeriod( - _disputeId: BigNumberish, - overrides?: Overrides - ): Promise; - - "closeEvidencePeriod(uint256)"( - _disputeId: BigNumberish, - overrides?: Overrides - ): Promise; - createDispute( _possibleRulings: BigNumberish, _metadata: BytesLike, @@ -377,6 +375,18 @@ export class IArbitrator extends Contract { overrides?: Overrides ): Promise; + closeEvidencePeriod( + _subject: string, + _disputeId: BigNumberish, + overrides?: Overrides + ): Promise; + + "closeEvidencePeriod(address,uint256)"( + _subject: string, + _disputeId: BigNumberish, + overrides?: Overrides + ): Promise; + rule( _disputeId: BigNumberish, overrides?: Overrides diff --git a/packages/hardhat/typechain/OwnableCeleste.d.ts b/packages/hardhat/typechain/OwnableCeleste.d.ts index 2d814946..ea50b4cb 100644 --- a/packages/hardhat/typechain/OwnableCeleste.d.ts +++ b/packages/hardhat/typechain/OwnableCeleste.d.ts @@ -27,16 +27,18 @@ interface OwnableCelesteInterface extends ethers.utils.Interface { "disputes(uint256)": FunctionFragment; "feeToken()": FunctionFragment; "feeAmount()": FunctionFragment; + "draft(uint256)": FunctionFragment; "getDisputeFees()": FunctionFragment; "submitEvidence(uint256,address,bytes)": FunctionFragment; - "closeEvidencePeriod(uint256)": FunctionFragment; "owner()": FunctionFragment; + "heartbeat(uint64)": FunctionFragment; "computeRuling(uint256)": FunctionFragment; "createDispute(uint256,bytes)": FunctionFragment; + "closeEvidencePeriod(address,uint256)": FunctionFragment; "rule(uint256)": FunctionFragment; "getDisputeManager()": FunctionFragment; "currentId()": FunctionFragment; - "setFee(address,uint256)": FunctionFragment; + "delayStartTime(uint64)": FunctionFragment; }; encodeFunctionData(functionFragment: "setOwner", values: [string]): string; @@ -50,6 +52,7 @@ interface OwnableCelesteInterface extends ethers.utils.Interface { ): string; encodeFunctionData(functionFragment: "feeToken", values?: undefined): string; encodeFunctionData(functionFragment: "feeAmount", values?: undefined): string; + encodeFunctionData(functionFragment: "draft", values: [BigNumberish]): string; encodeFunctionData( functionFragment: "getDisputeFees", values?: undefined @@ -58,11 +61,11 @@ interface OwnableCelesteInterface extends ethers.utils.Interface { functionFragment: "submitEvidence", values: [BigNumberish, string, BytesLike] ): string; + encodeFunctionData(functionFragment: "owner", values?: undefined): string; encodeFunctionData( - functionFragment: "closeEvidencePeriod", + functionFragment: "heartbeat", values: [BigNumberish] ): string; - encodeFunctionData(functionFragment: "owner", values?: undefined): string; encodeFunctionData( functionFragment: "computeRuling", values: [BigNumberish] @@ -71,6 +74,10 @@ interface OwnableCelesteInterface extends ethers.utils.Interface { functionFragment: "createDispute", values: [BigNumberish, BytesLike] ): string; + encodeFunctionData( + functionFragment: "closeEvidencePeriod", + values: [string, BigNumberish] + ): string; encodeFunctionData(functionFragment: "rule", values: [BigNumberish]): string; encodeFunctionData( functionFragment: "getDisputeManager", @@ -78,8 +85,8 @@ interface OwnableCelesteInterface extends ethers.utils.Interface { ): string; encodeFunctionData(functionFragment: "currentId", values?: undefined): string; encodeFunctionData( - functionFragment: "setFee", - values: [string, BigNumberish] + functionFragment: "delayStartTime", + values: [BigNumberish] ): string; decodeFunctionResult(functionFragment: "setOwner", data: BytesLike): Result; @@ -90,6 +97,7 @@ interface OwnableCelesteInterface extends ethers.utils.Interface { decodeFunctionResult(functionFragment: "disputes", data: BytesLike): Result; decodeFunctionResult(functionFragment: "feeToken", data: BytesLike): Result; decodeFunctionResult(functionFragment: "feeAmount", data: BytesLike): Result; + decodeFunctionResult(functionFragment: "draft", data: BytesLike): Result; decodeFunctionResult( functionFragment: "getDisputeFees", data: BytesLike @@ -98,11 +106,8 @@ interface OwnableCelesteInterface extends ethers.utils.Interface { functionFragment: "submitEvidence", data: BytesLike ): Result; - decodeFunctionResult( - functionFragment: "closeEvidencePeriod", - data: BytesLike - ): Result; decodeFunctionResult(functionFragment: "owner", data: BytesLike): Result; + decodeFunctionResult(functionFragment: "heartbeat", data: BytesLike): Result; decodeFunctionResult( functionFragment: "computeRuling", data: BytesLike @@ -111,15 +116,54 @@ interface OwnableCelesteInterface extends ethers.utils.Interface { functionFragment: "createDispute", data: BytesLike ): Result; + decodeFunctionResult( + functionFragment: "closeEvidencePeriod", + data: BytesLike + ): Result; decodeFunctionResult(functionFragment: "rule", data: BytesLike): Result; decodeFunctionResult( functionFragment: "getDisputeManager", data: BytesLike ): Result; decodeFunctionResult(functionFragment: "currentId", data: BytesLike): Result; - decodeFunctionResult(functionFragment: "setFee", data: BytesLike): Result; + decodeFunctionResult( + functionFragment: "delayStartTime", + data: BytesLike + ): Result; - events: {}; + events: { + "Heartbeat(uint64,uint64)": EventFragment; + "StartTimeDelayed(uint64,uint64)": EventFragment; + "DisputeStateChanged(uint256,uint8)": EventFragment; + "EvidenceSubmitted(uint256,address,bytes)": EventFragment; + "EvidencePeriodClosed(uint256,uint64)": EventFragment; + "NewDispute(uint256,address,uint64,uint64,bytes)": EventFragment; + "JurorDrafted(uint256,uint256,address)": EventFragment; + "RulingAppealed(uint256,uint256,uint8)": EventFragment; + "RulingAppealConfirmed(uint256,uint256,uint64,uint256)": EventFragment; + "RulingComputed(uint256,uint8)": EventFragment; + "PenaltiesSettled(uint256,uint256,uint256)": EventFragment; + "RewardSettled(uint256,uint256,address,uint256,uint256)": EventFragment; + "AppealDepositSettled(uint256,uint256)": EventFragment; + "MaxJurorsPerDraftBatchChanged(uint64,uint64)": EventFragment; + }; + + getEvent(nameOrSignatureOrTopic: "Heartbeat"): EventFragment; + getEvent(nameOrSignatureOrTopic: "StartTimeDelayed"): EventFragment; + getEvent(nameOrSignatureOrTopic: "DisputeStateChanged"): EventFragment; + getEvent(nameOrSignatureOrTopic: "EvidenceSubmitted"): EventFragment; + getEvent(nameOrSignatureOrTopic: "EvidencePeriodClosed"): EventFragment; + getEvent(nameOrSignatureOrTopic: "NewDispute"): EventFragment; + getEvent(nameOrSignatureOrTopic: "JurorDrafted"): EventFragment; + getEvent(nameOrSignatureOrTopic: "RulingAppealed"): EventFragment; + getEvent(nameOrSignatureOrTopic: "RulingAppealConfirmed"): EventFragment; + getEvent(nameOrSignatureOrTopic: "RulingComputed"): EventFragment; + getEvent(nameOrSignatureOrTopic: "PenaltiesSettled"): EventFragment; + getEvent(nameOrSignatureOrTopic: "RewardSettled"): EventFragment; + getEvent(nameOrSignatureOrTopic: "AppealDepositSettled"): EventFragment; + getEvent( + nameOrSignatureOrTopic: "MaxJurorsPerDraftBatchChanged" + ): EventFragment; } export class OwnableCeleste extends Contract { @@ -176,6 +220,16 @@ export class OwnableCeleste extends Contract { "feeAmount()"(overrides?: CallOverrides): Promise<[BigNumber]>; + draft( + _disputeId: BigNumberish, + overrides?: Overrides + ): Promise; + + "draft(uint256)"( + _disputeId: BigNumberish, + overrides?: Overrides + ): Promise; + getDisputeFees( overrides?: CallOverrides ): Promise<[string, string, BigNumber]>; @@ -198,29 +252,29 @@ export class OwnableCeleste extends Contract { overrides?: Overrides ): Promise; - closeEvidencePeriod( - _disputeId: BigNumberish, + owner(overrides?: CallOverrides): Promise<[string]>; + + "owner()"(overrides?: CallOverrides): Promise<[string]>; + + heartbeat( + _maxRequestedTransitions: BigNumberish, overrides?: Overrides ): Promise; - "closeEvidencePeriod(uint256)"( - _disputeId: BigNumberish, + "heartbeat(uint64)"( + _maxRequestedTransitions: BigNumberish, overrides?: Overrides ): Promise; - owner(overrides?: CallOverrides): Promise<[string]>; - - "owner()"(overrides?: CallOverrides): Promise<[string]>; - computeRuling( _disputeId: BigNumberish, - overrides?: CallOverrides - ): Promise<[string, number] & { subject: string; finalRuling: number }>; + overrides?: Overrides + ): Promise; "computeRuling(uint256)"( _disputeId: BigNumberish, - overrides?: CallOverrides - ): Promise<[string, number] & { subject: string; finalRuling: number }>; + overrides?: Overrides + ): Promise; createDispute( _possibleRulings: BigNumberish, @@ -234,6 +288,18 @@ export class OwnableCeleste extends Contract { overrides?: Overrides ): Promise; + closeEvidencePeriod( + _subject: string, + _disputeId: BigNumberish, + overrides?: Overrides + ): Promise; + + "closeEvidencePeriod(address,uint256)"( + _subject: string, + _disputeId: BigNumberish, + overrides?: Overrides + ): Promise; + rule( _disputeId: BigNumberish, overrides?: Overrides @@ -252,15 +318,13 @@ export class OwnableCeleste extends Contract { "currentId()"(overrides?: CallOverrides): Promise<[BigNumber]>; - setFee( - _feeToken: string, - _feeAmount: BigNumberish, + delayStartTime( + _newFirstTermStartTime: BigNumberish, overrides?: Overrides ): Promise; - "setFee(address,uint256)"( - _feeToken: string, - _feeAmount: BigNumberish, + "delayStartTime(uint64)"( + _newFirstTermStartTime: BigNumberish, overrides?: Overrides ): Promise; }; @@ -302,6 +366,16 @@ export class OwnableCeleste extends Contract { "feeAmount()"(overrides?: CallOverrides): Promise; + draft( + _disputeId: BigNumberish, + overrides?: Overrides + ): Promise; + + "draft(uint256)"( + _disputeId: BigNumberish, + overrides?: Overrides + ): Promise; + getDisputeFees( overrides?: CallOverrides ): Promise<[string, string, BigNumber]>; @@ -324,29 +398,29 @@ export class OwnableCeleste extends Contract { overrides?: Overrides ): Promise; - closeEvidencePeriod( - _disputeId: BigNumberish, + owner(overrides?: CallOverrides): Promise; + + "owner()"(overrides?: CallOverrides): Promise; + + heartbeat( + _maxRequestedTransitions: BigNumberish, overrides?: Overrides ): Promise; - "closeEvidencePeriod(uint256)"( - _disputeId: BigNumberish, + "heartbeat(uint64)"( + _maxRequestedTransitions: BigNumberish, overrides?: Overrides ): Promise; - owner(overrides?: CallOverrides): Promise; - - "owner()"(overrides?: CallOverrides): Promise; - computeRuling( _disputeId: BigNumberish, - overrides?: CallOverrides - ): Promise<[string, number] & { subject: string; finalRuling: number }>; + overrides?: Overrides + ): Promise; "computeRuling(uint256)"( _disputeId: BigNumberish, - overrides?: CallOverrides - ): Promise<[string, number] & { subject: string; finalRuling: number }>; + overrides?: Overrides + ): Promise; createDispute( _possibleRulings: BigNumberish, @@ -360,6 +434,18 @@ export class OwnableCeleste extends Contract { overrides?: Overrides ): Promise; + closeEvidencePeriod( + _subject: string, + _disputeId: BigNumberish, + overrides?: Overrides + ): Promise; + + "closeEvidencePeriod(address,uint256)"( + _subject: string, + _disputeId: BigNumberish, + overrides?: Overrides + ): Promise; + rule( _disputeId: BigNumberish, overrides?: Overrides @@ -378,15 +464,13 @@ export class OwnableCeleste extends Contract { "currentId()"(overrides?: CallOverrides): Promise; - setFee( - _feeToken: string, - _feeAmount: BigNumberish, + delayStartTime( + _newFirstTermStartTime: BigNumberish, overrides?: Overrides ): Promise; - "setFee(address,uint256)"( - _feeToken: string, - _feeAmount: BigNumberish, + "delayStartTime(uint64)"( + _newFirstTermStartTime: BigNumberish, overrides?: Overrides ): Promise; @@ -428,6 +512,13 @@ export class OwnableCeleste extends Contract { "feeAmount()"(overrides?: CallOverrides): Promise; + draft(_disputeId: BigNumberish, overrides?: CallOverrides): Promise; + + "draft(uint256)"( + _disputeId: BigNumberish, + overrides?: CallOverrides + ): Promise; + getDisputeFees( overrides?: CallOverrides ): Promise<[string, string, BigNumber]>; @@ -450,20 +541,20 @@ export class OwnableCeleste extends Contract { overrides?: CallOverrides ): Promise; - closeEvidencePeriod( - _disputeId: BigNumberish, - overrides?: CallOverrides - ): Promise; - - "closeEvidencePeriod(uint256)"( - _disputeId: BigNumberish, - overrides?: CallOverrides - ): Promise; - owner(overrides?: CallOverrides): Promise; "owner()"(overrides?: CallOverrides): Promise; + heartbeat( + _maxRequestedTransitions: BigNumberish, + overrides?: CallOverrides + ): Promise; + + "heartbeat(uint64)"( + _maxRequestedTransitions: BigNumberish, + overrides?: CallOverrides + ): Promise; + computeRuling( _disputeId: BigNumberish, overrides?: CallOverrides @@ -486,6 +577,18 @@ export class OwnableCeleste extends Contract { overrides?: CallOverrides ): Promise; + closeEvidencePeriod( + _subject: string, + _disputeId: BigNumberish, + overrides?: CallOverrides + ): Promise; + + "closeEvidencePeriod(address,uint256)"( + _subject: string, + _disputeId: BigNumberish, + overrides?: CallOverrides + ): Promise; + rule( _disputeId: BigNumberish, overrides?: CallOverrides @@ -504,20 +607,97 @@ export class OwnableCeleste extends Contract { "currentId()"(overrides?: CallOverrides): Promise; - setFee( - _feeToken: string, - _feeAmount: BigNumberish, + delayStartTime( + _newFirstTermStartTime: BigNumberish, overrides?: CallOverrides ): Promise; - "setFee(address,uint256)"( - _feeToken: string, - _feeAmount: BigNumberish, + "delayStartTime(uint64)"( + _newFirstTermStartTime: BigNumberish, overrides?: CallOverrides ): Promise; }; - filters: {}; + filters: { + Heartbeat(previousTermId: null, currentTermId: null): EventFilter; + + StartTimeDelayed( + previousStartTime: null, + currentStartTime: null + ): EventFilter; + + DisputeStateChanged( + disputeId: BigNumberish | null, + state: BigNumberish | null + ): EventFilter; + + EvidenceSubmitted( + disputeId: BigNumberish | null, + submitter: string | null, + evidence: null + ): EventFilter; + + EvidencePeriodClosed( + disputeId: BigNumberish | null, + termId: BigNumberish | null + ): EventFilter; + + NewDispute( + disputeId: BigNumberish | null, + subject: string | null, + draftTermId: BigNumberish | null, + jurorsNumber: null, + metadata: null + ): EventFilter; + + JurorDrafted( + disputeId: BigNumberish | null, + roundId: BigNumberish | null, + juror: string | null + ): EventFilter; + + RulingAppealed( + disputeId: BigNumberish | null, + roundId: BigNumberish | null, + ruling: null + ): EventFilter; + + RulingAppealConfirmed( + disputeId: BigNumberish | null, + roundId: BigNumberish | null, + draftTermId: BigNumberish | null, + jurorsNumber: null + ): EventFilter; + + RulingComputed( + disputeId: BigNumberish | null, + ruling: BigNumberish | null + ): EventFilter; + + PenaltiesSettled( + disputeId: BigNumberish | null, + roundId: BigNumberish | null, + collectedTokens: null + ): EventFilter; + + RewardSettled( + disputeId: BigNumberish | null, + roundId: BigNumberish | null, + juror: null, + tokens: null, + fees: null + ): EventFilter; + + AppealDepositSettled( + disputeId: BigNumberish | null, + roundId: BigNumberish | null + ): EventFilter; + + MaxJurorsPerDraftBatchChanged( + previousMaxJurorsPerDraftBatch: null, + currentMaxJurorsPerDraftBatch: null + ): EventFilter; + }; estimateGas: { setOwner(_owner: string, overrides?: Overrides): Promise; @@ -554,6 +734,13 @@ export class OwnableCeleste extends Contract { "feeAmount()"(overrides?: CallOverrides): Promise; + draft(_disputeId: BigNumberish, overrides?: Overrides): Promise; + + "draft(uint256)"( + _disputeId: BigNumberish, + overrides?: Overrides + ): Promise; + getDisputeFees(overrides?: CallOverrides): Promise; "getDisputeFees()"(overrides?: CallOverrides): Promise; @@ -572,28 +759,28 @@ export class OwnableCeleste extends Contract { overrides?: Overrides ): Promise; - closeEvidencePeriod( - _disputeId: BigNumberish, + owner(overrides?: CallOverrides): Promise; + + "owner()"(overrides?: CallOverrides): Promise; + + heartbeat( + _maxRequestedTransitions: BigNumberish, overrides?: Overrides ): Promise; - "closeEvidencePeriod(uint256)"( - _disputeId: BigNumberish, + "heartbeat(uint64)"( + _maxRequestedTransitions: BigNumberish, overrides?: Overrides ): Promise; - owner(overrides?: CallOverrides): Promise; - - "owner()"(overrides?: CallOverrides): Promise; - computeRuling( _disputeId: BigNumberish, - overrides?: CallOverrides + overrides?: Overrides ): Promise; "computeRuling(uint256)"( _disputeId: BigNumberish, - overrides?: CallOverrides + overrides?: Overrides ): Promise; createDispute( @@ -608,6 +795,18 @@ export class OwnableCeleste extends Contract { overrides?: Overrides ): Promise; + closeEvidencePeriod( + _subject: string, + _disputeId: BigNumberish, + overrides?: Overrides + ): Promise; + + "closeEvidencePeriod(address,uint256)"( + _subject: string, + _disputeId: BigNumberish, + overrides?: Overrides + ): Promise; + rule(_disputeId: BigNumberish, overrides?: Overrides): Promise; "rule(uint256)"( @@ -623,15 +822,13 @@ export class OwnableCeleste extends Contract { "currentId()"(overrides?: CallOverrides): Promise; - setFee( - _feeToken: string, - _feeAmount: BigNumberish, + delayStartTime( + _newFirstTermStartTime: BigNumberish, overrides?: Overrides ): Promise; - "setFee(address,uint256)"( - _feeToken: string, - _feeAmount: BigNumberish, + "delayStartTime(uint64)"( + _newFirstTermStartTime: BigNumberish, overrides?: Overrides ): Promise; }; @@ -677,6 +874,16 @@ export class OwnableCeleste extends Contract { "feeAmount()"(overrides?: CallOverrides): Promise; + draft( + _disputeId: BigNumberish, + overrides?: Overrides + ): Promise; + + "draft(uint256)"( + _disputeId: BigNumberish, + overrides?: Overrides + ): Promise; + getDisputeFees(overrides?: CallOverrides): Promise; "getDisputeFees()"( @@ -697,28 +904,28 @@ export class OwnableCeleste extends Contract { overrides?: Overrides ): Promise; - closeEvidencePeriod( - _disputeId: BigNumberish, + owner(overrides?: CallOverrides): Promise; + + "owner()"(overrides?: CallOverrides): Promise; + + heartbeat( + _maxRequestedTransitions: BigNumberish, overrides?: Overrides ): Promise; - "closeEvidencePeriod(uint256)"( - _disputeId: BigNumberish, + "heartbeat(uint64)"( + _maxRequestedTransitions: BigNumberish, overrides?: Overrides ): Promise; - owner(overrides?: CallOverrides): Promise; - - "owner()"(overrides?: CallOverrides): Promise; - computeRuling( _disputeId: BigNumberish, - overrides?: CallOverrides + overrides?: Overrides ): Promise; "computeRuling(uint256)"( _disputeId: BigNumberish, - overrides?: CallOverrides + overrides?: Overrides ): Promise; createDispute( @@ -733,6 +940,18 @@ export class OwnableCeleste extends Contract { overrides?: Overrides ): Promise; + closeEvidencePeriod( + _subject: string, + _disputeId: BigNumberish, + overrides?: Overrides + ): Promise; + + "closeEvidencePeriod(address,uint256)"( + _subject: string, + _disputeId: BigNumberish, + overrides?: Overrides + ): Promise; + rule( _disputeId: BigNumberish, overrides?: Overrides @@ -753,15 +972,13 @@ export class OwnableCeleste extends Contract { "currentId()"(overrides?: CallOverrides): Promise; - setFee( - _feeToken: string, - _feeAmount: BigNumberish, + delayStartTime( + _newFirstTermStartTime: BigNumberish, overrides?: Overrides ): Promise; - "setFee(address,uint256)"( - _feeToken: string, - _feeAmount: BigNumberish, + "delayStartTime(uint64)"( + _newFirstTermStartTime: BigNumberish, overrides?: Overrides ): Promise; }; diff --git a/packages/hardhat/typechain/factories/IArbitrable__factory.ts b/packages/hardhat/typechain/factories/IArbitrable__factory.ts new file mode 100644 index 00000000..e75eefb7 --- /dev/null +++ b/packages/hardhat/typechain/factories/IArbitrable__factory.ts @@ -0,0 +1,62 @@ +/* Autogenerated file. Do not edit manually. */ +/* tslint:disable */ +/* eslint-disable */ + +import { Signer } from "ethers"; +import { Provider, TransactionRequest } from "@ethersproject/providers"; +import { Contract, ContractFactory, Overrides } from "@ethersproject/contracts"; + +import type { IArbitrable } from "../IArbitrable"; + +export class IArbitrable__factory extends ContractFactory { + constructor(signer?: Signer) { + super(_abi, _bytecode, signer); + } + + deploy(overrides?: Overrides): Promise { + return super.deploy(overrides || {}) as Promise; + } + getDeployTransaction(overrides?: Overrides): TransactionRequest { + return super.getDeployTransaction(overrides || {}); + } + attach(address: string): IArbitrable { + return super.attach(address) as IArbitrable; + } + connect(signer: Signer): IArbitrable__factory { + return super.connect(signer) as IArbitrable__factory; + } + static connect( + address: string, + signerOrProvider: Signer | Provider + ): IArbitrable { + return new Contract(address, _abi, signerOrProvider) as IArbitrable; + } +} + +const _abi = [ + { + anonymous: false, + inputs: [ + { + indexed: true, + name: "arbitrator", + type: "address", + }, + { + indexed: true, + name: "disputeId", + type: "uint256", + }, + { + indexed: false, + name: "ruling", + type: "uint256", + }, + ], + name: "Ruled", + type: "event", + }, +]; + +const _bytecode = + "0x6080604052348015600f57600080fd5b50603580601d6000396000f3fe6080604052600080fdfea165627a7a72305820f0b6cd0156f229ec2003686eacff612db24067d37989778c39a1b2c9dff6a67d0029"; diff --git a/packages/hardhat/typechain/factories/IArbitrator__factory.ts b/packages/hardhat/typechain/factories/IArbitrator__factory.ts index 4d2c3041..07f199db 100644 --- a/packages/hardhat/typechain/factories/IArbitrator__factory.ts +++ b/packages/hardhat/typechain/factories/IArbitrator__factory.ts @@ -65,12 +65,21 @@ const _abi = [ constant: false, inputs: [ { - name: "_disputeId", + name: "_possibleRulings", + type: "uint256", + }, + { + name: "_metadata", + type: "bytes", + }, + ], + name: "createDispute", + outputs: [ + { + name: "", type: "uint256", }, ], - name: "closeEvidencePeriod", - outputs: [], payable: false, stateMutability: "nonpayable", type: "function", @@ -79,21 +88,16 @@ const _abi = [ constant: false, inputs: [ { - name: "_possibleRulings", - type: "uint256", - }, - { - name: "_metadata", - type: "bytes", + name: "_subject", + type: "address", }, - ], - name: "createDispute", - outputs: [ { - name: "", + name: "_disputeId", type: "uint256", }, ], + name: "closeEvidencePeriod", + outputs: [], payable: false, stateMutability: "nonpayable", type: "function", diff --git a/packages/hardhat/typechain/factories/OwnableCeleste__factory.ts b/packages/hardhat/typechain/factories/OwnableCeleste__factory.ts index bf4e594c..d473092c 100644 --- a/packages/hardhat/typechain/factories/OwnableCeleste__factory.ts +++ b/packages/hardhat/typechain/factories/OwnableCeleste__factory.ts @@ -129,6 +129,20 @@ const _abi = [ stateMutability: "view", type: "function", }, + { + constant: false, + inputs: [ + { + name: "_disputeId", + type: "uint256", + }, + ], + name: "draft", + outputs: [], + payable: false, + stateMutability: "nonpayable", + type: "function", + }, { constant: true, inputs: [], @@ -174,35 +188,40 @@ const _abi = [ type: "function", }, { - constant: false, - inputs: [ + constant: true, + inputs: [], + name: "owner", + outputs: [ { - name: "_disputeId", - type: "uint256", + name: "", + type: "address", }, ], - name: "closeEvidencePeriod", - outputs: [], payable: false, - stateMutability: "nonpayable", + stateMutability: "view", type: "function", }, { - constant: true, - inputs: [], - name: "owner", + constant: false, + inputs: [ + { + name: "_maxRequestedTransitions", + type: "uint64", + }, + ], + name: "heartbeat", outputs: [ { name: "", - type: "address", + type: "uint64", }, ], payable: false, - stateMutability: "view", + stateMutability: "nonpayable", type: "function", }, { - constant: true, + constant: false, inputs: [ { name: "_disputeId", @@ -221,7 +240,7 @@ const _abi = [ }, ], payable: false, - stateMutability: "view", + stateMutability: "nonpayable", type: "function", }, { @@ -247,6 +266,24 @@ const _abi = [ stateMutability: "nonpayable", type: "function", }, + { + constant: false, + inputs: [ + { + name: "_subject", + type: "address", + }, + { + name: "_disputeId", + type: "uint256", + }, + ], + name: "closeEvidencePeriod", + outputs: [], + payable: false, + stateMutability: "nonpayable", + type: "function", + }, { constant: false, inputs: [ @@ -302,15 +339,11 @@ const _abi = [ constant: false, inputs: [ { - name: "_feeToken", - type: "address", - }, - { - name: "_feeAmount", - type: "uint256", + name: "_newFirstTermStartTime", + type: "uint64", }, ], - name: "setFee", + name: "delayStartTime", outputs: [], payable: false, stateMutability: "nonpayable", @@ -331,7 +364,305 @@ const _abi = [ stateMutability: "nonpayable", type: "constructor", }, + { + anonymous: false, + inputs: [ + { + indexed: false, + name: "previousTermId", + type: "uint64", + }, + { + indexed: false, + name: "currentTermId", + type: "uint64", + }, + ], + name: "Heartbeat", + type: "event", + }, + { + anonymous: false, + inputs: [ + { + indexed: false, + name: "previousStartTime", + type: "uint64", + }, + { + indexed: false, + name: "currentStartTime", + type: "uint64", + }, + ], + name: "StartTimeDelayed", + type: "event", + }, + { + anonymous: false, + inputs: [ + { + indexed: true, + name: "disputeId", + type: "uint256", + }, + { + indexed: true, + name: "state", + type: "uint8", + }, + ], + name: "DisputeStateChanged", + type: "event", + }, + { + anonymous: false, + inputs: [ + { + indexed: true, + name: "disputeId", + type: "uint256", + }, + { + indexed: true, + name: "submitter", + type: "address", + }, + { + indexed: false, + name: "evidence", + type: "bytes", + }, + ], + name: "EvidenceSubmitted", + type: "event", + }, + { + anonymous: false, + inputs: [ + { + indexed: true, + name: "disputeId", + type: "uint256", + }, + { + indexed: true, + name: "termId", + type: "uint64", + }, + ], + name: "EvidencePeriodClosed", + type: "event", + }, + { + anonymous: false, + inputs: [ + { + indexed: true, + name: "disputeId", + type: "uint256", + }, + { + indexed: true, + name: "subject", + type: "address", + }, + { + indexed: true, + name: "draftTermId", + type: "uint64", + }, + { + indexed: false, + name: "jurorsNumber", + type: "uint64", + }, + { + indexed: false, + name: "metadata", + type: "bytes", + }, + ], + name: "NewDispute", + type: "event", + }, + { + anonymous: false, + inputs: [ + { + indexed: true, + name: "disputeId", + type: "uint256", + }, + { + indexed: true, + name: "roundId", + type: "uint256", + }, + { + indexed: true, + name: "juror", + type: "address", + }, + ], + name: "JurorDrafted", + type: "event", + }, + { + anonymous: false, + inputs: [ + { + indexed: true, + name: "disputeId", + type: "uint256", + }, + { + indexed: true, + name: "roundId", + type: "uint256", + }, + { + indexed: false, + name: "ruling", + type: "uint8", + }, + ], + name: "RulingAppealed", + type: "event", + }, + { + anonymous: false, + inputs: [ + { + indexed: true, + name: "disputeId", + type: "uint256", + }, + { + indexed: true, + name: "roundId", + type: "uint256", + }, + { + indexed: true, + name: "draftTermId", + type: "uint64", + }, + { + indexed: false, + name: "jurorsNumber", + type: "uint256", + }, + ], + name: "RulingAppealConfirmed", + type: "event", + }, + { + anonymous: false, + inputs: [ + { + indexed: true, + name: "disputeId", + type: "uint256", + }, + { + indexed: true, + name: "ruling", + type: "uint8", + }, + ], + name: "RulingComputed", + type: "event", + }, + { + anonymous: false, + inputs: [ + { + indexed: true, + name: "disputeId", + type: "uint256", + }, + { + indexed: true, + name: "roundId", + type: "uint256", + }, + { + indexed: false, + name: "collectedTokens", + type: "uint256", + }, + ], + name: "PenaltiesSettled", + type: "event", + }, + { + anonymous: false, + inputs: [ + { + indexed: true, + name: "disputeId", + type: "uint256", + }, + { + indexed: true, + name: "roundId", + type: "uint256", + }, + { + indexed: false, + name: "juror", + type: "address", + }, + { + indexed: false, + name: "tokens", + type: "uint256", + }, + { + indexed: false, + name: "fees", + type: "uint256", + }, + ], + name: "RewardSettled", + type: "event", + }, + { + anonymous: false, + inputs: [ + { + indexed: true, + name: "disputeId", + type: "uint256", + }, + { + indexed: true, + name: "roundId", + type: "uint256", + }, + ], + name: "AppealDepositSettled", + type: "event", + }, + { + anonymous: false, + inputs: [ + { + indexed: false, + name: "previousMaxJurorsPerDraftBatch", + type: "uint64", + }, + { + indexed: false, + name: "currentMaxJurorsPerDraftBatch", + type: "uint64", + }, + ], + name: "MaxJurorsPerDraftBatchChanged", + type: "event", + }, ]; const _bytecode = - "0x608060405234801561001057600080fd5b506040516040806111bf8339810180604052604081101561003057600080fd5b81019080805190602001909291908051906020019092919050505033600360006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550816000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055508060018190555050506110db806100e46000396000f3fe608060405234801561001057600080fd5b50600436106100f55760003560e01c80637e9adccf11610097578063db18af6c11610066578063db18af6c1461051d578063db9bee4614610592578063e00dd161146105dc578063e55156b5146105fa576100f5565b80637e9adccf1461038b5780638da5cb5b146103b9578063bd881e5314610403578063c13517e114610486576100f5565b8063647846a5116100d3578063647846a5146101fc57806369e15404146102465780637b751b9e146102645780637cb57c64146102e8576100f5565b806313af4035146100fa5780631da213f21461013e578063564a565d14610179575b600080fd5b61013c6004803603602081101561011057600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610648565b005b6101776004803603604081101561015457600080fd5b8101908080359060200190929190803560ff16906020019092919050505061074f565b005b6101a56004803603602081101561018f57600080fd5b81019080803590602001909291905050506109a0565b604051808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018260048111156101e757fe5b60ff1681526020019250505060405180910390f35b6102046109f1565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b61024e610a16565b6040518082815260200191505060405180910390f35b61026c610a1c565b604051808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001828152602001935050505060405180910390f35b610389600480360360608110156102fe57600080fd5b8101908080359060200190929190803573ffffffffffffffffffffffffffffffffffffffff1690602001909291908035906020019064010000000081111561034557600080fd5b82018360208201111561035757600080fd5b8035906020019184600183028401116401000000008311171561037957600080fd5b9091929391929390505050610a52565b005b6103b7600480360360208110156103a157600080fd5b8101908080359060200190929190505050610a58565b005b6103c1610a5b565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b61042f6004803603602081101561041957600080fd5b8101908080359060200190929190505050610a81565b604051808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200182600481111561047157fe5b60ff1681526020019250505060405180910390f35b6105076004803603604081101561049c57600080fd5b8101908080359060200190929190803590602001906401000000008111156104c357600080fd5b8201836020820111156104d557600080fd5b803590602001918460018302840111640100000000831117156104f757600080fd5b9091929391929390505050610adc565b6040518082815260200191505060405180910390f35b6105496004803603602081101561053357600080fd5b8101908080359060200190929190505050610c80565b604051808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018281526020019250505060405180910390f35b61059a610e2f565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b6105e4610e37565b6040518082815260200191505060405180910390f35b6106466004803603604081101561061057600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190505050610e3d565b005b600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff161461070b576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252600d8152602001807f4552523a4e4f545f4f574e45520000000000000000000000000000000000000081525060200191505060405180910390fd5b80600360006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555050565b600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614610812576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252600d8152602001807f4552523a4e4f545f4f574e45520000000000000000000000000000000000000081525060200191505060405180910390fd5b6000600481111561081f57fe5b81600481111561082b57fe5b1415801561085057506001600481111561084157fe5b81600481111561084d57fe5b14155b6108c2576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252601a8152602001807f4552523a4f5554434f4d455f4e4f545f41535349474e41424c4500000000000081525060200191505060405180910390fd5b6000600460008481526020019081526020016000209050600160048111156108e657fe5b8160000160149054906101000a900460ff16600481111561090357fe5b14610976576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260108152602001807f4552523a4e4f545f44495350555445440000000000000000000000000000000081525060200191505060405180910390fd5b818160000160146101000a81548160ff0219169083600481111561099657fe5b0217905550505050565b60046020528060005260406000206000915090508060000160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16908060000160149054906101000a900460ff16905082565b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60015481565b6000806000306000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff16600154925092509250909192565b50505050565b50565b600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60008060006004600085815260200190815260200160002090508060000160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1692508060000160149054906101000a900460ff16915050915091565b600080600254905060405180604001604052803373ffffffffffffffffffffffffffffffffffffffff16815260200160016004811115610b1857fe5b8152506004600083815260200190815260200160002060008201518160000160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555060208201518160000160146101000a81548160ff02191690836004811115610b9957fe5b0217905550905050600260008154809291906001019190505550610c0333306001546000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16610f4b909392919063ffffffff16565b610c75576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260128152602001807f4552523a4445504f5349545f4641494c4544000000000000000000000000000081525060200191505060405180910390fd5b809150509392505050565b600080600060046000858152602001908152602001600020905060036004811115610ca757fe5b8160000160149054906101000a900460ff166004811115610cc457fe5b1415610cfb578060000160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1660039250925050610e2a565b600480811115610d0757fe5b8160000160149054906101000a900460ff166004811115610d2457fe5b1415610d5b578060000160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1660049250925050610e2a565b60026004811115610d6857fe5b8160000160149054906101000a900460ff166004811115610d8557fe5b1415610dbc578060000160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1660009250925050610e2a565b6040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260108152602001807f554e45585045435445445f53544154450000000000000000000000000000000081525060200191505060405180910390fd5b915091565b600030905090565b60025481565b600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614610f00576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252600d8152602001807f4552523a4e4f545f4f574e45520000000000000000000000000000000000000081525060200191505060405180910390fd5b80600181905550816000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055505050565b600060608573ffffffffffffffffffffffffffffffffffffffff166323b872dd905060e01b858585604051602401808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018281526020019350505050604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050509050611052868261105d565b915050949350505050565b6000806040516020818551602087016000895af160008111156110a3573d600081146110905760208114611099576110a1565b600193506110a1565b600183511493505b505b5050809150509291505056fea165627a7a72305820bd4a295db9bcaba2a85d13d7982dc2f3a1586e33fa938dd46dc0ba2833ca42570029"; + "0x608060405234801561001057600080fd5b506040516040806116ff8339810180604052604081101561003057600080fd5b81019080805190602001909291908051906020019092919050505033600360006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550816000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555080600181905550505061161b806100e46000396000f3fe608060405234801561001057600080fd5b506004361061010b5760003560e01c80638da5cb5b116100a2578063c39c83d111610071578063c39c83d114610593578063db18af6c146105e1578063db9bee4614610656578063e00dd161146106a0578063e36057b7146106be5761010b565b80638da5cb5b146103cf5780639bf6fa5714610419578063bd881e5314610479578063c13517e1146104fc5761010b565b806369e15404116100de57806369e154041461025c578063710cf1ed1461027a5780637b751b9e146102a85780637cb57c641461032c5761010b565b806313af4035146101105780631da213f214610154578063564a565d1461018f578063647846a514610212575b600080fd5b6101526004803603602081101561012657600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff1690602001909291905050506106f6565b005b61018d6004803603604081101561016a57600080fd5b8101908080359060200190929190803560ff1690602001909291905050506107fd565b005b6101bb600480360360208110156101a557600080fd5b8101908080359060200190929190505050610a4e565b604051808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018260048111156101fd57fe5b60ff1681526020019250505060405180910390f35b61021a610a9f565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b610264610ac4565b6040518082815260200191505060405180910390f35b6102a66004803603602081101561029057600080fd5b8101908080359060200190929190505050610aca565b005b6102b0610bc7565b604051808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001828152602001935050505060405180910390f35b6103cd6004803603606081101561034257600080fd5b8101908080359060200190929190803573ffffffffffffffffffffffffffffffffffffffff1690602001909291908035906020019064010000000081111561038957600080fd5b82018360208201111561039b57600080fd5b803590602001918460018302840111640100000000831117156103bd57600080fd5b9091929391929390505050610bfd565b005b6103d7610dd5565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b61044f6004803603602081101561042f57600080fd5b81019080803567ffffffffffffffff169060200190929190505050610dfb565b604051808267ffffffffffffffff1667ffffffffffffffff16815260200191505060405180910390f35b6104a56004803603602081101561048f57600080fd5b8101908080359060200190929190505050610ece565b604051808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018260048111156104e757fe5b60ff1681526020019250505060405180910390f35b61057d6004803603604081101561051257600080fd5b81019080803590602001909291908035906020019064010000000081111561053957600080fd5b82018360208201111561054b57600080fd5b8035906020019184600183028401116401000000008311171561056d57600080fd5b9091929391929390505050610f29565b6040518082815260200191505060405180910390f35b6105df600480360360408110156105a957600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff1690602001909291908035906020019092919050505061115d565b005b61060d600480360360208110156105f757600080fd5b810190808035906020019092919050505061126d565b604051808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018281526020019250505060405180910390f35b61065e61141c565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b6106a8611424565b6040518082815260200191505060405180910390f35b6106f4600480360360208110156106d457600080fd5b81019080803567ffffffffffffffff16906020019092919050505061142a565b005b600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16146107b9576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252600d8152602001807f4552523a4e4f545f4f574e45520000000000000000000000000000000000000081525060200191505060405180910390fd5b80600360006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555050565b600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff16146108c0576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252600d8152602001807f4552523a4e4f545f4f574e45520000000000000000000000000000000000000081525060200191505060405180910390fd5b600060048111156108cd57fe5b8160048111156108d957fe5b141580156108fe5750600160048111156108ef57fe5b8160048111156108fb57fe5b14155b610970576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252601a8152602001807f4552523a4f5554434f4d455f4e4f545f41535349474e41424c4500000000000081525060200191505060405180910390fd5b60006004600084815260200190815260200160002090506001600481111561099457fe5b8160000160149054906101000a900460ff1660048111156109b157fe5b14610a24576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260108152602001807f4552523a4e4f545f44495350555445440000000000000000000000000000000081525060200191505060405180910390fd5b818160000160146101000a81548160ff02191690836004811115610a4457fe5b0217905550505050565b60046020528060005260406000206000915090508060000160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16908060000160149054906101000a900460ff16905082565b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60015481565b80600254811115610b43576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260198152602001807f444d5f444953505554455f444f45535f4e4f545f45584953540000000000000081525060200191505060405180910390fd5b3073ffffffffffffffffffffffffffffffffffffffff166000837fbfd1b785c517ac3c709db5d7c9904052346df35e7069c1cb80f3dd966579d52260405160405180910390a460016002811115610b9657fe5b827f9bfdc20780e4912d62e8c31a73ffad5cbd841d7f76d114aa9f302ceca2d8258560405160405180910390a35050565b6000806000306000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff16600154925092509250909192565b83600254811115610c76576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260198152602001807f444d5f444953505554455f444f45535f4e4f545f45584953540000000000000081525060200191505060405180910390fd5b60006004600087815260200190815260200160002090503373ffffffffffffffffffffffffffffffffffffffff168160000160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1614610d52576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252601e8152602001807f444d5f5355424a4543545f4e4f545f444953505554455f5355424a454354000081525060200191505060405180910390fd5b8473ffffffffffffffffffffffffffffffffffffffff16867fd25027d3faf6af10da1a82e9d4df3c98b93cb0481f9acaf87718a548fad0abce868660405180806020018281038252848482818152602001925080828437600081840152601f19601f820116905080830192505050935050505060405180910390a3505050505050565b600360009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b600080600360149054906101000a900467ffffffffffffffff1690506000838201905080600360146101000a81548167ffffffffffffffff021916908367ffffffffffffffff1602179055507fb8818b6d0c27e4fc7cf75de16ac2543426d3c0bcc520931d24e5a7dde4adca118282604051808367ffffffffffffffff1667ffffffffffffffff1681526020018267ffffffffffffffff1667ffffffffffffffff1681526020019250505060405180910390a1600360149054906101000a900467ffffffffffffffff1692505050919050565b60008060006004600085815260200190815260200160002090508060000160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1692508060000160149054906101000a900460ff16915050915091565b600080600254905060405180604001604052803373ffffffffffffffffffffffffffffffffffffffff16815260200160016004811115610f6557fe5b8152506004600083815260200190815260200160002060008201518160000160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555060208201518160000160146101000a81548160ff02191690836004811115610fe657fe5b021790555090505060026000815480929190600101919050555061105033306001546000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1661148b909392919063ffffffff16565b6110c2576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260128152602001807f4552523a4445504f5349545f4641494c4544000000000000000000000000000081525060200191505060405180910390fd5b60003373ffffffffffffffffffffffffffffffffffffffff16827fd4784fc5a2aef689d6639d09cb5b543abfeabd597519d01b93f4ffef74d1039660038888604051808467ffffffffffffffff168152602001806020018281038252848482818152602001925080828437600081840152601f19601f82011690508083019250505094505050505060405180910390a4809150509392505050565b60006004600083815260200190815260200160002090508273ffffffffffffffffffffffffffffffffffffffff168160000160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1614611239576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252601e8152602001807f444d5f5355424a4543545f4e4f545f444953505554455f5355424a454354000081525060200191505060405180910390fd5b6000827f1384c9abcdf1fa5a2a50953bad79f58ea7b2999fae7783b5b1e2edff339b8d1c60405160405180910390a3505050565b60008060006004600085815260200190815260200160002090506003600481111561129457fe5b8160000160149054906101000a900460ff1660048111156112b157fe5b14156112e8578060000160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1660039250925050611417565b6004808111156112f457fe5b8160000160149054906101000a900460ff16600481111561131157fe5b1415611348578060000160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1660049250925050611417565b6002600481111561135557fe5b8160000160149054906101000a900460ff16600481111561137257fe5b14156113a9578060000160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1660009250925050611417565b6040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825260108152602001807f554e45585045435445445f53544154450000000000000000000000000000000081525060200191505060405180910390fd5b915091565b600030905090565b60025481565b7f9b735da8a0762c6e913df06587b4fa81f87b8075e2a2afdeae6afde9456fd879600082604051808367ffffffffffffffff1681526020018267ffffffffffffffff1667ffffffffffffffff1681526020019250505060405180910390a150565b600060608573ffffffffffffffffffffffffffffffffffffffff166323b872dd905060e01b858585604051602401808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018281526020019350505050604051602081830303815290604052907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff83818316178352505050509050611592868261159d565b915050949350505050565b6000806040516020818551602087016000895af160008111156115e3573d600081146115d057602081146115d9576115e1565b600193506115e1565b600183511493505b505b5050809150509291505056fea165627a7a723058204a79b25c096e06a9beb39a17a71c1fac1cd3f1c716e5db2d881a5305fbaccf500029"; diff --git a/packages/hardhat/typechain/index.ts b/packages/hardhat/typechain/index.ts index f9c9980e..90b02875 100644 --- a/packages/hardhat/typechain/index.ts +++ b/packages/hardhat/typechain/index.ts @@ -11,6 +11,7 @@ export type { IERC20Metadata } from "./IERC20Metadata"; export type { IERC20 } from "./IERC20"; export type { IExecutable } from "./IExecutable"; export type { GovernERC20 } from "./GovernERC20"; +export type { IArbitrable } from "./IArbitrable"; export type { IArbitrator } from "./IArbitrator"; export type { OwnableCeleste } from "./OwnableCeleste"; export type { TokenMock } from "./TokenMock"; @@ -27,6 +28,7 @@ export { IERC20Metadata__factory } from "./factories/IERC20Metadata__factory"; export { IERC20__factory } from "./factories/IERC20__factory"; export { IExecutable__factory } from "./factories/IExecutable__factory"; export { GovernERC20__factory } from "./factories/GovernERC20__factory"; +export { IArbitrable__factory } from "./factories/IArbitrable__factory"; export { IArbitrator__factory } from "./factories/IArbitrator__factory"; export { OwnableCeleste__factory } from "./factories/OwnableCeleste__factory"; export { TokenMock__factory } from "./factories/TokenMock__factory"; diff --git a/yarn.lock b/yarn.lock index e0e4f61d..67df55e8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2680,11 +2680,6 @@ style-mod "^4.0.0" w3c-keyname "^2.2.4" -"@colors/colors@1.5.0": - version "1.5.0" - resolved "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz#bb504579c1cae923e6576a4f5da43d25f97bdbd9" - integrity sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ== - "@cspotcode/source-map-consumer@0.8.0": version "0.8.0" resolved "https://registry.yarnpkg.com/@cspotcode/source-map-consumer/-/source-map-consumer-0.8.0.tgz#33bf4b7b39c178821606f669bbc447a6a629786b" @@ -3236,7 +3231,7 @@ "@ethersproject/properties" "^5.6.0" "@ethersproject/transactions" "^5.6.0" -"@ethersproject/contracts@5.7.0", "@ethersproject/contracts@^5.7.0": +"@ethersproject/contracts@5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/contracts/-/contracts-5.7.0.tgz#c305e775abd07e48aa590e1a877ed5c316f8bd1e" integrity sha512-5GJbzEU3X+d33CdfPhcyS+z8MzsTrBGk/sc+G+59+tPa9yFkl6HQ9D6L0QMgNTA9q8dT0XKxxkyp883XsQvbbg== @@ -3733,7 +3728,7 @@ "@ethersproject/sha2" "^5.6.0" "@ethersproject/strings" "^5.6.0" -"@ethersproject/solidity@5.7.0", "@ethersproject/solidity@^5.7.0": +"@ethersproject/solidity@5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/solidity/-/solidity-5.7.0.tgz#5e9c911d8a2acce2a5ebb48a5e2e0af20b631cb8" integrity sha512-HmabMd2Dt/raavyaGukF4XxizWKhKQ24DoLtdNbBmNKUOPqwjsKQSdV9GQtj9CBEea9DlzETlVER1gYeXXBGaA== @@ -3886,7 +3881,7 @@ "@ethersproject/transactions" "^5.6.0" "@ethersproject/wordlists" "^5.6.0" -"@ethersproject/wallet@5.7.0", "@ethersproject/wallet@^5.7.0": +"@ethersproject/wallet@5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/wallet/-/wallet-5.7.0.tgz#4e5d0790d96fe21d61d38fb40324e6c7ef350b2d" integrity sha512-MhmXlJXEJFBFVKrDLB4ZdDzxcBxQ3rLyCkhNqVu3CDYvR97E+8r01UgrI+TI99Le+aYm/in/0vp86guJuM7FCA== @@ -5080,11 +5075,6 @@ resolved "https://registry.yarnpkg.com/@nomiclabs/hardhat-ethers/-/hardhat-ethers-2.0.0.tgz#ebab032b3aed03945ea560f56bb67aec56a30cbc" integrity sha512-fIi6XP9PgKqwSNVcLDr6S5hvGlc21PendaLD5eGdXEXc9aYQ0OJX8Mk3evs+p78x7W9n9U3ZcKtTiGc1+YScDw== -"@nomiclabs/hardhat-ethers@^2.1.1": - version "2.2.3" - resolved "https://registry.npmjs.org/@nomiclabs/hardhat-ethers/-/hardhat-ethers-2.2.3.tgz#b41053e360c31a32c2640c9a45ee981a7e603fe0" - integrity sha512-YhzPdzb612X591FOe68q+qXVXGG2ANZRvDo0RRUtimev85rCrAlv/TLMEZw5c+kq9AbzocLTVX/h2jVIFPL9Xg== - "@nomiclabs/hardhat-etherscan@^3.1.0": version "3.1.0" resolved "https://registry.yarnpkg.com/@nomiclabs/hardhat-etherscan/-/hardhat-etherscan-3.1.0.tgz#7137554862b3b1c914f1b1bf110f0529fd2dec53" @@ -5960,21 +5950,6 @@ dependencies: defer-to-connect "^1.0.1" -"@tenderly/hardhat-tenderly@^1.7.7": - version "1.7.7" - resolved "https://registry.npmjs.org/@tenderly/hardhat-tenderly/-/hardhat-tenderly-1.7.7.tgz#b320ee6bea3779e4781eb0299a3a816cbdc83def" - integrity sha512-p/jLzRPpoD7J0LGvUFEQjgniDzmP5AzfTgy41qqzyjhOsW0voe7wZI8lXjadl5MEr7rAXN1iH3VncT13qG6+Zw== - dependencies: - "@ethersproject/bignumber" "^5.7.0" - "@nomiclabs/hardhat-ethers" "^2.1.1" - axios "^0.27.2" - ethers "^5.7.0" - fs-extra "^10.1.0" - hardhat-deploy "^0.11.14" - js-yaml "^4.1.0" - tenderly "^0.5.3" - tslog "^4.3.1" - "@testing-library/react-hooks@^8.0.0": version "8.0.0" resolved "https://registry.yarnpkg.com/@testing-library/react-hooks/-/react-hooks-8.0.0.tgz#7d0164bffce4647f506039de0a97f6fcbd20f4bf" @@ -6415,7 +6390,7 @@ dependencies: ts-toolbelt "^6.15.1" -"@types/react-dom@17.0.2", "@types/react-dom@^17.0.2": +"@types/react-dom@^17.0.2": version "17.0.2" resolved "https://registry.npmjs.org/@types/react-dom/-/react-dom-17.0.2.tgz#35654cf6c49ae162d5bc90843d5437dc38008d43" integrity sha512-Icd9KEgdnFfJs39KyRyr0jQ7EKhq8U6CcHRMGAS45fp5qgUvxL3ujUCfWFttUK2UErqZNj97t9gsVPNAqcwoCg== @@ -6439,7 +6414,7 @@ "@types/history" "*" "@types/react" "*" -"@types/react@*", "@types/react@17.0.2", "@types/react@^15.0.0 || ^16.0.0", "@types/react@^17.0.2": +"@types/react@*", "@types/react@^17.0.2": version "17.0.2" resolved "https://registry.npmjs.org/@types/react/-/react-17.0.2.tgz#3de24c4efef902dd9795a49c75f760cbe4f7a5a8" integrity sha512-Xt40xQsrkdvjn1EyWe1Bc0dJLcil/9x2vAuW7ya+PuQip4UYUaXyhzWmAbwRsdMgwOFHpfp7/FFZebDU6Y8VHA== @@ -6447,6 +6422,15 @@ "@types/prop-types" "*" csstype "^3.0.2" +"@types/react@^15.0.0 || ^16.0.0": + version "16.14.50" + resolved "https://registry.npmjs.org/@types/react/-/react-16.14.50.tgz#ec9c30f2f0c7d9aa748949536d88e3439526a25d" + integrity sha512-7TWZ/HjhXsRK3BbhSFxTinbSft3sUXJAU3ONngT0rpcKJaIOlxkRke4bidqQTopUbEv1ApC5nlSEkIpX43MkTg== + dependencies: + "@types/prop-types" "*" + "@types/scheduler" "*" + csstype "^3.0.2" + "@types/readable-stream@^2.3.13": version "2.3.15" resolved "https://registry.yarnpkg.com/@types/readable-stream/-/readable-stream-2.3.15.tgz#3d79c9ceb1b6a57d5f6e6976f489b9b5384321ae" @@ -6462,6 +6446,11 @@ dependencies: "@types/node" "*" +"@types/scheduler@*": + version "0.16.5" + resolved "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.5.tgz#4751153abbf8d6199babb345a52e1eb4167d64af" + integrity sha512-s/FPdYRmZR8SjLWGMCuax7r3qCWQw9QKHzXVukAuuIJkXkDRwp+Pu5LMIVFi0Fxbav35WURicYr8u1QsoybnQw== + "@types/secp256k1@^4.0.1": version "4.0.3" resolved "https://registry.yarnpkg.com/@types/secp256k1/-/secp256k1-4.0.3.tgz#1b8e55d8e00f08ee7220b4d59a6abe89c37a901c" @@ -8196,14 +8185,6 @@ axios@^0.25.0: dependencies: follow-redirects "^1.14.7" -axios@^0.27.2: - version "0.27.2" - resolved "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz#207658cc8621606e586c85db4b41a750e756d972" - integrity sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ== - dependencies: - follow-redirects "^1.14.9" - form-data "^4.0.0" - axios@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/axios/-/axios-1.4.0.tgz#38a7bf1224cd308de271146038b551d725f0be1f" @@ -10373,15 +10354,6 @@ cli-spinners@^2.5.0: resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.6.1.tgz#adc954ebe281c37a6319bfa401e6dd2488ffb70d" integrity sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g== -cli-table3@^0.6.2: - version "0.6.3" - resolved "https://registry.npmjs.org/cli-table3/-/cli-table3-0.6.3.tgz#61ab765aac156b52f222954ffc607a6f01dbeeb2" - integrity sha512-w5Jac5SykAeZJKntOxJCrm63Eg5/4dhMWIcuTbo9rpE+brgaSZo0RuNJZeOyMgsUdhDeojvgyQLmjI+K50ZGyg== - dependencies: - string-width "^4.2.0" - optionalDependencies: - "@colors/colors" "1.5.0" - cli-width@^2.0.0: version "2.2.1" resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.1.tgz#b0433d0b4e9c847ef18868a4ef16fd5fc8271c48" @@ -10631,11 +10603,6 @@ commander@^5.0.0, commander@^5.1.0: resolved "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae" integrity sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg== -commander@^9.4.0: - version "9.5.0" - resolved "https://registry.npmjs.org/commander/-/commander-9.5.0.tgz#bc08d1eb5cedf7ccb797a96199d41c7bc3e60d30" - integrity sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ== - common-tags@^1.8.0: version "1.8.0" resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.0.tgz#8e3153e542d4a39e9b10554434afaaf98956a937" @@ -11612,11 +11579,6 @@ deferred-leveldown@~4.0.0: abstract-leveldown "~5.0.0" inherits "^2.0.3" -define-lazy-prop@^2.0.0: - version "2.0.0" - resolved "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f" - integrity sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og== - define-properties@^1.1.2, define-properties@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1" @@ -13509,7 +13471,7 @@ ethers@^5.5.1: "@ethersproject/web" "5.6.0" "@ethersproject/wordlists" "5.6.0" -ethers@^5.5.3, ethers@^5.7.0, ethers@^5.7.1: +ethers@^5.7.1: version "5.7.2" resolved "https://registry.yarnpkg.com/ethers/-/ethers-5.7.2.tgz#3a7deeabbb8c030d4126b24f84e525466145872e" integrity sha512-wswUsmWo1aOK8rR7DIKiWSw9DbLWe6x98Jrn8wcTflTVvaXhAMaB5zGAXy0GYQEQp9iO1iSHWVyARQm11zUtyg== @@ -13724,7 +13686,7 @@ expect@^29.0.0, expect@^29.1.2: jest-message-util "^29.1.2" jest-util "^29.1.2" -express@^4.14.0, express@^4.17.1, express@^4.18.1: +express@^4.14.0, express@^4.17.1: version "4.18.2" resolved "https://registry.yarnpkg.com/express/-/express-4.18.2.tgz#3fabe08296e930c796c19e3c516979386ba9fd59" integrity sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ== @@ -14227,7 +14189,7 @@ follow-redirects@^1.0.0, follow-redirects@^1.10.0, follow-redirects@^1.12.1: resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.3.tgz#6ada78118d8d24caee595595accdc0ac6abd022e" integrity sha512-3MkHxknWMUtb23apkgz/83fDoe+y+qr0TdgacGIA7bew+QLBo3vdgEN2xEsuXNivpFy4CyDhBBZnNZOtalmenw== -follow-redirects@^1.14.0, follow-redirects@^1.14.7, follow-redirects@^1.14.9, follow-redirects@^1.15.0: +follow-redirects@^1.14.0, follow-redirects@^1.14.7, follow-redirects@^1.15.0: version "1.15.2" resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13" integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA== @@ -15099,36 +15061,6 @@ hard-rejection@^2.1.0: resolved "https://registry.yarnpkg.com/hard-rejection/-/hard-rejection-2.1.0.tgz#1c6eda5c1685c63942766d79bb40ae773cecd883" integrity sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA== -hardhat-deploy@^0.11.14: - version "0.11.37" - resolved "https://registry.npmjs.org/hardhat-deploy/-/hardhat-deploy-0.11.37.tgz#6a771b859c82ae25292321a6d510d7c0eda09d2b" - integrity sha512-pohPSEEo/X9Yfv0Fc0kXBQW6JO0LNOILBGCP69Ci1COJvLht1hLjAtXt/hccyvD9qY/uwJAM75fmsf41Y9N7lg== - dependencies: - "@ethersproject/abi" "^5.7.0" - "@ethersproject/abstract-signer" "^5.7.0" - "@ethersproject/address" "^5.7.0" - "@ethersproject/bignumber" "^5.7.0" - "@ethersproject/bytes" "^5.7.0" - "@ethersproject/constants" "^5.7.0" - "@ethersproject/contracts" "^5.7.0" - "@ethersproject/providers" "^5.7.2" - "@ethersproject/solidity" "^5.7.0" - "@ethersproject/transactions" "^5.7.0" - "@ethersproject/wallet" "^5.7.0" - "@types/qs" "^6.9.7" - axios "^0.21.1" - chalk "^4.1.2" - chokidar "^3.5.2" - debug "^4.3.2" - enquirer "^2.3.6" - ethers "^5.5.3" - form-data "^4.0.0" - fs-extra "^10.0.0" - match-all "^1.2.6" - murmur-128 "^0.2.1" - qs "^6.9.4" - zksync-web3 "^0.14.3" - hardhat-deploy@^0.9.0: version "0.9.0" resolved "https://registry.yarnpkg.com/hardhat-deploy/-/hardhat-deploy-0.9.0.tgz#83480e1834ecf41d4a63017ab1aecfc586476ba5" @@ -15769,11 +15701,6 @@ human-signals@^2.1.0: resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0" integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw== -hyperlinker@^1.0.0: - version "1.0.0" - resolved "https://registry.npmjs.org/hyperlinker/-/hyperlinker-1.0.0.tgz#23dc9e38a206b208ee49bc2d6c8ef47027df0c0e" - integrity sha512-Ty8UblRWFEcfSuIaajM34LdPXIhbs1ajEX/BBPv24J+enSVaEVY63xQ6lTO9VRYS5LAoghIG0IDJ+p+IPzKUQQ== - iconv-lite@0.4.24, iconv-lite@^0.4.24: version "0.4.24" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" @@ -16377,7 +16304,7 @@ is-directory@^0.3.1: resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1" integrity sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE= -is-docker@^2.0.0, is-docker@^2.1.1: +is-docker@^2.0.0: version "2.2.1" resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa" integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ== @@ -17924,7 +17851,7 @@ js-yaml@3.x, js-yaml@^3.10.0, js-yaml@^3.13.1: argparse "^1.0.7" esprima "^4.0.0" -js-yaml@4.1.0, js-yaml@^4.0.0, js-yaml@^4.1.0: +js-yaml@4.1.0, js-yaml@^4.0.0: version "4.1.0" resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602" integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA== @@ -20969,15 +20896,6 @@ open@^7.0.2, open@^7.4.2: is-docker "^2.0.0" is-wsl "^2.1.1" -open@^8.4.0: - version "8.4.2" - resolved "https://registry.npmjs.org/open/-/open-8.4.2.tgz#5b5ffe2a8f793dcd2aad73e550cb87b59cb084f9" - integrity sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ== - dependencies: - define-lazy-prop "^2.0.0" - is-docker "^2.1.1" - is-wsl "^2.2.0" - opn@^5.1.0, opn@^5.5.0: version "5.5.0" resolved "https://registry.yarnpkg.com/opn/-/opn-5.5.0.tgz#fc7164fab56d235904c51c3b27da6758ca3b9bfc" @@ -23214,7 +23132,7 @@ react-display-name@^0.2.3: resolved "https://registry.yarnpkg.com/react-display-name/-/react-display-name-0.2.5.tgz#304c7cbfb59ee40389d436e1a822c17fe27936c6" integrity sha512-I+vcaK9t4+kypiSgaiVWAipqHRXYmZIuAiS8vzFvXHHXVigg/sMKwlRgLy6LH2i3rmP+0Vzfl5lFsFRwF1r3pg== -react-dom@17.0.2, react-dom@^17.0.2: +react-dom@^17.0.2: version "17.0.2" resolved "https://registry.npmjs.org/react-dom/-/react-dom-17.0.2.tgz#ecffb6845e3ad8dbfcdc498f0d0a939736502c23" integrity sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA== @@ -23464,7 +23382,7 @@ react-wonka@^2.0.1: resolved "https://registry.yarnpkg.com/react-wonka/-/react-wonka-2.0.1.tgz#75bdf03dbad8ceb8c1066216f635f05ce2b642a5" integrity sha512-mM2UH2gnK5LLzaqVWd6JCLrB1vO3I4PN/sQZbjvzsjms4vSv+nKwelNUftM0KeC+LtTPC4GGsuxyu2XJnsCUTw== -react@17.0.2, react@^17.0.2: +react@^17.0.2: version "17.0.2" resolved "https://registry.npmjs.org/react/-/react-17.0.2.tgz#d0b5cc516d29eb3eee383f75b62864cfb6800037" integrity sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA== @@ -25750,7 +25668,7 @@ style-to-object@^0.4.0: dependencies: inline-style-parser "0.1.1" -styled-components@^5, styled-components@^5.2.1: +styled-components@^5.2.1: version "5.3.11" resolved "https://registry.npmjs.org/styled-components/-/styled-components-5.3.11.tgz#9fda7bf1108e39bf3f3e612fcc18170dedcd57a8" integrity sha512-uuzIIfnVkagcVHv9nE0VPlHPSCmXIUGKfJ42LNjxCCTDTL5sgnJ8Z7GZBq0EnLYGln77tPpEpExt2+qa+cZqSw== @@ -26005,21 +25923,6 @@ tempy@^0.3.0: type-fest "^0.3.1" unique-string "^1.0.0" -tenderly@^0.5.3: - version "0.5.3" - resolved "https://registry.npmjs.org/tenderly/-/tenderly-0.5.3.tgz#115653ff33fc33e3be41ab7dd669fdbe0f28a6fb" - integrity sha512-sR+sbZKZzt3b2+moXJsrkBvbava1/4mGulIfuZw8bwr2OpCH8N00dME1t89JC8RjVnQjy4VewVFHyWANdn5zYQ== - dependencies: - axios "^0.27.2" - cli-table3 "^0.6.2" - commander "^9.4.0" - express "^4.18.1" - hyperlinker "^1.0.0" - js-yaml "^4.1.0" - open "^8.4.0" - prompts "^2.4.2" - tslog "^4.4.0" - terminal-link@^2.0.0: version "2.1.1" resolved "https://registry.yarnpkg.com/terminal-link/-/terminal-link-2.1.1.tgz#14a64a27ab3c0df933ea546fba55f2d078edc994" @@ -26528,11 +26431,6 @@ tslib@^2.5.0: resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.0.tgz#b295854684dbda164e181d259a22cd779dcd7bc3" integrity sha512-7At1WUettjcSRHXCyYtTselblcHl9PJFFVKiCAy/bY97+BPZXSQ2wbq0P9s8tK2G7dFQfNnlJnPAiArVBVBsfA== -tslog@^4.3.1, tslog@^4.4.0: - version "4.9.2" - resolved "https://registry.npmjs.org/tslog/-/tslog-4.9.2.tgz#35de3a073784dfe3849caeaa028010c7a62b7f4a" - integrity sha512-wBM+LRJoNl34Bdu8mYEFxpvmOUedpNUwMNQB/NcuPIZKwdDde6xLHUev3bBjXQU7gdurX++X/YE7gLH8eXYsiQ== - tsort@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/tsort/-/tsort-0.0.1.tgz#e2280f5e817f8bf4275657fd0f9aebd44f5a2786" @@ -28934,11 +28832,6 @@ yup@^0.32.11: property-expr "^2.0.4" toposort "^2.0.2" -zksync-web3@^0.14.3: - version "0.14.3" - resolved "https://registry.npmjs.org/zksync-web3/-/zksync-web3-0.14.3.tgz#64ac2a16d597464c3fc4ae07447a8007631c57c9" - integrity sha512-hT72th4AnqyLW1d5Jlv8N2B/qhEnl2NePK2A3org7tAa24niem/UAaHMkEvmWI3SF9waYUPtqAtjpf+yvQ9zvQ== - zwitch@^2.0.0: version "2.0.4" resolved "https://registry.yarnpkg.com/zwitch/-/zwitch-2.0.4.tgz#c827d4b0acb76fc3e685a4c6ec2902d51070e9d7"