From 4398b6293ab004820c4e446b5876b90321a0cee4 Mon Sep 17 00:00:00 2001 From: yongxinyao Date: Mon, 1 Jul 2024 11:17:55 +0800 Subject: [PATCH] tests: fix flow.test.ts in hardhat env & recompile to change *.js; add TestVoter.t.sol --- .../contracts-upgradeable/index.ts | 2 - src/types/@openzeppelin/contracts/index.ts | 2 - .../@openzeppelin/contracts/token/index.ts | 4 - .../@openzeppelin/contracts/utils/index.ts | 5 - src/types/contracts/RewardsDistributor.ts | 215 ++----- src/types/contracts/Vault.ts | 12 +- src/types/contracts/Voter.ts | 213 ++----- .../contracts/factories/FactoryRegistry.ts | 42 +- src/types/contracts/factories/index.ts | 1 - src/types/contracts/gauges/Gauge.ts | 6 - src/types/contracts/index.ts | 7 - src/types/contracts/interfaces/IGauge.ts | 6 - .../interfaces/IRewardsDistributor.ts | 201 ++----- src/types/contracts/interfaces/IVault.ts | 6 - src/types/contracts/interfaces/IVoter.ts | 207 ++----- .../interfaces/factories/IFactoryRegistry.ts | 42 +- src/types/contracts/interfaces/index.ts | 4 +- src/types/contracts/libraries/index.ts | 2 - src/types/contracts/test/index.ts | 1 + .../contracts-upgradeable/index.ts | 1 - .../@openzeppelin/contracts/index.ts | 1 - .../@openzeppelin/contracts/token/index.ts | 2 - .../@openzeppelin/contracts/utils/index.ts | 3 - .../contracts/RewardsDistributor__factory.ts | 216 +------ .../factories/contracts/Vault__factory.ts | 20 +- .../factories/contracts/Voter__factory.ts | 226 ++----- .../factories/FactoryRegistry__factory.ts | 33 +- .../factories/GaugeFactory__factory.ts | 2 +- .../factories/contracts/factories/index.ts | 1 - .../contracts/gauges/Gauge__factory.ts | 15 +- src/types/factories/contracts/index.ts | 5 - .../contracts/interfaces/IGauge__factory.ts | 13 - .../IRewardsDistributor__factory.ts | 185 +----- .../contracts/interfaces/IVault__factory.ts | 13 - .../contracts/interfaces/IVoter__factory.ts | 216 ++----- .../factories/IFactoryRegistry__factory.ts | 22 - .../factories/contracts/interfaces/index.ts | 4 +- .../factories/contracts/libraries/index.ts | 2 - src/types/factories/contracts/test/index.ts | 1 + src/types/hardhat.d.ts | 550 +----------------- src/types/index.ts | 62 +- test/TestVoter.t.sol | 60 +- test/VotingEscrow.test.ts | 196 ------- test/flow.test.ts | 38 +- 44 files changed, 428 insertions(+), 2437 deletions(-) delete mode 100644 test/VotingEscrow.test.ts diff --git a/src/types/@openzeppelin/contracts-upgradeable/index.ts b/src/types/@openzeppelin/contracts-upgradeable/index.ts index 9a00705..535f526 100644 --- a/src/types/@openzeppelin/contracts-upgradeable/index.ts +++ b/src/types/@openzeppelin/contracts-upgradeable/index.ts @@ -3,5 +3,3 @@ /* eslint-disable */ import type * as proxy from "./proxy"; export type { proxy }; -import type * as security from "./security"; -export type { security }; diff --git a/src/types/@openzeppelin/contracts/index.ts b/src/types/@openzeppelin/contracts/index.ts index 44bf2f2..de476b5 100644 --- a/src/types/@openzeppelin/contracts/index.ts +++ b/src/types/@openzeppelin/contracts/index.ts @@ -3,8 +3,6 @@ /* eslint-disable */ import type * as access from "./access"; export type { access }; -import type * as interfaces from "./interfaces"; -export type { interfaces }; import type * as metatx from "./metatx"; export type { metatx }; import type * as token from "./token"; diff --git a/src/types/@openzeppelin/contracts/token/index.ts b/src/types/@openzeppelin/contracts/token/index.ts index 15b460a..5c4062a 100644 --- a/src/types/@openzeppelin/contracts/token/index.ts +++ b/src/types/@openzeppelin/contracts/token/index.ts @@ -1,9 +1,5 @@ /* Autogenerated file. Do not edit manually. */ /* tslint:disable */ /* eslint-disable */ -import type * as erc1155 from "./ERC1155"; -export type { erc1155 }; import type * as erc20 from "./ERC20"; export type { erc20 }; -import type * as erc721 from "./ERC721"; -export type { erc721 }; diff --git a/src/types/@openzeppelin/contracts/utils/index.ts b/src/types/@openzeppelin/contracts/utils/index.ts index 0aa847a..3aa96c1 100644 --- a/src/types/@openzeppelin/contracts/utils/index.ts +++ b/src/types/@openzeppelin/contracts/utils/index.ts @@ -1,10 +1,5 @@ /* Autogenerated file. Do not edit manually. */ /* tslint:disable */ /* eslint-disable */ -import type * as cryptography from "./cryptography"; -export type { cryptography }; import type * as introspection from "./introspection"; export type { introspection }; -import type * as structs from "./structs"; -export type { structs }; -export type { ShortStrings } from "./ShortStrings"; diff --git a/src/types/contracts/RewardsDistributor.ts b/src/types/contracts/RewardsDistributor.ts index 886182b..b725b19 100644 --- a/src/types/contracts/RewardsDistributor.ts +++ b/src/types/contracts/RewardsDistributor.ts @@ -8,7 +8,6 @@ import type { FunctionFragment, Result, Interface, - EventFragment, AddressLike, ContractRunner, ContractMethod, @@ -18,7 +17,6 @@ import type { TypedContractEvent, TypedDeferredTopicFilter, TypedEventLog, - TypedLogDescription, TypedListener, TypedContractMethod, } from "../common"; @@ -26,129 +24,54 @@ import type { export interface RewardsDistributorInterface extends Interface { getFunction( nameOrSignature: - | "WEEK" - | "checkpointToken" - | "claim" - | "claimMany" - | "claimable" - | "lastTokenTime" + | "distributeRewards()" + | "distributeRewards(address,uint256)" + | "setStrategyManager" | "setVault" - | "startTime" - | "timeCursorOf" - | "tokenLastBalance" - | "tokensPerWeek" + | "strategyManager" | "vault" - | "ve" ): FunctionFragment; - getEvent( - nameOrSignatureOrTopic: "CheckpointToken" | "Claimed" - ): EventFragment; - - encodeFunctionData(functionFragment: "WEEK", values?: undefined): string; encodeFunctionData( - functionFragment: "checkpointToken", + functionFragment: "distributeRewards()", values?: undefined ): string; - encodeFunctionData(functionFragment: "claim", values: [BigNumberish]): string; - encodeFunctionData( - functionFragment: "claimMany", - values: [BigNumberish[]] - ): string; encodeFunctionData( - functionFragment: "claimable", - values: [BigNumberish] + functionFragment: "distributeRewards(address,uint256)", + values: [AddressLike, BigNumberish] ): string; encodeFunctionData( - functionFragment: "lastTokenTime", - values?: undefined + functionFragment: "setStrategyManager", + values: [AddressLike] ): string; encodeFunctionData( functionFragment: "setVault", values: [AddressLike] ): string; - encodeFunctionData(functionFragment: "startTime", values?: undefined): string; encodeFunctionData( - functionFragment: "timeCursorOf", - values: [BigNumberish] - ): string; - encodeFunctionData( - functionFragment: "tokenLastBalance", + functionFragment: "strategyManager", values?: undefined ): string; - encodeFunctionData( - functionFragment: "tokensPerWeek", - values: [BigNumberish] - ): string; encodeFunctionData(functionFragment: "vault", values?: undefined): string; - encodeFunctionData(functionFragment: "ve", values?: undefined): string; - decodeFunctionResult(functionFragment: "WEEK", data: BytesLike): Result; - decodeFunctionResult( - functionFragment: "checkpointToken", - data: BytesLike - ): Result; - decodeFunctionResult(functionFragment: "claim", data: BytesLike): Result; - decodeFunctionResult(functionFragment: "claimMany", data: BytesLike): Result; - decodeFunctionResult(functionFragment: "claimable", data: BytesLike): Result; decodeFunctionResult( - functionFragment: "lastTokenTime", + functionFragment: "distributeRewards()", data: BytesLike ): Result; - decodeFunctionResult(functionFragment: "setVault", data: BytesLike): Result; - decodeFunctionResult(functionFragment: "startTime", data: BytesLike): Result; decodeFunctionResult( - functionFragment: "timeCursorOf", + functionFragment: "distributeRewards(address,uint256)", data: BytesLike ): Result; decodeFunctionResult( - functionFragment: "tokenLastBalance", + functionFragment: "setStrategyManager", data: BytesLike ): Result; + decodeFunctionResult(functionFragment: "setVault", data: BytesLike): Result; decodeFunctionResult( - functionFragment: "tokensPerWeek", + functionFragment: "strategyManager", data: BytesLike ): Result; decodeFunctionResult(functionFragment: "vault", data: BytesLike): Result; - decodeFunctionResult(functionFragment: "ve", data: BytesLike): Result; -} - -export namespace CheckpointTokenEvent { - export type InputTuple = [time: BigNumberish, tokens: BigNumberish]; - export type OutputTuple = [time: bigint, tokens: bigint]; - export interface OutputObject { - time: bigint; - tokens: bigint; - } - export type Event = TypedContractEvent; - export type Filter = TypedDeferredTopicFilter; - export type Log = TypedEventLog; - export type LogDescription = TypedLogDescription; -} - -export namespace ClaimedEvent { - export type InputTuple = [ - tokenId: BigNumberish, - epochStart: BigNumberish, - epochEnd: BigNumberish, - amount: BigNumberish - ]; - export type OutputTuple = [ - tokenId: bigint, - epochStart: bigint, - epochEnd: bigint, - amount: bigint - ]; - export interface OutputObject { - tokenId: bigint; - epochStart: bigint; - epochEnd: bigint; - amount: bigint; - } - export type Event = TypedContractEvent; - export type Filter = TypedDeferredTopicFilter; - export type Log = TypedEventLog; - export type LogDescription = TypedLogDescription; } export interface RewardsDistributor extends BaseContract { @@ -194,114 +117,52 @@ export interface RewardsDistributor extends BaseContract { event?: TCEvent ): Promise; - WEEK: TypedContractMethod<[], [bigint], "view">; - - checkpointToken: TypedContractMethod<[], [void], "nonpayable">; - - claim: TypedContractMethod<[_tokenId: BigNumberish], [bigint], "nonpayable">; + "distributeRewards()": TypedContractMethod<[], [void], "payable">; - claimMany: TypedContractMethod< - [_tokenIds: BigNumberish[]], - [boolean], + "distributeRewards(address,uint256)": TypedContractMethod< + [_token: AddressLike, _amount: BigNumberish], + [void], "nonpayable" >; - claimable: TypedContractMethod<[_tokenId: BigNumberish], [bigint], "view">; - - lastTokenTime: TypedContractMethod<[], [bigint], "view">; + setStrategyManager: TypedContractMethod< + [_manager: AddressLike], + [void], + "nonpayable" + >; setVault: TypedContractMethod<[_vault: AddressLike], [void], "nonpayable">; - startTime: TypedContractMethod<[], [bigint], "view">; - - timeCursorOf: TypedContractMethod<[arg0: BigNumberish], [bigint], "view">; - - tokenLastBalance: TypedContractMethod<[], [bigint], "view">; - - tokensPerWeek: TypedContractMethod<[arg0: BigNumberish], [bigint], "view">; + strategyManager: TypedContractMethod<[], [string], "view">; vault: TypedContractMethod<[], [string], "view">; - ve: TypedContractMethod<[], [string], "view">; - getFunction( key: string | FunctionFragment ): T; getFunction( - nameOrSignature: "WEEK" - ): TypedContractMethod<[], [bigint], "view">; - getFunction( - nameOrSignature: "checkpointToken" - ): TypedContractMethod<[], [void], "nonpayable">; - getFunction( - nameOrSignature: "claim" - ): TypedContractMethod<[_tokenId: BigNumberish], [bigint], "nonpayable">; - getFunction( - nameOrSignature: "claimMany" - ): TypedContractMethod<[_tokenIds: BigNumberish[]], [boolean], "nonpayable">; + nameOrSignature: "distributeRewards()" + ): TypedContractMethod<[], [void], "payable">; getFunction( - nameOrSignature: "claimable" - ): TypedContractMethod<[_tokenId: BigNumberish], [bigint], "view">; + nameOrSignature: "distributeRewards(address,uint256)" + ): TypedContractMethod< + [_token: AddressLike, _amount: BigNumberish], + [void], + "nonpayable" + >; getFunction( - nameOrSignature: "lastTokenTime" - ): TypedContractMethod<[], [bigint], "view">; + nameOrSignature: "setStrategyManager" + ): TypedContractMethod<[_manager: AddressLike], [void], "nonpayable">; getFunction( nameOrSignature: "setVault" ): TypedContractMethod<[_vault: AddressLike], [void], "nonpayable">; getFunction( - nameOrSignature: "startTime" - ): TypedContractMethod<[], [bigint], "view">; - getFunction( - nameOrSignature: "timeCursorOf" - ): TypedContractMethod<[arg0: BigNumberish], [bigint], "view">; - getFunction( - nameOrSignature: "tokenLastBalance" - ): TypedContractMethod<[], [bigint], "view">; - getFunction( - nameOrSignature: "tokensPerWeek" - ): TypedContractMethod<[arg0: BigNumberish], [bigint], "view">; + nameOrSignature: "strategyManager" + ): TypedContractMethod<[], [string], "view">; getFunction( nameOrSignature: "vault" ): TypedContractMethod<[], [string], "view">; - getFunction(nameOrSignature: "ve"): TypedContractMethod<[], [string], "view">; - - getEvent( - key: "CheckpointToken" - ): TypedContractEvent< - CheckpointTokenEvent.InputTuple, - CheckpointTokenEvent.OutputTuple, - CheckpointTokenEvent.OutputObject - >; - getEvent( - key: "Claimed" - ): TypedContractEvent< - ClaimedEvent.InputTuple, - ClaimedEvent.OutputTuple, - ClaimedEvent.OutputObject - >; - - filters: { - "CheckpointToken(uint256,uint256)": TypedContractEvent< - CheckpointTokenEvent.InputTuple, - CheckpointTokenEvent.OutputTuple, - CheckpointTokenEvent.OutputObject - >; - CheckpointToken: TypedContractEvent< - CheckpointTokenEvent.InputTuple, - CheckpointTokenEvent.OutputTuple, - CheckpointTokenEvent.OutputObject - >; - "Claimed(uint256,uint256,uint256,uint256)": TypedContractEvent< - ClaimedEvent.InputTuple, - ClaimedEvent.OutputTuple, - ClaimedEvent.OutputObject - >; - Claimed: TypedContractEvent< - ClaimedEvent.InputTuple, - ClaimedEvent.OutputTuple, - ClaimedEvent.OutputObject - >; - }; + filters: {}; } diff --git a/src/types/contracts/Vault.ts b/src/types/contracts/Vault.ts index 1579e42..eadf382 100644 --- a/src/types/contracts/Vault.ts +++ b/src/types/contracts/Vault.ts @@ -38,7 +38,6 @@ export interface VaultInterface extends Interface { | "rewardsDistributor" | "setGovernor" | "updatePeriod" - | "ve" | "veRate" | "voter" | "weekly" @@ -81,7 +80,7 @@ export interface VaultInterface extends Interface { encodeFunctionData(functionFragment: "governor", values?: undefined): string; encodeFunctionData( functionFragment: "initialize", - values: [AddressLike, AddressLike, AddressLike] + values: [AddressLike, AddressLike] ): string; encodeFunctionData( functionFragment: "rewardsDistributor", @@ -95,7 +94,6 @@ export interface VaultInterface extends Interface { functionFragment: "updatePeriod", values?: undefined ): string; - encodeFunctionData(functionFragment: "ve", values?: undefined): string; encodeFunctionData(functionFragment: "veRate", values?: undefined): string; encodeFunctionData(functionFragment: "voter", values?: undefined): string; encodeFunctionData(functionFragment: "weekly", values?: undefined): string; @@ -137,7 +135,6 @@ export interface VaultInterface extends Interface { functionFragment: "updatePeriod", data: BytesLike ): Result; - decodeFunctionResult(functionFragment: "ve", data: BytesLike): Result; decodeFunctionResult(functionFragment: "veRate", data: BytesLike): Result; decodeFunctionResult(functionFragment: "voter", data: BytesLike): Result; decodeFunctionResult(functionFragment: "weekly", data: BytesLike): Result; @@ -320,7 +317,7 @@ export interface Vault extends BaseContract { governor: TypedContractMethod<[], [string], "view">; initialize: TypedContractMethod< - [_voter: AddressLike, _ve: AddressLike, _rewardsDistributor: AddressLike], + [_voter: AddressLike, _rewardsDistributor: AddressLike], [void], "nonpayable" >; @@ -335,8 +332,6 @@ export interface Vault extends BaseContract { updatePeriod: TypedContractMethod<[], [bigint], "nonpayable">; - ve: TypedContractMethod<[], [string], "view">; - veRate: TypedContractMethod<[], [bigint], "view">; voter: TypedContractMethod<[], [string], "view">; @@ -384,7 +379,7 @@ export interface Vault extends BaseContract { getFunction( nameOrSignature: "initialize" ): TypedContractMethod< - [_voter: AddressLike, _ve: AddressLike, _rewardsDistributor: AddressLike], + [_voter: AddressLike, _rewardsDistributor: AddressLike], [void], "nonpayable" >; @@ -397,7 +392,6 @@ export interface Vault extends BaseContract { getFunction( nameOrSignature: "updatePeriod" ): TypedContractMethod<[], [bigint], "nonpayable">; - getFunction(nameOrSignature: "ve"): TypedContractMethod<[], [string], "view">; getFunction( nameOrSignature: "veRate" ): TypedContractMethod<[], [bigint], "view">; diff --git a/src/types/contracts/Voter.ts b/src/types/contracts/Voter.ts index 2f78772..45c44ba 100644 --- a/src/types/contracts/Voter.ts +++ b/src/types/contracts/Voter.ts @@ -26,7 +26,6 @@ import type { export interface VoterInterface extends Interface { getFunction( nameOrSignature: - | "claimBribes" | "claimRewards" | "claimable" | "createGauge" @@ -39,14 +38,12 @@ export interface VoterInterface extends Interface { | "epochVoteStart" | "factoryRegistry" | "forwarder" - | "gaugeToBribe" | "gauges" | "governor" | "initialize" | "isAlive" | "isGauge" | "isTrustedForwarder" - | "isWhitelistedNFT" | "isWhitelistedToken" | "killGauge" | "lastVoted" @@ -62,17 +59,17 @@ export interface VoterInterface extends Interface { | "setEmergencyCouncil" | "setGovernor" | "setMaxVotingNum" + | "strategyManager" + | "team" | "totalWeight" | "updateFor(address)" | "updateFor(uint256,uint256)" | "updateFor(address[])" | "usedWeights" | "vault" - | "ve" | "vote" | "votes" | "weights" - | "whitelistNFT" | "whitelistToken" ): FunctionFragment; @@ -85,14 +82,9 @@ export interface VoterInterface extends Interface { | "GaugeRevived" | "NotifyReward" | "Voted" - | "WhitelistNFT" | "WhitelistToken" ): EventFragment; - encodeFunctionData( - functionFragment: "claimBribes", - values: [AddressLike[], AddressLike[][], BigNumberish] - ): string; encodeFunctionData( functionFragment: "claimRewards", values: [AddressLike[]] @@ -138,10 +130,6 @@ export interface VoterInterface extends Interface { values?: undefined ): string; encodeFunctionData(functionFragment: "forwarder", values?: undefined): string; - encodeFunctionData( - functionFragment: "gaugeToBribe", - values: [AddressLike] - ): string; encodeFunctionData(functionFragment: "gauges", values: [AddressLike]): string; encodeFunctionData(functionFragment: "governor", values?: undefined): string; encodeFunctionData( @@ -160,10 +148,6 @@ export interface VoterInterface extends Interface { functionFragment: "isTrustedForwarder", values: [AddressLike] ): string; - encodeFunctionData( - functionFragment: "isWhitelistedNFT", - values: [BigNumberish] - ): string; encodeFunctionData( functionFragment: "isWhitelistedToken", values: [AddressLike] @@ -174,7 +158,7 @@ export interface VoterInterface extends Interface { ): string; encodeFunctionData( functionFragment: "lastVoted", - values: [BigNumberish] + values: [AddressLike] ): string; encodeFunctionData(functionFragment: "length", values?: undefined): string; encodeFunctionData( @@ -185,17 +169,17 @@ export interface VoterInterface extends Interface { functionFragment: "notifyRewardAmount", values?: undefined ): string; - encodeFunctionData(functionFragment: "poke", values: [BigNumberish]): string; + encodeFunctionData(functionFragment: "poke", values?: undefined): string; encodeFunctionData( functionFragment: "poolForGauge", values: [AddressLike] ): string; encodeFunctionData( functionFragment: "poolVote", - values: [BigNumberish, BigNumberish] + values: [AddressLike, BigNumberish] ): string; encodeFunctionData(functionFragment: "pools", values: [BigNumberish]): string; - encodeFunctionData(functionFragment: "reset", values: [BigNumberish]): string; + encodeFunctionData(functionFragment: "reset", values?: undefined): string; encodeFunctionData( functionFragment: "reviveGauge", values: [AddressLike] @@ -212,6 +196,11 @@ export interface VoterInterface extends Interface { functionFragment: "setMaxVotingNum", values: [BigNumberish] ): string; + encodeFunctionData( + functionFragment: "strategyManager", + values?: undefined + ): string; + encodeFunctionData(functionFragment: "team", values?: undefined): string; encodeFunctionData( functionFragment: "totalWeight", values?: undefined @@ -230,35 +219,26 @@ export interface VoterInterface extends Interface { ): string; encodeFunctionData( functionFragment: "usedWeights", - values: [BigNumberish] + values: [AddressLike] ): string; encodeFunctionData(functionFragment: "vault", values?: undefined): string; - encodeFunctionData(functionFragment: "ve", values?: undefined): string; encodeFunctionData( functionFragment: "vote", - values: [BigNumberish, AddressLike[], BigNumberish[]] + values: [AddressLike[], BigNumberish[]] ): string; encodeFunctionData( functionFragment: "votes", - values: [BigNumberish, AddressLike] + values: [AddressLike, AddressLike] ): string; encodeFunctionData( functionFragment: "weights", values: [AddressLike] ): string; - encodeFunctionData( - functionFragment: "whitelistNFT", - values: [BigNumberish, boolean] - ): string; encodeFunctionData( functionFragment: "whitelistToken", values: [AddressLike, boolean] ): string; - decodeFunctionResult( - functionFragment: "claimBribes", - data: BytesLike - ): Result; decodeFunctionResult( functionFragment: "claimRewards", data: BytesLike @@ -295,10 +275,6 @@ export interface VoterInterface extends Interface { data: BytesLike ): Result; decodeFunctionResult(functionFragment: "forwarder", data: BytesLike): Result; - decodeFunctionResult( - functionFragment: "gaugeToBribe", - data: BytesLike - ): Result; decodeFunctionResult(functionFragment: "gauges", data: BytesLike): Result; decodeFunctionResult(functionFragment: "governor", data: BytesLike): Result; decodeFunctionResult(functionFragment: "initialize", data: BytesLike): Result; @@ -308,10 +284,6 @@ export interface VoterInterface extends Interface { functionFragment: "isTrustedForwarder", data: BytesLike ): Result; - decodeFunctionResult( - functionFragment: "isWhitelistedNFT", - data: BytesLike - ): Result; decodeFunctionResult( functionFragment: "isWhitelistedToken", data: BytesLike @@ -351,6 +323,11 @@ export interface VoterInterface extends Interface { functionFragment: "setMaxVotingNum", data: BytesLike ): Result; + decodeFunctionResult( + functionFragment: "strategyManager", + data: BytesLike + ): Result; + decodeFunctionResult(functionFragment: "team", data: BytesLike): Result; decodeFunctionResult( functionFragment: "totalWeight", data: BytesLike @@ -372,14 +349,9 @@ export interface VoterInterface extends Interface { data: BytesLike ): Result; decodeFunctionResult(functionFragment: "vault", data: BytesLike): Result; - decodeFunctionResult(functionFragment: "ve", data: BytesLike): Result; decodeFunctionResult(functionFragment: "vote", data: BytesLike): Result; decodeFunctionResult(functionFragment: "votes", data: BytesLike): Result; decodeFunctionResult(functionFragment: "weights", data: BytesLike): Result; - decodeFunctionResult( - functionFragment: "whitelistNFT", - data: BytesLike - ): Result; decodeFunctionResult( functionFragment: "whitelistToken", data: BytesLike @@ -390,7 +362,6 @@ export namespace AbstainedEvent { export type InputTuple = [ voter: AddressLike, pool: AddressLike, - tokenId: BigNumberish, weight: BigNumberish, totalWeight: BigNumberish, timestamp: BigNumberish @@ -398,7 +369,6 @@ export namespace AbstainedEvent { export type OutputTuple = [ voter: string, pool: string, - tokenId: bigint, weight: bigint, totalWeight: bigint, timestamp: bigint @@ -406,7 +376,6 @@ export namespace AbstainedEvent { export interface OutputObject { voter: string; pool: string; - tokenId: bigint; weight: bigint; totalWeight: bigint; timestamp: bigint; @@ -438,28 +407,22 @@ export namespace DistributeRewardEvent { export namespace GaugeCreatedEvent { export type InputTuple = [ poolFactory: AddressLike, - votingRewardsFactory: AddressLike, gaugeFactory: AddressLike, pool: AddressLike, - bribeVotingReward: AddressLike, gauge: AddressLike, creator: AddressLike ]; export type OutputTuple = [ poolFactory: string, - votingRewardsFactory: string, gaugeFactory: string, pool: string, - bribeVotingReward: string, gauge: string, creator: string ]; export interface OutputObject { poolFactory: string; - votingRewardsFactory: string; gaugeFactory: string; pool: string; - bribeVotingReward: string; gauge: string; creator: string; } @@ -510,7 +473,6 @@ export namespace VotedEvent { export type InputTuple = [ voter: AddressLike, pool: AddressLike, - tokenId: BigNumberish, weight: BigNumberish, totalWeight: BigNumberish, timestamp: BigNumberish @@ -518,7 +480,6 @@ export namespace VotedEvent { export type OutputTuple = [ voter: string, pool: string, - tokenId: bigint, weight: bigint, totalWeight: bigint, timestamp: bigint @@ -526,7 +487,6 @@ export namespace VotedEvent { export interface OutputObject { voter: string; pool: string; - tokenId: bigint; weight: bigint; totalWeight: bigint; timestamp: bigint; @@ -537,28 +497,6 @@ export namespace VotedEvent { export type LogDescription = TypedLogDescription; } -export namespace WhitelistNFTEvent { - export type InputTuple = [ - whitelister: AddressLike, - tokenId: BigNumberish, - _bool: boolean - ]; - export type OutputTuple = [ - whitelister: string, - tokenId: bigint, - _bool: boolean - ]; - export interface OutputObject { - whitelister: string; - tokenId: bigint; - _bool: boolean; - } - export type Event = TypedContractEvent; - export type Filter = TypedDeferredTopicFilter; - export type Log = TypedEventLog; - export type LogDescription = TypedLogDescription; -} - export namespace WhitelistTokenEvent { export type InputTuple = [ whitelister: AddressLike, @@ -624,12 +562,6 @@ export interface Voter extends BaseContract { event?: TCEvent ): Promise; - claimBribes: TypedContractMethod< - [_bribes: AddressLike[], _tokens: AddressLike[][], _tokenId: BigNumberish], - [void], - "nonpayable" - >; - claimRewards: TypedContractMethod< [_gauges: AddressLike[]], [void], @@ -678,8 +610,6 @@ export interface Voter extends BaseContract { forwarder: TypedContractMethod<[], [string], "view">; - gaugeToBribe: TypedContractMethod<[arg0: AddressLike], [string], "view">; - gauges: TypedContractMethod<[arg0: AddressLike], [string], "view">; governor: TypedContractMethod<[], [string], "view">; @@ -700,12 +630,6 @@ export interface Voter extends BaseContract { "view" >; - isWhitelistedNFT: TypedContractMethod< - [arg0: BigNumberish], - [boolean], - "view" - >; - isWhitelistedToken: TypedContractMethod< [arg0: AddressLike], [boolean], @@ -714,7 +638,7 @@ export interface Voter extends BaseContract { killGauge: TypedContractMethod<[_gauge: AddressLike], [void], "nonpayable">; - lastVoted: TypedContractMethod<[arg0: BigNumberish], [bigint], "view">; + lastVoted: TypedContractMethod<[arg0: AddressLike], [bigint], "view">; length: TypedContractMethod<[], [bigint], "view">; @@ -722,19 +646,19 @@ export interface Voter extends BaseContract { notifyRewardAmount: TypedContractMethod<[], [void], "payable">; - poke: TypedContractMethod<[_tokenId: BigNumberish], [void], "nonpayable">; + poke: TypedContractMethod<[], [void], "nonpayable">; poolForGauge: TypedContractMethod<[arg0: AddressLike], [string], "view">; poolVote: TypedContractMethod< - [arg0: BigNumberish, arg1: BigNumberish], + [arg0: AddressLike, arg1: BigNumberish], [string], "view" >; pools: TypedContractMethod<[arg0: BigNumberish], [string], "view">; - reset: TypedContractMethod<[_tokenId: BigNumberish], [void], "nonpayable">; + reset: TypedContractMethod<[], [void], "nonpayable">; reviveGauge: TypedContractMethod<[_gauge: AddressLike], [void], "nonpayable">; @@ -756,6 +680,10 @@ export interface Voter extends BaseContract { "nonpayable" >; + strategyManager: TypedContractMethod<[], [string], "view">; + + team: TypedContractMethod<[], [string], "view">; + totalWeight: TypedContractMethod<[], [bigint], "view">; "updateFor(address)": TypedContractMethod< @@ -776,36 +704,24 @@ export interface Voter extends BaseContract { "nonpayable" >; - usedWeights: TypedContractMethod<[arg0: BigNumberish], [bigint], "view">; + usedWeights: TypedContractMethod<[arg0: AddressLike], [bigint], "view">; vault: TypedContractMethod<[], [string], "view">; - ve: TypedContractMethod<[], [string], "view">; - vote: TypedContractMethod< - [ - _tokenId: BigNumberish, - _poolVote: AddressLike[], - _weights: BigNumberish[] - ], + [_poolVote: AddressLike[], _weights: BigNumberish[]], [void], "nonpayable" >; votes: TypedContractMethod< - [arg0: BigNumberish, arg1: AddressLike], + [arg0: AddressLike, arg1: AddressLike], [bigint], "view" >; weights: TypedContractMethod<[arg0: AddressLike], [bigint], "view">; - whitelistNFT: TypedContractMethod< - [_tokenId: BigNumberish, _bool: boolean], - [void], - "nonpayable" - >; - whitelistToken: TypedContractMethod< [_token: AddressLike, _bool: boolean], [void], @@ -816,13 +732,6 @@ export interface Voter extends BaseContract { key: string | FunctionFragment ): T; - getFunction( - nameOrSignature: "claimBribes" - ): TypedContractMethod< - [_bribes: AddressLike[], _tokens: AddressLike[][], _tokenId: BigNumberish], - [void], - "nonpayable" - >; getFunction( nameOrSignature: "claimRewards" ): TypedContractMethod<[_gauges: AddressLike[]], [void], "nonpayable">; @@ -867,9 +776,6 @@ export interface Voter extends BaseContract { getFunction( nameOrSignature: "forwarder" ): TypedContractMethod<[], [string], "view">; - getFunction( - nameOrSignature: "gaugeToBribe" - ): TypedContractMethod<[arg0: AddressLike], [string], "view">; getFunction( nameOrSignature: "gauges" ): TypedContractMethod<[arg0: AddressLike], [string], "view">; @@ -892,9 +798,6 @@ export interface Voter extends BaseContract { getFunction( nameOrSignature: "isTrustedForwarder" ): TypedContractMethod<[forwarder: AddressLike], [boolean], "view">; - getFunction( - nameOrSignature: "isWhitelistedNFT" - ): TypedContractMethod<[arg0: BigNumberish], [boolean], "view">; getFunction( nameOrSignature: "isWhitelistedToken" ): TypedContractMethod<[arg0: AddressLike], [boolean], "view">; @@ -903,7 +806,7 @@ export interface Voter extends BaseContract { ): TypedContractMethod<[_gauge: AddressLike], [void], "nonpayable">; getFunction( nameOrSignature: "lastVoted" - ): TypedContractMethod<[arg0: BigNumberish], [bigint], "view">; + ): TypedContractMethod<[arg0: AddressLike], [bigint], "view">; getFunction( nameOrSignature: "length" ): TypedContractMethod<[], [bigint], "view">; @@ -915,14 +818,14 @@ export interface Voter extends BaseContract { ): TypedContractMethod<[], [void], "payable">; getFunction( nameOrSignature: "poke" - ): TypedContractMethod<[_tokenId: BigNumberish], [void], "nonpayable">; + ): TypedContractMethod<[], [void], "nonpayable">; getFunction( nameOrSignature: "poolForGauge" ): TypedContractMethod<[arg0: AddressLike], [string], "view">; getFunction( nameOrSignature: "poolVote" ): TypedContractMethod< - [arg0: BigNumberish, arg1: BigNumberish], + [arg0: AddressLike, arg1: BigNumberish], [string], "view" >; @@ -931,7 +834,7 @@ export interface Voter extends BaseContract { ): TypedContractMethod<[arg0: BigNumberish], [string], "view">; getFunction( nameOrSignature: "reset" - ): TypedContractMethod<[_tokenId: BigNumberish], [void], "nonpayable">; + ): TypedContractMethod<[], [void], "nonpayable">; getFunction( nameOrSignature: "reviveGauge" ): TypedContractMethod<[_gauge: AddressLike], [void], "nonpayable">; @@ -944,6 +847,12 @@ export interface Voter extends BaseContract { getFunction( nameOrSignature: "setMaxVotingNum" ): TypedContractMethod<[_maxVotingNum: BigNumberish], [void], "nonpayable">; + getFunction( + nameOrSignature: "strategyManager" + ): TypedContractMethod<[], [string], "view">; + getFunction( + nameOrSignature: "team" + ): TypedContractMethod<[], [string], "view">; getFunction( nameOrSignature: "totalWeight" ): TypedContractMethod<[], [bigint], "view">; @@ -962,39 +871,27 @@ export interface Voter extends BaseContract { ): TypedContractMethod<[_gauges: AddressLike[]], [void], "nonpayable">; getFunction( nameOrSignature: "usedWeights" - ): TypedContractMethod<[arg0: BigNumberish], [bigint], "view">; + ): TypedContractMethod<[arg0: AddressLike], [bigint], "view">; getFunction( nameOrSignature: "vault" ): TypedContractMethod<[], [string], "view">; - getFunction(nameOrSignature: "ve"): TypedContractMethod<[], [string], "view">; getFunction( nameOrSignature: "vote" ): TypedContractMethod< - [ - _tokenId: BigNumberish, - _poolVote: AddressLike[], - _weights: BigNumberish[] - ], + [_poolVote: AddressLike[], _weights: BigNumberish[]], [void], "nonpayable" >; getFunction( nameOrSignature: "votes" ): TypedContractMethod< - [arg0: BigNumberish, arg1: AddressLike], + [arg0: AddressLike, arg1: AddressLike], [bigint], "view" >; getFunction( nameOrSignature: "weights" ): TypedContractMethod<[arg0: AddressLike], [bigint], "view">; - getFunction( - nameOrSignature: "whitelistNFT" - ): TypedContractMethod< - [_tokenId: BigNumberish, _bool: boolean], - [void], - "nonpayable" - >; getFunction( nameOrSignature: "whitelistToken" ): TypedContractMethod< @@ -1052,13 +949,6 @@ export interface Voter extends BaseContract { VotedEvent.OutputTuple, VotedEvent.OutputObject >; - getEvent( - key: "WhitelistNFT" - ): TypedContractEvent< - WhitelistNFTEvent.InputTuple, - WhitelistNFTEvent.OutputTuple, - WhitelistNFTEvent.OutputObject - >; getEvent( key: "WhitelistToken" ): TypedContractEvent< @@ -1068,7 +958,7 @@ export interface Voter extends BaseContract { >; filters: { - "Abstained(address,address,uint256,uint256,uint256,uint256)": TypedContractEvent< + "Abstained(address,address,uint256,uint256,uint256)": TypedContractEvent< AbstainedEvent.InputTuple, AbstainedEvent.OutputTuple, AbstainedEvent.OutputObject @@ -1090,7 +980,7 @@ export interface Voter extends BaseContract { DistributeRewardEvent.OutputObject >; - "GaugeCreated(address,address,address,address,address,address,address)": TypedContractEvent< + "GaugeCreated(address,address,address,address,address)": TypedContractEvent< GaugeCreatedEvent.InputTuple, GaugeCreatedEvent.OutputTuple, GaugeCreatedEvent.OutputObject @@ -1134,7 +1024,7 @@ export interface Voter extends BaseContract { NotifyRewardEvent.OutputObject >; - "Voted(address,address,uint256,uint256,uint256,uint256)": TypedContractEvent< + "Voted(address,address,uint256,uint256,uint256)": TypedContractEvent< VotedEvent.InputTuple, VotedEvent.OutputTuple, VotedEvent.OutputObject @@ -1145,17 +1035,6 @@ export interface Voter extends BaseContract { VotedEvent.OutputObject >; - "WhitelistNFT(address,uint256,bool)": TypedContractEvent< - WhitelistNFTEvent.InputTuple, - WhitelistNFTEvent.OutputTuple, - WhitelistNFTEvent.OutputObject - >; - WhitelistNFT: TypedContractEvent< - WhitelistNFTEvent.InputTuple, - WhitelistNFTEvent.OutputTuple, - WhitelistNFTEvent.OutputObject - >; - "WhitelistToken(address,address,bool)": TypedContractEvent< WhitelistTokenEvent.InputTuple, WhitelistTokenEvent.OutputTuple, diff --git a/src/types/contracts/factories/FactoryRegistry.ts b/src/types/contracts/factories/FactoryRegistry.ts index 0d484ce..e415d26 100644 --- a/src/types/contracts/factories/FactoryRegistry.ts +++ b/src/types/contracts/factories/FactoryRegistry.ts @@ -47,7 +47,7 @@ export interface FactoryRegistryInterface extends Interface { encodeFunctionData( functionFragment: "approve", - values: [AddressLike, AddressLike, AddressLike] + values: [AddressLike, AddressLike] ): string; encodeFunctionData( functionFragment: "factoriesToPoolFactory", @@ -119,17 +119,11 @@ export interface FactoryRegistryInterface extends Interface { export namespace ApproveEvent { export type InputTuple = [ poolFactory: AddressLike, - votingRewardsFactory: AddressLike, gaugeFactory: AddressLike ]; - export type OutputTuple = [ - poolFactory: string, - votingRewardsFactory: string, - gaugeFactory: string - ]; + export type OutputTuple = [poolFactory: string, gaugeFactory: string]; export interface OutputObject { poolFactory: string; - votingRewardsFactory: string; gaugeFactory: string; } export type Event = TypedContractEvent; @@ -166,17 +160,11 @@ export namespace SetManagedRewardsFactoryEvent { export namespace UnapproveEvent { export type InputTuple = [ poolFactory: AddressLike, - votingRewardsFactory: AddressLike, gaugeFactory: AddressLike ]; - export type OutputTuple = [ - poolFactory: string, - votingRewardsFactory: string, - gaugeFactory: string - ]; + export type OutputTuple = [poolFactory: string, gaugeFactory: string]; export interface OutputObject { poolFactory: string; - votingRewardsFactory: string; gaugeFactory: string; } export type Event = TypedContractEvent; @@ -229,18 +217,14 @@ export interface FactoryRegistry extends BaseContract { ): Promise; approve: TypedContractMethod< - [ - poolFactory: AddressLike, - votingRewardsFactory: AddressLike, - gaugeFactory: AddressLike - ], + [poolFactory: AddressLike, gaugeFactory: AddressLike], [void], "nonpayable" >; factoriesToPoolFactory: TypedContractMethod< [poolFactory: AddressLike], - [[string, string] & { votingRewardsFactory: string; gaugeFactory: string }], + [string], "view" >; @@ -279,21 +263,13 @@ export interface FactoryRegistry extends BaseContract { getFunction( nameOrSignature: "approve" ): TypedContractMethod< - [ - poolFactory: AddressLike, - votingRewardsFactory: AddressLike, - gaugeFactory: AddressLike - ], + [poolFactory: AddressLike, gaugeFactory: AddressLike], [void], "nonpayable" >; getFunction( nameOrSignature: "factoriesToPoolFactory" - ): TypedContractMethod< - [poolFactory: AddressLike], - [[string, string] & { votingRewardsFactory: string; gaugeFactory: string }], - "view" - >; + ): TypedContractMethod<[poolFactory: AddressLike], [string], "view">; getFunction( nameOrSignature: "fallbackPoolFactory" ): TypedContractMethod<[], [string], "view">; @@ -349,7 +325,7 @@ export interface FactoryRegistry extends BaseContract { >; filters: { - "Approve(address,address,address)": TypedContractEvent< + "Approve(address,address)": TypedContractEvent< ApproveEvent.InputTuple, ApproveEvent.OutputTuple, ApproveEvent.OutputObject @@ -382,7 +358,7 @@ export interface FactoryRegistry extends BaseContract { SetManagedRewardsFactoryEvent.OutputObject >; - "Unapprove(address,address,address)": TypedContractEvent< + "Unapprove(address,address)": TypedContractEvent< UnapproveEvent.InputTuple, UnapproveEvent.OutputTuple, UnapproveEvent.OutputObject diff --git a/src/types/contracts/factories/index.ts b/src/types/contracts/factories/index.ts index 8426581..704a4ea 100644 --- a/src/types/contracts/factories/index.ts +++ b/src/types/contracts/factories/index.ts @@ -3,4 +3,3 @@ /* eslint-disable */ export type { FactoryRegistry } from "./FactoryRegistry"; export type { GaugeFactory } from "./GaugeFactory"; -export type { VotingRewardsFactory } from "./VotingRewardsFactory"; diff --git a/src/types/contracts/gauges/Gauge.ts b/src/types/contracts/gauges/Gauge.ts index 2d1e71a..db3491a 100644 --- a/src/types/contracts/gauges/Gauge.ts +++ b/src/types/contracts/gauges/Gauge.ts @@ -46,7 +46,6 @@ export interface GaugeInterface extends Interface { | "stakingToken" | "totalSupply" | "userRewardPerTokenPaid" - | "ve" | "voter" | "withdraw" ): FunctionFragment; @@ -133,7 +132,6 @@ export interface GaugeInterface extends Interface { functionFragment: "userRewardPerTokenPaid", values: [AddressLike] ): string; - encodeFunctionData(functionFragment: "ve", values?: undefined): string; encodeFunctionData(functionFragment: "voter", values?: undefined): string; encodeFunctionData( functionFragment: "withdraw", @@ -202,7 +200,6 @@ export interface GaugeInterface extends Interface { functionFragment: "userRewardPerTokenPaid", data: BytesLike ): Result; - decodeFunctionResult(functionFragment: "ve", data: BytesLike): Result; decodeFunctionResult(functionFragment: "voter", data: BytesLike): Result; decodeFunctionResult(functionFragment: "withdraw", data: BytesLike): Result; } @@ -367,8 +364,6 @@ export interface Gauge extends BaseContract { "view" >; - ve: TypedContractMethod<[], [string], "view">; - voter: TypedContractMethod<[], [string], "view">; withdraw: TypedContractMethod<[_amount: BigNumberish], [void], "nonpayable">; @@ -441,7 +436,6 @@ export interface Gauge extends BaseContract { getFunction( nameOrSignature: "userRewardPerTokenPaid" ): TypedContractMethod<[arg0: AddressLike], [bigint], "view">; - getFunction(nameOrSignature: "ve"): TypedContractMethod<[], [string], "view">; getFunction( nameOrSignature: "voter" ): TypedContractMethod<[], [string], "view">; diff --git a/src/types/contracts/index.ts b/src/types/contracts/index.ts index 319b912..89ae177 100644 --- a/src/types/contracts/index.ts +++ b/src/types/contracts/index.ts @@ -7,21 +7,14 @@ import type * as factories from "./factories"; export type { factories }; import type * as gauges from "./gauges"; export type { gauges }; -import type * as governance from "./governance"; -export type { governance }; import type * as interfaces from "./interfaces"; export type { interfaces }; import type * as libraries from "./libraries"; export type { libraries }; -import type * as rewards from "./rewards"; -export type { rewards }; import type * as test from "./test"; export type { test }; export type { DAOForwarder } from "./DAOForwarder"; -export type { MarshallGovernor } from "./MarshallGovernor"; export type { RewardsDistributor } from "./RewardsDistributor"; export type { Vault } from "./Vault"; -export type { VeArtProxy } from "./VeArtProxy"; export type { VestingMaster } from "./VestingMaster"; export type { Voter } from "./Voter"; -export type { VotingEscrow } from "./VotingEscrow"; diff --git a/src/types/contracts/interfaces/IGauge.ts b/src/types/contracts/interfaces/IGauge.ts index f089293..84ed6e5 100644 --- a/src/types/contracts/interfaces/IGauge.ts +++ b/src/types/contracts/interfaces/IGauge.ts @@ -45,7 +45,6 @@ export interface IGaugeInterface extends Interface { | "stakingToken" | "totalSupply" | "userRewardPerTokenPaid" - | "ve" | "voter" | "withdraw" ): FunctionFragment; @@ -128,7 +127,6 @@ export interface IGaugeInterface extends Interface { functionFragment: "userRewardPerTokenPaid", values: [AddressLike] ): string; - encodeFunctionData(functionFragment: "ve", values?: undefined): string; encodeFunctionData(functionFragment: "voter", values?: undefined): string; encodeFunctionData( functionFragment: "withdraw", @@ -193,7 +191,6 @@ export interface IGaugeInterface extends Interface { functionFragment: "userRewardPerTokenPaid", data: BytesLike ): Result; - decodeFunctionResult(functionFragment: "ve", data: BytesLike): Result; decodeFunctionResult(functionFragment: "voter", data: BytesLike): Result; decodeFunctionResult(functionFragment: "withdraw", data: BytesLike): Result; } @@ -352,8 +349,6 @@ export interface IGauge extends BaseContract { "view" >; - ve: TypedContractMethod<[], [string], "view">; - voter: TypedContractMethod<[], [string], "view">; withdraw: TypedContractMethod<[_amount: BigNumberish], [void], "nonpayable">; @@ -423,7 +418,6 @@ export interface IGauge extends BaseContract { getFunction( nameOrSignature: "userRewardPerTokenPaid" ): TypedContractMethod<[arg0: AddressLike], [bigint], "view">; - getFunction(nameOrSignature: "ve"): TypedContractMethod<[], [string], "view">; getFunction( nameOrSignature: "voter" ): TypedContractMethod<[], [string], "view">; diff --git a/src/types/contracts/interfaces/IRewardsDistributor.ts b/src/types/contracts/interfaces/IRewardsDistributor.ts index d150fff..a4337b1 100644 --- a/src/types/contracts/interfaces/IRewardsDistributor.ts +++ b/src/types/contracts/interfaces/IRewardsDistributor.ts @@ -8,7 +8,6 @@ import type { FunctionFragment, Result, Interface, - EventFragment, AddressLike, ContractRunner, ContractMethod, @@ -18,7 +17,6 @@ import type { TypedContractEvent, TypedDeferredTopicFilter, TypedEventLog, - TypedLogDescription, TypedListener, TypedContractMethod, } from "../../common"; @@ -26,120 +24,54 @@ import type { export interface IRewardsDistributorInterface extends Interface { getFunction( nameOrSignature: - | "WEEK" - | "checkpointToken" - | "claim" - | "claimMany" - | "claimable" - | "lastTokenTime" + | "distributeRewards()" + | "distributeRewards(address,uint256)" + | "setStrategyManager" | "setVault" - | "startTime" - | "timeCursorOf" - | "tokenLastBalance" + | "strategyManager" | "vault" - | "ve" ): FunctionFragment; - getEvent( - nameOrSignatureOrTopic: "CheckpointToken" | "Claimed" - ): EventFragment; - - encodeFunctionData(functionFragment: "WEEK", values?: undefined): string; encodeFunctionData( - functionFragment: "checkpointToken", + functionFragment: "distributeRewards()", values?: undefined ): string; - encodeFunctionData(functionFragment: "claim", values: [BigNumberish]): string; - encodeFunctionData( - functionFragment: "claimMany", - values: [BigNumberish[]] - ): string; encodeFunctionData( - functionFragment: "claimable", - values: [BigNumberish] + functionFragment: "distributeRewards(address,uint256)", + values: [AddressLike, BigNumberish] ): string; encodeFunctionData( - functionFragment: "lastTokenTime", - values?: undefined + functionFragment: "setStrategyManager", + values: [AddressLike] ): string; encodeFunctionData( functionFragment: "setVault", values: [AddressLike] ): string; - encodeFunctionData(functionFragment: "startTime", values?: undefined): string; encodeFunctionData( - functionFragment: "timeCursorOf", - values: [BigNumberish] - ): string; - encodeFunctionData( - functionFragment: "tokenLastBalance", + functionFragment: "strategyManager", values?: undefined ): string; encodeFunctionData(functionFragment: "vault", values?: undefined): string; - encodeFunctionData(functionFragment: "ve", values?: undefined): string; - decodeFunctionResult(functionFragment: "WEEK", data: BytesLike): Result; decodeFunctionResult( - functionFragment: "checkpointToken", + functionFragment: "distributeRewards()", data: BytesLike ): Result; - decodeFunctionResult(functionFragment: "claim", data: BytesLike): Result; - decodeFunctionResult(functionFragment: "claimMany", data: BytesLike): Result; - decodeFunctionResult(functionFragment: "claimable", data: BytesLike): Result; decodeFunctionResult( - functionFragment: "lastTokenTime", + functionFragment: "distributeRewards(address,uint256)", data: BytesLike ): Result; - decodeFunctionResult(functionFragment: "setVault", data: BytesLike): Result; - decodeFunctionResult(functionFragment: "startTime", data: BytesLike): Result; decodeFunctionResult( - functionFragment: "timeCursorOf", + functionFragment: "setStrategyManager", data: BytesLike ): Result; + decodeFunctionResult(functionFragment: "setVault", data: BytesLike): Result; decodeFunctionResult( - functionFragment: "tokenLastBalance", + functionFragment: "strategyManager", data: BytesLike ): Result; decodeFunctionResult(functionFragment: "vault", data: BytesLike): Result; - decodeFunctionResult(functionFragment: "ve", data: BytesLike): Result; -} - -export namespace CheckpointTokenEvent { - export type InputTuple = [time: BigNumberish, tokens: BigNumberish]; - export type OutputTuple = [time: bigint, tokens: bigint]; - export interface OutputObject { - time: bigint; - tokens: bigint; - } - export type Event = TypedContractEvent; - export type Filter = TypedDeferredTopicFilter; - export type Log = TypedEventLog; - export type LogDescription = TypedLogDescription; -} - -export namespace ClaimedEvent { - export type InputTuple = [ - tokenId: BigNumberish, - epochStart: BigNumberish, - epochEnd: BigNumberish, - amount: BigNumberish - ]; - export type OutputTuple = [ - tokenId: bigint, - epochStart: bigint, - epochEnd: bigint, - amount: bigint - ]; - export interface OutputObject { - tokenId: bigint; - epochStart: bigint; - epochEnd: bigint; - amount: bigint; - } - export type Event = TypedContractEvent; - export type Filter = TypedDeferredTopicFilter; - export type Log = TypedEventLog; - export type LogDescription = TypedLogDescription; } export interface IRewardsDistributor extends BaseContract { @@ -185,109 +117,52 @@ export interface IRewardsDistributor extends BaseContract { event?: TCEvent ): Promise; - WEEK: TypedContractMethod<[], [bigint], "view">; + "distributeRewards()": TypedContractMethod<[], [void], "payable">; - checkpointToken: TypedContractMethod<[], [void], "nonpayable">; - - claim: TypedContractMethod<[tokenId: BigNumberish], [bigint], "nonpayable">; - - claimMany: TypedContractMethod< - [tokenIds: BigNumberish[]], - [boolean], + "distributeRewards(address,uint256)": TypedContractMethod< + [_token: AddressLike, _amount: BigNumberish], + [void], "nonpayable" >; - claimable: TypedContractMethod<[tokenId: BigNumberish], [bigint], "view">; - - lastTokenTime: TypedContractMethod<[], [bigint], "view">; + setStrategyManager: TypedContractMethod< + [_manager: AddressLike], + [void], + "nonpayable" + >; setVault: TypedContractMethod<[_vault: AddressLike], [void], "nonpayable">; - startTime: TypedContractMethod<[], [bigint], "view">; - - timeCursorOf: TypedContractMethod<[tokenId: BigNumberish], [bigint], "view">; - - tokenLastBalance: TypedContractMethod<[], [bigint], "view">; + strategyManager: TypedContractMethod<[], [string], "view">; vault: TypedContractMethod<[], [string], "view">; - ve: TypedContractMethod<[], [string], "view">; - getFunction( key: string | FunctionFragment ): T; getFunction( - nameOrSignature: "WEEK" - ): TypedContractMethod<[], [bigint], "view">; + nameOrSignature: "distributeRewards()" + ): TypedContractMethod<[], [void], "payable">; getFunction( - nameOrSignature: "checkpointToken" - ): TypedContractMethod<[], [void], "nonpayable">; - getFunction( - nameOrSignature: "claim" - ): TypedContractMethod<[tokenId: BigNumberish], [bigint], "nonpayable">; - getFunction( - nameOrSignature: "claimMany" - ): TypedContractMethod<[tokenIds: BigNumberish[]], [boolean], "nonpayable">; - getFunction( - nameOrSignature: "claimable" - ): TypedContractMethod<[tokenId: BigNumberish], [bigint], "view">; + nameOrSignature: "distributeRewards(address,uint256)" + ): TypedContractMethod< + [_token: AddressLike, _amount: BigNumberish], + [void], + "nonpayable" + >; getFunction( - nameOrSignature: "lastTokenTime" - ): TypedContractMethod<[], [bigint], "view">; + nameOrSignature: "setStrategyManager" + ): TypedContractMethod<[_manager: AddressLike], [void], "nonpayable">; getFunction( nameOrSignature: "setVault" ): TypedContractMethod<[_vault: AddressLike], [void], "nonpayable">; getFunction( - nameOrSignature: "startTime" - ): TypedContractMethod<[], [bigint], "view">; - getFunction( - nameOrSignature: "timeCursorOf" - ): TypedContractMethod<[tokenId: BigNumberish], [bigint], "view">; - getFunction( - nameOrSignature: "tokenLastBalance" - ): TypedContractMethod<[], [bigint], "view">; + nameOrSignature: "strategyManager" + ): TypedContractMethod<[], [string], "view">; getFunction( nameOrSignature: "vault" ): TypedContractMethod<[], [string], "view">; - getFunction(nameOrSignature: "ve"): TypedContractMethod<[], [string], "view">; - - getEvent( - key: "CheckpointToken" - ): TypedContractEvent< - CheckpointTokenEvent.InputTuple, - CheckpointTokenEvent.OutputTuple, - CheckpointTokenEvent.OutputObject - >; - getEvent( - key: "Claimed" - ): TypedContractEvent< - ClaimedEvent.InputTuple, - ClaimedEvent.OutputTuple, - ClaimedEvent.OutputObject - >; - - filters: { - "CheckpointToken(uint256,uint256)": TypedContractEvent< - CheckpointTokenEvent.InputTuple, - CheckpointTokenEvent.OutputTuple, - CheckpointTokenEvent.OutputObject - >; - CheckpointToken: TypedContractEvent< - CheckpointTokenEvent.InputTuple, - CheckpointTokenEvent.OutputTuple, - CheckpointTokenEvent.OutputObject - >; - "Claimed(uint256,uint256,uint256,uint256)": TypedContractEvent< - ClaimedEvent.InputTuple, - ClaimedEvent.OutputTuple, - ClaimedEvent.OutputObject - >; - Claimed: TypedContractEvent< - ClaimedEvent.InputTuple, - ClaimedEvent.OutputTuple, - ClaimedEvent.OutputObject - >; - }; + filters: {}; } diff --git a/src/types/contracts/interfaces/IVault.ts b/src/types/contracts/interfaces/IVault.ts index e793578..e0f24b2 100644 --- a/src/types/contracts/interfaces/IVault.ts +++ b/src/types/contracts/interfaces/IVault.ts @@ -37,7 +37,6 @@ export interface IVaultInterface extends Interface { | "rewardsDistributor" | "setGovernor" | "updatePeriod" - | "ve" | "veRate" | "voter" | "weekly" @@ -89,7 +88,6 @@ export interface IVaultInterface extends Interface { functionFragment: "updatePeriod", values?: undefined ): string; - encodeFunctionData(functionFragment: "ve", values?: undefined): string; encodeFunctionData(functionFragment: "veRate", values?: undefined): string; encodeFunctionData(functionFragment: "voter", values?: undefined): string; encodeFunctionData(functionFragment: "weekly", values?: undefined): string; @@ -130,7 +128,6 @@ export interface IVaultInterface extends Interface { functionFragment: "updatePeriod", data: BytesLike ): Result; - decodeFunctionResult(functionFragment: "ve", data: BytesLike): Result; decodeFunctionResult(functionFragment: "veRate", data: BytesLike): Result; decodeFunctionResult(functionFragment: "voter", data: BytesLike): Result; decodeFunctionResult(functionFragment: "weekly", data: BytesLike): Result; @@ -310,8 +307,6 @@ export interface IVault extends BaseContract { updatePeriod: TypedContractMethod<[], [bigint], "nonpayable">; - ve: TypedContractMethod<[], [string], "view">; - veRate: TypedContractMethod<[], [bigint], "view">; voter: TypedContractMethod<[], [string], "view">; @@ -365,7 +360,6 @@ export interface IVault extends BaseContract { getFunction( nameOrSignature: "updatePeriod" ): TypedContractMethod<[], [bigint], "nonpayable">; - getFunction(nameOrSignature: "ve"): TypedContractMethod<[], [string], "view">; getFunction( nameOrSignature: "veRate" ): TypedContractMethod<[], [bigint], "view">; diff --git a/src/types/contracts/interfaces/IVoter.ts b/src/types/contracts/interfaces/IVoter.ts index 4940320..2ecd34e 100644 --- a/src/types/contracts/interfaces/IVoter.ts +++ b/src/types/contracts/interfaces/IVoter.ts @@ -26,7 +26,6 @@ import type { export interface IVoterInterface extends Interface { getFunction( nameOrSignature: - | "claimBribes" | "claimRewards" | "claimable" | "createGauge" @@ -35,12 +34,10 @@ export interface IVoterInterface extends Interface { | "emergencyCouncil" | "factoryRegistry" | "forwarder" - | "gaugeToBribe" | "gauges" | "governor" | "isAlive" | "isGauge" - | "isWhitelistedNFT" | "isWhitelistedToken" | "killGauge" | "lastVoted" @@ -54,17 +51,17 @@ export interface IVoterInterface extends Interface { | "setEmergencyCouncil" | "setGovernor" | "setMaxVotingNum" + | "strategyManager" + | "team" | "totalWeight" | "updateFor(address)" | "updateFor(uint256,uint256)" | "updateFor(address[])" | "usedWeights" | "vault" - | "ve" | "vote" | "votes" | "weights" - | "whitelistNFT" | "whitelistToken" ): FunctionFragment; @@ -77,14 +74,9 @@ export interface IVoterInterface extends Interface { | "GaugeRevived" | "NotifyReward" | "Voted" - | "WhitelistNFT" | "WhitelistToken" ): EventFragment; - encodeFunctionData( - functionFragment: "claimBribes", - values: [AddressLike[], AddressLike[][], BigNumberish] - ): string; encodeFunctionData( functionFragment: "claimRewards", values: [AddressLike[]] @@ -114,10 +106,6 @@ export interface IVoterInterface extends Interface { values?: undefined ): string; encodeFunctionData(functionFragment: "forwarder", values?: undefined): string; - encodeFunctionData( - functionFragment: "gaugeToBribe", - values: [AddressLike] - ): string; encodeFunctionData(functionFragment: "gauges", values: [AddressLike]): string; encodeFunctionData(functionFragment: "governor", values?: undefined): string; encodeFunctionData( @@ -128,10 +116,6 @@ export interface IVoterInterface extends Interface { functionFragment: "isGauge", values: [AddressLike] ): string; - encodeFunctionData( - functionFragment: "isWhitelistedNFT", - values: [BigNumberish] - ): string; encodeFunctionData( functionFragment: "isWhitelistedToken", values: [AddressLike] @@ -142,7 +126,7 @@ export interface IVoterInterface extends Interface { ): string; encodeFunctionData( functionFragment: "lastVoted", - values: [BigNumberish] + values: [AddressLike] ): string; encodeFunctionData(functionFragment: "length", values?: undefined): string; encodeFunctionData( @@ -153,12 +137,12 @@ export interface IVoterInterface extends Interface { functionFragment: "notifyRewardAmount", values?: undefined ): string; - encodeFunctionData(functionFragment: "poke", values: [BigNumberish]): string; + encodeFunctionData(functionFragment: "poke", values?: undefined): string; encodeFunctionData( functionFragment: "poolForGauge", values: [AddressLike] ): string; - encodeFunctionData(functionFragment: "reset", values: [BigNumberish]): string; + encodeFunctionData(functionFragment: "reset", values?: undefined): string; encodeFunctionData( functionFragment: "reviveGauge", values: [AddressLike] @@ -175,6 +159,11 @@ export interface IVoterInterface extends Interface { functionFragment: "setMaxVotingNum", values: [BigNumberish] ): string; + encodeFunctionData( + functionFragment: "strategyManager", + values?: undefined + ): string; + encodeFunctionData(functionFragment: "team", values?: undefined): string; encodeFunctionData( functionFragment: "totalWeight", values?: undefined @@ -193,35 +182,26 @@ export interface IVoterInterface extends Interface { ): string; encodeFunctionData( functionFragment: "usedWeights", - values: [BigNumberish] + values: [AddressLike] ): string; encodeFunctionData(functionFragment: "vault", values?: undefined): string; - encodeFunctionData(functionFragment: "ve", values?: undefined): string; encodeFunctionData( functionFragment: "vote", - values: [BigNumberish, AddressLike[], BigNumberish[]] + values: [AddressLike[], BigNumberish[]] ): string; encodeFunctionData( functionFragment: "votes", - values: [BigNumberish, AddressLike] + values: [AddressLike, AddressLike] ): string; encodeFunctionData( functionFragment: "weights", values: [AddressLike] ): string; - encodeFunctionData( - functionFragment: "whitelistNFT", - values: [BigNumberish, boolean] - ): string; encodeFunctionData( functionFragment: "whitelistToken", values: [AddressLike, boolean] ): string; - decodeFunctionResult( - functionFragment: "claimBribes", - data: BytesLike - ): Result; decodeFunctionResult( functionFragment: "claimRewards", data: BytesLike @@ -248,18 +228,10 @@ export interface IVoterInterface extends Interface { data: BytesLike ): Result; decodeFunctionResult(functionFragment: "forwarder", data: BytesLike): Result; - decodeFunctionResult( - functionFragment: "gaugeToBribe", - data: BytesLike - ): Result; decodeFunctionResult(functionFragment: "gauges", data: BytesLike): Result; decodeFunctionResult(functionFragment: "governor", data: BytesLike): Result; decodeFunctionResult(functionFragment: "isAlive", data: BytesLike): Result; decodeFunctionResult(functionFragment: "isGauge", data: BytesLike): Result; - decodeFunctionResult( - functionFragment: "isWhitelistedNFT", - data: BytesLike - ): Result; decodeFunctionResult( functionFragment: "isWhitelistedToken", data: BytesLike @@ -297,6 +269,11 @@ export interface IVoterInterface extends Interface { functionFragment: "setMaxVotingNum", data: BytesLike ): Result; + decodeFunctionResult( + functionFragment: "strategyManager", + data: BytesLike + ): Result; + decodeFunctionResult(functionFragment: "team", data: BytesLike): Result; decodeFunctionResult( functionFragment: "totalWeight", data: BytesLike @@ -318,14 +295,9 @@ export interface IVoterInterface extends Interface { data: BytesLike ): Result; decodeFunctionResult(functionFragment: "vault", data: BytesLike): Result; - decodeFunctionResult(functionFragment: "ve", data: BytesLike): Result; decodeFunctionResult(functionFragment: "vote", data: BytesLike): Result; decodeFunctionResult(functionFragment: "votes", data: BytesLike): Result; decodeFunctionResult(functionFragment: "weights", data: BytesLike): Result; - decodeFunctionResult( - functionFragment: "whitelistNFT", - data: BytesLike - ): Result; decodeFunctionResult( functionFragment: "whitelistToken", data: BytesLike @@ -336,7 +308,6 @@ export namespace AbstainedEvent { export type InputTuple = [ voter: AddressLike, pool: AddressLike, - tokenId: BigNumberish, weight: BigNumberish, totalWeight: BigNumberish, timestamp: BigNumberish @@ -344,7 +315,6 @@ export namespace AbstainedEvent { export type OutputTuple = [ voter: string, pool: string, - tokenId: bigint, weight: bigint, totalWeight: bigint, timestamp: bigint @@ -352,7 +322,6 @@ export namespace AbstainedEvent { export interface OutputObject { voter: string; pool: string; - tokenId: bigint; weight: bigint; totalWeight: bigint; timestamp: bigint; @@ -384,28 +353,22 @@ export namespace DistributeRewardEvent { export namespace GaugeCreatedEvent { export type InputTuple = [ poolFactory: AddressLike, - votingRewardsFactory: AddressLike, gaugeFactory: AddressLike, pool: AddressLike, - bribeVotingReward: AddressLike, gauge: AddressLike, creator: AddressLike ]; export type OutputTuple = [ poolFactory: string, - votingRewardsFactory: string, gaugeFactory: string, pool: string, - bribeVotingReward: string, gauge: string, creator: string ]; export interface OutputObject { poolFactory: string; - votingRewardsFactory: string; gaugeFactory: string; pool: string; - bribeVotingReward: string; gauge: string; creator: string; } @@ -456,7 +419,6 @@ export namespace VotedEvent { export type InputTuple = [ voter: AddressLike, pool: AddressLike, - tokenId: BigNumberish, weight: BigNumberish, totalWeight: BigNumberish, timestamp: BigNumberish @@ -464,7 +426,6 @@ export namespace VotedEvent { export type OutputTuple = [ voter: string, pool: string, - tokenId: bigint, weight: bigint, totalWeight: bigint, timestamp: bigint @@ -472,7 +433,6 @@ export namespace VotedEvent { export interface OutputObject { voter: string; pool: string; - tokenId: bigint; weight: bigint; totalWeight: bigint; timestamp: bigint; @@ -483,28 +443,6 @@ export namespace VotedEvent { export type LogDescription = TypedLogDescription; } -export namespace WhitelistNFTEvent { - export type InputTuple = [ - whitelister: AddressLike, - tokenId: BigNumberish, - _bool: boolean - ]; - export type OutputTuple = [ - whitelister: string, - tokenId: bigint, - _bool: boolean - ]; - export interface OutputObject { - whitelister: string; - tokenId: bigint; - _bool: boolean; - } - export type Event = TypedContractEvent; - export type Filter = TypedDeferredTopicFilter; - export type Log = TypedEventLog; - export type LogDescription = TypedLogDescription; -} - export namespace WhitelistTokenEvent { export type InputTuple = [ whitelister: AddressLike, @@ -570,12 +508,6 @@ export interface IVoter extends BaseContract { event?: TCEvent ): Promise; - claimBribes: TypedContractMethod< - [_bribes: AddressLike[], _tokens: AddressLike[][], _tokenId: BigNumberish], - [void], - "nonpayable" - >; - claimRewards: TypedContractMethod< [_gauges: AddressLike[]], [void], @@ -608,8 +540,6 @@ export interface IVoter extends BaseContract { forwarder: TypedContractMethod<[], [string], "view">; - gaugeToBribe: TypedContractMethod<[gauge: AddressLike], [string], "view">; - gauges: TypedContractMethod<[pool: AddressLike], [string], "view">; governor: TypedContractMethod<[], [string], "view">; @@ -618,12 +548,6 @@ export interface IVoter extends BaseContract { isGauge: TypedContractMethod<[arg0: AddressLike], [boolean], "view">; - isWhitelistedNFT: TypedContractMethod< - [tokenId: BigNumberish], - [boolean], - "view" - >; - isWhitelistedToken: TypedContractMethod< [token: AddressLike], [boolean], @@ -632,7 +556,7 @@ export interface IVoter extends BaseContract { killGauge: TypedContractMethod<[_gauge: AddressLike], [void], "nonpayable">; - lastVoted: TypedContractMethod<[tokenId: BigNumberish], [bigint], "view">; + lastVoted: TypedContractMethod<[user: AddressLike], [bigint], "view">; length: TypedContractMethod<[], [bigint], "view">; @@ -640,11 +564,11 @@ export interface IVoter extends BaseContract { notifyRewardAmount: TypedContractMethod<[], [void], "payable">; - poke: TypedContractMethod<[_tokenId: BigNumberish], [void], "nonpayable">; + poke: TypedContractMethod<[], [void], "nonpayable">; poolForGauge: TypedContractMethod<[gauge: AddressLike], [string], "view">; - reset: TypedContractMethod<[_tokenId: BigNumberish], [void], "nonpayable">; + reset: TypedContractMethod<[], [void], "nonpayable">; reviveGauge: TypedContractMethod<[_gauge: AddressLike], [void], "nonpayable">; @@ -666,6 +590,10 @@ export interface IVoter extends BaseContract { "nonpayable" >; + strategyManager: TypedContractMethod<[], [string], "view">; + + team: TypedContractMethod<[], [string], "view">; + totalWeight: TypedContractMethod<[], [bigint], "view">; "updateFor(address)": TypedContractMethod< @@ -686,36 +614,24 @@ export interface IVoter extends BaseContract { "nonpayable" >; - usedWeights: TypedContractMethod<[tokenId: BigNumberish], [bigint], "view">; + usedWeights: TypedContractMethod<[user: AddressLike], [bigint], "view">; vault: TypedContractMethod<[], [string], "view">; - ve: TypedContractMethod<[], [string], "view">; - vote: TypedContractMethod< - [ - _tokenId: BigNumberish, - _poolVote: AddressLike[], - _weights: BigNumberish[] - ], + [_poolVote: AddressLike[], _weights: BigNumberish[]], [void], "nonpayable" >; votes: TypedContractMethod< - [tokenId: BigNumberish, pool: AddressLike], + [user: AddressLike, pool: AddressLike], [bigint], "view" >; weights: TypedContractMethod<[pool: AddressLike], [bigint], "view">; - whitelistNFT: TypedContractMethod< - [_tokenId: BigNumberish, _bool: boolean], - [void], - "nonpayable" - >; - whitelistToken: TypedContractMethod< [_token: AddressLike, _bool: boolean], [void], @@ -726,13 +642,6 @@ export interface IVoter extends BaseContract { key: string | FunctionFragment ): T; - getFunction( - nameOrSignature: "claimBribes" - ): TypedContractMethod< - [_bribes: AddressLike[], _tokens: AddressLike[][], _tokenId: BigNumberish], - [void], - "nonpayable" - >; getFunction( nameOrSignature: "claimRewards" ): TypedContractMethod<[_gauges: AddressLike[]], [void], "nonpayable">; @@ -765,9 +674,6 @@ export interface IVoter extends BaseContract { getFunction( nameOrSignature: "forwarder" ): TypedContractMethod<[], [string], "view">; - getFunction( - nameOrSignature: "gaugeToBribe" - ): TypedContractMethod<[gauge: AddressLike], [string], "view">; getFunction( nameOrSignature: "gauges" ): TypedContractMethod<[pool: AddressLike], [string], "view">; @@ -780,9 +686,6 @@ export interface IVoter extends BaseContract { getFunction( nameOrSignature: "isGauge" ): TypedContractMethod<[arg0: AddressLike], [boolean], "view">; - getFunction( - nameOrSignature: "isWhitelistedNFT" - ): TypedContractMethod<[tokenId: BigNumberish], [boolean], "view">; getFunction( nameOrSignature: "isWhitelistedToken" ): TypedContractMethod<[token: AddressLike], [boolean], "view">; @@ -791,7 +694,7 @@ export interface IVoter extends BaseContract { ): TypedContractMethod<[_gauge: AddressLike], [void], "nonpayable">; getFunction( nameOrSignature: "lastVoted" - ): TypedContractMethod<[tokenId: BigNumberish], [bigint], "view">; + ): TypedContractMethod<[user: AddressLike], [bigint], "view">; getFunction( nameOrSignature: "length" ): TypedContractMethod<[], [bigint], "view">; @@ -803,13 +706,13 @@ export interface IVoter extends BaseContract { ): TypedContractMethod<[], [void], "payable">; getFunction( nameOrSignature: "poke" - ): TypedContractMethod<[_tokenId: BigNumberish], [void], "nonpayable">; + ): TypedContractMethod<[], [void], "nonpayable">; getFunction( nameOrSignature: "poolForGauge" ): TypedContractMethod<[gauge: AddressLike], [string], "view">; getFunction( nameOrSignature: "reset" - ): TypedContractMethod<[_tokenId: BigNumberish], [void], "nonpayable">; + ): TypedContractMethod<[], [void], "nonpayable">; getFunction( nameOrSignature: "reviveGauge" ): TypedContractMethod<[_gauge: AddressLike], [void], "nonpayable">; @@ -826,6 +729,12 @@ export interface IVoter extends BaseContract { getFunction( nameOrSignature: "setMaxVotingNum" ): TypedContractMethod<[_maxVotingNum: BigNumberish], [void], "nonpayable">; + getFunction( + nameOrSignature: "strategyManager" + ): TypedContractMethod<[], [string], "view">; + getFunction( + nameOrSignature: "team" + ): TypedContractMethod<[], [string], "view">; getFunction( nameOrSignature: "totalWeight" ): TypedContractMethod<[], [bigint], "view">; @@ -844,39 +753,27 @@ export interface IVoter extends BaseContract { ): TypedContractMethod<[_gauges: AddressLike[]], [void], "nonpayable">; getFunction( nameOrSignature: "usedWeights" - ): TypedContractMethod<[tokenId: BigNumberish], [bigint], "view">; + ): TypedContractMethod<[user: AddressLike], [bigint], "view">; getFunction( nameOrSignature: "vault" ): TypedContractMethod<[], [string], "view">; - getFunction(nameOrSignature: "ve"): TypedContractMethod<[], [string], "view">; getFunction( nameOrSignature: "vote" ): TypedContractMethod< - [ - _tokenId: BigNumberish, - _poolVote: AddressLike[], - _weights: BigNumberish[] - ], + [_poolVote: AddressLike[], _weights: BigNumberish[]], [void], "nonpayable" >; getFunction( nameOrSignature: "votes" ): TypedContractMethod< - [tokenId: BigNumberish, pool: AddressLike], + [user: AddressLike, pool: AddressLike], [bigint], "view" >; getFunction( nameOrSignature: "weights" ): TypedContractMethod<[pool: AddressLike], [bigint], "view">; - getFunction( - nameOrSignature: "whitelistNFT" - ): TypedContractMethod< - [_tokenId: BigNumberish, _bool: boolean], - [void], - "nonpayable" - >; getFunction( nameOrSignature: "whitelistToken" ): TypedContractMethod< @@ -934,13 +831,6 @@ export interface IVoter extends BaseContract { VotedEvent.OutputTuple, VotedEvent.OutputObject >; - getEvent( - key: "WhitelistNFT" - ): TypedContractEvent< - WhitelistNFTEvent.InputTuple, - WhitelistNFTEvent.OutputTuple, - WhitelistNFTEvent.OutputObject - >; getEvent( key: "WhitelistToken" ): TypedContractEvent< @@ -950,7 +840,7 @@ export interface IVoter extends BaseContract { >; filters: { - "Abstained(address,address,uint256,uint256,uint256,uint256)": TypedContractEvent< + "Abstained(address,address,uint256,uint256,uint256)": TypedContractEvent< AbstainedEvent.InputTuple, AbstainedEvent.OutputTuple, AbstainedEvent.OutputObject @@ -972,7 +862,7 @@ export interface IVoter extends BaseContract { DistributeRewardEvent.OutputObject >; - "GaugeCreated(address,address,address,address,address,address,address)": TypedContractEvent< + "GaugeCreated(address,address,address,address,address)": TypedContractEvent< GaugeCreatedEvent.InputTuple, GaugeCreatedEvent.OutputTuple, GaugeCreatedEvent.OutputObject @@ -1016,7 +906,7 @@ export interface IVoter extends BaseContract { NotifyRewardEvent.OutputObject >; - "Voted(address,address,uint256,uint256,uint256,uint256)": TypedContractEvent< + "Voted(address,address,uint256,uint256,uint256)": TypedContractEvent< VotedEvent.InputTuple, VotedEvent.OutputTuple, VotedEvent.OutputObject @@ -1027,17 +917,6 @@ export interface IVoter extends BaseContract { VotedEvent.OutputObject >; - "WhitelistNFT(address,uint256,bool)": TypedContractEvent< - WhitelistNFTEvent.InputTuple, - WhitelistNFTEvent.OutputTuple, - WhitelistNFTEvent.OutputObject - >; - WhitelistNFT: TypedContractEvent< - WhitelistNFTEvent.InputTuple, - WhitelistNFTEvent.OutputTuple, - WhitelistNFTEvent.OutputObject - >; - "WhitelistToken(address,address,bool)": TypedContractEvent< WhitelistTokenEvent.InputTuple, WhitelistTokenEvent.OutputTuple, diff --git a/src/types/contracts/interfaces/factories/IFactoryRegistry.ts b/src/types/contracts/interfaces/factories/IFactoryRegistry.ts index de5a627..1877560 100644 --- a/src/types/contracts/interfaces/factories/IFactoryRegistry.ts +++ b/src/types/contracts/interfaces/factories/IFactoryRegistry.ts @@ -39,7 +39,7 @@ export interface IFactoryRegistryInterface extends Interface { encodeFunctionData( functionFragment: "approve", - values: [AddressLike, AddressLike, AddressLike] + values: [AddressLike, AddressLike] ): string; encodeFunctionData( functionFragment: "factoriesToPoolFactory", @@ -85,17 +85,11 @@ export interface IFactoryRegistryInterface extends Interface { export namespace ApproveEvent { export type InputTuple = [ poolFactory: AddressLike, - votingRewardsFactory: AddressLike, gaugeFactory: AddressLike ]; - export type OutputTuple = [ - poolFactory: string, - votingRewardsFactory: string, - gaugeFactory: string - ]; + export type OutputTuple = [poolFactory: string, gaugeFactory: string]; export interface OutputObject { poolFactory: string; - votingRewardsFactory: string; gaugeFactory: string; } export type Event = TypedContractEvent; @@ -119,17 +113,11 @@ export namespace SetManagedRewardsFactoryEvent { export namespace UnapproveEvent { export type InputTuple = [ poolFactory: AddressLike, - votingRewardsFactory: AddressLike, gaugeFactory: AddressLike ]; - export type OutputTuple = [ - poolFactory: string, - votingRewardsFactory: string, - gaugeFactory: string - ]; + export type OutputTuple = [poolFactory: string, gaugeFactory: string]; export interface OutputObject { poolFactory: string; - votingRewardsFactory: string; gaugeFactory: string; } export type Event = TypedContractEvent; @@ -182,18 +170,14 @@ export interface IFactoryRegistry extends BaseContract { ): Promise; approve: TypedContractMethod< - [ - poolFactory: AddressLike, - votingRewardsFactory: AddressLike, - gaugeFactory: AddressLike - ], + [poolFactory: AddressLike, gaugeFactory: AddressLike], [void], "nonpayable" >; factoriesToPoolFactory: TypedContractMethod< [poolFactory: AddressLike], - [[string, string] & { votingRewardsFactory: string; gaugeFactory: string }], + [string], "view" >; @@ -220,21 +204,13 @@ export interface IFactoryRegistry extends BaseContract { getFunction( nameOrSignature: "approve" ): TypedContractMethod< - [ - poolFactory: AddressLike, - votingRewardsFactory: AddressLike, - gaugeFactory: AddressLike - ], + [poolFactory: AddressLike, gaugeFactory: AddressLike], [void], "nonpayable" >; getFunction( nameOrSignature: "factoriesToPoolFactory" - ): TypedContractMethod< - [poolFactory: AddressLike], - [[string, string] & { votingRewardsFactory: string; gaugeFactory: string }], - "view" - >; + ): TypedContractMethod<[poolFactory: AddressLike], [string], "view">; getFunction( nameOrSignature: "isPoolFactoryApproved" ): TypedContractMethod<[poolFactory: AddressLike], [boolean], "view">; @@ -271,7 +247,7 @@ export interface IFactoryRegistry extends BaseContract { >; filters: { - "Approve(address,address,address)": TypedContractEvent< + "Approve(address,address)": TypedContractEvent< ApproveEvent.InputTuple, ApproveEvent.OutputTuple, ApproveEvent.OutputObject @@ -293,7 +269,7 @@ export interface IFactoryRegistry extends BaseContract { SetManagedRewardsFactoryEvent.OutputObject >; - "Unapprove(address,address,address)": TypedContractEvent< + "Unapprove(address,address)": TypedContractEvent< UnapproveEvent.InputTuple, UnapproveEvent.OutputTuple, UnapproveEvent.OutputObject diff --git a/src/types/contracts/interfaces/index.ts b/src/types/contracts/interfaces/index.ts index 1defae8..fb12ed0 100644 --- a/src/types/contracts/interfaces/index.ts +++ b/src/types/contracts/interfaces/index.ts @@ -4,9 +4,7 @@ import type * as factories from "./factories"; export type { factories }; export type { IGauge } from "./IGauge"; -export type { IReward } from "./IReward"; export type { IRewardsDistributor } from "./IRewardsDistributor"; +export type { IStrategyManager } from "./IStrategyManager"; export type { IVault } from "./IVault"; -export type { IVeArtProxy } from "./IVeArtProxy"; export type { IVoter } from "./IVoter"; -export type { IVotingEscrow } from "./IVotingEscrow"; diff --git a/src/types/contracts/libraries/index.ts b/src/types/contracts/libraries/index.ts index b354cdb..281bdfa 100644 --- a/src/types/contracts/libraries/index.ts +++ b/src/types/contracts/libraries/index.ts @@ -1,6 +1,4 @@ /* Autogenerated file. Do not edit manually. */ /* tslint:disable */ /* eslint-disable */ -export type { BalanceLogicLibrary } from "./BalanceLogicLibrary"; -export type { DelegationLogicLibrary } from "./DelegationLogicLibrary"; export type { SafeCastLibrary } from "./SafeCastLibrary"; diff --git a/src/types/contracts/test/index.ts b/src/types/contracts/test/index.ts index 14ee957..8de46ab 100644 --- a/src/types/contracts/test/index.ts +++ b/src/types/contracts/test/index.ts @@ -1,4 +1,5 @@ /* Autogenerated file. Do not edit manually. */ /* tslint:disable */ /* eslint-disable */ +export type { TestStrategyManager } from "./TestStrategyManager"; export type { TestToken } from "./TestToken"; diff --git a/src/types/factories/@openzeppelin/contracts-upgradeable/index.ts b/src/types/factories/@openzeppelin/contracts-upgradeable/index.ts index d09d6b7..9306542 100644 --- a/src/types/factories/@openzeppelin/contracts-upgradeable/index.ts +++ b/src/types/factories/@openzeppelin/contracts-upgradeable/index.ts @@ -2,4 +2,3 @@ /* tslint:disable */ /* eslint-disable */ export * as proxy from "./proxy"; -export * as security from "./security"; diff --git a/src/types/factories/@openzeppelin/contracts/index.ts b/src/types/factories/@openzeppelin/contracts/index.ts index fce9817..167bd72 100644 --- a/src/types/factories/@openzeppelin/contracts/index.ts +++ b/src/types/factories/@openzeppelin/contracts/index.ts @@ -2,7 +2,6 @@ /* tslint:disable */ /* eslint-disable */ export * as access from "./access"; -export * as interfaces from "./interfaces"; export * as metatx from "./metatx"; export * as token from "./token"; export * as utils from "./utils"; diff --git a/src/types/factories/@openzeppelin/contracts/token/index.ts b/src/types/factories/@openzeppelin/contracts/token/index.ts index a00c658..da1e061 100644 --- a/src/types/factories/@openzeppelin/contracts/token/index.ts +++ b/src/types/factories/@openzeppelin/contracts/token/index.ts @@ -1,6 +1,4 @@ /* Autogenerated file. Do not edit manually. */ /* tslint:disable */ /* eslint-disable */ -export * as erc1155 from "./ERC1155"; export * as erc20 from "./ERC20"; -export * as erc721 from "./ERC721"; diff --git a/src/types/factories/@openzeppelin/contracts/utils/index.ts b/src/types/factories/@openzeppelin/contracts/utils/index.ts index 3faaf1a..03cab17 100644 --- a/src/types/factories/@openzeppelin/contracts/utils/index.ts +++ b/src/types/factories/@openzeppelin/contracts/utils/index.ts @@ -1,7 +1,4 @@ /* Autogenerated file. Do not edit manually. */ /* tslint:disable */ /* eslint-disable */ -export * as cryptography from "./cryptography"; export * as introspection from "./introspection"; -export * as structs from "./structs"; -export { ShortStrings__factory } from "./ShortStrings__factory"; diff --git a/src/types/factories/contracts/RewardsDistributor__factory.ts b/src/types/factories/contracts/RewardsDistributor__factory.ts index e351e0c..d0ec707 100644 --- a/src/types/factories/contracts/RewardsDistributor__factory.ts +++ b/src/types/factories/contracts/RewardsDistributor__factory.ts @@ -24,18 +24,13 @@ const _abi = [ inputs: [ { internalType: "address", - name: "_ve", + name: "manager", type: "address", }, ], stateMutability: "nonpayable", type: "constructor", }, - { - inputs: [], - name: "NotManagedOrNormalNFT", - type: "error", - }, { inputs: [], name: "NotVault", @@ -43,149 +38,52 @@ const _abi = [ }, { inputs: [], - name: "UpdatePeriod", + name: "ZeroAddress", type: "error", }, - { - anonymous: false, - inputs: [ - { - indexed: false, - internalType: "uint256", - name: "time", - type: "uint256", - }, - { - indexed: false, - internalType: "uint256", - name: "tokens", - type: "uint256", - }, - ], - name: "CheckpointToken", - type: "event", - }, - { - anonymous: false, - inputs: [ - { - indexed: true, - internalType: "uint256", - name: "tokenId", - type: "uint256", - }, - { - indexed: true, - internalType: "uint256", - name: "epochStart", - type: "uint256", - }, - { - indexed: true, - internalType: "uint256", - name: "epochEnd", - type: "uint256", - }, - { - indexed: false, - internalType: "uint256", - name: "amount", - type: "uint256", - }, - ], - name: "Claimed", - type: "event", - }, { inputs: [], - name: "WEEK", - outputs: [ - { - internalType: "uint256", - name: "", - type: "uint256", - }, - ], - stateMutability: "view", - type: "function", + name: "ZeroAmount", + type: "error", }, { inputs: [], - name: "checkpointToken", + name: "distributeRewards", outputs: [], - stateMutability: "nonpayable", + stateMutability: "payable", type: "function", }, { inputs: [ { - internalType: "uint256", - name: "_tokenId", - type: "uint256", + internalType: "address", + name: "_token", + type: "address", }, - ], - name: "claim", - outputs: [ { internalType: "uint256", - name: "", + name: "_amount", type: "uint256", }, ], + name: "distributeRewards", + outputs: [], stateMutability: "nonpayable", type: "function", }, { inputs: [ { - internalType: "uint256[]", - name: "_tokenIds", - type: "uint256[]", - }, - ], - name: "claimMany", - outputs: [ - { - internalType: "bool", - name: "", - type: "bool", + internalType: "address", + name: "_manager", + type: "address", }, ], + name: "setStrategyManager", + outputs: [], stateMutability: "nonpayable", type: "function", }, - { - inputs: [ - { - internalType: "uint256", - name: "_tokenId", - type: "uint256", - }, - ], - name: "claimable", - outputs: [ - { - internalType: "uint256", - name: "claimable_", - type: "uint256", - }, - ], - stateMutability: "view", - type: "function", - }, - { - inputs: [], - name: "lastTokenTime", - outputs: [ - { - internalType: "uint256", - name: "", - type: "uint256", - }, - ], - stateMutability: "view", - type: "function", - }, { inputs: [ { @@ -201,71 +99,7 @@ const _abi = [ }, { inputs: [], - name: "startTime", - outputs: [ - { - internalType: "uint256", - name: "", - type: "uint256", - }, - ], - stateMutability: "view", - type: "function", - }, - { - inputs: [ - { - internalType: "uint256", - name: "", - type: "uint256", - }, - ], - name: "timeCursorOf", - outputs: [ - { - internalType: "uint256", - name: "", - type: "uint256", - }, - ], - stateMutability: "view", - type: "function", - }, - { - inputs: [], - name: "tokenLastBalance", - outputs: [ - { - internalType: "uint256", - name: "", - type: "uint256", - }, - ], - stateMutability: "view", - type: "function", - }, - { - inputs: [ - { - internalType: "uint256", - name: "", - type: "uint256", - }, - ], - name: "tokensPerWeek", - outputs: [ - { - internalType: "uint256", - name: "", - type: "uint256", - }, - ], - stateMutability: "view", - type: "function", - }, - { - inputs: [], - name: "vault", + name: "strategyManager", outputs: [ { internalType: "address", @@ -278,10 +112,10 @@ const _abi = [ }, { inputs: [], - name: "ve", + name: "vault", outputs: [ { - internalType: "contract IVotingEscrow", + internalType: "address", name: "", type: "address", }, @@ -296,7 +130,7 @@ const _abi = [ ] as const; const _bytecode = - "0x60a0346100f657601f61151e38819003918201601f19168301916001600160401b038311848410176100fb578084926020946040528339810103126100f657516001600160a01b038116908190036100f657600160005562093a808042048181029181830414901517156100e057600181905560035560805266038d7ea4c6800480546001600160a01b0319163317905560405161140c90816101128239608051818181610565015281816105c301528181610641015281816106e501528181610746015281816107f001528181610add01528181610d880152610eac0152f35b634e487b7160e01b600052601160045260246000fd5b600080fd5b634e487b7160e01b600052604160045260246000fdfe608080604052600436101561001d575b50361561001b57600080fd5b005b600090813560e01c9081631f85071614610d7457508063379607f514610a2c5780634607bf6014610a025780636817031b146109b257806378e9792514610994578063899519be146109615780638ec8468a1461093d578063925489a8146103e7578063939ea66b146103c9578063bee5dc321461015c578063d1d58b2514610104578063f4359ce5146100e65763fbfa77cf0361000f57346100e357806003193601126100e35766038d7ea4c68004546040516001600160a01b039091168152602090f35b80fd5b50346100e357806003193601126100e357602060405162093a808152f35b50346100e35760203660031901126100e35762093a8090816003540482810292818404149015171561014857602061013e83600435610e83565b5050604051908152f35b634e487b7160e01b81526011600452602490fd5b50346100e357806003193601126100e35766038d7ea4c68004546001600160a01b031633036103b7574766038d7ea4c680059061019a825482610db7565b91556003546101a98142610db7565b904260035562093a8091828204838102908082048514901517156103a3579285905b601482106101f6575b866000805160206113e08339815191526040888151904282526020820152a180f35b8085019081861161038f578142106000146102de575050508015806102d5575b1561026d57505066038d7ea4c68000811015610259576000805160206113e08339815191529160409160040161024d828254610e1c565b90555b913880806101d4565b634e487b7160e01b83526032600452602483fd5b61028361027d6102889342610db7565b85610dfa565b610dda565b9066038d7ea4c680008110156102c157916040916102ba6000805160206113e083398151915294600401918254610e1c565b9055610250565b634e487b7160e01b84526032600452602484fd5b50814214610216565b9194909383801580610386575b1561033657505066038d7ea4c680008110156103225760040161030f868254610e1c565b90555b61031c8394610e0d565b906101cb565b634e487b7160e01b87526032600452602487fd5b61028361034661034c9388610db7565b89610dfa565b9066038d7ea4c680008110156103725761036b90600401918254610e1c565b9055610312565b634e487b7160e01b88526032600452602488fd5b508186146102eb565b634e487b7160e01b88526011600452602488fd5b634e487b7160e01b86526011600452602486fd5b6040516362df054560e01b8152600490fd5b50346100e357806003193601126100e3576020600354604051908152f35b50346100e35760203660031901126100e35767ffffffffffffffff8060043511610939573660236004350112156109395760043560040135116100e3573660246004356004013560051b6004350101116100e357600490610446611330565b66038d7ea4c6800454604051630a441f7b60e01b81529260209184919082906001600160a01b03165afa91821561092c5781926108f8575b5062093a809182420490838202918083048514901517156108e457106108d25781600354049182818102048114831517156108be578190825b6004356004013581106104f9575b505060019250806104de575b5055602060405160018152f35b6104f166038d7ea4c68005918254610db7565b9055386104d1565b60248160051b600435010135156108b95761052182860260248360051b600435010135611386565b80610536575b5061053190610e0d565b6104b7565b9092604051635a2d1e0760e11b815260248560051b600435010135600482015260608160248160018060a01b037f0000000000000000000000000000000000000000000000000000000000000000165afa9081156106d857869161088a575b5060405163bb941cff60e01b815260248660051b600435010135600482015260208160248160018060a01b037f0000000000000000000000000000000000000000000000000000000000000000165afa90811561086057879161086b575b506001600160a01b031615801591906107c1575b811561079d575b50156106e3576040516331a9108f60e11b815260248560051b600435010135600482015260208160248160018060a01b037f0000000000000000000000000000000000000000000000000000000000000000165afa9081156106d8579161069d878080808861053199976106a29983916106a9575b506001600160a01b03165af16106976112a9565b506112e9565b610e1c565b9290610527565b6106cb915060203d6020116106d1575b6106c38183610e53565b81019061128a565b38610683565b503d6106b9565b6040513d88823e3d90fd5b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03163b156107995760405163076426ed60e11b815260248560051b600435010135600482015282602482015285816044818660018060a01b037f0000000000000000000000000000000000000000000000000000000000000000165af180156106d857908691610785575b5050610531916106a291610e1c565b61078e90610e29565b610799578438610776565b8480fd5b60208101514210159150816107b4575b503861060e565b60409150015115386107ad565b9050604051639cf1969b60e01b815260248660051b600435010135600482015260208160248160018060a01b037f0000000000000000000000000000000000000000000000000000000000000000165afa908115610860578791610829575b50151590610607565b90506020813d602011610858575b8161084460209383610e53565b81010312610853575138610820565b600080fd5b3d9150610837565b6040513d89823e3d90fd5b610884915060203d6020116106d1576106c38183610e53565b386105f3565b6108ac915060603d6060116108b2575b6108a48183610e53565b810190611236565b38610595565b503d61089a565b6104c5565b634e487b7160e01b82526011600452602482fd5b60405163465a1c3560e01b8152600490fd5b634e487b7160e01b83526011600452602483fd5b9091506020813d602011610924575b8161091460209383610e53565b810103126108535751903861047e565b3d9150610907565b50604051903d90823e3d90fd5b5080fd5b50346100e357806003193601126100e357602066038d7ea4c6800554604051908152f35b50346100e35760203660031901126100e35760043566038d7ea4c680008110156109395760209060040154604051908152f35b50346100e357806003193601126100e3576020600154604051908152f35b50346100e35760203660031901126100e3576001600160a01b03600435818116908190036109fe5766038d7ea4c6800491825490811633036103b7576001600160a01b03191617905580f35b8280fd5b50346100e35760203660031901126100e35760406020916004358152600283522054604051908152f35b50346100e357602090816003193601126100e35760043590610a4c611330565b66038d7ea4c6800454604051630a441f7b60e01b81526001600160a01b039185908290600490829086165afa908115610bed578391610d47575b5062093a80908142049082820291808304841490151715610d3357106108d25780600354048181029181830414901517156108e457610ac59084611386565b9283610ada575b505060019055604051908152f35b817f00000000000000000000000000000000000000000000000000000000000000001690604051635a2d1e0760e11b8152816004820152606081602481865afa908115610d28578591610d0a575b5060405163bb941cff60e01b8152600481018390528781602481875afa9081156106d8578893929186918891610ced575b50161590811591610c7b575b8115610c58575b5015610bf8576024604051809481936331a9108f60e11b835260048301525afa908115610bed5792808080878196610bb4966001998491610bd0575b50165af16106976112a9565b66038d7ea4c68005610bc7848254610db7565b90559038610acc565b610be791508c8d3d106106d1576106c38183610e53565b38610ba8565b6040513d85823e3d90fd5b91925050813b156109fe57839160448492604051948593849263076426ed60e11b845260048401528160248401525af18015610c4d579060019291610c3e575b50610bb4565b610c4790610e29565b38610c38565b6040513d84823e3d90fd5b83810151421015915081610c6e575b5038610b6c565b6040915001511538610c67565b91925050604051639cf1969b60e01b81528260048201528781602481875afa9081156106d85790889392918791610cb6575b50151590610b65565b848193949592503d8311610ce6575b610ccf8183610e53565b81010312610ce257908792915138610cad565b8580fd5b503d610cc5565b610d049150853d87116106d1576106c38183610e53565b38610b59565b610d22915060603d81116108b2576108a48183610e53565b38610b28565b6040513d87823e3d90fd5b634e487b7160e01b85526011600452602485fd5b90508481813d8311610d6d575b610d5e8183610e53565b810103126109fe575138610a86565b503d610d54565b9050346109395781600319360112610939577f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03168152602090f35b91908203918211610dc457565b634e487b7160e01b600052601160045260246000fd5b8115610de4570490565b634e487b7160e01b600052601260045260246000fd5b81810292918115918404141715610dc457565b6000198114610dc45760010190565b91908201809211610dc457565b67ffffffffffffffff8111610e3d57604052565b634e487b7160e01b600052604160045260246000fd5b90601f8019910116810190811067ffffffffffffffff821117610e3d57604052565b519081600f0b820361085357565b600092600091600190815490808552602091600283526040968787205496879860018060a01b037f00000000000000000000000000000000000000000000000000000000000000001681519363e58f594760e01b8552600495878787015260249589818881875afa90811561122c5786916111ff575b50156111ec578b156110d5575b818c10156110c757808c106110bf575b5090839291899897969594995b610f34575b50505050505050505050565b9091929394959697989a9c6032808d10156110b757828f10156110b75762093a808f019e8f81116110a5578f9062093a7f810191821161109357865191637028a55d60e11b83528b8b840152808a8401528c836044818a5afa92831561105a578993611064575b50875190630981b24d60e41b82528b8201528c818b818a5afa90811561105a578991611029575b508061102357508c925b66038d7ea4c68000821015611013575092610ffa611007936102838f9998979694611000958e015490610dfa565b90610e1c565b9e9c610e0d565b99989796959493610f23565b634e487b7160e01b89528a528888fd5b92610fcc565b90508c81813d8311611053575b6110408183610e53565b8101031261104f575138610fc2565b8880fd5b503d611036565b88513d8b823e3d90fd5b9092508c81813d831161108c575b61107c8183610e53565b8101031261104f57519138610f9b565b503d611072565b634e487b7160e01b885260118a528888fd5b634e487b7160e01b8752601189528787fd5b509c9a610f28565b9a5088610f16565b50929b505050505050505050565b9b509091809a50516322565a1560e11b81528686820152888582015260a081604481865afa9081156111e257908b9392918591611142575b5062093a809b8c910151048b81029b818d04149015171561112f578a9b610f06565b5050634e487b7160e01b82525060118352fd5b919293505060a0813d82116111da575b8161115f60a09383610e53565b810103126111d6578a519060a0820182811067ffffffffffffffff8211176111c4578c94939291608091865261119481610e75565b83526111a18b8201610e75565b8b840152858101518684015260608101516060840152015160808201523861110d565b634e487b7160e01b8652604188528686fd5b8380fd5b3d9150611152565b8b513d86823e3d90fd5b5050505096975050505050509250918190565b90508981813d8311611225575b6112168183610e53565b81010312610ce2575138610ef9565b503d61120c565b85513d88823e3d90fd5b908160609103126108535760405190606082019082821067ffffffffffffffff831117610e3d57604091825261126b81610e75565b8352602081015160208401520151801515810361085357604082015290565b9081602091031261085357516001600160a01b03811681036108535790565b3d156112e4573d9067ffffffffffffffff8211610e3d57604051916112d8601f8201601f191660200184610e53565b82523d6000602084013e565b606090565b156112f057565b60405162461bcd60e51b81526020600482015260186024820152773a3930b739b332b9103932bbb0b93239903330b4b632b21760411b6044820152606490fd5b600260005414611341576002600055565b60405162461bcd60e51b815260206004820152601f60248201527f5265656e7472616e637947756172643a207265656e7472616e742063616c6c006044820152606490fd5b906113919082610e83565b91928060005260026020528260406000205583156113d6577fcae2990aa9af8eb1c64713b7eddb3a80bf18e49a94a13fe0d0002b5d61d58f006020604051868152a490565b5050505060009056fece749457b74e10f393f2c6b1ce4261b78791376db5a3f501477a809f03f500d6a164736f6c6343000813000a"; + "0x60803461007f57601f6106c438819003918201601f19168301916001600160401b038311848410176100845780849260209460405283398101031261007f57516001600160a01b0381169081900361007f57600160005560018060a01b0319338160025416176002556001541617600155604051610629908161009b8239f35b600080fd5b634e487b7160e01b600052604160045260246000fdfe6080604081815260049182361015610022575b505050361561002057600080fd5b005b600092833560e01c91826339b70e38146104b8575081635c966646146104575781636817031b146103ed5781636f4a2cd01461034c578163a8031a1d1461009f575063fbfa77cf146100745780610012565b3461009b578160031936011261009b5760025490516001600160a01b039091168152602090f35b5080fd5b9050346103485781600319360112610348576100b96104dd565b916024918235906002865414610306576002808755546001600160a01b039590861633036102f75782156102e857851691856001541695845196602097888101916323b872dd60e01b8352338983015260448201528360648201526064815260a081019167ffffffffffffffff91808410838511176102d65760e08101848110848211176102c45789528a84527f5361666545524332303a206c6f772d6c6576656c2063616c6c206661696c656460c0820152518b91829190828a5af13d156102b6573d9182116102a457906101af92918851916101a08c601f19601f84011601846104f8565b82523d8c8c84013e5b87610548565b80519088821592831561028c575b5050501561023757918760449288959460015416908751988996879563a8031a1d60e01b87528601528401525af190811561022e5750610200575b826001815580f35b8161021f92903d10610227575b61021781836104f8565b810190610530565b5038806101f8565b503d61020d565b513d85823e3d90fd5b845162461bcd60e51b8152808401889052602a818801527f5361666545524332303a204552433230206f7065726174696f6e20646964206e6044820152691bdd081cdd58d8d9595960b21b6064820152608490fd5b61029c9350820181019101610530565b3888816101bd565b634e487b7160e01b8b5260418652888bfd5b6101af9291506060906101a9565b634e487b7160e01b8d52604188528a8dfd5b634e487b7160e01b8c5260418752898cfd5b508251631f2a200560e01b8152fd5b5082516362df054560e01b8152fd5b606490601f85602086519362461bcd60e51b85528401528201527f5265656e7472616e637947756172643a207265656e7472616e742063616c6c006044820152fd5b8280fd5b91905082600319360112610348576002546001600160a01b0390811633036103df5734156103d15760016044602092825416948451958693849263a8031a1d60e01b845283015234602483015234905af19081156103c857506103ad575080f35b6103c49060203d81116102275761021781836104f8565b5080f35b513d84823e3d90fd5b5051631f2a200560e01b8152fd5b50516362df054560e01b8152fd5b905034610348576020366003190112610348576104086104dd565b60025491906001600160a01b03908184163303610447571692831561043a5750506001600160a01b0319161760025580f35b5163d92e233d60e01b8152fd5b84516362df054560e01b81528390fd5b905034610348576020366003190112610348576104726104dd565b6002546001600160a01b039190821633036104a8571691821561043a575050600180546001600160a01b03191691909117905580f35b83516362df054560e01b81528390fd5b84903461009b578160031936011261009b576001546001600160a01b03168152602090f35b600435906001600160a01b03821682036104f357565b600080fd5b90601f8019910116810190811067ffffffffffffffff82111761051a57604052565b634e487b7160e01b600052604160045260246000fd5b908160209103126104f3575180151581036104f35790565b919290156105aa575081511561055c575090565b3b156105655790565b60405162461bcd60e51b815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e74726163740000006044820152606490fd5b8251909150156105bd5750805190602001fd5b6040519062461bcd60e51b82528160208060048301528251908160248401526000935b828510610603575050604492506000838284010152601f80199101168101030190fd5b84810182015186860160440152938101938593506105e056fea164736f6c6343000813000a"; type RewardsDistributorConstructorParams = | [signer?: Signer] @@ -316,16 +150,16 @@ export class RewardsDistributor__factory extends ContractFactory { } override getDeployTransaction( - _ve: AddressLike, + manager: AddressLike, overrides?: NonPayableOverrides & { from?: string } ): Promise { - return super.getDeployTransaction(_ve, overrides || {}); + return super.getDeployTransaction(manager, overrides || {}); } override deploy( - _ve: AddressLike, + manager: AddressLike, overrides?: NonPayableOverrides & { from?: string } ) { - return super.deploy(_ve, overrides || {}) as Promise< + return super.deploy(manager, overrides || {}) as Promise< RewardsDistributor & { deploymentTransaction(): ContractTransactionResponse; } diff --git a/src/types/factories/contracts/Vault__factory.ts b/src/types/factories/contracts/Vault__factory.ts index 19cbba0..8d8b872 100644 --- a/src/types/factories/contracts/Vault__factory.ts +++ b/src/types/factories/contracts/Vault__factory.ts @@ -274,11 +274,6 @@ const _abi = [ name: "_voter", type: "address", }, - { - internalType: "address", - name: "_ve", - type: "address", - }, { internalType: "address", name: "_rewardsDistributor", @@ -329,19 +324,6 @@ const _abi = [ stateMutability: "nonpayable", type: "function", }, - { - inputs: [], - name: "ve", - outputs: [ - { - internalType: "contract IVotingEscrow", - name: "", - type: "address", - }, - ], - stateMutability: "view", - type: "function", - }, { inputs: [], name: "veRate", @@ -411,7 +393,7 @@ const _abi = [ ] as const; const _bytecode = - "0x6080806040523461001657610c2c908161001c8239f35b600080fdfe60806040908082526004908136101561003d575b5050361561002057600080fd5b60009051348152600080516020610c0083398151915260203392a3005b600091823560e01c9182630a441f7b14610921575081630c340a24146108f85781631f850716146108cf57816326cfc17b146108b05781633f2a55401461088757816346c96aac1461085b5781636a110383146107ff578163829965cc146107e0578163a83627de1461061c578163ada6565e146105fd578163c0c53b8b1461041f578163c42cf5351461038f578163d9caed1214610290578163e69d849d146101ec578163ed88c68e146101ac578163f01aea0314610129575063f4359ce5146101085780610013565b90346101255781600319360112610125576020905162093a808152f35b5080fd5b905082346101a85760203660031901126101a857600154823592906001600160a01b0316330361019a57611388831161018c5791602091817f1b3e838a14abc73095667e9ce064209c4643de8849f0efbf7f4ea8f8a7103f39945551908152a180f35b9051636a43f8d160e01b8152fd5b9051633b8d9d7560e21b8152fd5b8280fd5b839150826003193601126101a85734156101de5750819051348152600080516020610c0083398151915260203392a380f35b9051636370392160e11b8152fd5b905082346101a857806003193601126101a85761020761093d565b906024359160018060a01b0316928151906323b872dd60e01b60208301523360248301523060448301528360648301526064825260a082019082821067ffffffffffffffff83111761027b5750825261026090846109b3565b51908152600080516020610c0083398151915260203392a380f35b604190634e487b7160e01b6000525260246000fd5b839150346101a85760603660031901126101a8576102ac61093d565b6024356001600160a01b03818116949185900361038b57604435928160015416330361037b571692836103315750848285828215610328575b839283928392f11561031f575b519081527f3115d1449a7b732c986cba18244e897a450f61e1bb8d589cd2e69e6c8924f9f760203392a480f35b513d85823e3d90fd5b506108fc6102e5565b81519063a9059cbb60e01b602083015285602483015283604483015260448252608082019082821067ffffffffffffffff83111761027b5750825261037690846109b3565b6102f2565b8251633b8d9d7560e21b81528590fd5b8580fd5b839150346101a85760203660031901126101a8576103ab61093d565b60015491906001600160a01b0390818416330361040f57169283156104025750506001600160a01b03191681176001557f5ffbefd23f1844198adf645535c8dce8d9f3f2f9f5e917bf4e3aa8fc90299a908280a280f35b5163d92e233d60e01b8152fd5b8451633b8d9d7560e21b81528390fd5b905082346101a85760603660031901126101a85761043b61093d565b6001600160a01b0360243581811694929392908590036105f8576044359182168092036105f85785549160ff8360081c1615928380946105eb575b80156105d4575b1561057a5760ff198116600117885583610569575b5086549462010000600160b01b039060101b16958662010000600160b01b0319871617885560018060a01b0319908160025416176002553381600154161760015560035416176003556103e8815569152d02c7e14af680000060055562093a80908142048281029281840414901517156105565750600655610512578380f35b610100600160b01b0319909116909117825551600181527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb384740249890602090a18180808380f35b634e487b7160e01b875260119052602486fd5b61ffff191661010117875587610492565b845162461bcd60e51b8152602081850152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b6064820152608490fd5b50303b15801561047d5750600160ff82161461047d565b50600160ff821610610476565b600080fd5b839150346101a857826003193601126101a85760209250549051908152f35b905082346101a857826003193601126101a8576006549162093a808084018085116107cd57421015610653575b6020848451908152f35b60075460001981146107cd5760010160075580420493818502948086048314901517156107cd5790610688610695928661097c565b0484600655600554610953565b908147106107bf576127106106ab825484610953565b0460018060a01b03868080808585600354168282156107b6575bf1156107ac57868160035416803b1561012557819085885180948193635f72ee1960e11b83525af180156107a257610789575b509061070c8792835460101c16918561097c565b92813b156101a857855180948193630314777960e21b83525af1801561077f57610767575b506020935081519081527ff54dbf4cddb908bac0d67a3e6d3e4de95d0e7bc059afe2d34b37a6ebbc3879ca843392a28380610649565b6107718591610989565b61077b5783610731565b8380fd5b83513d87823e3d90fd5b9661079961070c98939293610989565b969190916106f8565b86513d8a823e3d90fd5b84513d88823e3d90fd5b506108fc6106c5565b8251636a259e3160e11b8152fd5b634e487b7160e01b865260118352602486fd5b8284346101255781600319360112610125576020906007549051908152f35b905082346101a85760203660031901126101a857600154823592906001600160a01b0316330361019a5750816020917f6b7d0eeb50ab9007d612c3d47bc900447594cde214923c1b9d0f2b1fc960ca719360055551908152a180f35b8284346101255781600319360112610125579054905160109190911c6001600160a01b03168152602090f35b82843461012557816003193601126101255760035490516001600160a01b039091168152602090f35b8284346101255781600319360112610125576020906005549051908152f35b82843461012557816003193601126101255760025490516001600160a01b039091168152602090f35b82843461012557816003193601126101255760015490516001600160a01b039091168152602090f35b8390346101255781600319360112610125576020906006548152f35b600435906001600160a01b03821682036105f857565b8181029291811591840414171561096657565b634e487b7160e01b600052601160045260246000fd5b9190820391821161096657565b67ffffffffffffffff811161099d57604052565b634e487b7160e01b600052604160045260246000fd5b6040805167ffffffffffffffff94936001600160a01b0390931692908083018681118282101761099d5783526020938482527f5361666545524332303a206c6f772d6c6576656c2063616c6c206661696c6564858301526000808487829651910182855af13d15610b1e573d91888311610b0a57855192601f19603f81601f8401160116840199848b10908b1117610af65786979899610a5d96975283528286893d92013e610b2b565b805191821591858315610acf575b505050905015610a79575050565b60849250519062461bcd60e51b82526004820152602a60248201527f5361666545524332303a204552433230206f7065726174696f6e20646964206e6044820152691bdd081cdd58d8d9595960b21b6064820152fd5b91938180945001031261012557830151908115158203610af3575080388085610a6b565b80fd5b634e487b7160e01b86526041600452602486fd5b634e487b7160e01b85526041600452602485fd5b610a5d9394959697506060915b91929015610b8d5750815115610b3f575090565b3b15610b485790565b60405162461bcd60e51b815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e74726163740000006044820152606490fd5b825190915015610ba05750805190602001fd5b6040519062461bcd60e51b82528160208060048301528251908160248401526000935b828510610be6575050604492506000838284010152601f80199101168101030190fd5b8481018201518686016044015293810193859350610bc356fe597440e65d8cdea1298e19df50e115bda25508180452d87a7f4f99195fb843a4a164736f6c6343000813000a"; + "0x6080806040523461001657610bb4908161001c8239f35b600080fdfe60806040908082526004908136101561003d575b5050361561002057600080fd5b60009051348152600080516020610b8883398151915260203392a3005b600091823560e01c9182630a441f7b146108a7575081630c340a241461087e57816326cfc17b1461085f5781633f2a55401461083657816346c96aac1461080a578163485cc9551461064a5781636a110383146105f0578163829965cc146105d1578163a83627de14610435578163ada6565e14610416578163c42cf53514610386578163d9caed1214610287578163e69d849d146101e3578163ed88c68e146101a3578163f01aea031461011e575063f4359ce5146100fd5780610013565b903461011a578160031936011261011a576020905162093a808152f35b5080fd5b9050823461019f57602036600319011261019f57600154823592906001600160a01b031633036101915761138883116101835750816020917f1b3e838a14abc73095667e9ce064209c4643de8849f0efbf7f4ea8f8a7103f399360035551908152a180f35b9051636a43f8d160e01b8152fd5b9051633b8d9d7560e21b8152fd5b8280fd5b8391508260031936011261019f5734156101d55750819051348152600080516020610b8883398151915260203392a380f35b9051636370392160e11b8152fd5b9050823461019f578060031936011261019f576101fe6108c3565b906024359160018060a01b0316928151906323b872dd60e01b60208301523360248301523060448301528360648301526064825260a082019082821067ffffffffffffffff83111761027257508252610257908461093e565b51908152600080516020610b8883398151915260203392a380f35b604190634e487b7160e01b6000525260246000fd5b8391503461019f57606036600319011261019f576102a36108c3565b6024356001600160a01b03818116949185900361038257604435928160015416330361037257169283610328575084828582821561031f575b839283928392f115610316575b519081527f3115d1449a7b732c986cba18244e897a450f61e1bb8d589cd2e69e6c8924f9f760203392a480f35b513d85823e3d90fd5b506108fc6102dc565b81519063a9059cbb60e01b602083015285602483015283604483015260448252608082019082821067ffffffffffffffff8311176102725750825261036d908461093e565b6102e9565b8251633b8d9d7560e21b81528590fd5b8580fd5b8391503461019f57602036600319011261019f576103a26108c3565b60015491906001600160a01b0390818416330361040657169283156103f95750506001600160a01b03191681176001557f5ffbefd23f1844198adf645535c8dce8d9f3f2f9f5e917bf4e3aa8fc90299a908280a280f35b5163d92e233d60e01b8152fd5b8451633b8d9d7560e21b81528390fd5b82843461011a578160031936011261011a576020906003549051908152f35b9050823461019f578260031936011261019f576005549162093a808084018085116105be5742101561046c575b6020848451908152f35b60065460001981146105be5760010160065580420493818502948086048314901517156105be57906104a16104ad9286610907565b048460055582546108de565b908147106105b0576127106104c4600354846108de565b0460018060a01b03806002541687813b156105ad578391858851809481936306f4a2cd60e41b83525af180156105a35761058a575b509061050d8792835460101c169185610907565b92813b1561019f57855180948193630314777960e21b83525af1801561058057610568575b506020935081519081527ff54dbf4cddb908bac0d67a3e6d3e4de95d0e7bc059afe2d34b37a6ebbc3879ca843392a28380610462565b6105728591610914565b61057c5783610532565b8380fd5b83513d87823e3d90fd5b9661059a61050d98939293610914565b969190916104f9565b86513d8a823e3d90fd5b80fd5b8251636a259e3160e11b8152fd5b634e487b7160e01b865260118352602486fd5b82843461011a578160031936011261011a576020906006549051908152f35b9050823461019f57602036600319011261019f57600154823592906001600160a01b031633036101915791602091817f6b7d0eeb50ab9007d612c3d47bc900447594cde214923c1b9d0f2b1fc960ca71945551908152a180f35b9050823461019f578060031936011261019f576106656108c3565b906024359260018060a01b0384168094036108065784549060ff8260081c1615918280936107f9575b80156107e2575b156107885760ff198116600117875582610777575b5085549362010000600160b01b039060101b16948562010000600160b01b0319861617875560018060a01b03193381600154161760015560025416176002556103e860035569152d02c7e14af6800000815562093a80908142048281029281840414901517156107645750600555610720578380f35b610100600160b01b0319909116909117825551600181527f7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb384740249890602090a18180808380f35b634e487b7160e01b875260119052602486fd5b61ffff1916610101178655866106aa565b835162461bcd60e51b8152602081840152602e60248201527f496e697469616c697a61626c653a20636f6e747261637420697320616c72656160448201526d191e481a5b9a5d1a585b1a5e995960921b6064820152608490fd5b50303b1580156106955750600160ff821614610695565b50600160ff82161061068e565b8480fd5b82843461011a578160031936011261011a579054905160109190911c6001600160a01b03168152602090f35b82843461011a578160031936011261011a5760025490516001600160a01b039091168152602090f35b8391503461019f578260031936011261019f5760209250549051908152f35b82843461011a578160031936011261011a5760015490516001600160a01b039091168152602090f35b83903461011a578160031936011261011a576020906005548152f35b600435906001600160a01b03821682036108d957565b600080fd5b818102929181159184041417156108f157565b634e487b7160e01b600052601160045260246000fd5b919082039182116108f157565b67ffffffffffffffff811161092857604052565b634e487b7160e01b600052604160045260246000fd5b6040805167ffffffffffffffff94936001600160a01b039093169290808301868111828210176109285783526020938482527f5361666545524332303a206c6f772d6c6576656c2063616c6c206661696c6564858301526000808487829651910182855af13d15610aa6573d91888311610a9257855192601f19603f81601f8401160116840199848b10908b1117610a7e57869798996109e896975283528286893d92013e610ab3565b805191821591858315610a5a575b505050905015610a04575050565b60849250519062461bcd60e51b82526004820152602a60248201527f5361666545524332303a204552433230206f7065726174696f6e20646964206e6044820152691bdd081cdd58d8d9595960b21b6064820152fd5b91938180945001031261011a578301519081151582036105ad5750803880856109f6565b634e487b7160e01b86526041600452602486fd5b634e487b7160e01b85526041600452602485fd5b6109e89394959697506060915b91929015610b155750815115610ac7575090565b3b15610ad05790565b60405162461bcd60e51b815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e74726163740000006044820152606490fd5b825190915015610b285750805190602001fd5b6040519062461bcd60e51b82528160208060048301528251908160248401526000935b828510610b6e575050604492506000838284010152601f80199101168101030190fd5b8481018201518686016044015293810193859350610b4b56fe597440e65d8cdea1298e19df50e115bda25508180452d87a7f4f99195fb843a4a164736f6c6343000813000a"; type VaultConstructorParams = | [signer?: Signer] diff --git a/src/types/factories/contracts/Voter__factory.ts b/src/types/factories/contracts/Voter__factory.ts index df3a13a..98e7fbb 100644 --- a/src/types/factories/contracts/Voter__factory.ts +++ b/src/types/factories/contracts/Voter__factory.ts @@ -26,7 +26,7 @@ const _abi = [ }, { internalType: "address", - name: "_ve", + name: "_strategyManager", type: "address", }, { @@ -48,6 +48,11 @@ const _abi = [ name: "DistributeWindow", type: "error", }, + { + inputs: [], + name: "EpochVoteEnd", + type: "error", + }, { inputs: [], name: "FactoryPathNotApproved", @@ -125,11 +130,6 @@ const _abi = [ name: "NotVault", type: "error", }, - { - inputs: [], - name: "NotWhitelistedNFT", - type: "error", - }, { inputs: [], name: "NotWhitelistedToken", @@ -180,12 +180,6 @@ const _abi = [ name: "pool", type: "address", }, - { - indexed: true, - internalType: "uint256", - name: "tokenId", - type: "uint256", - }, { indexed: false, internalType: "uint256", @@ -242,12 +236,6 @@ const _abi = [ name: "poolFactory", type: "address", }, - { - indexed: true, - internalType: "address", - name: "votingRewardsFactory", - type: "address", - }, { indexed: true, internalType: "address", @@ -260,12 +248,6 @@ const _abi = [ name: "pool", type: "address", }, - { - indexed: false, - internalType: "address", - name: "bribeVotingReward", - type: "address", - }, { indexed: false, internalType: "address", @@ -342,12 +324,6 @@ const _abi = [ name: "pool", type: "address", }, - { - indexed: true, - internalType: "uint256", - name: "tokenId", - type: "uint256", - }, { indexed: false, internalType: "uint256", @@ -370,31 +346,6 @@ const _abi = [ name: "Voted", type: "event", }, - { - anonymous: false, - inputs: [ - { - indexed: true, - internalType: "address", - name: "whitelister", - type: "address", - }, - { - indexed: true, - internalType: "uint256", - name: "tokenId", - type: "uint256", - }, - { - indexed: true, - internalType: "bool", - name: "_bool", - type: "bool", - }, - ], - name: "WhitelistNFT", - type: "event", - }, { anonymous: false, inputs: [ @@ -420,29 +371,6 @@ const _abi = [ name: "WhitelistToken", type: "event", }, - { - inputs: [ - { - internalType: "address[]", - name: "_bribes", - type: "address[]", - }, - { - internalType: "address[][]", - name: "_tokens", - type: "address[][]", - }, - { - internalType: "uint256", - name: "_tokenId", - type: "uint256", - }, - ], - name: "claimBribes", - outputs: [], - stateMutability: "nonpayable", - type: "function", - }, { inputs: [ { @@ -645,25 +573,6 @@ const _abi = [ stateMutability: "view", type: "function", }, - { - inputs: [ - { - internalType: "address", - name: "", - type: "address", - }, - ], - name: "gaugeToBribe", - outputs: [ - { - internalType: "address", - name: "", - type: "address", - }, - ], - stateMutability: "view", - type: "function", - }, { inputs: [ { @@ -771,25 +680,6 @@ const _abi = [ stateMutability: "view", type: "function", }, - { - inputs: [ - { - internalType: "uint256", - name: "", - type: "uint256", - }, - ], - name: "isWhitelistedNFT", - outputs: [ - { - internalType: "bool", - name: "", - type: "bool", - }, - ], - stateMutability: "view", - type: "function", - }, { inputs: [ { @@ -825,9 +715,9 @@ const _abi = [ { inputs: [ { - internalType: "uint256", + internalType: "address", name: "", - type: "uint256", + type: "address", }, ], name: "lastVoted", @@ -875,13 +765,7 @@ const _abi = [ type: "function", }, { - inputs: [ - { - internalType: "uint256", - name: "_tokenId", - type: "uint256", - }, - ], + inputs: [], name: "poke", outputs: [], stateMutability: "nonpayable", @@ -909,9 +793,9 @@ const _abi = [ { inputs: [ { - internalType: "uint256", + internalType: "address", name: "", - type: "uint256", + type: "address", }, { internalType: "uint256", @@ -950,13 +834,7 @@ const _abi = [ type: "function", }, { - inputs: [ - { - internalType: "uint256", - name: "_tokenId", - type: "uint256", - }, - ], + inputs: [], name: "reset", outputs: [], stateMutability: "nonpayable", @@ -1014,6 +892,32 @@ const _abi = [ stateMutability: "nonpayable", type: "function", }, + { + inputs: [], + name: "strategyManager", + outputs: [ + { + internalType: "address", + name: "", + type: "address", + }, + ], + stateMutability: "view", + type: "function", + }, + { + inputs: [], + name: "team", + outputs: [ + { + internalType: "address", + name: "", + type: "address", + }, + ], + stateMutability: "view", + type: "function", + }, { inputs: [], name: "totalWeight", @@ -1074,9 +978,9 @@ const _abi = [ { inputs: [ { - internalType: "uint256", + internalType: "address", name: "", - type: "uint256", + type: "address", }, ], name: "usedWeights", @@ -1103,26 +1007,8 @@ const _abi = [ stateMutability: "view", type: "function", }, - { - inputs: [], - name: "ve", - outputs: [ - { - internalType: "address", - name: "", - type: "address", - }, - ], - stateMutability: "view", - type: "function", - }, { inputs: [ - { - internalType: "uint256", - name: "_tokenId", - type: "uint256", - }, { internalType: "address[]", name: "_poolVote", @@ -1142,9 +1028,9 @@ const _abi = [ { inputs: [ { - internalType: "uint256", + internalType: "address", name: "", - type: "uint256", + type: "address", }, { internalType: "address", @@ -1182,24 +1068,6 @@ const _abi = [ stateMutability: "view", type: "function", }, - { - inputs: [ - { - internalType: "uint256", - name: "_tokenId", - type: "uint256", - }, - { - internalType: "bool", - name: "_bool", - type: "bool", - }, - ], - name: "whitelistNFT", - outputs: [], - stateMutability: "nonpayable", - type: "function", - }, { inputs: [ { @@ -1221,7 +1089,7 @@ const _abi = [ ] as const; const _bytecode = - "0x610100346200013057601f620028f338819003918201601f19168301916001600160401b03831184841017620001355780849260609460405283398101031262000130576200004e816200014b565b906200006b604062000063602084016200014b565b92016200014b565b6080839052600160005560a09290925260c05260e0526001600160a01b036200009362000160565b1660018060a01b031981816001541617600155818160025416176002556003541617600355601e60055560405161273d9081620001b682396080518181816114c70152611e0e015260a05181818161033d0152610db6015260c051818181610ada015281816111a5015281816116d701528181611888015281816119a801528181611f1501526121ea015260e051818181610d5e01526116280152f35b600080fd5b634e487b7160e01b600052604160045260246000fd5b51906001600160a01b03821682036200013057565b6080516001600160a01b0316331480620001a9575b15620001a55760131936013681116200018f573560601c90565b634e487b7160e01b600052601160045260246000fd5b3390565b5060143610156200017556fe608060408181526004918236101561001657600080fd5b600092833560e01c91826306d6a1b214611bf5575081630c340a2414611bcc5781630c51dde414611afd5781630e0a596814611ad85781630ffb1d8b14611a345781631703e5f9146119f65781631f7b6d32146119d75781631f8507161461199357816330331b2f14611920578163310bd74b1461181c57816332145f901461168257816339e9f3b6146116575781633bf0c9fb14611613578163402914f5146115db578163462d0b2e146114ee578163572b6c051461149c5781636138889b146113c8578382637625391a146112fe575081637715ee75146110c45781637778960e1461109b578163794cea3c14610ce957816379e9382414610cc15781637ac09bf714610a2b578163880e36fc14610a01578163929c8dcd146109c657816396c82e57146109a8578163992a7933146108b25781639f06247b14610807578163a7cac846146107cf578163a86a366d1461079c578163aa79979b1461075e578163aa9354a314610737578163ab37f486146106f9578163ac4afa38146106b8578163b9a09fd51461067d578163c42cf53514610616578163c9ff6f4d146105bf578163d23254b41461057d578163d4e2616f14610550578163d560b0d7146104e6578163d58b15d4146104b7578163e2819d5c14610427578163e586875f146103b3578163e8b3fd5714610394578163f3594be01461036c578163f645d4f914610328578163f9f031df14610262575063fbfa77cf1461023757600080fd5b3461025e578160031936011261025e5760015490516001600160a01b039091168152602090f35b5080fd5b9050346103245760203660031901126103245780356001600160401b038111610320576102929036908301611d5c565b9183835193815b8581106102a4578280f35b6001600160a01b03806102b78385612160565b5116906102c2611e0b565b90823b1561031c57602486928389519586948593630c00007b60e41b8552168c8401525af1801561031257906102fe9291610303575b50611dd9565b610299565b61030c90611c9d565b386102f8565b85513d86823e3d90fd5b8580fd5b8380fd5b8280fd5b50503461025e578160031936011261025e57517f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03168152602090f35b905034610324576020366003190112610324576020928291358152600e845220549051908152f35b50503461025e578160031936011261025e576020906005549051908152f35b905034610324576020366003190112610324576103ce611c2d565b906103d7611e0b565b600354926001600160a01b039182851690831603610417571692831561040a5750506001600160a01b0319161760035580f35b5163d92e233d60e01b8152fd5b845163c560129360e01b81528390fd5b91905034610324578060031936011261032457813590610445611c5e565b9061044e611e0b565b6002546001600160a01b0391821695911685036104a9575082855260116020528420805460ff191660ff831515161790551515917f8a6ff732c8641e1e34d771e1f8b1673e988c1abdfb694ebdf6c910a5e3d0d8538480a480f35b9051633b8d9d7560e21b8152fd5b8284346104e35760203660031901126104e3575062092c706020923591519162093a8081069003018152f35b80fd5b83903461025e57602036600319011261025e578035906001600160401b0382116103245761051691369101611d5c565b805190825b828110610526578380f35b61054b906105466001600160a01b0361053f8386612160565b5116612511565b611dd9565b61051b565b905034610324576020366003190112610324578160209360ff923581526011855220541690519015158152f35b905034610324578160031936011261032457602092829161059c611c48565b90358252600b85528282206001600160a01b039091168252845220549051908152f35b50503461025e576105cf36611d7a565b91905b8281106105dd578380f35b806105466105ed61061193611d90565b90546001600160a01b0360039290921b1c8116875260076020528487205416612511565b6105d2565b90503461032457602036600319011261032457610631611c2d565b9061063a611e0b565b600254926001600160a01b03918285169083160361066d571692831561040a5750506001600160a01b0319161760025580f35b8451633b8d9d7560e21b81528390fd5b50503461025e57602036600319011261025e576020916001600160a01b03908290826106a7611c2d565b168152600785522054169051908152f35b9050346103245760203660031901126103245735916006548310156104e357506106e3602092611d90565b905491519160018060a01b039160031b1c168152f35b50503461025e57602036600319011261025e5760209160ff9082906001600160a01b03610724611c2d565b1681526010855220541690519015158152f35b90503461032457602036600319011261032457602092503590519062093a80810690038152f35b50503461025e57602036600319011261025e5760209160ff9082906001600160a01b03610789611c2d565b168152600f855220541690519015158152f35b50503461025e576107ac36611d7a565b92908152600c6020528181209081548410156104e357506020926106e391611dc1565b50503461025e57602036600319011261025e5760209181906001600160a01b036107f7611c2d565b168152600a845220549051908152f35b9190503461032457602036600319011261032457610823611c2d565b61082b611e0b565b6003546001600160a01b039291908316908316036108a3571691828452601260205260ff8285205416610895575081835260126020528220805460ff191660011790557fed18e9faa3dccfd8aa45f69c4de40546b2ca9cccc4538a2323531656516db1aa8280a280f35b9051635f5a482960e11b8152fd5b50505163c560129360e01b8152fd5b91905034610324576020366003190112610324576108ce611c2d565b6108d6611e0b565b6003546001600160a01b039291908316908316036108a357811692838552601260205260ff83862054161561099a575082845260156020528184205484918115908115610958575b5050601260205250508220805460ff191690557f04a5d3f5d80d22d9345acc80618f4a4e7e663cf9e1aed23b57d975acec002ba78280a280f35b83928392839260015416908390610991575bf11561098657818352601560205282818120558238808061091e565b51913d9150823e3d90fd5b506108fc61096a565b8251633f88da5160e21b8152fd5b90503461032457826003193601126103245760209250549051908152f35b50503461025e57602036600319011261025e576020916001600160a01b03908290826109f0611c2d565b168152600985522054169051908152f35b90503461032457602036600319011261032457602092503590519062093a80908181069003018152f35b83833461025e57606036600319011261025e576001600160401b038335602435828111610cbd57610a5f9036908701611c6d565b91909260443590811161031c57610a799036908801611c6d565b9362093a804206420393838852602098600e8a5287892054861115610caf57610e108601421115610ca157610aac611e7c565b610ab4611e0b565b885163430c208160e01b81526001600160a01b03918216838201908152602081018890527f000000000000000000000000000000000000000000000000000000000000000090921697918c908290819003604001818e8c5af1908115610c97578b91610c6a575b5015610c5b57878303610c4c576005548311610c3d5762092c7001421180610c28575b610c1a578460248b92828c52600e8452428b8d20558a5198899384926339f890b560e21b84528301525afa948515610c10578895610bdf575b5090610b84913691611cfe565b93610b9a610b9182611ce7565b96519687611cc6565b8086528786019060051b820191368311610bdb57905b828210610bcc57505050610bc5949550612194565b6001815580f35b81358152908801908801610bb0565b8780fd5b9094508881813d8311610c09575b610bf78183611cc6565b81010312610bdb575193610b84610b77565b503d610bed565b87513d8a823e3d90fd5b8751630392978d60e41b8152fd5b5084895260118a5260ff888a20541615610b3e565b50875163ebcfae4b60e01b8152fd5b50875163332ac86360e21b8152fd5b50875163390cdd9b60e21b8152fd5b610c8a91508c8d3d10610c90575b610c828183611cc6565b810190611e64565b8c610b1b565b503d610c78565b8a513d8d823e3d90fd5b8751635a780bad60e01b8152fd5b875163cade311f60e01b8152fd5b8480fd5b905034610324576020366003190112610324576020928291358152600d845220549051908152f35b91905034610324578060031936011261032457610d04611c2d565b90610d0d611c48565b93610d16611e7c565b610d1e611e0b565b6001600160a01b03868116808452600760209081528585205490969390831661108b578551631217afdb60e01b81529383168885018190529286856024817f000000000000000000000000000000000000000000000000000000000000000085165afa998a15611081578695879b611032575b506002548a96959493831692919082168303610ffc575b885163dabc8e8360e01b81527f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03818116998301998a52831660208a0152909c90978b908e908590829060400103991698818c8b5af19c8d15610ff257899d610fb4575b508951631e533a8f60e21b81526001600160a01b03988916818e019081529890921660208901528216968a908290819060400103818b8b5af1908115610faa578891610f61575b5090610ed5828b9c9d60088c9d858d97169e8f908189526009835287818a2095169860018060a01b0319958a878254161790558b8152600784522081858254161790558d5252868c8c2091825416179055600f8d528c60128c8c209160ff19926001848254161790555260018c8c2091825416179055612511565b600654600160401b811015610f4e57926080926001999897969592610f20868c7f3420db1b33ca18e4323a00a7c63a9bd16ceb7685aad2a46b734f3a3f73b42b869801600655611d90565b819291549060031b9186831b921b19161790558a519283528c8301528a8a8301526060820152a45551908152f35b634e487b7160e01b895260418d52602489fd5b90508981813d8311610fa3575b610f788183611cc6565b81010312610bdb5790610ed58a8a9b9c9d6008610f958c966124fd565b949550509d9c509a50610e5a565b503d610f6e565b89513d8a823e3d90fd5b909c508a81813d8311610feb575b610fcc8183611cc6565b81010312610fe75782610fdf8c926124fd565b9d9150610e13565b8880fd5b503d610fc2565b8a513d8b823e3d90fd5b909192809495965087526010895260ff8888205416156110225790899594939291610da8565b87516365a9cebb60e01b81528a90fd5b8880929c508197503d831161107a575b61104c8183611cc6565b8101031261031c57908493929161106e896110678c986124fd565b96016124fd565b9a909192939495610d91565b503d611042565b87513d88823e3d90fd5b85516348fe415b60e11b81528890fd5b50503461025e578160031936011261025e5760035490516001600160a01b039091168152602090f35b905034610324576060366003190112610324576001600160401b03918135838111610cbd576110f69036908401611d5c565b9260248035938285116112fa57366023860112156112fa57848101359261111c84611ce7565b9361112986519586611cc6565b808552602096848887019260051b820101923684116112f657858201925b8484106112cc5750505050506044948786356111988382611166611e0b565b8a5163430c208160e01b81526001600160a01b0390911688820190815260208101929092529283918291604090910190565b038160018060a01b0396877f0000000000000000000000000000000000000000000000000000000000000000165af19081156112c2578b916112a5575b5015611295578851988a5b8a81106111eb578b80f35b836111f68284612160565b51168c611203838b612160565b5191803b1561025e578c908287948b8f8e815198899763f5f8d36560e01b895288019388015286015281518091528b6064860192019083905b8d81831061127557505050509083809203925af1801561126b579061126692916103035750611dd9565b6111e0565b8a513d8f823e3d90fd5b83518e16855289975088955093840193929092019160019091019061123c565b865163390cdd9b60e21b81528490fd5b6112bc9150843d8611610c9057610c828183611cc6565b386111d5565b88513d8d823e3d90fd5b83358281116112f2578a916112e783928a3691880101611d5c565b815201930192611147565b8c80fd5b8a80fd5b8680fd5b809184346113c45761130f36611d7a565b9390611319611e7c565b600154835163541b13ef60e11b81526001600160a01b0395602094919285928492918391908a165af180156113ba57908391611391575b50505b84811061136257856001815580f35b808461137061138c93611d90565b90549060031b1c16875260078352610546858589205416612603565b611353565b813d83116113b3575b6113a48183611cc6565b8101031261031c578187611350565b503d61139a565b84513d89823e3d90fd5b5050fd5b905034610324576020366003190112610324578281356001600160401b03811161025e576113f99036908401611d5c565b92611402611e7c565b600154815163541b13ef60e11b81526001600160a01b03949093602092859291839188165af19081156114935750611468575b50815191835b83811061144a57846001815580f35b806105468461145c6114639486612160565b5116612603565b61143b565b602090813d811161148c575b61147e8183611cc6565b810103126103245738611435565b503d611474565b513d86823e3d90fd5b50503461025e57602036600319011261025e576020906114ba611c2d565b90519060018060a01b03807f0000000000000000000000000000000000000000000000000000000000000000169116148152f35b90503461032457816003193601126103245780356001600160401b0381116103205761151d9036908301611c6d565b611528939193611c48565b91611531611e0b565b9460018060a01b039460019686808954169116036115cd5750865b83811061156957505050501660018060a01b031982541617905580f35b8060051b82013590868216809203610fe75787826115c8938b526010602052858b208260ff198254161790558861159e611e0b565b167f44948130cf88523dbc150908a47dd6332c33a01a3869d7f2fa78e51d5a5f9c578c80a4611dd9565b61154c565b82516362df054560e01b8152fd5b50503461025e57602036600319011261025e5760209181906001600160a01b03611603611c2d565b1681526015845220549051908152f35b50503461025e578160031936011261025e57517f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03168152602090f35b8284346104e35760203660031901126104e35750610e106020923591519162093a8081069003018152f35b83833461025e5760209081600319360112610324578335936116a2611e7c565b610e1062093a80420642030142111561180e5781516339f890b560e21b81529081018590526001600160a01b039483826024817f00000000000000000000000000000000000000000000000000000000000000008a165afa9182156118045785926117d5575b50808552600c8452828520928051808587829754938481520190895287892092895b898282106117bd5750505061174192500385611cc6565b83519061174d82611ce7565b9561175a82519788611cc6565b828752601f1961176984611ce7565b013682890137875b8381106117855788610bc589898989612194565b6117b890858a52600b8352838a208b61179e838b612160565b51168b528352838a20546117b2828b612160565b52611dd9565b611771565b85548d1684526001958601958a95509301920161172a565b9091508381813d83116117fd575b6117ed8183611cc6565b81010312610cbd57519086611708565b503d6117e3565b83513d87823e3d90fd5b9051635a780bad60e01b8152fd5b9050346103245760203660031901126103245780359162093a8042064203838552600e6020528185205481111561191257610e100142111561190557611860611e7c565b805163430c208160e01b815233838201908152602081810186905290829081906040010381887f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03165af19081156118fb5785916118dd575b50156118d05783610bc584611ef2565b5163390cdd9b60e21b8152fd5b6118f5915060203d8111610c9057610c828183611cc6565b386118c0565b82513d87823e3d90fd5b51635a780bad60e01b8152fd5b505163cade311f60e01b8152fd5b9050346103245760203660031901126103245780359161193e611e0b565b6002546001600160a01b0390811691160361198657600a831061197957600554831461196c57505060055580f35b5163c23f6ccb60e01b8152fd5b51632db4ddc160e11b8152fd5b51633b8d9d7560e21b8152fd5b50503461025e578160031936011261025e57517f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03168152602090f35b50503461025e578160031936011261025e576020906006549051908152f35b50503461025e57602036600319011261025e5760209160ff9082906001600160a01b03611a21611c2d565b1681526012855220541690519015158152f35b91905034610324578060031936011261032457611a4f611c2d565b91611a58611c5e565b92611a61611e0b565b6002546001600160a01b03939190841690841603611aca575081168085526010602052918420805460ff191660ff85151516179055611a9e611e0b565b16911515917f44948130cf88523dbc150908a47dd6332c33a01a3869d7f2fa78e51d5a5f9c578480a480f35b8351633b8d9d7560e21b8152fd5b83346104e35760203660031901126104e357611afa611af5611c2d565b612511565b80f35b83838160031936011261025e57611b12611e0b565b6001546001600160a01b039182169291168203611bbd57670de0b6b3a7640000803402903482041434151715611baa577f095667752957714306e1a6ad83495404412df6fdb932fca6dc849a7ee910d4c191611b7d602092875460018111600014611ba15790612174565b80611b8c575b5051348152a280f35b611b9890601354611ed2565b60135585611b83565b50600190612174565b634e487b7160e01b845260118552602484fd5b516362df054560e01b81528390fd5b50503461025e578160031936011261025e5760025490516001600160a01b039091168152602090f35b84908434610324576020366003190112610324576020926001600160a01b03919082611c1f611c2d565b168152600885522054168152f35b600435906001600160a01b0382168203611c4357565b600080fd5b602435906001600160a01b0382168203611c4357565b602435908115158203611c4357565b9181601f84011215611c43578235916001600160401b038311611c43576020808501948460051b010111611c4357565b6001600160401b038111611cb057604052565b634e487b7160e01b600052604160045260246000fd5b90601f801991011681019081106001600160401b03821117611cb057604052565b6001600160401b038111611cb05760051b60200190565b9291611d0982611ce7565b91611d176040519384611cc6565b829481845260208094019160051b8101928311611c4357905b828210611d3d5750505050565b81356001600160a01b0381168103611c43578152908301908301611d30565b9080601f83011215611c4357816020611d7793359101611cfe565b90565b6040906003190112611c43576004359060243590565b600654811015611dab57600660005260206000200190600090565b634e487b7160e01b600052603260045260246000fd5b8054821015611dab5760005260206000200190600090565b6000198114611de85760010190565b634e487b7160e01b600052601160045260246000fd5b91908203918211611de857565b337f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03161480611e59575b15611e55576013193601368111611de8573560601c90565b3390565b506014361015611e3d565b90816020910312611c4357518015158103611c435790565b600260005414611e8d576002600055565b60405162461bcd60e51b815260206004820152601f60248201527f5265656e7472616e637947756172643a207265656e7472616e742063616c6c006044820152606490fd5b91908201809211611de857565b81810292918115918404141715611de857565b6000818152602091600c835260409081832080548491855b828110611fe45750507f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03169050803b15610cbd578480916044865180948193632d27a2cd60e11b83528860048401528160248401525af18015611fda5790611f839291611fcb575b50600454611dfe565b6004558252600d83528181812055600c835281209182549282815583611faa575b50505050565b82528120918201915b828110611fc05780611fa4565b818155600101611fb3565b611fd490611c9d565b38611f7a565b84513d87823e3d90fd5b87611fef8284611dc1565b9060018060a01b03918291549060031b1c1690878a52600b808452898b20838c528452898b2054908a8c83612034575b5050505050505061202f90611dd9565b611f0a565b84879b94959697939261204e926007809652205416612511565b858d52600a809a528b8d20612064858254611dfe565b90558a8d528d528a8c20858d528d528b8b8120558c52828a8c2054168b5260098c52828a8c205416803b1561215c578b809160448c8e51948593849263278afc8b60e21b845289600485015260248401525af1801561215257938d612132858f8f96908f9961202f9c9b9989937fadab630928b1d46214641293704a312ee7ad87e03ae14a7fd95e7308b93998df9961210293612143575b50611ed2565b9e61210b611e0b565b958a8352522054955193849316954291846040919493926060820195825260208201520152565b0390a4905087388080808a8c61201f565b61214c90611c9d565b386120fc565b8b513d8e823e3d90fd5b8b80fd5b8051821015611dab5760209160051b010190565b811561217e570490565b634e487b7160e01b600052601260045260246000fd5b9192906121a083611ef2565b835190600092838096815b8581106124d9575060005b85811061227357505050505050826121e8575b6121d590600454611ed2565b600455600052600d602052604060002055565b7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b031690813b15611c435760008092604460405180958193632d27a2cd60e11b8352886004840152600160248401525af1918215612267576121d592612258575b5090506121c9565b61226190611c9d565b38612250565b6040513d6000823e3d90fd5b6001600160a01b036122858284612160565b51166000818152600760205260409020546001600160a01b03169081156124c15781600052601260205260ff8060406000205416156124a85782600052600f602052604060002054166122e3575b50506122de90611dd9565b6121b6565b61230685612301896122fb879d9f978b9e979e612160565b51611edf565b612174565b988a600052600b80602052604060002083600052602052604060002054612496578a156124845761233682612511565b60008c8152600c602052604090208054600160401b811015611cb05761236191600182018155611dc1565b81549060031b9085821b9160018060a01b03901b191617905582600052600a60205260406000206123938c8254611ed2565b90558b60005260205260406000208260005260205260406000206123b88b8254611ed2565b90556000908152600960205260409020546001600160a01b031690813b15611c435760008b60448c83604051968794859363f320772360e01b8552600485015260248401525af18015612267578a61241e816122de978f96612424956121435750611ed2565b9d611ed2565b997f452d440efc30dfa14a0ef803ccb55936af860ec6a6960ed27f129bef913f296a61244e611e0b565b6000848152600a60209081526040918290205482519586529085015242908401526001600160a01b031691606090a490386122d3565b60405163334ab3f560e11b8152600490fd5b60405163315f6a3d60e01b8152600490fd5b6040516302b0b9ed60e61b815260048101849052602490fd5b60249060405190634c89018560e01b82526004820152fd5b916124f26124f8916124eb8587612160565b5190611ed2565b92611dd9565b6121ab565b51906001600160a01b0382168203611c4357565b6001600160a01b0390811660008181526008602090815260408083205485168352600a82528083205490939080156125f2578184526014835261255e858520805490601354809155611dfe565b908161256e575b50505050505050565b670de0b6b3a76400009161258191611edf565b04948184526012835260ff85852054166000146125bc575082526015905220805490916125ad91611ed2565b90555b38808080808080612565565b83958493508392508291600154168282156125e9575bf1156125df5750506125b0565b51903d90823e3d90fd5b506108fc6125d2565b509350601490601354948352522055565b9061260d82612511565b6001600160a01b0391821660008181526015602090815260408083205481516302dcc80960e31b8152939691939091908381600481895afa9081156126ed578891612703575b508211806126f7575b61266a575b50505050509050565b848752601583528684812055843b156112fa578351630314777960e21b81528781600481868a5af180156126ed577f4fa9693cae526341d334e2862ca2413b2e503f1266255f9e0869fb36e6d89b1795969798506126de575b506126cc611e0b565b169351908152a3803880808080612661565b6126e790611c9d565b386126c3565b85513d8a823e3d90fd5b5062093a80821161265c565b90508381813d8311612729575b61271a8183611cc6565b81010312610bdb575138612653565b503d61271056fea164736f6c6343000813000a"; + "0x60e0346200011357601f6200213738819003918201601f19168301916001600160401b03831184841017620001185780849260609460405283398101031262000113576200004d816200012e565b62000069604062000061602085016200012e565b93016200012e565b60808290526001600081905560a09290925281546001600160a01b03199081166001600160a01b039485161790925560c05290620000a662000143565b16908181600254161760025581816003541617600355818160055416176005556004541617600455601e600755604051611f9e9081620001998239608051818181610fd80152611836015260a0518181816102f70152610a75015260c051818181610a1e01526111420152f35b600080fd5b634e487b7160e01b600052604160045260246000fd5b51906001600160a01b03821682036200011357565b6080516001600160a01b03163314806200018c575b156200018857601319360136811162000172573560601c90565b634e487b7160e01b600052601160045260246000fd5b3390565b5060143610156200015856fe608060408181526004918236101561001657600080fd5b600092833560e01c9182622f8de4146116105750816306d6a1b2146115d55781630c340a24146115ac5781630c51dde4146114da5781630e0a5968146114b55781630ffb1d8b146114125781631703e5f9146113d457816318178358146112575781631f7b6d321461123857816330331b2f146111c557816339b70e381461119c57816339e9f3b6146111715781633bf0c9fb1461112d578163402914f5146110f5578163462d0b2e14610fff578163572b6c0514610fad5781636138889b14610ef95781636f816a2014610d28578382637625391a14610c5e575081637778960e14610c36578163794cea3c146109aa57816385f2aef214610981578163880e36fc1461095757816396c82e5714610938578163992a7933146108435781639a61df891461080b5781639f06247b14610761578163a7cac84614610729578163aa79979b146106eb578163aa9354a3146106c4578163ab37f48614610686578163ac4afa3814610645578163b9a09fd51461060a578163c42cf53514610596578163c48f5af41461053d578163c9ff6f4d146104e6578163cad1b9061461049d578163d560b0d714610454578163d58b15d414610425578163d826f88f146103b8578163e586875f14610345578163e8b3fd5714610326578163f645d4f9146102e2578163f9f031df14610240575063fbfa77cf1461021557600080fd5b3461023c578160031936011261023c5760025490516001600160a01b039091168152602090f35b5080fd5b9050346102de5761025036611764565b9183835193815b858110610262578280f35b6001600160a01b03806102758385611a72565b511690610280611833565b90823b156102da57602486928389519586948593630c00007b60e41b8552168c8401525af180156102d057906102bc92916102c1575b50611801565b610257565b6102ca906116a5565b386102b6565b85513d86823e3d90fd5b8580fd5b8280fd5b50503461023c578160031936011261023c57517f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03168152602090f35b50503461023c578160031936011261023c576020906007549051908152f35b919050346102de5760203660031901126102de57610361611644565b610369611833565b8354916001600160a01b0391828416908316036103a8571691821561039957506001600160a01b03191617905580f35b5163d92e233d60e01b81528390fd5b5050505163c560129360e01b8152fd5b919050346102de57826003193601126102de5762093a8042064203338452600f6020528184205481111561041757610e100142111561040a57826103fa61188c565b61040333611902565b6001815580f35b51635a780bad60e01b8152fd5b505163cade311f60e01b8152fd5b828434610451576020366003190112610451575062092c706020923591519162093a8081069003018152f35b80fd5b83346104515761046336611764565b805190825b828110610473578380f35b610498906104936001600160a01b0361048c8386611a72565b5116611d72565b611801565b610468565b50503461023c578060031936011261023c57806020926104bb611644565b6104c361165f565b6001600160a01b039182168352600c865283832091168252845220549051908152f35b50503461023c576104f6366117a2565b91905b828110610504578380f35b80610493610514610538936117b8565b90546001600160a01b0360039290921b1c8116875260096020528487205416611d72565b6104f9565b50503461023c578060031936011261023c57610557611644565b6001600160a01b039081168352600d602052818320805460243594908510156104515750602093610587916117e9565b92905490519260031b1c168152f35b9050346102de5760203660031901126102de576105b1611644565b906105ba611833565b600354926001600160a01b0391828516908316036105fa57169283156105ed5750506001600160a01b0319161760035580f35b5163d92e233d60e01b8152fd5b8451633b8d9d7560e21b81528390fd5b50503461023c57602036600319011261023c576020916001600160a01b0390829082610634611644565b168152600985522054169051908152f35b9050346102de5760203660031901126102de57359160085483101561045157506106706020926117b8565b905491519160018060a01b039160031b1c168152f35b50503461023c57602036600319011261023c5760209160ff9082906001600160a01b036106b1611644565b1681526011855220541690519015158152f35b9050346102de5760203660031901126102de57602092503590519062093a80810690038152f35b50503461023c57602036600319011261023c5760209160ff9082906001600160a01b03610716611644565b1681526010855220541690519015158152f35b50503461023c57602036600319011261023c5760209181906001600160a01b03610751611644565b168152600b845220549051908152f35b919050346102de5760203660031901126102de5761077d611644565b610785611833565b83546001600160a01b039291908316908316036107fc571691828452601260205260ff82852054166107ee575081835260126020528220805460ff191660011790557fed18e9faa3dccfd8aa45f69c4de40546b2ca9cccc4538a2323531656516db1aa8280a280f35b9051635f5a482960e11b8152fd5b50505163c560129360e01b8152fd5b50503461023c57602036600319011261023c5760209181906001600160a01b03610833611644565b168152600f845220549051908152f35b919050346102de5760203660031901126102de5761085f611644565b610867611833565b83546001600160a01b039291908316908316036107fc57811692838552601260205260ff83862054161561092a5750828452601560205281842054849181159081156108e8575b5050601260205250508220805460ff191690557f04a5d3f5d80d22d9345acc80618f4a4e7e663cf9e1aed23b57d975acec002ba78280a280f35b83928392839260025416908390610921575bf1156109165781835260156020528281812055823880806108ae565b51913d9150823e3d90fd5b506108fc6108fa565b8251633f88da5160e21b8152fd5b50503461023c578160031936011261023c576020906006549051908152f35b9050346102de5760203660031901126102de57602092503590519062093a80908181069003018152f35b50503461023c578160031936011261023c5760055490516001600160a01b039091168152602090f35b8284346104515781600319360112610451576109c4611644565b916109cd61165f565b916109d661188c565b6109de611833565b6001600160a01b039384168083526009602090815284842054909691908616610c26578451631217afdb60e01b81529186168883018190529187816024817f00000000000000000000000000000000000000000000000000000000000000008b165afa908115610c1c579087918691610bff575b508180600354169516948503610bd3575b1692855196631e533a8f60e21b8852807f0000000000000000000000000000000000000000000000000000000000000000168a890152826024890152888860448189895af1978815610bc9578698610b9a575b5082865260098952610b15878720988281169960018060a01b0319908b828254161790558a8952600a8c52858a8a209182541617905560108b5288882060ff199060018282541617905560128c5260018a8a2091825416179055611d72565b600854600160401b811015610b8757927fa4d97e9e7c65249b4cd01acb82add613adea98af32daf092366982f0a0d4e45392606092610b5e866001809b9a9998016008556117b8565b819291549060031b9185831b921b19161790558851918252898b83015288820152a35551908152f35b634e487b7160e01b875260418b52602487fd5b610bbb919850893d8b11610bc2575b610bb381836116ce565b810190611d53565b968a610ab6565b503d610ba9565b87513d88823e3d90fd5b90508185526011885260ff868620541615610bef578690610a63565b85516365a9cebb60e01b81528990fd5b610c169150893d8b11610bc257610bb381836116ce565b8a610a52565b86513d87823e3d90fd5b84516348fe415b60e11b81528890fd5b9050346102de57826003193601126102de575490516001600160a01b03909116815260209150f35b80918434610d2457610c6f366117a2565b9390610c7961188c565b600254835163541b13ef60e11b81526001600160a01b0395602094919285928492918391908a165af18015610d1a57908391610cf1575b50505b848110610cc257856001815580f35b8084610cd0610cec936117b8565b90549060031b1c16875260098352610493858589205416611e64565b610cb3565b813d8311610d13575b610d0481836116ce565b810103126102da578187610cb0565b503d610cfa565b84513d89823e3d90fd5b5050fd5b83833461023c578060031936011261023c576001600160401b038335818111610ef557610d589036908601611675565b949091602435908111610ef157610d729036908301611675565b9262093a804206420396338752602097600f895286882054811115610ee157610e108101421115610ed157610da561188c565b858203610ec1576007548211610eb15762092c70014211610ea15733808852600f8952868820429055600154875163673e156160e11b8152958601919091528890859060249082906001600160a01b03165afa938415610e97578794610e66575b5090610e13913691611706565b92610e29610e20826116ef565b955195866116ce565b8085528685019060051b820191368311610e6257905b828210610e53578661040387878733611aa6565b81358152908701908701610e3f565b8680fd5b9093508781813d8311610e90575b610e7e81836116ce565b81010312610e62575192610e13610e06565b503d610e74565b86513d89823e3d90fd5b85516370163b4560e01b81528490fd5b865163ebcfae4b60e01b81528590fd5b865163332ac86360e21b81528590fd5b8651635a780bad60e01b81528590fd5b865163cade311f60e01b81528590fd5b8480fd5b8380fd5b9050346102de5782610f0a36611764565b92610f1361188c565b600254815163541b13ef60e11b81526001600160a01b03949093602092859291839188165af1908115610fa45750610f79575b50815191835b838110610f5b57846001815580f35b8061049384610f6d610f749486611a72565b5116611e64565b610f4c565b602090813d8111610f9d575b610f8f81836116ce565b810103126102de5738610f46565b503d610f85565b513d86823e3d90fd5b50503461023c57602036600319011261023c57602090610fcb611644565b90519060018060a01b03807f0000000000000000000000000000000000000000000000000000000000000000169116148152f35b919050346102de57806003193601126102de5781356001600160401b038111610ef55761102f9036908401611675565b909161103961165f565b92611042611833565b6002546001600160a01b039691908716908716036110e75750855b83811061107c57505050501660018060a01b0319600254161760025580f35b8060051b820135908682168092036110e3578188526011602052838820805460ff191660019081179091556110de92886110b4611833565b167f44948130cf88523dbc150908a47dd6332c33a01a3869d7f2fa78e51d5a5f9c578b80a4611801565b61105d565b8780fd5b82516362df054560e01b8152fd5b50503461023c57602036600319011261023c5760209181906001600160a01b0361111d611644565b1681526015845220549051908152f35b50503461023c578160031936011261023c57517f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03168152602090f35b8284346104515760203660031901126104515750610e106020923591519162093a8081069003018152f35b50503461023c578160031936011261023c5760015490516001600160a01b039091168152602090f35b9050346102de5760203660031901126102de578035916111e3611833565b6003546001600160a01b0390811691160361122b57600a831061121e57600754831461121157505060075580f35b5163c23f6ccb60e01b8152fd5b51632db4ddc160e11b8152fd5b51633b8d9d7560e21b8152fd5b50503461023c578160031936011261023c576020906008549051908152f35b919050346102de57826003193601126102de5761127261188c565b610e1062093a80420642030142111561040a5760018054825163673e156160e11b8152339481019490945290926001600160a01b03929160209081908390602490829088165afa9182156113ca57869261139b575b50338652600d81528286209280518085848297549384815201908a52848a20928a5b8a878383106113845750505050611302925003856116ce565b83519161130e836116ef565b9561131b835197886116ce565b838752601f1961132a856116ef565b013683890137885b84811061134c5789896113478a8a8a33611aa6565b815580f35b61137f90338b52600c8452848b2083611365838b611a72565b51168c528452848b2054611379828b611a72565b52611801565b611332565b86548c168552958101958a955090930192016112e9565b9080925081813d83116113c3575b6113b381836116ce565b810103126102da575190386112c7565b503d6113a9565b83513d88823e3d90fd5b50503461023c57602036600319011261023c5760209160ff9082906001600160a01b036113ff611644565b1681526012855220541690519015158152f35b919050346102de57806003193601126102de5761142d611644565b9160243592831515809403610ef157611444611833565b6003546001600160a01b039391908416908416036114a757508116918285526011602052842060ff1981541660ff851617905561147f611833565b167f44948130cf88523dbc150908a47dd6332c33a01a3869d7f2fa78e51d5a5f9c578480a480f35b8351633b8d9d7560e21b8152fd5b8334610451576020366003190112610451576114d76114d2611644565b611d72565b80f35b919050826003193601126102de576114f0611833565b6002546001600160a01b03918216939116830361159e57670de0b6b3a76400009081340291348304143415171561158b57507f095667752957714306e1a6ad83495404412df6fdb932fca6dc849a7ee910d4c19161155e602092600654600181116000146115825790611a86565b8061156d575b5051348152a280f35b611579906013546118e2565b60135538611564565b50600190611a86565b634e487b7160e01b855260119052602484fd5b90516362df054560e01b8152fd5b50503461023c578160031936011261023c5760035490516001600160a01b039091168152602090f35b50503461023c57602036600319011261023c576020916001600160a01b03908290826115ff611644565b168152600a85522054169051908152f35b849084346102de5760203660031901126102de576020926001600160a01b03611637611644565b168152600e845220548152f35b600435906001600160a01b038216820361165a57565b600080fd5b602435906001600160a01b038216820361165a57565b9181601f8401121561165a578235916001600160401b03831161165a576020808501948460051b01011161165a57565b6001600160401b0381116116b857604052565b634e487b7160e01b600052604160045260246000fd5b90601f801991011681019081106001600160401b038211176116b857604052565b6001600160401b0381116116b85760051b60200190565b9291611711826116ef565b9161171f60405193846116ce565b829481845260208094019160051b810192831161165a57905b8282106117455750505050565b81356001600160a01b038116810361165a578152908301908301611738565b602060031982011261165a57600435906001600160401b03821161165a578060238301121561165a5781602461179f93600401359101611706565b90565b604090600319011261165a576004359060243590565b6008548110156117d357600860005260206000200190600090565b634e487b7160e01b600052603260045260246000fd5b80548210156117d35760005260206000200190600090565b60001981146118105760010190565b634e487b7160e01b600052601160045260246000fd5b9190820391821161181057565b337f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03161480611881575b1561187d576013193601368111611810573560601c90565b3390565b506014361015611865565b60026000541461189d576002600055565b60405162461bcd60e51b815260206004820152601f60248201527f5265656e7472616e637947756172643a207265656e7472616e742063616c6c006044820152606490fd5b9190820180921161181057565b8181029291811591840414171561181057565b60018060a01b0380911690600090828252602092600d8452604091828420908154908592865b838110611987575050505061193f90600654611826565b6006558252600e83528181812055600d835281209182549282815583611966575b50505050565b82528120918201915b82811061197c5780611960565b81815560010161196f565b888361199383856117e9565b90549060031b1c16878a52600c808352898b20828c528352898b2054908a8c836119cc575b5050505050506119c790611801565b611928565b859a9291899495969160098693522054166119e690611d72565b848d52600b809a528b8d20848154906119fe91611826565b90558a8d528d528a8c20848d528d52828c8c812055611a1c916118e2565b97611a25611833565b848d52908d528a8c20548b51938452602084015242604084015216907f3e8b1c6af149581ed7abb63a47f214448cce9d760a210d4d7cfe12399fc5b69790606090a3883880808a8c6119b8565b80518210156117d35760209160051b010190565b8115611a90570490565b634e487b7160e01b600052601260045260246000fd5b919290611ab283611902565b835190600092838096815b858110611d2f575060005b858110611afe57505050505050611ae1906006546118e2565b6006556001600160a01b03166000908152600e6020526040902055565b6001600160a01b03611b108284611a72565b51166000818152600960205260409020546001600160a01b0316908115611d175781600052601260205260ff806040600020541615611cfe5782600052601060205260406000205416611b6e575b5050611b6990611801565b611ac8565b611b9185611b8c89611b869c9e9c878b989798611a72565b516118ef565b611a86565b9260018060a01b038b16600052600c602052604060002082600052602052604060002054611cec578315611cda57611bc890611d72565b6001600160a01b038a166000908152600d602052604090208054909390600160401b8110156116b85781611c77818e9d611c0e85611b699a6001611c7d980181556117e9565b81549060031b9089821b9160018060a01b03901b191617905586600052600b9e8f6020526040600020611c428482546118e2565b905560018060a01b0316600052600c6020526040600020876000526020526040600020611c708382546118e2565b90556118e2565b9d6118e2565b600083815260209b8c526040908190205481519384529b83019b909b52429a82019a909a526001600160a01b038b16907fa1bc625e9c44bf21dd212ffbb0d5fb1d28c54b91ebce688958ccbfc721984b4b90606090a39038611b5e565b60405163334ab3f560e11b8152600490fd5b60405163315f6a3d60e01b8152600490fd5b6040516302b0b9ed60e61b815260048101849052602490fd5b60249060405190634c89018560e01b82526004820152fd5b91611d48611d4e91611d418587611a72565b51906118e2565b92611801565b611abd565b9081602091031261165a57516001600160a01b038116810361165a5790565b6001600160a01b039081166000818152600a602090815260408083205485168352600b8252808320549093908015611e535781845260148352611dbf858520805490601354809155611826565b9081611dcf575b50505050505050565b670de0b6b3a764000091611de2916118ef565b04948184526012835260ff8585205416600014611e1d57508252601590522080549091611e0e916118e2565b90555b38808080808080611dc6565b8395849350839250829160025416828215611e4a575bf115611e40575050611e11565b51903d90823e3d90fd5b506108fc611e33565b509350601490601354948352522055565b90611e6e82611d72565b6001600160a01b0391821660008181526015602090815260408083205481516302dcc80960e31b8152939691939091908381600481895afa908115611f4e578891611f64575b50821180611f58575b611ecb575b50505050509050565b848752601583528684812055843b15610e62578351630314777960e21b81528781600481868a5af18015611f4e577f4fa9693cae526341d334e2862ca2413b2e503f1266255f9e0869fb36e6d89b179596979850611f3f575b50611f2d611833565b169351908152a3803880808080611ec2565b611f48906116a5565b38611f24565b85513d8a823e3d90fd5b5062093a808211611ebd565b90508381813d8311611f8a575b611f7b81836116ce565b810103126110e3575138611eb4565b503d611f7156fea164736f6c6343000813000a"; type VoterConstructorParams = | [signer?: Signer] @@ -1242,26 +1110,26 @@ export class Voter__factory extends ContractFactory { override getDeployTransaction( _forwarder: AddressLike, - _ve: AddressLike, + _strategyManager: AddressLike, _factoryRegistry: AddressLike, overrides?: NonPayableOverrides & { from?: string } ): Promise { return super.getDeployTransaction( _forwarder, - _ve, + _strategyManager, _factoryRegistry, overrides || {} ); } override deploy( _forwarder: AddressLike, - _ve: AddressLike, + _strategyManager: AddressLike, _factoryRegistry: AddressLike, overrides?: NonPayableOverrides & { from?: string } ) { return super.deploy( _forwarder, - _ve, + _strategyManager, _factoryRegistry, overrides || {} ) as Promise< diff --git a/src/types/factories/contracts/factories/FactoryRegistry__factory.ts b/src/types/factories/contracts/factories/FactoryRegistry__factory.ts index acd09b2..21bcf12 100644 --- a/src/types/factories/contracts/factories/FactoryRegistry__factory.ts +++ b/src/types/factories/contracts/factories/FactoryRegistry__factory.ts @@ -27,11 +27,6 @@ const _abi = [ name: "_fallbackPoolFactory", type: "address", }, - { - internalType: "address", - name: "_fallbackVotingRewardsFactory", - type: "address", - }, { internalType: "address", name: "_fallbackGaugeFactory", @@ -80,12 +75,6 @@ const _abi = [ name: "poolFactory", type: "address", }, - { - indexed: true, - internalType: "address", - name: "votingRewardsFactory", - type: "address", - }, { indexed: true, internalType: "address", @@ -137,12 +126,6 @@ const _abi = [ name: "poolFactory", type: "address", }, - { - indexed: true, - internalType: "address", - name: "votingRewardsFactory", - type: "address", - }, { indexed: true, internalType: "address", @@ -160,11 +143,6 @@ const _abi = [ name: "poolFactory", type: "address", }, - { - internalType: "address", - name: "votingRewardsFactory", - type: "address", - }, { internalType: "address", name: "gaugeFactory", @@ -186,11 +164,6 @@ const _abi = [ ], name: "factoriesToPoolFactory", outputs: [ - { - internalType: "address", - name: "votingRewardsFactory", - type: "address", - }, { internalType: "address", name: "gaugeFactory", @@ -307,7 +280,7 @@ const _abi = [ ] as const; const _bytecode = - "0x60a0346200022b57601f62000b8a38819003918201601f191683019291906001600160401b03841183851017620002305781606092849260409687528339810103126200022b57620000518162000266565b9160206200006e826200006683860162000266565b940162000266565b60008054336001600160a01b031980831682178455939792956001600160a01b03949093909285929083167f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e08980a38060805216938415801562000220575b801562000215575b62000204578486526003815282862054620001f3579086889286885260048152808589206200010362000246565b886001818454169384845201541692839101528015600014620001a45750509185600181969493600483979560008051602062000b6a8339815191529a6200014a62000246565b9316835284818401971687528b8d525282868c209151168482541617815501925116908254161790555b6200017f856200027b565b5051961694169280a461084e90816200031c823960805181818160c201526104740152f35b935093505084161490811591620001e5575b50620001d557908060008051602062000b6a8339815191529262000174565b51630358043160e01b8152600490fd5b9050828716141538620001b6565b82516362cee17560e11b8152600490fd5b825163d92e233d60e01b8152600490fd5b5083881615620000d5565b5083871615620000cd565b600080fd5b634e487b7160e01b600052604160045260246000fd5b60408051919082016001600160401b038111838210176200023057604052565b51906001600160a01b03821682036200022b57565b60008181526003602052604081205462000316576002546801000000000000000081101562000302576001810180600255811015620002ee577f405787fa12a823e0f2b7631cc41b3ba8828b3321ca811111fa75cd3aa3bb5ace0182905560025491815260036020526040902055600190565b634e487b7160e01b82526032600452602482fd5b634e487b7160e01b82526041600452602482fd5b90509056fe608060408181526004908136101561001657600080fd5b600092833560e01c90816306121cd5146104fe575080630cb299c9146104df5780631217afdb146104a357806356d9cb641461045f578063715018a6146104025780638da5cb5b146103da5780639b140a851461025d578063d1ea0a1d1461021f578063f2fde38b1461015c5763fbf1f78a1461009257600080fd5b34610158576020366003190112610158576100ab6105c6565b6100b36105e1565b6001600160a01b0392818416927f00000000000000000000000000000000000000000000000000000000000000008516841461014b578386526003602052808620541561013e575050610110839161010a84610719565b50610803565b939093169216907fbbbf8609bccd24696f7d2d86357dbd1a55ff9b79853a72ea11b1c0968ada17768480a480f35b5163d38afd6560e01b8152fd5b51630a235adf60e11b8152fd5b8280fd5b509034610158576020366003190112610158576101776105c6565b906101806105e1565b6001600160a01b039182169283156101cd57505082546001600160a01b0319811683178455167f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e08380a380f35b906020608492519162461bcd60e51b8352820152602660248201527f4f776e61626c653a206e6577206f776e657220697320746865207a65726f206160448201526564647265737360d01b6064820152fd5b8382346102595760203660031901126102595760209181906001600160a01b036102476105c6565b16815260038452205415159051908152f35b5080fd5b509034610158576060366003190112610158576102786105c6565b916001600160a01b03602435818116939192908490036103d657604435948386168096036103d25783906102aa6105e1565b1692831580156103ca575b80156103c2575b6103b4578387526003602052818720546103a65783875282602052602082882083516102e781610639565b83600181845416938484520154169283910152801560001461037757505060018183519361031485610639565b8785526020850195898752878b52602052892093511692818060a01b0319938482541617815501925116908254161790555b61034f8161069c565b507f5abe7702ac48299ef7647755d7af6d6a6beecd1c584bbb6fa55b7a882490efc78480a480f35b86148015925061039b575b5061038e575050610346565b51630358043160e01b8152fd5b905085141538610382565b50516362cee17560e11b8152fd5b505163d92e233d60e01b8152fd5b5085156102bc565b5084156102b5565b8680fd5b8580fd5b838234610259578160031936011261025957905490516001600160a01b039091168152602090f35b833461045c578060031936011261045c5761041b6105e1565b80546001600160a01b03198116825581906001600160a01b03167f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e08280a380f35b80fd5b838234610259578160031936011261025957517f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03168152602090f35b50823461045c57602036600319011261045c57506104c76104c26105c6565b610803565b82516001600160a01b03928316815291166020820152f35b8382346102595781600319360112610259576020906002549051908152f35b90508391346101585782600319360112610158576002549283835260209182840180956002845284842090845b868282106105b25750505050849003601f01601f191684019567ffffffffffffffff87118588101761059f575085815282865292518583018190528594938501939290915b82811061057f57505050500390f35b83516001600160a01b031685528695509381019392810192600101610570565b634e487b7160e01b835260419052602482fd5b83548552909301926001928301920161052b565b600435906001600160a01b03821682036105dc57565b600080fd5b6000546001600160a01b031633036105f557565b606460405162461bcd60e51b815260206004820152602060248201527f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e65726044820152fd5b6040810190811067ffffffffffffffff82111761065557604052565b634e487b7160e01b600052604160045260246000fd5b60025481101561068657600260005260206000200190600090565b634e487b7160e01b600052603260045260246000fd5b60008181526003602052604081205461071457600254600160401b8110156107005790826106ec6106d58460016040960160025561066b565b819391549060031b91821b91600019901b19161790565b905560025492815260036020522055600190565b634e487b7160e01b82526041600452602482fd5b905090565b60008181526003602052604081205490919080156107fe57600019908082018181116107ea57600254908382019182116107d6578082036107a2575b505050600254801561078e5781019061076d8261066b565b909182549160031b1b19169055600255815260036020526040812055600190565b634e487b7160e01b84526031600452602484fd5b6107c06107b16106d59361066b565b90549060031b1c92839261066b565b9055845260036020526040842055388080610755565b634e487b7160e01b86526011600452602486fd5b634e487b7160e01b85526011600452602485fd5b505090565b9060209160018060a01b03809116600052600483526040600020906040519061082b82610639565b600181845416938484520154169384910152919056fea164736f6c6343000813000a5abe7702ac48299ef7647755d7af6d6a6beecd1c584bbb6fa55b7a882490efc7"; + "0x60a0346101a657610a7990601f38839003908101601f19168201906001600160401b038211838310176101ab57808391604095869485528339810103126101a657610055602061004e836101e0565b92016101e0565b60008054336001600160a01b031980831682178455939592949293926001600160a01b039283929083167f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e08880a38060805216928315801561019c575b61018c5783855260036020528085205461017c57838552600460205280852092826100db6101c1565b945416809452831560001461014b57600080516020610a5983398151915293506101036101c1565b908388168252858752600460205283838820925116908254161790555b610129846101f4565b505194169280a36107c79081610292823960805181818160c2015261041f0152f35b5090918286160361016c5790600080516020610a5983398151915291610120565b51630358043160e01b8152600490fd5b516362cee17560e11b8152600490fd5b5163d92e233d60e01b8152600490fd5b50818616156100b2565b600080fd5b634e487b7160e01b600052604160045260246000fd5b60405190602082016001600160401b038111838210176101ab57604052565b51906001600160a01b03821682036101a657565b60008181526003602052604081205461028c5760025468010000000000000000811015610278576001810180600255811015610264577f405787fa12a823e0f2b7631cc41b3ba8828b3321ca811111fa75cd3aa3bb5ace0182905560025491815260036020526040902055600190565b634e487b7160e01b82526032600452602482fd5b634e487b7160e01b82526041600452602482fd5b90509056fe608060408181526004908136101561001657600080fd5b600092833560e01c90816306121cd5146104b5575080630cb299c9146104965780631217afdb1461044e57806356d9cb641461040a578063715018a6146103ad5780637e5465ba1461028a5780638da5cb5b14610262578063d1ea0a1d14610224578063f2fde38b146101615763fbf1f78a1461009257600080fd5b3461015d57602036600319011261015d576100ab61057d565b906100b4610598565b6001600160a01b03918216927f00000000000000000000000000000000000000000000000000000000000000008316841461014f578385526003602052818520541561014157610103846106d0565b5083855260205261011781852091516105f0565b5416907fb0a24d625a3d04a04108c98b7722db25e9435210d27050369082689178d4f1db8380a380f35b905163d38afd6560e01b8152fd5b9051630a235adf60e11b8152fd5b8280fd5b50903461015d57602036600319011261015d5761017c61057d565b90610185610598565b6001600160a01b039182169283156101d257505082546001600160a01b0319811683178455167f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e08380a380f35b906020608492519162461bcd60e51b8352820152602660248201527f4f776e61626c653a206e6577206f776e657220697320746865207a65726f206160448201526564647265737360d01b6064820152fd5b83823461025e57602036600319011261025e5760209181906001600160a01b0361024c61057d565b16815260038452205415159051908152f35b5080fd5b83823461025e578160031936011261025e57905490516001600160a01b039091168152602090f35b503461015d578060031936011261015d576102a361057d565b6001600160a01b036024358181169492908590036103a95781906102c5610598565b1692831580156103a1575b610392578386526003602052808620546103835783865282602052808620828251916102fb836105f0565b541680915280156000146103665750805192610316846105f0565b8584528487526020528520915182546001600160a01b03191691161790555b61033e81610653565b507f3ce2da1daf10aa0a28578b70fe768ed2f390a3da82445358f9346fbc2981f6fd8380a380f35b9091508403610376575050610335565b51630358043160e01b8152fd5b516362cee17560e11b81529050fd5b5163d92e233d60e01b81529050fd5b5084156102d0565b8580fd5b83346104075780600319360112610407576103c6610598565b80546001600160a01b03198116825581906001600160a01b03167f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e08280a380f35b80fd5b83823461025e578160031936011261025e57517f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03168152602090f35b503461015d57602036600319011261015d576020926001600160a01b03928291908461047861057d565b1682528552209181519261048b846105f0565b541680925251908152f35b83823461025e578160031936011261025e576020906002549051908152f35b905083913461015d578260031936011261015d576002549283835260209182840180956002845284842090845b868282106105695750505050849003601f01601f191684019567ffffffffffffffff871185881017610556575085815282865292518583018190528594938501939290915b82811061053657505050500390f35b83516001600160a01b031685528695509381019392810192600101610527565b634e487b7160e01b835260419052602482fd5b8354855290930192600192830192016104e2565b600435906001600160a01b038216820361059357565b600080fd5b6000546001600160a01b031633036105ac57565b606460405162461bcd60e51b815260206004820152602060248201527f4f776e61626c653a2063616c6c6572206973206e6f7420746865206f776e65726044820152fd5b6020810190811067ffffffffffffffff82111761060c57604052565b634e487b7160e01b600052604160045260246000fd5b60025481101561063d57600260005260206000200190600090565b634e487b7160e01b600052603260045260246000fd5b6000818152600360205260408120546106cb57600254600160401b8110156106b75790826106a361068c84600160409601600255610622565b819391549060031b91821b91600019901b19161790565b905560025492815260036020522055600190565b634e487b7160e01b82526041600452602482fd5b905090565b60008181526003602052604081205490919080156107b557600019908082018181116107a1576002549083820191821161078d57808203610759575b50505060025480156107455781019061072482610622565b909182549160031b1b19169055600255815260036020526040812055600190565b634e487b7160e01b84526031600452602484fd5b61077761076861068c93610622565b90549060031b1c928392610622565b905584526003602052604084205538808061070c565b634e487b7160e01b86526011600452602486fd5b634e487b7160e01b85526011600452602485fd5b50509056fea164736f6c6343000813000a3ce2da1daf10aa0a28578b70fe768ed2f390a3da82445358f9346fbc2981f6fd"; type FactoryRegistryConstructorParams = | [signer?: Signer] @@ -328,26 +301,22 @@ export class FactoryRegistry__factory extends ContractFactory { override getDeployTransaction( _fallbackPoolFactory: AddressLike, - _fallbackVotingRewardsFactory: AddressLike, _fallbackGaugeFactory: AddressLike, overrides?: NonPayableOverrides & { from?: string } ): Promise { return super.getDeployTransaction( _fallbackPoolFactory, - _fallbackVotingRewardsFactory, _fallbackGaugeFactory, overrides || {} ); } override deploy( _fallbackPoolFactory: AddressLike, - _fallbackVotingRewardsFactory: AddressLike, _fallbackGaugeFactory: AddressLike, overrides?: NonPayableOverrides & { from?: string } ) { return super.deploy( _fallbackPoolFactory, - _fallbackVotingRewardsFactory, _fallbackGaugeFactory, overrides || {} ) as Promise< diff --git a/src/types/factories/contracts/factories/GaugeFactory__factory.ts b/src/types/factories/contracts/factories/GaugeFactory__factory.ts index 818b9c6..f205fe0 100644 --- a/src/types/factories/contracts/factories/GaugeFactory__factory.ts +++ b/src/types/factories/contracts/factories/GaugeFactory__factory.ts @@ -42,7 +42,7 @@ const _abi = [ ] as const; const _bytecode = - "0x608080604052346100165761138f908161001c8239f35b600080fdfe608080604052600436101561001357600080fd5b600090813560e01c63794cea3c1461002a57600080fd5b346100d35760403660031901126100d3576001600160a01b0390600435828116908190036100cf576024358381168091036100cb576112ab918284019284841067ffffffffffffffff8511176100b757916060939185936100d885398252602082015233604082015203019083f09081156100ac576020925060405191168152f35b6040513d84823e3d90fd5b634e487b7160e01b87526041600452602487fd5b8480fd5b8380fd5b5080fdfe61010080604052346200016357606081620012ab803803809162000024828562000168565b83398101031262000163576020816200003f600493620001a2565b906200005b604062000053858401620001a2565b9201620001a2565b608092909252600160005560a05260c0819052604051630fc2838b60e11b815292839182906001600160a01b03165afa908115620001575760009162000113575b5060e0526040516110f39081620001b882396080518181816107520152610c9a015260a0518181816103d10152818161053201528181610695015261097f015260c0518181816102b20152818161032c015281816105f10152818161078e0152610a6b015260e0518181816107f901526109d80152f35b6020813d82116200014e575b816200012e6020938362000168565b810103126200014a57620001439150620001a2565b386200009c565b5080fd5b3d91506200011f565b6040513d6000823e3d90fd5b600080fd5b601f909101601f19168101906001600160401b038211908210176200018c57604052565b634e487b7160e01b600052604160045260246000fd5b51906001600160a01b0382168203620001635756fe6040608081526004908136101561001557600080fd5b600091823560e01c9081628cc26214610aea5781630700037d14610ab25781630c51dde414610a4357816316e6404814610a2657816318160ddd14610a075781631f850716146109c35781632e1a7d4d146108b45781633506c729146107bd57816346c96aac14610779578163572b6c05146107275781636e553f651461059957816370a082311461056157816372f702f31461051d5781637b0a47ee146104fe57816380faa57d146104e15781638b876347146104a957816394af5b6314610481578163b6b55f25146102dd578163c00007b0146101a5578163c8f33c9114610186578163cd3daf9d14610162578163df136d6514610140575063ebe2b12b1461011f57600080fd5b3461013c578160031936011261013c576020906001549051908152f35b5080fd5b90503461015e578260031936011261015e5760209250549051908152f35b8280fd5b50503461013c578160031936011261013c5760209061017f610b8e565b9051908152f35b50503461013c578160031936011261013c576020906003549051908152f35b90503461015e57602036600319011261015e576101c0610b10565b916101c9610cf0565b6101d1610c97565b6001600160a01b03808516949181168086141591826102b0575b50506102a2576101fa90610f86565b8284526008602052808420918483549384610218575b506001815580f35b558480808086885af1610229610c57565b501561026557507f1f89f96333d3133000ee447473151fa9606543368f02271c9d95ae14f13bcc679160209151908152a2388080808481610210565b6020606492519162461bcd60e51b835282015260186024820152773a3930b739b332b9103932bbb0b93239903330b4b632b21760411b6044820152fd5b505163ea8e4eb560e01b8152fd5b7f0000000000000000000000000000000000000000000000000000000000000000161415905038806101eb565b90503461015e5760208060031936011261047d5781356102fb610c97565b92610304610cf0565b811561046f578451631703e5f960e01b815230828201526001600160a01b03919084816024817f000000000000000000000000000000000000000000000000000000000000000087165afa908115610465578891610438575b501561042a5750907f5548c837ab068cf56a2c2479df0882a4922fd203edb7517321831d95078c5f629291610390610c97565b9461039a81610f86565b6103f6828851976323b872dd60e01b878a01521696876024820152306044820152846064820152606481526103ce81610c03565b837f000000000000000000000000000000000000000000000000000000000000000016610dba565b61040283600554610b81565b60055516948587526006835280872061041c838254610b81565b905551908152a36001815580f35b85516310f3d9c960e01b8152fd5b6104589150853d871161045e575b6104508183610c35565b810190610da2565b3861035d565b503d610446565b87513d8a823e3d90fd5b8451631f2a200560e01b8152fd5b8380fd5b90503461015e57602036600319011261015e5760209282913581526009845220549051908152f35b50503461013c57602036600319011261013c5760209181906001600160a01b036104d1610b10565b1681526007845220549051908152f35b50503461013c578160031936011261013c5760209061017f610bf1565b50503461013c578160031936011261013c576020906002549051908152f35b50503461013c578160031936011261013c57517f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03168152602090f35b50503461013c57602036600319011261013c5760209181906001600160a01b03610589610b10565b1681526006845220549051908152f35b9190503461015e578060031936011261015e576001600160a01b03602435818116939192823591858103610723576105cf610cf0565b8215610713578151631703e5f960e01b815230858201526020949085816024817f00000000000000000000000000000000000000000000000000000000000000008b165afa9081156107095789916106ec575b50156106de5750906106ba7f5548c837ab068cf56a2c2479df0882a4922fd203edb7517321831d95078c5f6294939261066261065c610c97565b91610f86565b868351916323b872dd60e01b8784015216968760248301523060448301528460648301526064825261069382610c03565b7f000000000000000000000000000000000000000000000000000000000000000016610dba565b6106c682600554610b81565b6005558587526006835280872061041c838254610b81565b82516310f3d9c960e01b8152fd5b6107039150863d881161045e576104508183610c35565b38610622565b84513d8b823e3d90fd5b8151631f2a200560e01b81528490fd5b8680fd5b50503461013c57602036600319011261013c57602090610745610b10565b90519060018060a01b03807f0000000000000000000000000000000000000000000000000000000000000000169116148152f35b50503461013c578160031936011261013c57517f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03168152602090f35b90508260031936011261015e576107d2610cf0565b6107da610c97565b82516342f9577960e11b81529092906001600160a01b039060208185817f000000000000000000000000000000000000000000000000000000000000000086165afa9081156108aa579082918791610869575b50169084160361085c57341561084f57836108483485610feb565b6001815580f35b51631f2a200560e01b8152fd5b51633a7cfa5d60e21b8152fd5b9150506020813d82116108a2575b8161088460209383610c35565b8101031261089e5751818116810361089e5781903861082d565b8580fd5b3d9150610877565b83513d88823e3d90fd5b9190503461015e57602036600319011261015e578135906108d3610cf0565b6108db610c97565b926108e584610f86565b6108f183600554610b2b565b60055560018060a01b03809416938486526006602052828620610915858254610b2b565b905582519163a9059cbb60e01b602084015285602484015284604484015260448352608083019083821067ffffffffffffffff8311176109b057507f884edad9ce6fa2440d8a54cc123490eb96d2768479d49ff9c7366125a9424364949284926109a492602096527f000000000000000000000000000000000000000000000000000000000000000016610dba565b51908152a26001815580f35b634e487b7160e01b885260419052602487fd5b50503461013c578160031936011261013c57517f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03168152602090f35b50503461013c578160031936011261013c576020906005549051908152f35b50503461013c578160031936011261013c5760209061017f610fcc565b90508260031936011261015e57610a58610cf0565b610a60610c97565b916001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000811690841603610aa557341561084f57836108483485610feb565b5163c18384c160e01b8152fd5b50503461013c57602036600319011261013c5760209181906001600160a01b03610ada610b10565b1681526008845220549051908152f35b50503461013c57602036600319011261013c5760209061017f610b0b610b10565b610d46565b600435906001600160a01b0382168203610b2657565b600080fd5b91908203918211610b3857565b634e487b7160e01b600052601160045260246000fd5b81810292918115918404141715610b3857565b8115610b6b570490565b634e487b7160e01b600052601260045260246000fd5b91908201809211610b3857565b6005548015610bea57600454610bba610bb1610ba8610bf1565b60035490610b2b565b60025490610b4e565b670de0b6b3a764000090818102918183041490151715610b3857610be792610be191610b61565b90610b81565b90565b5060045490565b600154804210600014610be757504290565b60a0810190811067ffffffffffffffff821117610c1f57604052565b634e487b7160e01b600052604160045260246000fd5b90601f8019910116810190811067ffffffffffffffff821117610c1f57604052565b3d15610c92573d9067ffffffffffffffff8211610c1f5760405191610c86601f8201601f191660200184610c35565b82523d6000602084013e565b606090565b337f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03161480610ce5575b15610ce1576013193601368111610b38573560601c90565b3390565b506014361015610cc9565b600260005414610d01576002600055565b60405162461bcd60e51b815260206004820152601f60248201527f5265656e7472616e637947756172643a207265656e7472616e742063616c6c006044820152606490fd5b610be79060018060a01b0316604060008281526006602052670de0b6b3a7640000610d9183832054610d8b610d79610b8e565b87865260076020528686205490610b2b565b90610b4e565b049281526008602052205490610b81565b90816020910312610b2657518015158103610b265790565b60408051908101916001600160a01b031667ffffffffffffffff831182841017610c1f57610e2a926040526000806020958685527f5361666545524332303a206c6f772d6c6576656c2063616c6c206661696c656487860152868151910182855af1610e24610c57565b91610eb2565b805190828215928315610e9a575b50505015610e435750565b6084906040519062461bcd60e51b82526004820152602a60248201527f5361666545524332303a204552433230206f7065726174696f6e20646964206e6044820152691bdd081cdd58d8d9595960b21b6064820152fd5b610eaa9350820181019101610da2565b388281610e38565b91929015610f145750815115610ec6575090565b3b15610ecf5790565b60405162461bcd60e51b815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e74726163740000006044820152606490fd5b825190915015610f275750805190602001fd5b6040519062461bcd60e51b82528160208060048301528251908160248401526000935b828510610f6d575050604492506000838284010152601f80199101168101030190fd5b8481018201518686016044015293810193859350610f4a565b610f8e610b8e565b600455610f99610bf1565b600355610fa581610d46565b9060018060a01b031660005260086020526040600020556004546007602052604060002055565b60015480421015610fe557610bb1610be7914290610b2b565b50600090565b610ff3610b8e565b60045562093a8061100c81420642039142908301610b2b565b9060015482814210156000146110bf57611027915085610b61565b6002555b6002549060005260096020528060406000205580156110ad5761104e8247610b61565b1061109b577f095667752957714306e1a6ad83495404412df6fdb932fca6dc849a7ee910d4c1916110856020924260035542610b81565b6001556040519384526001600160a01b031692a2565b604051633c6be1b360e01b8152600490fd5b6040516307ced7af60e01b8152600490fd5b6110d96110d3610bb16110de944290610b2b565b87610b81565b610b61565b60025561102b56fea164736f6c6343000813000aa164736f6c6343000813000a"; + "0x6080806040523461001657611290908161001c8239f35b600080fdfe608080604052600436101561001357600080fd5b600090813560e01c63794cea3c1461002a57600080fd5b346100d35760403660031901126100d3576001600160a01b0390600435828116908190036100cf576024358381168091036100cb576111ac918284019284841067ffffffffffffffff8511176100b757916060939185936100d885398252602082015233604082015203019083f09081156100ac576020925060405191168152f35b6040513d84823e3d90fd5b634e487b7160e01b87526041600452602487fd5b8480fd5b8380fd5b5080fdfe60e0346100d857601f6111ac38819003918201601f19168301916001600160401b038311848410176100dd578084926060946040528339810103126100d857610047816100f3565b906100606040610059602084016100f3565b92016100f3565b91608052600160005560a05260c0526040516110a4908161010882396080518181816107470152610c4b015260a0518181816103c6015281816105270152818161068a0152610974015260c0518181816102a701528181610321015281816105e601528181610783015281816107ee0152610a1c0152f35b600080fd5b634e487b7160e01b600052604160045260246000fd5b51906001600160a01b03821682036100d85756fe6040608081526004908136101561001557600080fd5b600091823560e01c9081628cc26214610a9b5781630700037d14610a635781630c51dde4146109f457816316e64048146109d757816318160ddd146109b85781632e1a7d4d146108a95781633506c729146107b257816346c96aac1461076e578163572b6c051461071c5781636e553f651461058e57816370a082311461055657816372f702f3146105125781637b0a47ee146104f357816380faa57d146104d65781638b8763471461049e57816394af5b6314610476578163b6b55f25146102d2578163c00007b01461019a578163c8f33c911461017b578163cd3daf9d14610157578163df136d6514610135575063ebe2b12b1461011457600080fd5b346101315781600319360112610131576020906001549051908152f35b5080fd5b90503461015357826003193601126101535760209250549051908152f35b8280fd5b505034610131578160031936011261013157602090610174610b3f565b9051908152f35b5050346101315781600319360112610131576020906003549051908152f35b905034610153576020366003190112610153576101b5610ac1565b916101be610ca1565b6101c6610c48565b6001600160a01b03808516949181168086141591826102a5575b5050610297576101ef90610f37565b828452600860205280842091848354938461020d575b506001815580f35b558480808086885af161021e610c08565b501561025a57507f1f89f96333d3133000ee447473151fa9606543368f02271c9d95ae14f13bcc679160209151908152a2388080808481610205565b6020606492519162461bcd60e51b835282015260186024820152773a3930b739b332b9103932bbb0b93239903330b4b632b21760411b6044820152fd5b505163ea8e4eb560e01b8152fd5b7f0000000000000000000000000000000000000000000000000000000000000000161415905038806101e0565b905034610153576020806003193601126104725781356102f0610c48565b926102f9610ca1565b8115610464578451631703e5f960e01b815230828201526001600160a01b03919084816024817f000000000000000000000000000000000000000000000000000000000000000087165afa90811561045a57889161042d575b501561041f5750907f5548c837ab068cf56a2c2479df0882a4922fd203edb7517321831d95078c5f629291610385610c48565b9461038f81610f37565b6103eb828851976323b872dd60e01b878a01521696876024820152306044820152846064820152606481526103c381610bb4565b837f000000000000000000000000000000000000000000000000000000000000000016610d6b565b6103f783600554610b32565b600555169485875260068352808720610411838254610b32565b905551908152a36001815580f35b85516310f3d9c960e01b8152fd5b61044d9150853d8711610453575b6104458183610be6565b810190610d53565b38610352565b503d61043b565b87513d8a823e3d90fd5b8451631f2a200560e01b8152fd5b8380fd5b9050346101535760203660031901126101535760209282913581526009845220549051908152f35b5050346101315760203660031901126101315760209181906001600160a01b036104c6610ac1565b1681526007845220549051908152f35b505034610131578160031936011261013157602090610174610ba2565b5050346101315781600319360112610131576020906002549051908152f35b505034610131578160031936011261013157517f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03168152602090f35b5050346101315760203660031901126101315760209181906001600160a01b0361057e610ac1565b1681526006845220549051908152f35b919050346101535780600319360112610153576001600160a01b03602435818116939192823591858103610718576105c4610ca1565b8215610708578151631703e5f960e01b815230858201526020949085816024817f00000000000000000000000000000000000000000000000000000000000000008b165afa9081156106fe5789916106e1575b50156106d35750906106af7f5548c837ab068cf56a2c2479df0882a4922fd203edb7517321831d95078c5f62949392610657610651610c48565b91610f37565b868351916323b872dd60e01b8784015216968760248301523060448301528460648301526064825261068882610bb4565b7f000000000000000000000000000000000000000000000000000000000000000016610d6b565b6106bb82600554610b32565b60055585875260068352808720610411838254610b32565b82516310f3d9c960e01b8152fd5b6106f89150863d8811610453576104458183610be6565b38610617565b84513d8b823e3d90fd5b8151631f2a200560e01b81528490fd5b8680fd5b5050346101315760203660031901126101315760209061073a610ac1565b90519060018060a01b03807f0000000000000000000000000000000000000000000000000000000000000000169116148152f35b505034610131578160031936011261013157517f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03168152602090f35b905082600319360112610153576107c7610ca1565b6107cf610c48565b82516342f9577960e11b81529092906001600160a01b039060208185817f000000000000000000000000000000000000000000000000000000000000000086165afa90811561089f57908291879161085e575b501690841603610851573415610844578361083d3485610f9c565b6001815580f35b51631f2a200560e01b8152fd5b51633a7cfa5d60e21b8152fd5b9150506020813d8211610897575b8161087960209383610be6565b810103126108935751818116810361089357819038610822565b8580fd5b3d915061086c565b83513d88823e3d90fd5b91905034610153576020366003190112610153578135906108c8610ca1565b6108d0610c48565b926108da84610f37565b6108e683600554610adc565b60055560018060a01b0380941693848652600660205282862061090a858254610adc565b905582519163a9059cbb60e01b602084015285602484015284604484015260448352608083019083821067ffffffffffffffff8311176109a557507f884edad9ce6fa2440d8a54cc123490eb96d2768479d49ff9c7366125a94243649492849261099992602096527f000000000000000000000000000000000000000000000000000000000000000016610d6b565b51908152a26001815580f35b634e487b7160e01b885260419052602487fd5b5050346101315781600319360112610131576020906005549051908152f35b505034610131578160031936011261013157602090610174610f7d565b90508260031936011261015357610a09610ca1565b610a11610c48565b916001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000811690841603610a56573415610844578361083d3485610f9c565b5163c18384c160e01b8152fd5b5050346101315760203660031901126101315760209181906001600160a01b03610a8b610ac1565b1681526008845220549051908152f35b50503461013157602036600319011261013157602090610174610abc610ac1565b610cf7565b600435906001600160a01b0382168203610ad757565b600080fd5b91908203918211610ae957565b634e487b7160e01b600052601160045260246000fd5b81810292918115918404141715610ae957565b8115610b1c570490565b634e487b7160e01b600052601260045260246000fd5b91908201809211610ae957565b6005548015610b9b57600454610b6b610b62610b59610ba2565b60035490610adc565b60025490610aff565b670de0b6b3a764000090818102918183041490151715610ae957610b9892610b9291610b12565b90610b32565b90565b5060045490565b600154804210600014610b9857504290565b60a0810190811067ffffffffffffffff821117610bd057604052565b634e487b7160e01b600052604160045260246000fd5b90601f8019910116810190811067ffffffffffffffff821117610bd057604052565b3d15610c43573d9067ffffffffffffffff8211610bd05760405191610c37601f8201601f191660200184610be6565b82523d6000602084013e565b606090565b337f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03161480610c96575b15610c92576013193601368111610ae9573560601c90565b3390565b506014361015610c7a565b600260005414610cb2576002600055565b60405162461bcd60e51b815260206004820152601f60248201527f5265656e7472616e637947756172643a207265656e7472616e742063616c6c006044820152606490fd5b610b989060018060a01b0316604060008281526006602052670de0b6b3a7640000610d4283832054610d3c610d2a610b3f565b87865260076020528686205490610adc565b90610aff565b049281526008602052205490610b32565b90816020910312610ad757518015158103610ad75790565b60408051908101916001600160a01b031667ffffffffffffffff831182841017610bd057610ddb926040526000806020958685527f5361666545524332303a206c6f772d6c6576656c2063616c6c206661696c656487860152868151910182855af1610dd5610c08565b91610e63565b805190828215928315610e4b575b50505015610df45750565b6084906040519062461bcd60e51b82526004820152602a60248201527f5361666545524332303a204552433230206f7065726174696f6e20646964206e6044820152691bdd081cdd58d8d9595960b21b6064820152fd5b610e5b9350820181019101610d53565b388281610de9565b91929015610ec55750815115610e77575090565b3b15610e805790565b60405162461bcd60e51b815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e74726163740000006044820152606490fd5b825190915015610ed85750805190602001fd5b6040519062461bcd60e51b82528160208060048301528251908160248401526000935b828510610f1e575050604492506000838284010152601f80199101168101030190fd5b8481018201518686016044015293810193859350610efb565b610f3f610b3f565b600455610f4a610ba2565b600355610f5681610cf7565b9060018060a01b031660005260086020526040600020556004546007602052604060002055565b60015480421015610f9657610b62610b98914290610adc565b50600090565b610fa4610b3f565b60045562093a80610fbd81420642039142908301610adc565b90600154828142101560001461107057610fd8915085610b12565b6002555b60025490600052600960205280604060002055801561105e57610fff8247610b12565b1061104c577f095667752957714306e1a6ad83495404412df6fdb932fca6dc849a7ee910d4c1916110366020924260035542610b32565b6001556040519384526001600160a01b031692a2565b604051633c6be1b360e01b8152600490fd5b6040516307ced7af60e01b8152600490fd5b61108a611084610b6261108f944290610adc565b87610b32565b610b12565b600255610fdc56fea164736f6c6343000813000aa164736f6c6343000813000a"; type GaugeFactoryConstructorParams = | [signer?: Signer] diff --git a/src/types/factories/contracts/factories/index.ts b/src/types/factories/contracts/factories/index.ts index 8cf20c0..53d3e66 100644 --- a/src/types/factories/contracts/factories/index.ts +++ b/src/types/factories/contracts/factories/index.ts @@ -3,4 +3,3 @@ /* eslint-disable */ export { FactoryRegistry__factory } from "./FactoryRegistry__factory"; export { GaugeFactory__factory } from "./GaugeFactory__factory"; -export { VotingRewardsFactory__factory } from "./VotingRewardsFactory__factory"; diff --git a/src/types/factories/contracts/gauges/Gauge__factory.ts b/src/types/factories/contracts/gauges/Gauge__factory.ts index 5d3535b..0923099 100644 --- a/src/types/factories/contracts/gauges/Gauge__factory.ts +++ b/src/types/factories/contracts/gauges/Gauge__factory.ts @@ -444,19 +444,6 @@ const _abi = [ stateMutability: "view", type: "function", }, - { - inputs: [], - name: "ve", - outputs: [ - { - internalType: "address", - name: "", - type: "address", - }, - ], - stateMutability: "view", - type: "function", - }, { inputs: [], name: "voter", @@ -486,7 +473,7 @@ const _abi = [ ] as const; const _bytecode = - "0x61010080604052346200016357606081620012ab803803809162000024828562000168565b83398101031262000163576020816200003f600493620001a2565b906200005b604062000053858401620001a2565b9201620001a2565b608092909252600160005560a05260c0819052604051630fc2838b60e11b815292839182906001600160a01b03165afa908115620001575760009162000113575b5060e0526040516110f39081620001b882396080518181816107520152610c9a015260a0518181816103d10152818161053201528181610695015261097f015260c0518181816102b20152818161032c015281816105f10152818161078e0152610a6b015260e0518181816107f901526109d80152f35b6020813d82116200014e575b816200012e6020938362000168565b810103126200014a57620001439150620001a2565b386200009c565b5080fd5b3d91506200011f565b6040513d6000823e3d90fd5b600080fd5b601f909101601f19168101906001600160401b038211908210176200018c57604052565b634e487b7160e01b600052604160045260246000fd5b51906001600160a01b0382168203620001635756fe6040608081526004908136101561001557600080fd5b600091823560e01c9081628cc26214610aea5781630700037d14610ab25781630c51dde414610a4357816316e6404814610a2657816318160ddd14610a075781631f850716146109c35781632e1a7d4d146108b45781633506c729146107bd57816346c96aac14610779578163572b6c05146107275781636e553f651461059957816370a082311461056157816372f702f31461051d5781637b0a47ee146104fe57816380faa57d146104e15781638b876347146104a957816394af5b6314610481578163b6b55f25146102dd578163c00007b0146101a5578163c8f33c9114610186578163cd3daf9d14610162578163df136d6514610140575063ebe2b12b1461011f57600080fd5b3461013c578160031936011261013c576020906001549051908152f35b5080fd5b90503461015e578260031936011261015e5760209250549051908152f35b8280fd5b50503461013c578160031936011261013c5760209061017f610b8e565b9051908152f35b50503461013c578160031936011261013c576020906003549051908152f35b90503461015e57602036600319011261015e576101c0610b10565b916101c9610cf0565b6101d1610c97565b6001600160a01b03808516949181168086141591826102b0575b50506102a2576101fa90610f86565b8284526008602052808420918483549384610218575b506001815580f35b558480808086885af1610229610c57565b501561026557507f1f89f96333d3133000ee447473151fa9606543368f02271c9d95ae14f13bcc679160209151908152a2388080808481610210565b6020606492519162461bcd60e51b835282015260186024820152773a3930b739b332b9103932bbb0b93239903330b4b632b21760411b6044820152fd5b505163ea8e4eb560e01b8152fd5b7f0000000000000000000000000000000000000000000000000000000000000000161415905038806101eb565b90503461015e5760208060031936011261047d5781356102fb610c97565b92610304610cf0565b811561046f578451631703e5f960e01b815230828201526001600160a01b03919084816024817f000000000000000000000000000000000000000000000000000000000000000087165afa908115610465578891610438575b501561042a5750907f5548c837ab068cf56a2c2479df0882a4922fd203edb7517321831d95078c5f629291610390610c97565b9461039a81610f86565b6103f6828851976323b872dd60e01b878a01521696876024820152306044820152846064820152606481526103ce81610c03565b837f000000000000000000000000000000000000000000000000000000000000000016610dba565b61040283600554610b81565b60055516948587526006835280872061041c838254610b81565b905551908152a36001815580f35b85516310f3d9c960e01b8152fd5b6104589150853d871161045e575b6104508183610c35565b810190610da2565b3861035d565b503d610446565b87513d8a823e3d90fd5b8451631f2a200560e01b8152fd5b8380fd5b90503461015e57602036600319011261015e5760209282913581526009845220549051908152f35b50503461013c57602036600319011261013c5760209181906001600160a01b036104d1610b10565b1681526007845220549051908152f35b50503461013c578160031936011261013c5760209061017f610bf1565b50503461013c578160031936011261013c576020906002549051908152f35b50503461013c578160031936011261013c57517f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03168152602090f35b50503461013c57602036600319011261013c5760209181906001600160a01b03610589610b10565b1681526006845220549051908152f35b9190503461015e578060031936011261015e576001600160a01b03602435818116939192823591858103610723576105cf610cf0565b8215610713578151631703e5f960e01b815230858201526020949085816024817f00000000000000000000000000000000000000000000000000000000000000008b165afa9081156107095789916106ec575b50156106de5750906106ba7f5548c837ab068cf56a2c2479df0882a4922fd203edb7517321831d95078c5f6294939261066261065c610c97565b91610f86565b868351916323b872dd60e01b8784015216968760248301523060448301528460648301526064825261069382610c03565b7f000000000000000000000000000000000000000000000000000000000000000016610dba565b6106c682600554610b81565b6005558587526006835280872061041c838254610b81565b82516310f3d9c960e01b8152fd5b6107039150863d881161045e576104508183610c35565b38610622565b84513d8b823e3d90fd5b8151631f2a200560e01b81528490fd5b8680fd5b50503461013c57602036600319011261013c57602090610745610b10565b90519060018060a01b03807f0000000000000000000000000000000000000000000000000000000000000000169116148152f35b50503461013c578160031936011261013c57517f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03168152602090f35b90508260031936011261015e576107d2610cf0565b6107da610c97565b82516342f9577960e11b81529092906001600160a01b039060208185817f000000000000000000000000000000000000000000000000000000000000000086165afa9081156108aa579082918791610869575b50169084160361085c57341561084f57836108483485610feb565b6001815580f35b51631f2a200560e01b8152fd5b51633a7cfa5d60e21b8152fd5b9150506020813d82116108a2575b8161088460209383610c35565b8101031261089e5751818116810361089e5781903861082d565b8580fd5b3d9150610877565b83513d88823e3d90fd5b9190503461015e57602036600319011261015e578135906108d3610cf0565b6108db610c97565b926108e584610f86565b6108f183600554610b2b565b60055560018060a01b03809416938486526006602052828620610915858254610b2b565b905582519163a9059cbb60e01b602084015285602484015284604484015260448352608083019083821067ffffffffffffffff8311176109b057507f884edad9ce6fa2440d8a54cc123490eb96d2768479d49ff9c7366125a9424364949284926109a492602096527f000000000000000000000000000000000000000000000000000000000000000016610dba565b51908152a26001815580f35b634e487b7160e01b885260419052602487fd5b50503461013c578160031936011261013c57517f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03168152602090f35b50503461013c578160031936011261013c576020906005549051908152f35b50503461013c578160031936011261013c5760209061017f610fcc565b90508260031936011261015e57610a58610cf0565b610a60610c97565b916001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000811690841603610aa557341561084f57836108483485610feb565b5163c18384c160e01b8152fd5b50503461013c57602036600319011261013c5760209181906001600160a01b03610ada610b10565b1681526008845220549051908152f35b50503461013c57602036600319011261013c5760209061017f610b0b610b10565b610d46565b600435906001600160a01b0382168203610b2657565b600080fd5b91908203918211610b3857565b634e487b7160e01b600052601160045260246000fd5b81810292918115918404141715610b3857565b8115610b6b570490565b634e487b7160e01b600052601260045260246000fd5b91908201809211610b3857565b6005548015610bea57600454610bba610bb1610ba8610bf1565b60035490610b2b565b60025490610b4e565b670de0b6b3a764000090818102918183041490151715610b3857610be792610be191610b61565b90610b81565b90565b5060045490565b600154804210600014610be757504290565b60a0810190811067ffffffffffffffff821117610c1f57604052565b634e487b7160e01b600052604160045260246000fd5b90601f8019910116810190811067ffffffffffffffff821117610c1f57604052565b3d15610c92573d9067ffffffffffffffff8211610c1f5760405191610c86601f8201601f191660200184610c35565b82523d6000602084013e565b606090565b337f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03161480610ce5575b15610ce1576013193601368111610b38573560601c90565b3390565b506014361015610cc9565b600260005414610d01576002600055565b60405162461bcd60e51b815260206004820152601f60248201527f5265656e7472616e637947756172643a207265656e7472616e742063616c6c006044820152606490fd5b610be79060018060a01b0316604060008281526006602052670de0b6b3a7640000610d9183832054610d8b610d79610b8e565b87865260076020528686205490610b2b565b90610b4e565b049281526008602052205490610b81565b90816020910312610b2657518015158103610b265790565b60408051908101916001600160a01b031667ffffffffffffffff831182841017610c1f57610e2a926040526000806020958685527f5361666545524332303a206c6f772d6c6576656c2063616c6c206661696c656487860152868151910182855af1610e24610c57565b91610eb2565b805190828215928315610e9a575b50505015610e435750565b6084906040519062461bcd60e51b82526004820152602a60248201527f5361666545524332303a204552433230206f7065726174696f6e20646964206e6044820152691bdd081cdd58d8d9595960b21b6064820152fd5b610eaa9350820181019101610da2565b388281610e38565b91929015610f145750815115610ec6575090565b3b15610ecf5790565b60405162461bcd60e51b815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e74726163740000006044820152606490fd5b825190915015610f275750805190602001fd5b6040519062461bcd60e51b82528160208060048301528251908160248401526000935b828510610f6d575050604492506000838284010152601f80199101168101030190fd5b8481018201518686016044015293810193859350610f4a565b610f8e610b8e565b600455610f99610bf1565b600355610fa581610d46565b9060018060a01b031660005260086020526040600020556004546007602052604060002055565b60015480421015610fe557610bb1610be7914290610b2b565b50600090565b610ff3610b8e565b60045562093a8061100c81420642039142908301610b2b565b9060015482814210156000146110bf57611027915085610b61565b6002555b6002549060005260096020528060406000205580156110ad5761104e8247610b61565b1061109b577f095667752957714306e1a6ad83495404412df6fdb932fca6dc849a7ee910d4c1916110856020924260035542610b81565b6001556040519384526001600160a01b031692a2565b604051633c6be1b360e01b8152600490fd5b6040516307ced7af60e01b8152600490fd5b6110d96110d3610bb16110de944290610b2b565b87610b81565b610b61565b60025561102b56fea164736f6c6343000813000a"; + "0x60e0346100d857601f6111ac38819003918201601f19168301916001600160401b038311848410176100dd578084926060946040528339810103126100d857610047816100f3565b906100606040610059602084016100f3565b92016100f3565b91608052600160005560a05260c0526040516110a4908161010882396080518181816107470152610c4b015260a0518181816103c6015281816105270152818161068a0152610974015260c0518181816102a701528181610321015281816105e601528181610783015281816107ee0152610a1c0152f35b600080fd5b634e487b7160e01b600052604160045260246000fd5b51906001600160a01b03821682036100d85756fe6040608081526004908136101561001557600080fd5b600091823560e01c9081628cc26214610a9b5781630700037d14610a635781630c51dde4146109f457816316e64048146109d757816318160ddd146109b85781632e1a7d4d146108a95781633506c729146107b257816346c96aac1461076e578163572b6c051461071c5781636e553f651461058e57816370a082311461055657816372f702f3146105125781637b0a47ee146104f357816380faa57d146104d65781638b8763471461049e57816394af5b6314610476578163b6b55f25146102d2578163c00007b01461019a578163c8f33c911461017b578163cd3daf9d14610157578163df136d6514610135575063ebe2b12b1461011457600080fd5b346101315781600319360112610131576020906001549051908152f35b5080fd5b90503461015357826003193601126101535760209250549051908152f35b8280fd5b505034610131578160031936011261013157602090610174610b3f565b9051908152f35b5050346101315781600319360112610131576020906003549051908152f35b905034610153576020366003190112610153576101b5610ac1565b916101be610ca1565b6101c6610c48565b6001600160a01b03808516949181168086141591826102a5575b5050610297576101ef90610f37565b828452600860205280842091848354938461020d575b506001815580f35b558480808086885af161021e610c08565b501561025a57507f1f89f96333d3133000ee447473151fa9606543368f02271c9d95ae14f13bcc679160209151908152a2388080808481610205565b6020606492519162461bcd60e51b835282015260186024820152773a3930b739b332b9103932bbb0b93239903330b4b632b21760411b6044820152fd5b505163ea8e4eb560e01b8152fd5b7f0000000000000000000000000000000000000000000000000000000000000000161415905038806101e0565b905034610153576020806003193601126104725781356102f0610c48565b926102f9610ca1565b8115610464578451631703e5f960e01b815230828201526001600160a01b03919084816024817f000000000000000000000000000000000000000000000000000000000000000087165afa90811561045a57889161042d575b501561041f5750907f5548c837ab068cf56a2c2479df0882a4922fd203edb7517321831d95078c5f629291610385610c48565b9461038f81610f37565b6103eb828851976323b872dd60e01b878a01521696876024820152306044820152846064820152606481526103c381610bb4565b837f000000000000000000000000000000000000000000000000000000000000000016610d6b565b6103f783600554610b32565b600555169485875260068352808720610411838254610b32565b905551908152a36001815580f35b85516310f3d9c960e01b8152fd5b61044d9150853d8711610453575b6104458183610be6565b810190610d53565b38610352565b503d61043b565b87513d8a823e3d90fd5b8451631f2a200560e01b8152fd5b8380fd5b9050346101535760203660031901126101535760209282913581526009845220549051908152f35b5050346101315760203660031901126101315760209181906001600160a01b036104c6610ac1565b1681526007845220549051908152f35b505034610131578160031936011261013157602090610174610ba2565b5050346101315781600319360112610131576020906002549051908152f35b505034610131578160031936011261013157517f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03168152602090f35b5050346101315760203660031901126101315760209181906001600160a01b0361057e610ac1565b1681526006845220549051908152f35b919050346101535780600319360112610153576001600160a01b03602435818116939192823591858103610718576105c4610ca1565b8215610708578151631703e5f960e01b815230858201526020949085816024817f00000000000000000000000000000000000000000000000000000000000000008b165afa9081156106fe5789916106e1575b50156106d35750906106af7f5548c837ab068cf56a2c2479df0882a4922fd203edb7517321831d95078c5f62949392610657610651610c48565b91610f37565b868351916323b872dd60e01b8784015216968760248301523060448301528460648301526064825261068882610bb4565b7f000000000000000000000000000000000000000000000000000000000000000016610d6b565b6106bb82600554610b32565b60055585875260068352808720610411838254610b32565b82516310f3d9c960e01b8152fd5b6106f89150863d8811610453576104458183610be6565b38610617565b84513d8b823e3d90fd5b8151631f2a200560e01b81528490fd5b8680fd5b5050346101315760203660031901126101315760209061073a610ac1565b90519060018060a01b03807f0000000000000000000000000000000000000000000000000000000000000000169116148152f35b505034610131578160031936011261013157517f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03168152602090f35b905082600319360112610153576107c7610ca1565b6107cf610c48565b82516342f9577960e11b81529092906001600160a01b039060208185817f000000000000000000000000000000000000000000000000000000000000000086165afa90811561089f57908291879161085e575b501690841603610851573415610844578361083d3485610f9c565b6001815580f35b51631f2a200560e01b8152fd5b51633a7cfa5d60e21b8152fd5b9150506020813d8211610897575b8161087960209383610be6565b810103126108935751818116810361089357819038610822565b8580fd5b3d915061086c565b83513d88823e3d90fd5b91905034610153576020366003190112610153578135906108c8610ca1565b6108d0610c48565b926108da84610f37565b6108e683600554610adc565b60055560018060a01b0380941693848652600660205282862061090a858254610adc565b905582519163a9059cbb60e01b602084015285602484015284604484015260448352608083019083821067ffffffffffffffff8311176109a557507f884edad9ce6fa2440d8a54cc123490eb96d2768479d49ff9c7366125a94243649492849261099992602096527f000000000000000000000000000000000000000000000000000000000000000016610d6b565b51908152a26001815580f35b634e487b7160e01b885260419052602487fd5b5050346101315781600319360112610131576020906005549051908152f35b505034610131578160031936011261013157602090610174610f7d565b90508260031936011261015357610a09610ca1565b610a11610c48565b916001600160a01b037f0000000000000000000000000000000000000000000000000000000000000000811690841603610a56573415610844578361083d3485610f9c565b5163c18384c160e01b8152fd5b5050346101315760203660031901126101315760209181906001600160a01b03610a8b610ac1565b1681526008845220549051908152f35b50503461013157602036600319011261013157602090610174610abc610ac1565b610cf7565b600435906001600160a01b0382168203610ad757565b600080fd5b91908203918211610ae957565b634e487b7160e01b600052601160045260246000fd5b81810292918115918404141715610ae957565b8115610b1c570490565b634e487b7160e01b600052601260045260246000fd5b91908201809211610ae957565b6005548015610b9b57600454610b6b610b62610b59610ba2565b60035490610adc565b60025490610aff565b670de0b6b3a764000090818102918183041490151715610ae957610b9892610b9291610b12565b90610b32565b90565b5060045490565b600154804210600014610b9857504290565b60a0810190811067ffffffffffffffff821117610bd057604052565b634e487b7160e01b600052604160045260246000fd5b90601f8019910116810190811067ffffffffffffffff821117610bd057604052565b3d15610c43573d9067ffffffffffffffff8211610bd05760405191610c37601f8201601f191660200184610be6565b82523d6000602084013e565b606090565b337f00000000000000000000000000000000000000000000000000000000000000006001600160a01b03161480610c96575b15610c92576013193601368111610ae9573560601c90565b3390565b506014361015610c7a565b600260005414610cb2576002600055565b60405162461bcd60e51b815260206004820152601f60248201527f5265656e7472616e637947756172643a207265656e7472616e742063616c6c006044820152606490fd5b610b989060018060a01b0316604060008281526006602052670de0b6b3a7640000610d4283832054610d3c610d2a610b3f565b87865260076020528686205490610adc565b90610aff565b049281526008602052205490610b32565b90816020910312610ad757518015158103610ad75790565b60408051908101916001600160a01b031667ffffffffffffffff831182841017610bd057610ddb926040526000806020958685527f5361666545524332303a206c6f772d6c6576656c2063616c6c206661696c656487860152868151910182855af1610dd5610c08565b91610e63565b805190828215928315610e4b575b50505015610df45750565b6084906040519062461bcd60e51b82526004820152602a60248201527f5361666545524332303a204552433230206f7065726174696f6e20646964206e6044820152691bdd081cdd58d8d9595960b21b6064820152fd5b610e5b9350820181019101610d53565b388281610de9565b91929015610ec55750815115610e77575090565b3b15610e805790565b60405162461bcd60e51b815260206004820152601d60248201527f416464726573733a2063616c6c20746f206e6f6e2d636f6e74726163740000006044820152606490fd5b825190915015610ed85750805190602001fd5b6040519062461bcd60e51b82528160208060048301528251908160248401526000935b828510610f1e575050604492506000838284010152601f80199101168101030190fd5b8481018201518686016044015293810193859350610efb565b610f3f610b3f565b600455610f4a610ba2565b600355610f5681610cf7565b9060018060a01b031660005260086020526040600020556004546007602052604060002055565b60015480421015610f9657610b62610b98914290610adc565b50600090565b610fa4610b3f565b60045562093a80610fbd81420642039142908301610adc565b90600154828142101560001461107057610fd8915085610b12565b6002555b60025490600052600960205280604060002055801561105e57610fff8247610b12565b1061104c577f095667752957714306e1a6ad83495404412df6fdb932fca6dc849a7ee910d4c1916110366020924260035542610b32565b6001556040519384526001600160a01b031692a2565b604051633c6be1b360e01b8152600490fd5b6040516307ced7af60e01b8152600490fd5b61108a611084610b6261108f944290610adc565b87610b32565b610b12565b600255610fdc56fea164736f6c6343000813000a"; type GaugeConstructorParams = | [signer?: Signer] diff --git a/src/types/factories/contracts/index.ts b/src/types/factories/contracts/index.ts index 75dc1e3..63ec9c8 100644 --- a/src/types/factories/contracts/index.ts +++ b/src/types/factories/contracts/index.ts @@ -4,16 +4,11 @@ export * as art from "./art"; export * as factories from "./factories"; export * as gauges from "./gauges"; -export * as governance from "./governance"; export * as interfaces from "./interfaces"; export * as libraries from "./libraries"; -export * as rewards from "./rewards"; export * as test from "./test"; export { DAOForwarder__factory } from "./DAOForwarder__factory"; -export { MarshallGovernor__factory } from "./MarshallGovernor__factory"; export { RewardsDistributor__factory } from "./RewardsDistributor__factory"; export { Vault__factory } from "./Vault__factory"; -export { VeArtProxy__factory } from "./VeArtProxy__factory"; export { VestingMaster__factory } from "./VestingMaster__factory"; export { Voter__factory } from "./Voter__factory"; -export { VotingEscrow__factory } from "./VotingEscrow__factory"; diff --git a/src/types/factories/contracts/interfaces/IGauge__factory.ts b/src/types/factories/contracts/interfaces/IGauge__factory.ts index 02c0d52..c28c0a2 100644 --- a/src/types/factories/contracts/interfaces/IGauge__factory.ts +++ b/src/types/factories/contracts/interfaces/IGauge__factory.ts @@ -396,19 +396,6 @@ const _abi = [ stateMutability: "view", type: "function", }, - { - inputs: [], - name: "ve", - outputs: [ - { - internalType: "address", - name: "", - type: "address", - }, - ], - stateMutability: "view", - type: "function", - }, { inputs: [], name: "voter", diff --git a/src/types/factories/contracts/interfaces/IRewardsDistributor__factory.ts b/src/types/factories/contracts/interfaces/IRewardsDistributor__factory.ts index ac52457..cb9b26b 100644 --- a/src/types/factories/contracts/interfaces/IRewardsDistributor__factory.ts +++ b/src/types/factories/contracts/interfaces/IRewardsDistributor__factory.ts @@ -9,11 +9,6 @@ import type { } from "../../../contracts/interfaces/IRewardsDistributor"; const _abi = [ - { - inputs: [], - name: "NotManagedOrNormalNFT", - type: "error", - }, { inputs: [], name: "NotVault", @@ -21,149 +16,52 @@ const _abi = [ }, { inputs: [], - name: "UpdatePeriod", + name: "ZeroAddress", type: "error", }, - { - anonymous: false, - inputs: [ - { - indexed: false, - internalType: "uint256", - name: "time", - type: "uint256", - }, - { - indexed: false, - internalType: "uint256", - name: "tokens", - type: "uint256", - }, - ], - name: "CheckpointToken", - type: "event", - }, - { - anonymous: false, - inputs: [ - { - indexed: true, - internalType: "uint256", - name: "tokenId", - type: "uint256", - }, - { - indexed: true, - internalType: "uint256", - name: "epochStart", - type: "uint256", - }, - { - indexed: true, - internalType: "uint256", - name: "epochEnd", - type: "uint256", - }, - { - indexed: false, - internalType: "uint256", - name: "amount", - type: "uint256", - }, - ], - name: "Claimed", - type: "event", - }, { inputs: [], - name: "WEEK", - outputs: [ - { - internalType: "uint256", - name: "", - type: "uint256", - }, - ], - stateMutability: "view", - type: "function", + name: "ZeroAmount", + type: "error", }, { inputs: [], - name: "checkpointToken", + name: "distributeRewards", outputs: [], - stateMutability: "nonpayable", + stateMutability: "payable", type: "function", }, { inputs: [ { - internalType: "uint256", - name: "tokenId", - type: "uint256", + internalType: "address", + name: "_token", + type: "address", }, - ], - name: "claim", - outputs: [ { internalType: "uint256", - name: "", + name: "_amount", type: "uint256", }, ], + name: "distributeRewards", + outputs: [], stateMutability: "nonpayable", type: "function", }, { inputs: [ { - internalType: "uint256[]", - name: "tokenIds", - type: "uint256[]", - }, - ], - name: "claimMany", - outputs: [ - { - internalType: "bool", - name: "", - type: "bool", + internalType: "address", + name: "_manager", + type: "address", }, ], + name: "setStrategyManager", + outputs: [], stateMutability: "nonpayable", type: "function", }, - { - inputs: [ - { - internalType: "uint256", - name: "tokenId", - type: "uint256", - }, - ], - name: "claimable", - outputs: [ - { - internalType: "uint256", - name: "", - type: "uint256", - }, - ], - stateMutability: "view", - type: "function", - }, - { - inputs: [], - name: "lastTokenTime", - outputs: [ - { - internalType: "uint256", - name: "", - type: "uint256", - }, - ], - stateMutability: "view", - type: "function", - }, { inputs: [ { @@ -179,52 +77,7 @@ const _abi = [ }, { inputs: [], - name: "startTime", - outputs: [ - { - internalType: "uint256", - name: "", - type: "uint256", - }, - ], - stateMutability: "view", - type: "function", - }, - { - inputs: [ - { - internalType: "uint256", - name: "tokenId", - type: "uint256", - }, - ], - name: "timeCursorOf", - outputs: [ - { - internalType: "uint256", - name: "", - type: "uint256", - }, - ], - stateMutability: "view", - type: "function", - }, - { - inputs: [], - name: "tokenLastBalance", - outputs: [ - { - internalType: "uint256", - name: "", - type: "uint256", - }, - ], - stateMutability: "view", - type: "function", - }, - { - inputs: [], - name: "vault", + name: "strategyManager", outputs: [ { internalType: "address", @@ -237,10 +90,10 @@ const _abi = [ }, { inputs: [], - name: "ve", + name: "vault", outputs: [ { - internalType: "contract IVotingEscrow", + internalType: "address", name: "", type: "address", }, diff --git a/src/types/factories/contracts/interfaces/IVault__factory.ts b/src/types/factories/contracts/interfaces/IVault__factory.ts index 2a1db99..a9698ec 100644 --- a/src/types/factories/contracts/interfaces/IVault__factory.ts +++ b/src/types/factories/contracts/interfaces/IVault__factory.ts @@ -290,19 +290,6 @@ const _abi = [ stateMutability: "nonpayable", type: "function", }, - { - inputs: [], - name: "ve", - outputs: [ - { - internalType: "contract IVotingEscrow", - name: "", - type: "address", - }, - ], - stateMutability: "view", - type: "function", - }, { inputs: [], name: "veRate", diff --git a/src/types/factories/contracts/interfaces/IVoter__factory.ts b/src/types/factories/contracts/interfaces/IVoter__factory.ts index 629f4ba..d93567f 100644 --- a/src/types/factories/contracts/interfaces/IVoter__factory.ts +++ b/src/types/factories/contracts/interfaces/IVoter__factory.ts @@ -19,6 +19,11 @@ const _abi = [ name: "DistributeWindow", type: "error", }, + { + inputs: [], + name: "EpochVoteEnd", + type: "error", + }, { inputs: [], name: "FactoryPathNotApproved", @@ -96,11 +101,6 @@ const _abi = [ name: "NotVault", type: "error", }, - { - inputs: [], - name: "NotWhitelistedNFT", - type: "error", - }, { inputs: [], name: "NotWhitelistedToken", @@ -151,12 +151,6 @@ const _abi = [ name: "pool", type: "address", }, - { - indexed: true, - internalType: "uint256", - name: "tokenId", - type: "uint256", - }, { indexed: false, internalType: "uint256", @@ -213,12 +207,6 @@ const _abi = [ name: "poolFactory", type: "address", }, - { - indexed: true, - internalType: "address", - name: "votingRewardsFactory", - type: "address", - }, { indexed: true, internalType: "address", @@ -231,12 +219,6 @@ const _abi = [ name: "pool", type: "address", }, - { - indexed: false, - internalType: "address", - name: "bribeVotingReward", - type: "address", - }, { indexed: false, internalType: "address", @@ -313,12 +295,6 @@ const _abi = [ name: "pool", type: "address", }, - { - indexed: true, - internalType: "uint256", - name: "tokenId", - type: "uint256", - }, { indexed: false, internalType: "uint256", @@ -341,31 +317,6 @@ const _abi = [ name: "Voted", type: "event", }, - { - anonymous: false, - inputs: [ - { - indexed: true, - internalType: "address", - name: "whitelister", - type: "address", - }, - { - indexed: true, - internalType: "uint256", - name: "tokenId", - type: "uint256", - }, - { - indexed: true, - internalType: "bool", - name: "_bool", - type: "bool", - }, - ], - name: "WhitelistNFT", - type: "event", - }, { anonymous: false, inputs: [ @@ -391,29 +342,6 @@ const _abi = [ name: "WhitelistToken", type: "event", }, - { - inputs: [ - { - internalType: "address[]", - name: "_bribes", - type: "address[]", - }, - { - internalType: "address[][]", - name: "_tokens", - type: "address[][]", - }, - { - internalType: "uint256", - name: "_tokenId", - type: "uint256", - }, - ], - name: "claimBribes", - outputs: [], - stateMutability: "nonpayable", - type: "function", - }, { inputs: [ { @@ -540,25 +468,6 @@ const _abi = [ stateMutability: "view", type: "function", }, - { - inputs: [ - { - internalType: "address", - name: "gauge", - type: "address", - }, - ], - name: "gaugeToBribe", - outputs: [ - { - internalType: "address", - name: "", - type: "address", - }, - ], - stateMutability: "view", - type: "function", - }, { inputs: [ { @@ -629,25 +538,6 @@ const _abi = [ stateMutability: "view", type: "function", }, - { - inputs: [ - { - internalType: "uint256", - name: "tokenId", - type: "uint256", - }, - ], - name: "isWhitelistedNFT", - outputs: [ - { - internalType: "bool", - name: "", - type: "bool", - }, - ], - stateMutability: "view", - type: "function", - }, { inputs: [ { @@ -683,9 +573,9 @@ const _abi = [ { inputs: [ { - internalType: "uint256", - name: "tokenId", - type: "uint256", + internalType: "address", + name: "user", + type: "address", }, ], name: "lastVoted", @@ -733,13 +623,7 @@ const _abi = [ type: "function", }, { - inputs: [ - { - internalType: "uint256", - name: "_tokenId", - type: "uint256", - }, - ], + inputs: [], name: "poke", outputs: [], stateMutability: "nonpayable", @@ -765,13 +649,7 @@ const _abi = [ type: "function", }, { - inputs: [ - { - internalType: "uint256", - name: "_tokenId", - type: "uint256", - }, - ], + inputs: [], name: "reset", outputs: [], stateMutability: "nonpayable", @@ -829,6 +707,32 @@ const _abi = [ stateMutability: "nonpayable", type: "function", }, + { + inputs: [], + name: "strategyManager", + outputs: [ + { + internalType: "address", + name: "", + type: "address", + }, + ], + stateMutability: "view", + type: "function", + }, + { + inputs: [], + name: "team", + outputs: [ + { + internalType: "address", + name: "", + type: "address", + }, + ], + stateMutability: "view", + type: "function", + }, { inputs: [], name: "totalWeight", @@ -889,9 +793,9 @@ const _abi = [ { inputs: [ { - internalType: "uint256", - name: "tokenId", - type: "uint256", + internalType: "address", + name: "user", + type: "address", }, ], name: "usedWeights", @@ -918,26 +822,8 @@ const _abi = [ stateMutability: "view", type: "function", }, - { - inputs: [], - name: "ve", - outputs: [ - { - internalType: "address", - name: "", - type: "address", - }, - ], - stateMutability: "view", - type: "function", - }, { inputs: [ - { - internalType: "uint256", - name: "_tokenId", - type: "uint256", - }, { internalType: "address[]", name: "_poolVote", @@ -957,9 +843,9 @@ const _abi = [ { inputs: [ { - internalType: "uint256", - name: "tokenId", - type: "uint256", + internalType: "address", + name: "user", + type: "address", }, { internalType: "address", @@ -997,24 +883,6 @@ const _abi = [ stateMutability: "view", type: "function", }, - { - inputs: [ - { - internalType: "uint256", - name: "_tokenId", - type: "uint256", - }, - { - internalType: "bool", - name: "_bool", - type: "bool", - }, - ], - name: "whitelistNFT", - outputs: [], - stateMutability: "nonpayable", - type: "function", - }, { inputs: [ { diff --git a/src/types/factories/contracts/interfaces/factories/IFactoryRegistry__factory.ts b/src/types/factories/contracts/interfaces/factories/IFactoryRegistry__factory.ts index e148572..eec9b9f 100644 --- a/src/types/factories/contracts/interfaces/factories/IFactoryRegistry__factory.ts +++ b/src/types/factories/contracts/interfaces/factories/IFactoryRegistry__factory.ts @@ -48,12 +48,6 @@ const _abi = [ name: "poolFactory", type: "address", }, - { - indexed: true, - internalType: "address", - name: "votingRewardsFactory", - type: "address", - }, { indexed: true, internalType: "address", @@ -86,12 +80,6 @@ const _abi = [ name: "poolFactory", type: "address", }, - { - indexed: true, - internalType: "address", - name: "votingRewardsFactory", - type: "address", - }, { indexed: true, internalType: "address", @@ -109,11 +97,6 @@ const _abi = [ name: "poolFactory", type: "address", }, - { - internalType: "address", - name: "votingRewardsFactory", - type: "address", - }, { internalType: "address", name: "gaugeFactory", @@ -135,11 +118,6 @@ const _abi = [ ], name: "factoriesToPoolFactory", outputs: [ - { - internalType: "address", - name: "votingRewardsFactory", - type: "address", - }, { internalType: "address", name: "gaugeFactory", diff --git a/src/types/factories/contracts/interfaces/index.ts b/src/types/factories/contracts/interfaces/index.ts index f1a3b25..ce36c58 100644 --- a/src/types/factories/contracts/interfaces/index.ts +++ b/src/types/factories/contracts/interfaces/index.ts @@ -3,9 +3,7 @@ /* eslint-disable */ export * as factories from "./factories"; export { IGauge__factory } from "./IGauge__factory"; -export { IReward__factory } from "./IReward__factory"; export { IRewardsDistributor__factory } from "./IRewardsDistributor__factory"; +export { IStrategyManager__factory } from "./IStrategyManager__factory"; export { IVault__factory } from "./IVault__factory"; -export { IVeArtProxy__factory } from "./IVeArtProxy__factory"; export { IVoter__factory } from "./IVoter__factory"; -export { IVotingEscrow__factory } from "./IVotingEscrow__factory"; diff --git a/src/types/factories/contracts/libraries/index.ts b/src/types/factories/contracts/libraries/index.ts index 17103b2..17a059a 100644 --- a/src/types/factories/contracts/libraries/index.ts +++ b/src/types/factories/contracts/libraries/index.ts @@ -1,6 +1,4 @@ /* Autogenerated file. Do not edit manually. */ /* tslint:disable */ /* eslint-disable */ -export { BalanceLogicLibrary__factory } from "./BalanceLogicLibrary__factory"; -export { DelegationLogicLibrary__factory } from "./DelegationLogicLibrary__factory"; export { SafeCastLibrary__factory } from "./SafeCastLibrary__factory"; diff --git a/src/types/factories/contracts/test/index.ts b/src/types/factories/contracts/test/index.ts index 33edb32..34ddc64 100644 --- a/src/types/factories/contracts/test/index.ts +++ b/src/types/factories/contracts/test/index.ts @@ -1,4 +1,5 @@ /* Autogenerated file. Do not edit manually. */ /* tslint:disable */ /* eslint-disable */ +export { TestStrategyManager__factory } from "./TestStrategyManager__factory"; export { TestToken__factory } from "./TestToken__factory"; diff --git a/src/types/hardhat.d.ts b/src/types/hardhat.d.ts index d3d2d03..447e8d5 100644 --- a/src/types/hardhat.d.ts +++ b/src/types/hardhat.d.ts @@ -25,34 +25,14 @@ declare module "hardhat/types/runtime" { name: "Initializable", signerOrOptions?: ethers.Signer | FactoryOptions ): Promise; - getContractFactory( - name: "ReentrancyGuardUpgradeable", - signerOrOptions?: ethers.Signer | FactoryOptions - ): Promise; getContractFactory( name: "Ownable", signerOrOptions?: ethers.Signer | FactoryOptions ): Promise; - getContractFactory( - name: "IERC4906", - signerOrOptions?: ethers.Signer | FactoryOptions - ): Promise; - getContractFactory( - name: "IERC5267", - signerOrOptions?: ethers.Signer | FactoryOptions - ): Promise; - getContractFactory( - name: "IERC6372", - signerOrOptions?: ethers.Signer | FactoryOptions - ): Promise; getContractFactory( name: "ERC2771Context", signerOrOptions?: ethers.Signer | FactoryOptions ): Promise; - getContractFactory( - name: "IERC1155Receiver", - signerOrOptions?: ethers.Signer | FactoryOptions - ): Promise; getContractFactory( name: "ERC20", signerOrOptions?: ethers.Signer | FactoryOptions @@ -69,22 +49,6 @@ declare module "hardhat/types/runtime" { name: "IERC20", signerOrOptions?: ethers.Signer | FactoryOptions ): Promise; - getContractFactory( - name: "IERC721Metadata", - signerOrOptions?: ethers.Signer | FactoryOptions - ): Promise; - getContractFactory( - name: "IERC721", - signerOrOptions?: ethers.Signer | FactoryOptions - ): Promise; - getContractFactory( - name: "IERC721Receiver", - signerOrOptions?: ethers.Signer | FactoryOptions - ): Promise; - getContractFactory( - name: "EIP712", - signerOrOptions?: ethers.Signer | FactoryOptions - ): Promise; getContractFactory( name: "ERC165", signerOrOptions?: ethers.Signer | FactoryOptions @@ -93,14 +57,6 @@ declare module "hardhat/types/runtime" { name: "IERC165", signerOrOptions?: ethers.Signer | FactoryOptions ): Promise; - getContractFactory( - name: "ShortStrings", - signerOrOptions?: ethers.Signer | FactoryOptions - ): Promise; - getContractFactory( - name: "DoubleEndedQueue", - signerOrOptions?: ethers.Signer | FactoryOptions - ): Promise; getContractFactory( name: "PerlinNoise", signerOrOptions?: ethers.Signer | FactoryOptions @@ -121,38 +77,10 @@ declare module "hardhat/types/runtime" { name: "GaugeFactory", signerOrOptions?: ethers.Signer | FactoryOptions ): Promise; - getContractFactory( - name: "VotingRewardsFactory", - signerOrOptions?: ethers.Signer | FactoryOptions - ): Promise; getContractFactory( name: "Gauge", signerOrOptions?: ethers.Signer | FactoryOptions ): Promise; - getContractFactory( - name: "IVetoGovernor", - signerOrOptions?: ethers.Signer | FactoryOptions - ): Promise; - getContractFactory( - name: "IVotes", - signerOrOptions?: ethers.Signer | FactoryOptions - ): Promise; - getContractFactory( - name: "VetoGovernor", - signerOrOptions?: ethers.Signer | FactoryOptions - ): Promise; - getContractFactory( - name: "VetoGovernorCountingSimple", - signerOrOptions?: ethers.Signer | FactoryOptions - ): Promise; - getContractFactory( - name: "VetoGovernorVotes", - signerOrOptions?: ethers.Signer | FactoryOptions - ): Promise; - getContractFactory( - name: "VetoGovernorVotesQuorumFraction", - signerOrOptions?: ethers.Signer | FactoryOptions - ): Promise; getContractFactory( name: "IFactoryRegistry", signerOrOptions?: ethers.Signer | FactoryOptions @@ -169,62 +97,34 @@ declare module "hardhat/types/runtime" { name: "IGauge", signerOrOptions?: ethers.Signer | FactoryOptions ): Promise; - getContractFactory( - name: "IReward", - signerOrOptions?: ethers.Signer | FactoryOptions - ): Promise; getContractFactory( name: "IRewardsDistributor", signerOrOptions?: ethers.Signer | FactoryOptions ): Promise; getContractFactory( - name: "IVault", + name: "IStrategyManager", signerOrOptions?: ethers.Signer | FactoryOptions - ): Promise; + ): Promise; getContractFactory( - name: "IVeArtProxy", + name: "IVault", signerOrOptions?: ethers.Signer | FactoryOptions - ): Promise; + ): Promise; getContractFactory( name: "IVoter", signerOrOptions?: ethers.Signer | FactoryOptions ): Promise; - getContractFactory( - name: "IVotingEscrow", - signerOrOptions?: ethers.Signer | FactoryOptions - ): Promise; - getContractFactory( - name: "BalanceLogicLibrary", - signerOrOptions?: ethers.Signer | FactoryOptions - ): Promise; - getContractFactory( - name: "DelegationLogicLibrary", - signerOrOptions?: ethers.Signer | FactoryOptions - ): Promise; getContractFactory( name: "SafeCastLibrary", signerOrOptions?: ethers.Signer | FactoryOptions ): Promise; - getContractFactory( - name: "MarshallGovernor", - signerOrOptions?: ethers.Signer | FactoryOptions - ): Promise; - getContractFactory( - name: "BribeVotingReward", - signerOrOptions?: ethers.Signer | FactoryOptions - ): Promise; - getContractFactory( - name: "Reward", - signerOrOptions?: ethers.Signer | FactoryOptions - ): Promise; - getContractFactory( - name: "VotingReward", - signerOrOptions?: ethers.Signer | FactoryOptions - ): Promise; getContractFactory( name: "RewardsDistributor", signerOrOptions?: ethers.Signer | FactoryOptions ): Promise; + getContractFactory( + name: "TestStrategyManager", + signerOrOptions?: ethers.Signer | FactoryOptions + ): Promise; getContractFactory( name: "TestToken", signerOrOptions?: ethers.Signer | FactoryOptions @@ -233,10 +133,6 @@ declare module "hardhat/types/runtime" { name: "Vault", signerOrOptions?: ethers.Signer | FactoryOptions ): Promise; - getContractFactory( - name: "VeArtProxy", - signerOrOptions?: ethers.Signer | FactoryOptions - ): Promise; getContractFactory( name: "VestingMaster", signerOrOptions?: ethers.Signer | FactoryOptions @@ -245,10 +141,6 @@ declare module "hardhat/types/runtime" { name: "Voter", signerOrOptions?: ethers.Signer | FactoryOptions ): Promise; - getContractFactory( - name: "VotingEscrow", - signerOrOptions?: ethers.Signer | FactoryOptions - ): Promise; getContractAt( name: "Forwarder", @@ -265,41 +157,16 @@ declare module "hardhat/types/runtime" { address: string | ethers.Addressable, signer?: ethers.Signer ): Promise; - getContractAt( - name: "ReentrancyGuardUpgradeable", - address: string | ethers.Addressable, - signer?: ethers.Signer - ): Promise; getContractAt( name: "Ownable", address: string | ethers.Addressable, signer?: ethers.Signer ): Promise; - getContractAt( - name: "IERC4906", - address: string | ethers.Addressable, - signer?: ethers.Signer - ): Promise; - getContractAt( - name: "IERC5267", - address: string | ethers.Addressable, - signer?: ethers.Signer - ): Promise; - getContractAt( - name: "IERC6372", - address: string | ethers.Addressable, - signer?: ethers.Signer - ): Promise; getContractAt( name: "ERC2771Context", address: string | ethers.Addressable, signer?: ethers.Signer ): Promise; - getContractAt( - name: "IERC1155Receiver", - address: string | ethers.Addressable, - signer?: ethers.Signer - ): Promise; getContractAt( name: "ERC20", address: string | ethers.Addressable, @@ -320,26 +187,6 @@ declare module "hardhat/types/runtime" { address: string | ethers.Addressable, signer?: ethers.Signer ): Promise; - getContractAt( - name: "IERC721Metadata", - address: string | ethers.Addressable, - signer?: ethers.Signer - ): Promise; - getContractAt( - name: "IERC721", - address: string | ethers.Addressable, - signer?: ethers.Signer - ): Promise; - getContractAt( - name: "IERC721Receiver", - address: string | ethers.Addressable, - signer?: ethers.Signer - ): Promise; - getContractAt( - name: "EIP712", - address: string | ethers.Addressable, - signer?: ethers.Signer - ): Promise; getContractAt( name: "ERC165", address: string | ethers.Addressable, @@ -350,16 +197,6 @@ declare module "hardhat/types/runtime" { address: string | ethers.Addressable, signer?: ethers.Signer ): Promise; - getContractAt( - name: "ShortStrings", - address: string | ethers.Addressable, - signer?: ethers.Signer - ): Promise; - getContractAt( - name: "DoubleEndedQueue", - address: string | ethers.Addressable, - signer?: ethers.Signer - ): Promise; getContractAt( name: "PerlinNoise", address: string | ethers.Addressable, @@ -385,46 +222,11 @@ declare module "hardhat/types/runtime" { address: string | ethers.Addressable, signer?: ethers.Signer ): Promise; - getContractAt( - name: "VotingRewardsFactory", - address: string | ethers.Addressable, - signer?: ethers.Signer - ): Promise; getContractAt( name: "Gauge", address: string | ethers.Addressable, signer?: ethers.Signer ): Promise; - getContractAt( - name: "IVetoGovernor", - address: string | ethers.Addressable, - signer?: ethers.Signer - ): Promise; - getContractAt( - name: "IVotes", - address: string | ethers.Addressable, - signer?: ethers.Signer - ): Promise; - getContractAt( - name: "VetoGovernor", - address: string | ethers.Addressable, - signer?: ethers.Signer - ): Promise; - getContractAt( - name: "VetoGovernorCountingSimple", - address: string | ethers.Addressable, - signer?: ethers.Signer - ): Promise; - getContractAt( - name: "VetoGovernorVotes", - address: string | ethers.Addressable, - signer?: ethers.Signer - ): Promise; - getContractAt( - name: "VetoGovernorVotesQuorumFraction", - address: string | ethers.Addressable, - signer?: ethers.Signer - ): Promise; getContractAt( name: "IFactoryRegistry", address: string | ethers.Addressable, @@ -445,76 +247,41 @@ declare module "hardhat/types/runtime" { address: string | ethers.Addressable, signer?: ethers.Signer ): Promise; - getContractAt( - name: "IReward", - address: string | ethers.Addressable, - signer?: ethers.Signer - ): Promise; getContractAt( name: "IRewardsDistributor", address: string | ethers.Addressable, signer?: ethers.Signer ): Promise; getContractAt( - name: "IVault", + name: "IStrategyManager", address: string | ethers.Addressable, signer?: ethers.Signer - ): Promise; + ): Promise; getContractAt( - name: "IVeArtProxy", + name: "IVault", address: string | ethers.Addressable, signer?: ethers.Signer - ): Promise; + ): Promise; getContractAt( name: "IVoter", address: string | ethers.Addressable, signer?: ethers.Signer ): Promise; - getContractAt( - name: "IVotingEscrow", - address: string | ethers.Addressable, - signer?: ethers.Signer - ): Promise; - getContractAt( - name: "BalanceLogicLibrary", - address: string | ethers.Addressable, - signer?: ethers.Signer - ): Promise; - getContractAt( - name: "DelegationLogicLibrary", - address: string | ethers.Addressable, - signer?: ethers.Signer - ): Promise; getContractAt( name: "SafeCastLibrary", address: string | ethers.Addressable, signer?: ethers.Signer ): Promise; getContractAt( - name: "MarshallGovernor", - address: string | ethers.Addressable, - signer?: ethers.Signer - ): Promise; - getContractAt( - name: "BribeVotingReward", - address: string | ethers.Addressable, - signer?: ethers.Signer - ): Promise; - getContractAt( - name: "Reward", - address: string | ethers.Addressable, - signer?: ethers.Signer - ): Promise; - getContractAt( - name: "VotingReward", + name: "RewardsDistributor", address: string | ethers.Addressable, signer?: ethers.Signer - ): Promise; + ): Promise; getContractAt( - name: "RewardsDistributor", + name: "TestStrategyManager", address: string | ethers.Addressable, signer?: ethers.Signer - ): Promise; + ): Promise; getContractAt( name: "TestToken", address: string | ethers.Addressable, @@ -525,11 +292,6 @@ declare module "hardhat/types/runtime" { address: string | ethers.Addressable, signer?: ethers.Signer ): Promise; - getContractAt( - name: "VeArtProxy", - address: string | ethers.Addressable, - signer?: ethers.Signer - ): Promise; getContractAt( name: "VestingMaster", address: string | ethers.Addressable, @@ -540,11 +302,6 @@ declare module "hardhat/types/runtime" { address: string | ethers.Addressable, signer?: ethers.Signer ): Promise; - getContractAt( - name: "VotingEscrow", - address: string | ethers.Addressable, - signer?: ethers.Signer - ): Promise; deployContract( name: "Forwarder", @@ -558,34 +315,14 @@ declare module "hardhat/types/runtime" { name: "Initializable", signerOrOptions?: ethers.Signer | DeployContractOptions ): Promise; - deployContract( - name: "ReentrancyGuardUpgradeable", - signerOrOptions?: ethers.Signer | DeployContractOptions - ): Promise; deployContract( name: "Ownable", signerOrOptions?: ethers.Signer | DeployContractOptions ): Promise; - deployContract( - name: "IERC4906", - signerOrOptions?: ethers.Signer | DeployContractOptions - ): Promise; - deployContract( - name: "IERC5267", - signerOrOptions?: ethers.Signer | DeployContractOptions - ): Promise; - deployContract( - name: "IERC6372", - signerOrOptions?: ethers.Signer | DeployContractOptions - ): Promise; deployContract( name: "ERC2771Context", signerOrOptions?: ethers.Signer | DeployContractOptions ): Promise; - deployContract( - name: "IERC1155Receiver", - signerOrOptions?: ethers.Signer | DeployContractOptions - ): Promise; deployContract( name: "ERC20", signerOrOptions?: ethers.Signer | DeployContractOptions @@ -602,22 +339,6 @@ declare module "hardhat/types/runtime" { name: "IERC20", signerOrOptions?: ethers.Signer | DeployContractOptions ): Promise; - deployContract( - name: "IERC721Metadata", - signerOrOptions?: ethers.Signer | DeployContractOptions - ): Promise; - deployContract( - name: "IERC721", - signerOrOptions?: ethers.Signer | DeployContractOptions - ): Promise; - deployContract( - name: "IERC721Receiver", - signerOrOptions?: ethers.Signer | DeployContractOptions - ): Promise; - deployContract( - name: "EIP712", - signerOrOptions?: ethers.Signer | DeployContractOptions - ): Promise; deployContract( name: "ERC165", signerOrOptions?: ethers.Signer | DeployContractOptions @@ -626,14 +347,6 @@ declare module "hardhat/types/runtime" { name: "IERC165", signerOrOptions?: ethers.Signer | DeployContractOptions ): Promise; - deployContract( - name: "ShortStrings", - signerOrOptions?: ethers.Signer | DeployContractOptions - ): Promise; - deployContract( - name: "DoubleEndedQueue", - signerOrOptions?: ethers.Signer | DeployContractOptions - ): Promise; deployContract( name: "PerlinNoise", signerOrOptions?: ethers.Signer | DeployContractOptions @@ -654,38 +367,10 @@ declare module "hardhat/types/runtime" { name: "GaugeFactory", signerOrOptions?: ethers.Signer | DeployContractOptions ): Promise; - deployContract( - name: "VotingRewardsFactory", - signerOrOptions?: ethers.Signer | DeployContractOptions - ): Promise; deployContract( name: "Gauge", signerOrOptions?: ethers.Signer | DeployContractOptions ): Promise; - deployContract( - name: "IVetoGovernor", - signerOrOptions?: ethers.Signer | DeployContractOptions - ): Promise; - deployContract( - name: "IVotes", - signerOrOptions?: ethers.Signer | DeployContractOptions - ): Promise; - deployContract( - name: "VetoGovernor", - signerOrOptions?: ethers.Signer | DeployContractOptions - ): Promise; - deployContract( - name: "VetoGovernorCountingSimple", - signerOrOptions?: ethers.Signer | DeployContractOptions - ): Promise; - deployContract( - name: "VetoGovernorVotes", - signerOrOptions?: ethers.Signer | DeployContractOptions - ): Promise; - deployContract( - name: "VetoGovernorVotesQuorumFraction", - signerOrOptions?: ethers.Signer | DeployContractOptions - ): Promise; deployContract( name: "IFactoryRegistry", signerOrOptions?: ethers.Signer | DeployContractOptions @@ -702,62 +387,34 @@ declare module "hardhat/types/runtime" { name: "IGauge", signerOrOptions?: ethers.Signer | DeployContractOptions ): Promise; - deployContract( - name: "IReward", - signerOrOptions?: ethers.Signer | DeployContractOptions - ): Promise; deployContract( name: "IRewardsDistributor", signerOrOptions?: ethers.Signer | DeployContractOptions ): Promise; deployContract( - name: "IVault", + name: "IStrategyManager", signerOrOptions?: ethers.Signer | DeployContractOptions - ): Promise; + ): Promise; deployContract( - name: "IVeArtProxy", + name: "IVault", signerOrOptions?: ethers.Signer | DeployContractOptions - ): Promise; + ): Promise; deployContract( name: "IVoter", signerOrOptions?: ethers.Signer | DeployContractOptions ): Promise; - deployContract( - name: "IVotingEscrow", - signerOrOptions?: ethers.Signer | DeployContractOptions - ): Promise; - deployContract( - name: "BalanceLogicLibrary", - signerOrOptions?: ethers.Signer | DeployContractOptions - ): Promise; - deployContract( - name: "DelegationLogicLibrary", - signerOrOptions?: ethers.Signer | DeployContractOptions - ): Promise; deployContract( name: "SafeCastLibrary", signerOrOptions?: ethers.Signer | DeployContractOptions ): Promise; - deployContract( - name: "MarshallGovernor", - signerOrOptions?: ethers.Signer | DeployContractOptions - ): Promise; - deployContract( - name: "BribeVotingReward", - signerOrOptions?: ethers.Signer | DeployContractOptions - ): Promise; - deployContract( - name: "Reward", - signerOrOptions?: ethers.Signer | DeployContractOptions - ): Promise; - deployContract( - name: "VotingReward", - signerOrOptions?: ethers.Signer | DeployContractOptions - ): Promise; deployContract( name: "RewardsDistributor", signerOrOptions?: ethers.Signer | DeployContractOptions ): Promise; + deployContract( + name: "TestStrategyManager", + signerOrOptions?: ethers.Signer | DeployContractOptions + ): Promise; deployContract( name: "TestToken", signerOrOptions?: ethers.Signer | DeployContractOptions @@ -766,10 +423,6 @@ declare module "hardhat/types/runtime" { name: "Vault", signerOrOptions?: ethers.Signer | DeployContractOptions ): Promise; - deployContract( - name: "VeArtProxy", - signerOrOptions?: ethers.Signer | DeployContractOptions - ): Promise; deployContract( name: "VestingMaster", signerOrOptions?: ethers.Signer | DeployContractOptions @@ -778,10 +431,6 @@ declare module "hardhat/types/runtime" { name: "Voter", signerOrOptions?: ethers.Signer | DeployContractOptions ): Promise; - deployContract( - name: "VotingEscrow", - signerOrOptions?: ethers.Signer | DeployContractOptions - ): Promise; deployContract( name: "Forwarder", @@ -798,41 +447,16 @@ declare module "hardhat/types/runtime" { args: any[], signerOrOptions?: ethers.Signer | DeployContractOptions ): Promise; - deployContract( - name: "ReentrancyGuardUpgradeable", - args: any[], - signerOrOptions?: ethers.Signer | DeployContractOptions - ): Promise; deployContract( name: "Ownable", args: any[], signerOrOptions?: ethers.Signer | DeployContractOptions ): Promise; - deployContract( - name: "IERC4906", - args: any[], - signerOrOptions?: ethers.Signer | DeployContractOptions - ): Promise; - deployContract( - name: "IERC5267", - args: any[], - signerOrOptions?: ethers.Signer | DeployContractOptions - ): Promise; - deployContract( - name: "IERC6372", - args: any[], - signerOrOptions?: ethers.Signer | DeployContractOptions - ): Promise; deployContract( name: "ERC2771Context", args: any[], signerOrOptions?: ethers.Signer | DeployContractOptions ): Promise; - deployContract( - name: "IERC1155Receiver", - args: any[], - signerOrOptions?: ethers.Signer | DeployContractOptions - ): Promise; deployContract( name: "ERC20", args: any[], @@ -853,26 +477,6 @@ declare module "hardhat/types/runtime" { args: any[], signerOrOptions?: ethers.Signer | DeployContractOptions ): Promise; - deployContract( - name: "IERC721Metadata", - args: any[], - signerOrOptions?: ethers.Signer | DeployContractOptions - ): Promise; - deployContract( - name: "IERC721", - args: any[], - signerOrOptions?: ethers.Signer | DeployContractOptions - ): Promise; - deployContract( - name: "IERC721Receiver", - args: any[], - signerOrOptions?: ethers.Signer | DeployContractOptions - ): Promise; - deployContract( - name: "EIP712", - args: any[], - signerOrOptions?: ethers.Signer | DeployContractOptions - ): Promise; deployContract( name: "ERC165", args: any[], @@ -883,16 +487,6 @@ declare module "hardhat/types/runtime" { args: any[], signerOrOptions?: ethers.Signer | DeployContractOptions ): Promise; - deployContract( - name: "ShortStrings", - args: any[], - signerOrOptions?: ethers.Signer | DeployContractOptions - ): Promise; - deployContract( - name: "DoubleEndedQueue", - args: any[], - signerOrOptions?: ethers.Signer | DeployContractOptions - ): Promise; deployContract( name: "PerlinNoise", args: any[], @@ -918,46 +512,11 @@ declare module "hardhat/types/runtime" { args: any[], signerOrOptions?: ethers.Signer | DeployContractOptions ): Promise; - deployContract( - name: "VotingRewardsFactory", - args: any[], - signerOrOptions?: ethers.Signer | DeployContractOptions - ): Promise; deployContract( name: "Gauge", args: any[], signerOrOptions?: ethers.Signer | DeployContractOptions ): Promise; - deployContract( - name: "IVetoGovernor", - args: any[], - signerOrOptions?: ethers.Signer | DeployContractOptions - ): Promise; - deployContract( - name: "IVotes", - args: any[], - signerOrOptions?: ethers.Signer | DeployContractOptions - ): Promise; - deployContract( - name: "VetoGovernor", - args: any[], - signerOrOptions?: ethers.Signer | DeployContractOptions - ): Promise; - deployContract( - name: "VetoGovernorCountingSimple", - args: any[], - signerOrOptions?: ethers.Signer | DeployContractOptions - ): Promise; - deployContract( - name: "VetoGovernorVotes", - args: any[], - signerOrOptions?: ethers.Signer | DeployContractOptions - ): Promise; - deployContract( - name: "VetoGovernorVotesQuorumFraction", - args: any[], - signerOrOptions?: ethers.Signer | DeployContractOptions - ): Promise; deployContract( name: "IFactoryRegistry", args: any[], @@ -978,76 +537,41 @@ declare module "hardhat/types/runtime" { args: any[], signerOrOptions?: ethers.Signer | DeployContractOptions ): Promise; - deployContract( - name: "IReward", - args: any[], - signerOrOptions?: ethers.Signer | DeployContractOptions - ): Promise; deployContract( name: "IRewardsDistributor", args: any[], signerOrOptions?: ethers.Signer | DeployContractOptions ): Promise; deployContract( - name: "IVault", + name: "IStrategyManager", args: any[], signerOrOptions?: ethers.Signer | DeployContractOptions - ): Promise; + ): Promise; deployContract( - name: "IVeArtProxy", + name: "IVault", args: any[], signerOrOptions?: ethers.Signer | DeployContractOptions - ): Promise; + ): Promise; deployContract( name: "IVoter", args: any[], signerOrOptions?: ethers.Signer | DeployContractOptions ): Promise; - deployContract( - name: "IVotingEscrow", - args: any[], - signerOrOptions?: ethers.Signer | DeployContractOptions - ): Promise; - deployContract( - name: "BalanceLogicLibrary", - args: any[], - signerOrOptions?: ethers.Signer | DeployContractOptions - ): Promise; - deployContract( - name: "DelegationLogicLibrary", - args: any[], - signerOrOptions?: ethers.Signer | DeployContractOptions - ): Promise; deployContract( name: "SafeCastLibrary", args: any[], signerOrOptions?: ethers.Signer | DeployContractOptions ): Promise; deployContract( - name: "MarshallGovernor", - args: any[], - signerOrOptions?: ethers.Signer | DeployContractOptions - ): Promise; - deployContract( - name: "BribeVotingReward", - args: any[], - signerOrOptions?: ethers.Signer | DeployContractOptions - ): Promise; - deployContract( - name: "Reward", - args: any[], - signerOrOptions?: ethers.Signer | DeployContractOptions - ): Promise; - deployContract( - name: "VotingReward", + name: "RewardsDistributor", args: any[], signerOrOptions?: ethers.Signer | DeployContractOptions - ): Promise; + ): Promise; deployContract( - name: "RewardsDistributor", + name: "TestStrategyManager", args: any[], signerOrOptions?: ethers.Signer | DeployContractOptions - ): Promise; + ): Promise; deployContract( name: "TestToken", args: any[], @@ -1058,11 +582,6 @@ declare module "hardhat/types/runtime" { args: any[], signerOrOptions?: ethers.Signer | DeployContractOptions ): Promise; - deployContract( - name: "VeArtProxy", - args: any[], - signerOrOptions?: ethers.Signer | DeployContractOptions - ): Promise; deployContract( name: "VestingMaster", args: any[], @@ -1073,11 +592,6 @@ declare module "hardhat/types/runtime" { args: any[], signerOrOptions?: ethers.Signer | DeployContractOptions ): Promise; - deployContract( - name: "VotingEscrow", - args: any[], - signerOrOptions?: ethers.Signer | DeployContractOptions - ): Promise; // default types getContractFactory( diff --git a/src/types/index.ts b/src/types/index.ts index 5f401f8..e195fbf 100644 --- a/src/types/index.ts +++ b/src/types/index.ts @@ -14,20 +14,10 @@ export type { IForwarder } from "./@opengsn/contracts/src/forwarder/IForwarder"; export { IForwarder__factory } from "./factories/@opengsn/contracts/src/forwarder/IForwarder__factory"; export type { Initializable } from "./@openzeppelin/contracts-upgradeable/proxy/utils/Initializable"; export { Initializable__factory } from "./factories/@openzeppelin/contracts-upgradeable/proxy/utils/Initializable__factory"; -export type { ReentrancyGuardUpgradeable } from "./@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable"; -export { ReentrancyGuardUpgradeable__factory } from "./factories/@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable__factory"; export type { Ownable } from "./@openzeppelin/contracts/access/Ownable"; export { Ownable__factory } from "./factories/@openzeppelin/contracts/access/Ownable__factory"; -export type { IERC4906 } from "./@openzeppelin/contracts/interfaces/IERC4906"; -export { IERC4906__factory } from "./factories/@openzeppelin/contracts/interfaces/IERC4906__factory"; -export type { IERC5267 } from "./@openzeppelin/contracts/interfaces/IERC5267"; -export { IERC5267__factory } from "./factories/@openzeppelin/contracts/interfaces/IERC5267__factory"; -export type { IERC6372 } from "./@openzeppelin/contracts/interfaces/IERC6372"; -export { IERC6372__factory } from "./factories/@openzeppelin/contracts/interfaces/IERC6372__factory"; export type { ERC2771Context } from "./@openzeppelin/contracts/metatx/ERC2771Context"; export { ERC2771Context__factory } from "./factories/@openzeppelin/contracts/metatx/ERC2771Context__factory"; -export type { IERC1155Receiver } from "./@openzeppelin/contracts/token/ERC1155/IERC1155Receiver"; -export { IERC1155Receiver__factory } from "./factories/@openzeppelin/contracts/token/ERC1155/IERC1155Receiver__factory"; export type { ERC20 } from "./@openzeppelin/contracts/token/ERC20/ERC20"; export { ERC20__factory } from "./factories/@openzeppelin/contracts/token/ERC20/ERC20__factory"; export type { IERC20Metadata } from "./@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata"; @@ -36,22 +26,10 @@ export type { IERC20Permit } from "./@openzeppelin/contracts/token/ERC20/extensi export { IERC20Permit__factory } from "./factories/@openzeppelin/contracts/token/ERC20/extensions/IERC20Permit__factory"; export type { IERC20 } from "./@openzeppelin/contracts/token/ERC20/IERC20"; export { IERC20__factory } from "./factories/@openzeppelin/contracts/token/ERC20/IERC20__factory"; -export type { IERC721Metadata } from "./@openzeppelin/contracts/token/ERC721/extensions/IERC721Metadata"; -export { IERC721Metadata__factory } from "./factories/@openzeppelin/contracts/token/ERC721/extensions/IERC721Metadata__factory"; -export type { IERC721 } from "./@openzeppelin/contracts/token/ERC721/IERC721"; -export { IERC721__factory } from "./factories/@openzeppelin/contracts/token/ERC721/IERC721__factory"; -export type { IERC721Receiver } from "./@openzeppelin/contracts/token/ERC721/IERC721Receiver"; -export { IERC721Receiver__factory } from "./factories/@openzeppelin/contracts/token/ERC721/IERC721Receiver__factory"; -export type { EIP712 } from "./@openzeppelin/contracts/utils/cryptography/EIP712"; -export { EIP712__factory } from "./factories/@openzeppelin/contracts/utils/cryptography/EIP712__factory"; export type { ERC165 } from "./@openzeppelin/contracts/utils/introspection/ERC165"; export { ERC165__factory } from "./factories/@openzeppelin/contracts/utils/introspection/ERC165__factory"; export type { IERC165 } from "./@openzeppelin/contracts/utils/introspection/IERC165"; export { IERC165__factory } from "./factories/@openzeppelin/contracts/utils/introspection/IERC165__factory"; -export type { ShortStrings } from "./@openzeppelin/contracts/utils/ShortStrings"; -export { ShortStrings__factory } from "./factories/@openzeppelin/contracts/utils/ShortStrings__factory"; -export type { DoubleEndedQueue } from "./@openzeppelin/contracts/utils/structs/DoubleEndedQueue"; -export { DoubleEndedQueue__factory } from "./factories/@openzeppelin/contracts/utils/structs/DoubleEndedQueue__factory"; export type { PerlinNoise } from "./contracts/art/PerlinNoise"; export { PerlinNoise__factory } from "./factories/contracts/art/PerlinNoise__factory"; export type { Trig } from "./contracts/art/Trig"; @@ -62,22 +40,8 @@ export type { FactoryRegistry } from "./contracts/factories/FactoryRegistry"; export { FactoryRegistry__factory } from "./factories/contracts/factories/FactoryRegistry__factory"; export type { GaugeFactory } from "./contracts/factories/GaugeFactory"; export { GaugeFactory__factory } from "./factories/contracts/factories/GaugeFactory__factory"; -export type { VotingRewardsFactory } from "./contracts/factories/VotingRewardsFactory"; -export { VotingRewardsFactory__factory } from "./factories/contracts/factories/VotingRewardsFactory__factory"; export type { Gauge } from "./contracts/gauges/Gauge"; export { Gauge__factory } from "./factories/contracts/gauges/Gauge__factory"; -export type { IVetoGovernor } from "./contracts/governance/IVetoGovernor"; -export { IVetoGovernor__factory } from "./factories/contracts/governance/IVetoGovernor__factory"; -export type { IVotes } from "./contracts/governance/IVotes"; -export { IVotes__factory } from "./factories/contracts/governance/IVotes__factory"; -export type { VetoGovernor } from "./contracts/governance/VetoGovernor"; -export { VetoGovernor__factory } from "./factories/contracts/governance/VetoGovernor__factory"; -export type { VetoGovernorCountingSimple } from "./contracts/governance/VetoGovernorCountingSimple"; -export { VetoGovernorCountingSimple__factory } from "./factories/contracts/governance/VetoGovernorCountingSimple__factory"; -export type { VetoGovernorVotes } from "./contracts/governance/VetoGovernorVotes"; -export { VetoGovernorVotes__factory } from "./factories/contracts/governance/VetoGovernorVotes__factory"; -export type { VetoGovernorVotesQuorumFraction } from "./contracts/governance/VetoGovernorVotesQuorumFraction"; -export { VetoGovernorVotesQuorumFraction__factory } from "./factories/contracts/governance/VetoGovernorVotesQuorumFraction__factory"; export type { IFactoryRegistry } from "./contracts/interfaces/factories/IFactoryRegistry"; export { IFactoryRegistry__factory } from "./factories/contracts/interfaces/factories/IFactoryRegistry__factory"; export type { IGaugeFactory } from "./contracts/interfaces/factories/IGaugeFactory"; @@ -86,43 +50,25 @@ export type { IVotingRewardsFactory } from "./contracts/interfaces/factories/IVo export { IVotingRewardsFactory__factory } from "./factories/contracts/interfaces/factories/IVotingRewardsFactory__factory"; export type { IGauge } from "./contracts/interfaces/IGauge"; export { IGauge__factory } from "./factories/contracts/interfaces/IGauge__factory"; -export type { IReward } from "./contracts/interfaces/IReward"; -export { IReward__factory } from "./factories/contracts/interfaces/IReward__factory"; export type { IRewardsDistributor } from "./contracts/interfaces/IRewardsDistributor"; export { IRewardsDistributor__factory } from "./factories/contracts/interfaces/IRewardsDistributor__factory"; +export type { IStrategyManager } from "./contracts/interfaces/IStrategyManager"; +export { IStrategyManager__factory } from "./factories/contracts/interfaces/IStrategyManager__factory"; export type { IVault } from "./contracts/interfaces/IVault"; export { IVault__factory } from "./factories/contracts/interfaces/IVault__factory"; -export type { IVeArtProxy } from "./contracts/interfaces/IVeArtProxy"; -export { IVeArtProxy__factory } from "./factories/contracts/interfaces/IVeArtProxy__factory"; export type { IVoter } from "./contracts/interfaces/IVoter"; export { IVoter__factory } from "./factories/contracts/interfaces/IVoter__factory"; -export type { IVotingEscrow } from "./contracts/interfaces/IVotingEscrow"; -export { IVotingEscrow__factory } from "./factories/contracts/interfaces/IVotingEscrow__factory"; -export type { BalanceLogicLibrary } from "./contracts/libraries/BalanceLogicLibrary"; -export { BalanceLogicLibrary__factory } from "./factories/contracts/libraries/BalanceLogicLibrary__factory"; -export type { DelegationLogicLibrary } from "./contracts/libraries/DelegationLogicLibrary"; -export { DelegationLogicLibrary__factory } from "./factories/contracts/libraries/DelegationLogicLibrary__factory"; export type { SafeCastLibrary } from "./contracts/libraries/SafeCastLibrary"; export { SafeCastLibrary__factory } from "./factories/contracts/libraries/SafeCastLibrary__factory"; -export type { MarshallGovernor } from "./contracts/MarshallGovernor"; -export { MarshallGovernor__factory } from "./factories/contracts/MarshallGovernor__factory"; -export type { BribeVotingReward } from "./contracts/rewards/BribeVotingReward"; -export { BribeVotingReward__factory } from "./factories/contracts/rewards/BribeVotingReward__factory"; -export type { Reward } from "./contracts/rewards/Reward"; -export { Reward__factory } from "./factories/contracts/rewards/Reward__factory"; -export type { VotingReward } from "./contracts/rewards/VotingReward"; -export { VotingReward__factory } from "./factories/contracts/rewards/VotingReward__factory"; export type { RewardsDistributor } from "./contracts/RewardsDistributor"; export { RewardsDistributor__factory } from "./factories/contracts/RewardsDistributor__factory"; +export type { TestStrategyManager } from "./contracts/test/TestStrategyManager"; +export { TestStrategyManager__factory } from "./factories/contracts/test/TestStrategyManager__factory"; export type { TestToken } from "./contracts/test/TestToken"; export { TestToken__factory } from "./factories/contracts/test/TestToken__factory"; export type { Vault } from "./contracts/Vault"; export { Vault__factory } from "./factories/contracts/Vault__factory"; -export type { VeArtProxy } from "./contracts/VeArtProxy"; -export { VeArtProxy__factory } from "./factories/contracts/VeArtProxy__factory"; export type { VestingMaster } from "./contracts/VestingMaster"; export { VestingMaster__factory } from "./factories/contracts/VestingMaster__factory"; export type { Voter } from "./contracts/Voter"; export { Voter__factory } from "./factories/contracts/Voter__factory"; -export type { VotingEscrow } from "./contracts/VotingEscrow"; -export { VotingEscrow__factory } from "./factories/contracts/VotingEscrow__factory"; diff --git a/test/TestVoter.t.sol b/test/TestVoter.t.sol index 37dd26f..5cdd654 100644 --- a/test/TestVoter.t.sol +++ b/test/TestVoter.t.sol @@ -3,23 +3,75 @@ pragma solidity ^0.8.13; import {Test, console} from "forge-std/Test.sol"; import {stdError} from "forge-std/StdError.sol"; +import {TestToken} from "../contracts/test/TestToken.sol"; import {Vault} from "../contracts/Vault.sol"; import {Voter} from "../contracts/Voter.sol"; +import {IVoter} from "../contracts/interfaces/IVoter.sol"; import {DAOForwarder} from "../contracts/DAOForwarder.sol"; import {TestStrategyManager} from "../contracts/test/TestStrategyManager.sol"; -//import {TestStrategyManager} from "../contracts/test/TestStrategyManager.sol"; +import {FactoryRegistry} from "../contracts/factories/FactoryRegistry.sol"; +import {GaugeFactory} from "../contracts/factories/GaugeFactory.sol"; contract TestVoter is Test{ Voter public voter; + TestToken public pool; + address public poolFactory; DAOForwarder public forwarder; + GaugeFactory public gaugeFactory; + FactoryRegistry public factoryRegistry; function setUp() public { forwarder = new DAOForwarder(); + pool = new TestToken("test-pool", "pool"); + gaugeFactory = new GaugeFactory(); + poolFactory = address (1); TestStrategyManager strategyManager = new TestStrategyManager(); - voter = new Voter(address(forwarder), address(strategyManager), address(1)); + factoryRegistry = new FactoryRegistry(poolFactory, address (gaugeFactory)); + voter = new Voter(address(forwarder), address(strategyManager), address(factoryRegistry)); } - function test_MaxEpochNum() external { - assertEq(30, voter.maxVotingNum()); + function test_gauge_actions() external { + //1. createGauge success + voter.createGauge(poolFactory, address (pool)); + assertEq(1, voter.length()); + assertNotEq(address (0), voter.gauges(address (pool))); + + //1.1 repeat add same pool so failed + vm.expectRevert(IVoter.GaugeExists.selector); + voter.createGauge(poolFactory, address (pool)); + assertEq(1, voter.length()); + + //1.2 caller not governor & pool is not whitelistedToken + address pool2 = address (22); + vm.prank(address (2)); + vm.expectRevert(IVoter.NotWhitelistedToken.selector); + voter.createGauge(poolFactory, pool2); + assertEq(1, voter.length()); + + //1.3 set whitelistedToken + voter.whitelistToken(pool2, true); + voter.createGauge(poolFactory, pool2); + assertEq(2, voter.length()); + + //2. kill gauge + address gauge2 = voter.gauges(pool2); + voter.killGauge(gauge2); + assertFalse(voter.isAlive(gauge2)); + + //3. receive gauge + voter.reviveGauge(gauge2); + assertTrue(voter.isAlive(gauge2)); + assertEq(2, voter.length()); + } + + function test_vote_actions() external { + skip(10 days); + voter.createGauge(poolFactory, address (pool)); + + //1. vote + vm.expectRevert(IVoter.UnequalLengths.selector); + voter.vote(new address[] (0), new uint256[](1)); + //2. poke + //3. reset vote } } \ No newline at end of file diff --git a/test/VotingEscrow.test.ts b/test/VotingEscrow.test.ts deleted file mode 100644 index 16b9a17..0000000 --- a/test/VotingEscrow.test.ts +++ /dev/null @@ -1,196 +0,0 @@ -import { HardhatEthersSigner } from '@nomicfoundation/hardhat-ethers/signers'; -import { expect } from 'chai'; -import { ethers } from 'hardhat'; -import { VotingEscrow } from '../src/types'; - -describe('VotingEscrow', function () { - let accounts: HardhatEthersSigner[]; - let ve: VotingEscrow; - let now: number; - const WEEK = 60 * 60 * 24 * 7; - const YEAR = 60 * 60 * 24 * 365; - - before(async function () { - accounts = await ethers.getSigners(); - const balanceLogic = await ethers.deployContract('BalanceLogicLibrary'); - const delegationLogic = await ethers.deployContract('DelegationLogicLibrary'); - ve = await ethers.deployContract('VotingEscrow', [], { - signer: accounts[0], - libraries: { - BalanceLogicLibrary: balanceLogic.target, - DelegationLogicLibrary: delegationLogic.target, - }, - }); - await ve.initialize([]); - }); - - describe('native bucket', function () { - let root: string; - let node1: string; - let node2: string; - - before(async function () { - now = Math.floor(new Date().getTime() / 1000); - - node1 = ethers.keccak256( - ethers.solidityPacked( - ['uint256', 'address', 'uint256', 'uint256'], - [200, accounts[1].address, now + YEAR, ethers.parseEther('100')], - ), - ); - - node2 = ethers.keccak256( - ethers.solidityPacked( - ['uint256', 'address', 'uint256', 'uint256'], - [201, accounts[2].address, now + WEEK * 2, ethers.parseEther('2000')], - ), - ); - - root = ethers.keccak256( - Buffer.concat( - [Buffer.from(node1.substring(2), 'hex'), Buffer.from(node2.substring(2), 'hex')].sort(Buffer.compare), - ), - ); - }); - - it('create native ve', async function () { - await ethers.provider.send('evm_mine'); - await expect(ve.connect(accounts[1]).commitNativeRoots(now, [root])).to.be.revertedWithCustomError(ve, 'NotTeam'); - await ve.connect(accounts[0]).commitNativeRoots(now, [root]); - await ve.connect(accounts[0]).approveNativeRoots(); - - expect(await ve.nativeRoot(0)).to.equal(root); - - expect(await ve.ownerOf(1)).to.equal(ethers.ZeroAddress); - - await ve - .connect(accounts[2]) - .claimNative(200, accounts[1].address, now + YEAR, ethers.parseEther('100'), root, [node2]); - expect(await ve.ownerOf(1)).to.equal(accounts[1].address); - let locked = await ve.locked(1); - expect(locked.amount).to.equal(ethers.parseEther('100')); - expect(locked.isPermanent).to.equal(false); - expect(await ve.nativeTokenId(200)).to.equal(1); - expect(await ve.tokenIdNative(1)).to.equal(200); - - const end = locked.end; - expect(await ve.balanceOf(accounts[1].address)).to.equal(1); - await ve - .connect(accounts[2]) - .claimNative(200, accounts[1].address, now + YEAR, ethers.parseEther('100'), root, [node2]); - expect(await ve.balanceOf(accounts[1].address)).to.equal(1); - locked = await ve.locked(1); - expect(locked.amount).to.equal(ethers.parseEther('100')); - expect(locked.isPermanent).to.equal(false); - expect(locked.end).to.equal(end); - expect(await ve.nativeTokenId(200)).to.equal(1); - expect(await ve.tokenIdNative(1)).to.equal(200); - }); - - it('new roots', async function () { - expect(await ve.nativeRootsLength()).to.equal(1); - expect(await ve.pendingNativeRootsLength()).to.equal(1); - await ve - .connect(accounts[0]) - .commitNativeRoots(now, [ - '0xbd9f4afe55a5d8d2a8e6877c836619210f7e4cad731a462d21ed21810cf95f69', - '0x87a28a9921aec2784a49cd425412717a5d0138966baa1087c305429e7cd4fd20', - ]); - expect(await ve.nativeRootsLength()).to.equal(1); - expect(await ve.pendingNativeRootsLength()).to.equal(2); - await ve.connect(accounts[0]).approveNativeRoots(); - expect(await ve.nativeRootsLength()).to.equal(2); - - await expect( - ve - .connect(accounts[2]) - .claimNative(200, accounts[1].address, now + YEAR, ethers.parseEther('100'), root, [node2]), - ).to.be.revertedWithCustomError(ve, 'InvalidRoot'); - - expect(await ve.balanceOf('0x2c315181b9d4e46e5491a0517c07de349c3bd487')).to.equal(0); - await ve - .connect(accounts[2]) - .claimNative( - 58883, - '0x2c315181b9d4e46e5491a0517c07de349c3bd487', - 1709212657, - 96875147383225985091955n, - '0x87a28a9921aec2784a49cd425412717a5d0138966baa1087c305429e7cd4fd20', - [ - '0x7b500757c8b0eb5573f024910c4ce12c56063667659a53b2a2643a043cb1961d', - '0x603e4df20b56d1e8ab66710781f3982af5361404a8f1e4543633d519d7987f28', - '0xad4e7eaeac44bf7d5cba82f2e8043b63a8d6cc033cc1a0f0696252afe31c25b6', - '0xd1c2c10b069f463c2e8253d0346420d96d2150932bf9fc9104c73da75c2b5ebd', - '0x10f45744b8423776535a226d12c87784e3f54525e82ba7dd4da7f37565c2a1c4', - '0x88a332194125fd4214e4a53b4a258c1db7f697e6093e7e266db7ce3fd105beea', - '0x7df342affe4c93328e9f8ce390ae9e86b22f30632405e3310b6672078fb3e538', - '0xdf4a7d87273b691644c2a4171912199adb90460358eceff9fa7db65ad512f5b9', - '0xdede6b2ed735996d3ac262b897974ca56eedda33597601ce939a9d630b1bc75d', - '0x393a17291b56b3131740d0d0439f0c47eb78085a6746fcc9506dc9d57e91a775', - '0x10045be4c6337509ee805ec6ca69962a1a95d4c29bd91da2cc609237da12908e', - '0x88ead5b46e066d4afaa2ba8d5f5d67af17e0e21231504b4acfcee80b18b33956', - '0x7d495f9d4bf40bed8c552fab70a22be7dde892ff53ee675beffb1b4feabe0902', - '0xebb323c0d369e0fdf5bf8bc5672c4452980480d0af4f1edd20ce09848a68bcbb', - ], - ); - expect(await ve.balanceOf('0x2c315181b9d4e46e5491a0517c07de349c3bd487')).to.equal(1); - - expect(await ve.balanceOf('0x274880f6a49e272d014a38a6cbf70745f78be97c')).to.equal(0); - await ve - .connect(accounts[2]) - .claimNative( - 10, - '0x274880f6a49e272d014a38a6cbf70745f78be97c', - 1734282935, - 1319048074701238343513203n, - '0xbd9f4afe55a5d8d2a8e6877c836619210f7e4cad731a462d21ed21810cf95f69', - [ - '0x3a5040f68f45376d4de453b6815292e85b6fecba60508d8c98bd45819ff4102d', - '0xf2252ba65ef362b77657ff6d1c58c4df47e7bf9dd379ad96816865c2f9676966', - '0x22bdc23013d31bc249d4ec1e7f9c4c48f80c6ea2c86192f9ac4fb0640b889e78', - '0x91f961379e0fba07087297cd7dc94e62854d1c111dd4daff7ab7d923ead028b0', - '0xba1aecf645deee3b9cf6beed5d88354b798b6082946a6c685473580d178f95fb', - '0xa6999e6a9a1dbbf6e7524bba62df2a954c89347acbda509e5c90f25cfeb0f33a', - '0xcbea1e50b336f87f16b30c67e1c926ef3133b6760928027cfa396af90864e448', - '0xf4460d3bc61da56a24cf6270a34b3fc36acce8d1f29b2817f51b101818aa053b', - '0x788bbba70ef1e587c1e5802dac2cdfb4ec109f1a59ca1664d1961c224d4b0c6c', - '0x06f58c7757dd54c66528702949d916849b42091c123e03360d95772ffc5641ab', - '0x12e2c08b4558747741a848de74d721a07a956f1ef679eb843af9f502a915eaaf', - '0xc36933d70ddbdcb02da5786310fd0a1a885cc4cfdd1febad646ea17830ec9792', - '0xf892a5f55c6d3d8a0aba9c34315150565d91201a389d57bc683c55f4f182c2b2', - '0x482943ca78ac725dbbbde5cce17f95aaddcdefeb98c6daf607b847820cd88449', - ], - ); - expect(await ve.balanceOf('0x274880f6a49e272d014a38a6cbf70745f78be97c')).to.equal(1); - - await ve - .connect(accounts[2]) - .claimNative( - 0, - '0xc2b1dc4d5adf5ce43d813282b9e508d3de0a583b', - 1714483057, - 2138109339745468104220672n, - '0xbd9f4afe55a5d8d2a8e6877c836619210f7e4cad731a462d21ed21810cf95f69', - [ - '0x92ed514fa3cc423d25128eb2b78df61fa7b18d0aa446990ec315062decf9e38c', - '0x4174b5dbed567380a7ad9e497ae6e3f09461605c2a4ae743adc0c0c9f2bcec9d', - '0x2abc507ff435012cd3e0effff5f12df340865155376bfe227ad3a8ecab23ca37', - '0x91f961379e0fba07087297cd7dc94e62854d1c111dd4daff7ab7d923ead028b0', - '0xba1aecf645deee3b9cf6beed5d88354b798b6082946a6c685473580d178f95fb', - '0xa6999e6a9a1dbbf6e7524bba62df2a954c89347acbda509e5c90f25cfeb0f33a', - '0xcbea1e50b336f87f16b30c67e1c926ef3133b6760928027cfa396af90864e448', - '0xf4460d3bc61da56a24cf6270a34b3fc36acce8d1f29b2817f51b101818aa053b', - '0x788bbba70ef1e587c1e5802dac2cdfb4ec109f1a59ca1664d1961c224d4b0c6c', - '0x06f58c7757dd54c66528702949d916849b42091c123e03360d95772ffc5641ab', - '0x12e2c08b4558747741a848de74d721a07a956f1ef679eb843af9f502a915eaaf', - '0xc36933d70ddbdcb02da5786310fd0a1a885cc4cfdd1febad646ea17830ec9792', - '0xf892a5f55c6d3d8a0aba9c34315150565d91201a389d57bc683c55f4f182c2b2', - '0x482943ca78ac725dbbbde5cce17f95aaddcdefeb98c6daf607b847820cd88449', - ], - ); - expect(await ve.balanceOf('0xc2b1dc4d5adf5ce43d813282b9e508d3de0a583b')).to.equal(1); - const tokenId = await ve.nativeTokenId(0); - expect(await ve.tokenIdNative(tokenId)).to.equal(0); - }); - }); -}); diff --git a/test/flow.test.ts b/test/flow.test.ts index c1f8409..f2a19a9 100644 --- a/test/flow.test.ts +++ b/test/flow.test.ts @@ -1,53 +1,33 @@ import { expect } from 'chai'; import { ethers } from 'hardhat'; +import {address} from "hardhat/internal/core/config/config-validation"; describe('Flow', function () { it('Vote flow', async function () { + const [deployer] = await ethers.getSigners(); const forwarder = await ethers.deployContract('Forwarder'); - const b = await ethers.deployContract('BalanceLogicLibrary'); - const d = await ethers.deployContract('DelegationLogicLibrary'); - const ve = await ethers.deployContract('VotingEscrow', [], { - libraries: { - BalanceLogicLibrary: b.target, - DelegationLogicLibrary: d.target, - }, - }); - await ve.initialize([]); - - let tx = await ve.createLock('0x0000000000000000000000000000000000000000', '10000000000000000000', 126144000, { - value: '10000000000000000000', - }); - await tx.wait(); - await expect( - ve.createLock('0x0000000000000000000000000000000000000000', '10000000000000000000', 126144000, { - value: '20000000000000000', - }), - ).to.be.revertedWithCustomError(ve, 'InvalidAmount'); - const poolFactory = await ethers.deployContract('EmptyPoolFactory', []); - const votingRewardsFactory = await ethers.deployContract('VotingRewardsFactory', []); const gaugeFactory = await ethers.deployContract('GaugeFactory', []); const factoryRegistry = await ethers.deployContract('FactoryRegistry', [ poolFactory.target, - votingRewardsFactory.target, gaugeFactory.target, ]); + const strategyManager = await ethers.deployContract('TestStrategyManager'); + await strategyManager.setShare(deployer.address, 100); + const voter = await ethers.deployContract('Voter', [forwarder.target, strategyManager.target, factoryRegistry.target]); - const voter = await ethers.deployContract('Voter', [forwarder.target, ve.target, factoryRegistry.target]); - - const rewardsDistributor = await ethers.deployContract('RewardsDistributor', [ve.target]); + const rewardsDistributor = await ethers.deployContract('RewardsDistributor', [strategyManager.target]); await rewardsDistributor.waitForDeployment(); const vault = await ethers.deployContract('Vault'); - await vault.initialize(voter.target, ve.target, rewardsDistributor.target); + await vault.initialize(voter.target, rewardsDistributor.target); await voter.initialize([], vault.target); await rewardsDistributor.setVault(vault.target); const token = await ethers.deployContract('TestToken', ['Test Token', 'TEST']); - await voter.createGauge(poolFactory.target, token.target); + await voter .createGauge(poolFactory.target, token.target); - await ve.setVoter(voter.target); - await voter.vote(1, [token.target], [5000]); + await voter.vote([token.target], [5000]); }); });