From 9c1bd9892615ed22f466af0eecfb3200da43930a Mon Sep 17 00:00:00 2001 From: ap-justin <89639563+ap-justin@users.noreply.github.com> Date: Tue, 25 Jul 2023 12:23:32 +0800 Subject: [PATCH] Update contract address and types (#2274) * update types * update contract-address --- src/constants/contracts.ts | 4 +- .../accounts/facets/AccountsDonationMatch.ts | 36 +-- .../facets/AccountsQueryEndowments.ts | 12 +- .../core/accounts/interfaces/IAccounts.ts | 141 ++++++++-- .../interfaces/IAccountsDonationMatch.ts | 132 +++++++++- .../interfaces/IAccountsQueryEndowments.ts | 12 +- .../contracts/core/gasFwd/GasFwdFactory.ts | 77 ++++++ .../contracts/core/gasFwd/IGasFwdFactory.ts | 39 ++- .../core/registrar/LocalRegistrar.ts | 229 +++++++++++------ .../contracts/core/registrar/Registrar.ts | 95 +------ .../registrar/interfaces/ILocalRegistrar.ts | 240 ++++++++++++++++++ .../core/registrar/interfaces/IRegistrar.ts | 187 +++++++++++++- .../goldfinch/IRegistrarGoldfinch.ts | 240 ++++++++++++++++++ .../multisigs/CharityApplications.ts | 21 +- .../interfaces/ICharityApplications.ts | 21 +- 15 files changed, 1237 insertions(+), 249 deletions(-) diff --git a/src/constants/contracts.ts b/src/constants/contracts.ts index b9686c0962..a675f5f7b3 100644 --- a/src/constants/contracts.ts +++ b/src/constants/contracts.ts @@ -17,8 +17,8 @@ const mainnet:Contracts = { const testnet:Contracts = { registrar: "0xe1215B3e150dd298d787D41a4879959D30Dc3939", "index-fund": "0xf6B32b4a0371050321fC01672FDfad76aF55603f", - "multisig/ap": "0xeA2B4CD932f5Cecea867D8794206c5D51A13a516", - "multisig/review": "0x3769916a8c97FFf1C48DE49b03181578576aFdF1", + "multisig/ap": "0x9034E5Bb0e03c985952C3506363Fe936c4A799f5", + "multisig/review": "0xbF338a5f1030c9c3c7d729214A0299201149146C", accounts: "0xE2e48880d780c4Fa36655EC9014DBbdA1164C0cA", "gift-card": "0x47e49a7700c9D79412bb47385eD349106d4941F9", } diff --git a/src/types/typechain-types/contracts/core/accounts/facets/AccountsDonationMatch.ts b/src/types/typechain-types/contracts/core/accounts/facets/AccountsDonationMatch.ts index af13db1977..d701962dd1 100644 --- a/src/types/typechain-types/contracts/core/accounts/facets/AccountsDonationMatch.ts +++ b/src/types/typechain-types/contracts/core/accounts/facets/AccountsDonationMatch.ts @@ -86,20 +86,20 @@ export declare namespace AccountMessages { export interface AccountsDonationMatchInterface extends utils.Interface { functions: { - "depositDonationMatchErC20(uint32,address,uint256)": FunctionFragment; + "depositDonationMatchERC20(uint32,address,uint256)": FunctionFragment; "setupDonationMatch(uint32,(uint8,(address,address,uint24)))": FunctionFragment; - "withdrawDonationMatchErC20(uint32,address,uint256)": FunctionFragment; + "withdrawDonationMatchERC20(uint32,address,uint256)": FunctionFragment; }; getFunction( nameOrSignatureOrTopic: - | "depositDonationMatchErC20" + | "depositDonationMatchERC20" | "setupDonationMatch" - | "withdrawDonationMatchErC20" + | "withdrawDonationMatchERC20" ): FunctionFragment; encodeFunctionData( - functionFragment: "depositDonationMatchErC20", + functionFragment: "depositDonationMatchERC20", values: [ PromiseOrValue, PromiseOrValue, @@ -111,7 +111,7 @@ export interface AccountsDonationMatchInterface extends utils.Interface { values: [PromiseOrValue, AccountMessages.DonationMatchStruct] ): string; encodeFunctionData( - functionFragment: "withdrawDonationMatchErC20", + functionFragment: "withdrawDonationMatchERC20", values: [ PromiseOrValue, PromiseOrValue, @@ -120,7 +120,7 @@ export interface AccountsDonationMatchInterface extends utils.Interface { ): string; decodeFunctionResult( - functionFragment: "depositDonationMatchErC20", + functionFragment: "depositDonationMatchERC20", data: BytesLike ): Result; decodeFunctionResult( @@ -128,7 +128,7 @@ export interface AccountsDonationMatchInterface extends utils.Interface { data: BytesLike ): Result; decodeFunctionResult( - functionFragment: "withdrawDonationMatchErC20", + functionFragment: "withdrawDonationMatchERC20", data: BytesLike ): Result; @@ -427,7 +427,7 @@ export interface AccountsDonationMatch extends BaseContract { removeListener: OnEvent; functions: { - depositDonationMatchErC20( + depositDonationMatchERC20( id: PromiseOrValue, token: PromiseOrValue, amount: PromiseOrValue, @@ -440,7 +440,7 @@ export interface AccountsDonationMatch extends BaseContract { overrides?: Overrides & { from?: PromiseOrValue } ): Promise; - withdrawDonationMatchErC20( + withdrawDonationMatchERC20( id: PromiseOrValue, recipient: PromiseOrValue, amount: PromiseOrValue, @@ -448,7 +448,7 @@ export interface AccountsDonationMatch extends BaseContract { ): Promise; }; - depositDonationMatchErC20( + depositDonationMatchERC20( id: PromiseOrValue, token: PromiseOrValue, amount: PromiseOrValue, @@ -461,7 +461,7 @@ export interface AccountsDonationMatch extends BaseContract { overrides?: Overrides & { from?: PromiseOrValue } ): Promise; - withdrawDonationMatchErC20( + withdrawDonationMatchERC20( id: PromiseOrValue, recipient: PromiseOrValue, amount: PromiseOrValue, @@ -469,7 +469,7 @@ export interface AccountsDonationMatch extends BaseContract { ): Promise; callStatic: { - depositDonationMatchErC20( + depositDonationMatchERC20( id: PromiseOrValue, token: PromiseOrValue, amount: PromiseOrValue, @@ -482,7 +482,7 @@ export interface AccountsDonationMatch extends BaseContract { overrides?: CallOverrides ): Promise; - withdrawDonationMatchErC20( + withdrawDonationMatchERC20( id: PromiseOrValue, recipient: PromiseOrValue, amount: PromiseOrValue, @@ -654,7 +654,7 @@ export interface AccountsDonationMatch extends BaseContract { }; estimateGas: { - depositDonationMatchErC20( + depositDonationMatchERC20( id: PromiseOrValue, token: PromiseOrValue, amount: PromiseOrValue, @@ -667,7 +667,7 @@ export interface AccountsDonationMatch extends BaseContract { overrides?: Overrides & { from?: PromiseOrValue } ): Promise; - withdrawDonationMatchErC20( + withdrawDonationMatchERC20( id: PromiseOrValue, recipient: PromiseOrValue, amount: PromiseOrValue, @@ -676,7 +676,7 @@ export interface AccountsDonationMatch extends BaseContract { }; populateTransaction: { - depositDonationMatchErC20( + depositDonationMatchERC20( id: PromiseOrValue, token: PromiseOrValue, amount: PromiseOrValue, @@ -689,7 +689,7 @@ export interface AccountsDonationMatch extends BaseContract { overrides?: Overrides & { from?: PromiseOrValue } ): Promise; - withdrawDonationMatchErC20( + withdrawDonationMatchERC20( id: PromiseOrValue, recipient: PromiseOrValue, amount: PromiseOrValue, diff --git a/src/types/typechain-types/contracts/core/accounts/facets/AccountsQueryEndowments.ts b/src/types/typechain-types/contracts/core/accounts/facets/AccountsQueryEndowments.ts index d1407eafcf..d31147c325 100644 --- a/src/types/typechain-types/contracts/core/accounts/facets/AccountsQueryEndowments.ts +++ b/src/types/typechain-types/contracts/core/accounts/facets/AccountsQueryEndowments.ts @@ -149,12 +149,10 @@ export declare namespace AccountMessages { export type ConfigResponseStruct = { owner: PromiseOrValue; version: PromiseOrValue; + networkName: PromiseOrValue; registrarContract: PromiseOrValue; nextAccountId: PromiseOrValue; maxGeneralCategoryId: PromiseOrValue; - subDao: PromiseOrValue; - gateway: PromiseOrValue; - gasReceiver: PromiseOrValue; earlyLockedWithdrawFee: LibAccounts.FeeSettingStruct; }; @@ -162,21 +160,17 @@ export declare namespace AccountMessages { string, string, string, + string, BigNumber, BigNumber, - string, - string, - string, LibAccounts.FeeSettingStructOutput ] & { owner: string; version: string; + networkName: string; registrarContract: string; nextAccountId: BigNumber; maxGeneralCategoryId: BigNumber; - subDao: string; - gateway: string; - gasReceiver: string; earlyLockedWithdrawFee: LibAccounts.FeeSettingStructOutput; }; diff --git a/src/types/typechain-types/contracts/core/accounts/interfaces/IAccounts.ts b/src/types/typechain-types/contracts/core/accounts/interfaces/IAccounts.ts index 896846d3d0..54390d14d7 100644 --- a/src/types/typechain-types/contracts/core/accounts/interfaces/IAccounts.ts +++ b/src/types/typechain-types/contracts/core/accounts/interfaces/IAccounts.ts @@ -440,12 +440,10 @@ export declare namespace AccountMessages { export type ConfigResponseStruct = { owner: PromiseOrValue; version: PromiseOrValue; + networkName: PromiseOrValue; registrarContract: PromiseOrValue; nextAccountId: PromiseOrValue; maxGeneralCategoryId: PromiseOrValue; - subDao: PromiseOrValue; - gateway: PromiseOrValue; - gasReceiver: PromiseOrValue; earlyLockedWithdrawFee: LibAccounts.FeeSettingStruct; }; @@ -453,21 +451,17 @@ export declare namespace AccountMessages { string, string, string, + string, BigNumber, BigNumber, - string, - string, - string, LibAccounts.FeeSettingStructOutput ] & { owner: string; version: string; + networkName: string; registrarContract: string; nextAccountId: BigNumber; maxGeneralCategoryId: BigNumber; - subDao: string; - gateway: string; - gasReceiver: string; earlyLockedWithdrawFee: LibAccounts.FeeSettingStructOutput; }; @@ -484,6 +478,28 @@ export declare namespace AccountMessages { closingBeneficiary: LibAccounts.BeneficiaryStructOutput; }; + export type DonationMatchDataStruct = { + reserveToken: PromiseOrValue; + uniswapFactory: PromiseOrValue; + poolFee: PromiseOrValue; + }; + + export type DonationMatchDataStructOutput = [string, string, number] & { + reserveToken: string; + uniswapFactory: string; + poolFee: number; + }; + + export type DonationMatchStruct = { + enumData: PromiseOrValue; + data: AccountMessages.DonationMatchDataStruct; + }; + + export type DonationMatchStructOutput = [ + number, + AccountMessages.DonationMatchDataStructOutput + ] & { enumData: number; data: AccountMessages.DonationMatchDataStructOutput }; + export type InvestRequestStruct = { strategy: PromiseOrValue; token: PromiseOrValue; @@ -785,7 +801,7 @@ export interface IAccountsInterface extends utils.Interface { "closeEndowment(uint32,((uint32,uint256,address),uint8))": FunctionFragment; "createDaoContract((uint32,address,uint256,uint256,uint256,uint256,uint256,uint256,uint256,(uint8,(address,uint256,string,string,(uint8,(uint128,uint256,uint128,uint128)),string,string,uint256,address,uint256,uint256)),uint8,address,address))": FunctionFragment; "createEndowment((bool,uint256,string,uint256[],uint8,uint8,string,string,address[],uint256,uint256,address[],address[],(address,uint256),(address,uint256),(address,uint256),(address,uint256),uint256,((bool,(address,uint256)),(bool,(address,uint256)),(bool,(address,uint256)),(bool,(address,uint256)),(bool,(address,uint256)),(bool,(address,uint256)),(bool,(address,uint256)),(bool,(address,uint256)),(bool,(address,uint256)),(bool,(address,uint256)),(bool,(address,uint256)),(bool,(address,uint256)),(bool,(address,uint256)),(bool,(address,uint256)),(bool,(address,uint256)),(bool,(address,uint256)),(bool,(address,uint256))),uint32,address[],bool,(uint256,uint256,uint256),uint256))": FunctionFragment; - "depositDonationMatchErC20(uint32,address,uint256)": FunctionFragment; + "depositDonationMatchERC20(uint32,address,uint256)": FunctionFragment; "depositERC20((uint32,uint256,uint256),address,uint256)": FunctionFragment; "depositMatic((uint32,uint256,uint256))": FunctionFragment; "manageAllowances(uint32,address,address,uint256)": FunctionFragment; @@ -795,6 +811,7 @@ export interface IAccountsInterface extends utils.Interface { "queryState(uint32)": FunctionFragment; "queryTokenAmount(uint32,uint8,address)": FunctionFragment; "setupDao(uint32,(uint256,uint256,uint256,uint256,uint256,uint128,uint256,(uint8,(address,uint256,string,string,(uint8,(uint128,uint256,uint128,uint128)),string,string,uint256,address,uint256,uint256))))": FunctionFragment; + "setupDonationMatch(uint32,(uint8,(address,address,uint24)))": FunctionFragment; "spendAllowance(uint32,address,uint256,address)": FunctionFragment; "strategyInvest(uint32,(bytes4,string,uint256,uint256,uint256))": FunctionFragment; "strategyRedeem(uint32,(bytes4,string,uint256,uint256,uint256))": FunctionFragment; @@ -809,6 +826,7 @@ export interface IAccountsInterface extends utils.Interface { "updateFeeSettings((uint32,(address,uint256),(address,uint256),(address,uint256),(address,uint256)))": FunctionFragment; "updateOwner(address)": FunctionFragment; "withdraw(uint32,uint8,address,uint32,(address,uint256)[])": FunctionFragment; + "withdrawDonationMatchERC20(uint32,address,uint256)": FunctionFragment; }; getFunction( @@ -816,7 +834,7 @@ export interface IAccountsInterface extends utils.Interface { | "closeEndowment" | "createDaoContract" | "createEndowment" - | "depositDonationMatchErC20" + | "depositDonationMatchERC20" | "depositERC20" | "depositMatic" | "manageAllowances" @@ -826,6 +844,7 @@ export interface IAccountsInterface extends utils.Interface { | "queryState" | "queryTokenAmount" | "setupDao" + | "setupDonationMatch" | "spendAllowance" | "strategyInvest" | "strategyRedeem" @@ -840,6 +859,7 @@ export interface IAccountsInterface extends utils.Interface { | "updateFeeSettings" | "updateOwner" | "withdraw" + | "withdrawDonationMatchERC20" ): FunctionFragment; encodeFunctionData( @@ -855,7 +875,7 @@ export interface IAccountsInterface extends utils.Interface { values: [AccountMessages.CreateEndowmentRequestStruct] ): string; encodeFunctionData( - functionFragment: "depositDonationMatchErC20", + functionFragment: "depositDonationMatchERC20", values: [ PromiseOrValue, PromiseOrValue, @@ -915,6 +935,10 @@ export interface IAccountsInterface extends utils.Interface { functionFragment: "setupDao", values: [PromiseOrValue, SubDaoLib.DaoSetupStruct] ): string; + encodeFunctionData( + functionFragment: "setupDonationMatch", + values: [PromiseOrValue, AccountMessages.DonationMatchStruct] + ): string; encodeFunctionData( functionFragment: "spendAllowance", values: [ @@ -1007,6 +1031,14 @@ export interface IAccountsInterface extends utils.Interface { IAccountsDepositWithdrawEndowments.TokenInfoStruct[] ] ): string; + encodeFunctionData( + functionFragment: "withdrawDonationMatchERC20", + values: [ + PromiseOrValue, + PromiseOrValue, + PromiseOrValue + ] + ): string; decodeFunctionResult( functionFragment: "closeEndowment", @@ -1021,7 +1053,7 @@ export interface IAccountsInterface extends utils.Interface { data: BytesLike ): Result; decodeFunctionResult( - functionFragment: "depositDonationMatchErC20", + functionFragment: "depositDonationMatchERC20", data: BytesLike ): Result; decodeFunctionResult( @@ -1054,6 +1086,10 @@ export interface IAccountsInterface extends utils.Interface { data: BytesLike ): Result; decodeFunctionResult(functionFragment: "setupDao", data: BytesLike): Result; + decodeFunctionResult( + functionFragment: "setupDonationMatch", + data: BytesLike + ): Result; decodeFunctionResult( functionFragment: "spendAllowance", data: BytesLike @@ -1104,6 +1140,10 @@ export interface IAccountsInterface extends utils.Interface { data: BytesLike ): Result; decodeFunctionResult(functionFragment: "withdraw", data: BytesLike): Result; + decodeFunctionResult( + functionFragment: "withdrawDonationMatchERC20", + data: BytesLike + ): Result; events: { "AllowanceSpent(uint256,address,address,uint256)": EventFragment; @@ -1416,7 +1456,7 @@ export interface IAccounts extends BaseContract { overrides?: Overrides & { from?: PromiseOrValue } ): Promise; - depositDonationMatchErC20( + depositDonationMatchERC20( id: PromiseOrValue, token: PromiseOrValue, amount: PromiseOrValue, @@ -1489,6 +1529,12 @@ export interface IAccounts extends BaseContract { overrides?: Overrides & { from?: PromiseOrValue } ): Promise; + setupDonationMatch( + id: PromiseOrValue, + details: AccountMessages.DonationMatchStruct, + overrides?: Overrides & { from?: PromiseOrValue } + ): Promise; + spendAllowance( endowId: PromiseOrValue, token: PromiseOrValue, @@ -1582,6 +1628,13 @@ export interface IAccounts extends BaseContract { tokens: IAccountsDepositWithdrawEndowments.TokenInfoStruct[], overrides?: Overrides & { from?: PromiseOrValue } ): Promise; + + withdrawDonationMatchERC20( + id: PromiseOrValue, + recipient: PromiseOrValue, + amount: PromiseOrValue, + overrides?: Overrides & { from?: PromiseOrValue } + ): Promise; }; closeEndowment( @@ -1600,7 +1653,7 @@ export interface IAccounts extends BaseContract { overrides?: Overrides & { from?: PromiseOrValue } ): Promise; - depositDonationMatchErC20( + depositDonationMatchERC20( id: PromiseOrValue, token: PromiseOrValue, amount: PromiseOrValue, @@ -1661,6 +1714,12 @@ export interface IAccounts extends BaseContract { overrides?: Overrides & { from?: PromiseOrValue } ): Promise; + setupDonationMatch( + id: PromiseOrValue, + details: AccountMessages.DonationMatchStruct, + overrides?: Overrides & { from?: PromiseOrValue } + ): Promise; + spendAllowance( endowId: PromiseOrValue, token: PromiseOrValue, @@ -1755,6 +1814,13 @@ export interface IAccounts extends BaseContract { overrides?: Overrides & { from?: PromiseOrValue } ): Promise; + withdrawDonationMatchERC20( + id: PromiseOrValue, + recipient: PromiseOrValue, + amount: PromiseOrValue, + overrides?: Overrides & { from?: PromiseOrValue } + ): Promise; + callStatic: { closeEndowment( id: PromiseOrValue, @@ -1772,7 +1838,7 @@ export interface IAccounts extends BaseContract { overrides?: CallOverrides ): Promise; - depositDonationMatchErC20( + depositDonationMatchERC20( id: PromiseOrValue, token: PromiseOrValue, amount: PromiseOrValue, @@ -1833,6 +1899,12 @@ export interface IAccounts extends BaseContract { overrides?: CallOverrides ): Promise; + setupDonationMatch( + id: PromiseOrValue, + details: AccountMessages.DonationMatchStruct, + overrides?: CallOverrides + ): Promise; + spendAllowance( endowId: PromiseOrValue, token: PromiseOrValue, @@ -1926,6 +1998,13 @@ export interface IAccounts extends BaseContract { tokens: IAccountsDepositWithdrawEndowments.TokenInfoStruct[], overrides?: CallOverrides ): Promise; + + withdrawDonationMatchERC20( + id: PromiseOrValue, + recipient: PromiseOrValue, + amount: PromiseOrValue, + overrides?: CallOverrides + ): Promise; }; filters: { @@ -2108,7 +2187,7 @@ export interface IAccounts extends BaseContract { overrides?: Overrides & { from?: PromiseOrValue } ): Promise; - depositDonationMatchErC20( + depositDonationMatchERC20( id: PromiseOrValue, token: PromiseOrValue, amount: PromiseOrValue, @@ -2167,6 +2246,12 @@ export interface IAccounts extends BaseContract { overrides?: Overrides & { from?: PromiseOrValue } ): Promise; + setupDonationMatch( + id: PromiseOrValue, + details: AccountMessages.DonationMatchStruct, + overrides?: Overrides & { from?: PromiseOrValue } + ): Promise; + spendAllowance( endowId: PromiseOrValue, token: PromiseOrValue, @@ -2260,6 +2345,13 @@ export interface IAccounts extends BaseContract { tokens: IAccountsDepositWithdrawEndowments.TokenInfoStruct[], overrides?: Overrides & { from?: PromiseOrValue } ): Promise; + + withdrawDonationMatchERC20( + id: PromiseOrValue, + recipient: PromiseOrValue, + amount: PromiseOrValue, + overrides?: Overrides & { from?: PromiseOrValue } + ): Promise; }; populateTransaction: { @@ -2279,7 +2371,7 @@ export interface IAccounts extends BaseContract { overrides?: Overrides & { from?: PromiseOrValue } ): Promise; - depositDonationMatchErC20( + depositDonationMatchERC20( id: PromiseOrValue, token: PromiseOrValue, amount: PromiseOrValue, @@ -2338,6 +2430,12 @@ export interface IAccounts extends BaseContract { overrides?: Overrides & { from?: PromiseOrValue } ): Promise; + setupDonationMatch( + id: PromiseOrValue, + details: AccountMessages.DonationMatchStruct, + overrides?: Overrides & { from?: PromiseOrValue } + ): Promise; + spendAllowance( endowId: PromiseOrValue, token: PromiseOrValue, @@ -2431,5 +2529,12 @@ export interface IAccounts extends BaseContract { tokens: IAccountsDepositWithdrawEndowments.TokenInfoStruct[], overrides?: Overrides & { from?: PromiseOrValue } ): Promise; + + withdrawDonationMatchERC20( + id: PromiseOrValue, + recipient: PromiseOrValue, + amount: PromiseOrValue, + overrides?: Overrides & { from?: PromiseOrValue } + ): Promise; }; } diff --git a/src/types/typechain-types/contracts/core/accounts/interfaces/IAccountsDonationMatch.ts b/src/types/typechain-types/contracts/core/accounts/interfaces/IAccountsDonationMatch.ts index 8d52edf370..147199a439 100644 --- a/src/types/typechain-types/contracts/core/accounts/interfaces/IAccountsDonationMatch.ts +++ b/src/types/typechain-types/contracts/core/accounts/interfaces/IAccountsDonationMatch.ts @@ -23,17 +23,58 @@ import type { PromiseOrValue, } from "../../../../common"; +export declare namespace AccountMessages { + export type DonationMatchDataStruct = { + reserveToken: PromiseOrValue; + uniswapFactory: PromiseOrValue; + poolFee: PromiseOrValue; + }; + + export type DonationMatchDataStructOutput = [string, string, number] & { + reserveToken: string; + uniswapFactory: string; + poolFee: number; + }; + + export type DonationMatchStruct = { + enumData: PromiseOrValue; + data: AccountMessages.DonationMatchDataStruct; + }; + + export type DonationMatchStructOutput = [ + number, + AccountMessages.DonationMatchDataStructOutput + ] & { enumData: number; data: AccountMessages.DonationMatchDataStructOutput }; +} + export interface IAccountsDonationMatchInterface extends utils.Interface { functions: { - "depositDonationMatchErC20(uint32,address,uint256)": FunctionFragment; + "depositDonationMatchERC20(uint32,address,uint256)": FunctionFragment; + "setupDonationMatch(uint32,(uint8,(address,address,uint24)))": FunctionFragment; + "withdrawDonationMatchERC20(uint32,address,uint256)": FunctionFragment; }; getFunction( - nameOrSignatureOrTopic: "depositDonationMatchErC20" + nameOrSignatureOrTopic: + | "depositDonationMatchERC20" + | "setupDonationMatch" + | "withdrawDonationMatchERC20" ): FunctionFragment; encodeFunctionData( - functionFragment: "depositDonationMatchErC20", + functionFragment: "depositDonationMatchERC20", + values: [ + PromiseOrValue, + PromiseOrValue, + PromiseOrValue + ] + ): string; + encodeFunctionData( + functionFragment: "setupDonationMatch", + values: [PromiseOrValue, AccountMessages.DonationMatchStruct] + ): string; + encodeFunctionData( + functionFragment: "withdrawDonationMatchERC20", values: [ PromiseOrValue, PromiseOrValue, @@ -42,7 +83,15 @@ export interface IAccountsDonationMatchInterface extends utils.Interface { ): string; decodeFunctionResult( - functionFragment: "depositDonationMatchErC20", + functionFragment: "depositDonationMatchERC20", + data: BytesLike + ): Result; + decodeFunctionResult( + functionFragment: "setupDonationMatch", + data: BytesLike + ): Result; + decodeFunctionResult( + functionFragment: "withdrawDonationMatchERC20", data: BytesLike ): Result; @@ -76,47 +125,112 @@ export interface IAccountsDonationMatch extends BaseContract { removeListener: OnEvent; functions: { - depositDonationMatchErC20( + depositDonationMatchERC20( id: PromiseOrValue, token: PromiseOrValue, amount: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; + + setupDonationMatch( + id: PromiseOrValue, + details: AccountMessages.DonationMatchStruct, + overrides?: Overrides & { from?: PromiseOrValue } + ): Promise; + + withdrawDonationMatchERC20( + id: PromiseOrValue, + recipient: PromiseOrValue, + amount: PromiseOrValue, + overrides?: Overrides & { from?: PromiseOrValue } + ): Promise; }; - depositDonationMatchErC20( + depositDonationMatchERC20( id: PromiseOrValue, token: PromiseOrValue, amount: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; + setupDonationMatch( + id: PromiseOrValue, + details: AccountMessages.DonationMatchStruct, + overrides?: Overrides & { from?: PromiseOrValue } + ): Promise; + + withdrawDonationMatchERC20( + id: PromiseOrValue, + recipient: PromiseOrValue, + amount: PromiseOrValue, + overrides?: Overrides & { from?: PromiseOrValue } + ): Promise; + callStatic: { - depositDonationMatchErC20( + depositDonationMatchERC20( id: PromiseOrValue, token: PromiseOrValue, amount: PromiseOrValue, overrides?: CallOverrides ): Promise; + + setupDonationMatch( + id: PromiseOrValue, + details: AccountMessages.DonationMatchStruct, + overrides?: CallOverrides + ): Promise; + + withdrawDonationMatchERC20( + id: PromiseOrValue, + recipient: PromiseOrValue, + amount: PromiseOrValue, + overrides?: CallOverrides + ): Promise; }; filters: {}; estimateGas: { - depositDonationMatchErC20( + depositDonationMatchERC20( id: PromiseOrValue, token: PromiseOrValue, amount: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; + + setupDonationMatch( + id: PromiseOrValue, + details: AccountMessages.DonationMatchStruct, + overrides?: Overrides & { from?: PromiseOrValue } + ): Promise; + + withdrawDonationMatchERC20( + id: PromiseOrValue, + recipient: PromiseOrValue, + amount: PromiseOrValue, + overrides?: Overrides & { from?: PromiseOrValue } + ): Promise; }; populateTransaction: { - depositDonationMatchErC20( + depositDonationMatchERC20( id: PromiseOrValue, token: PromiseOrValue, amount: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; + + setupDonationMatch( + id: PromiseOrValue, + details: AccountMessages.DonationMatchStruct, + overrides?: Overrides & { from?: PromiseOrValue } + ): Promise; + + withdrawDonationMatchERC20( + id: PromiseOrValue, + recipient: PromiseOrValue, + amount: PromiseOrValue, + overrides?: Overrides & { from?: PromiseOrValue } + ): Promise; }; } diff --git a/src/types/typechain-types/contracts/core/accounts/interfaces/IAccountsQueryEndowments.ts b/src/types/typechain-types/contracts/core/accounts/interfaces/IAccountsQueryEndowments.ts index bc636c047c..cd57a4d170 100644 --- a/src/types/typechain-types/contracts/core/accounts/interfaces/IAccountsQueryEndowments.ts +++ b/src/types/typechain-types/contracts/core/accounts/interfaces/IAccountsQueryEndowments.ts @@ -149,12 +149,10 @@ export declare namespace AccountMessages { export type ConfigResponseStruct = { owner: PromiseOrValue; version: PromiseOrValue; + networkName: PromiseOrValue; registrarContract: PromiseOrValue; nextAccountId: PromiseOrValue; maxGeneralCategoryId: PromiseOrValue; - subDao: PromiseOrValue; - gateway: PromiseOrValue; - gasReceiver: PromiseOrValue; earlyLockedWithdrawFee: LibAccounts.FeeSettingStruct; }; @@ -162,21 +160,17 @@ export declare namespace AccountMessages { string, string, string, + string, BigNumber, BigNumber, - string, - string, - string, LibAccounts.FeeSettingStructOutput ] & { owner: string; version: string; + networkName: string; registrarContract: string; nextAccountId: BigNumber; maxGeneralCategoryId: BigNumber; - subDao: string; - gateway: string; - gasReceiver: string; earlyLockedWithdrawFee: LibAccounts.FeeSettingStructOutput; }; diff --git a/src/types/typechain-types/contracts/core/gasFwd/GasFwdFactory.ts b/src/types/typechain-types/contracts/core/gasFwd/GasFwdFactory.ts index ca836bbf8c..89f7b5b88b 100644 --- a/src/types/typechain-types/contracts/core/gasFwd/GasFwdFactory.ts +++ b/src/types/typechain-types/contracts/core/gasFwd/GasFwdFactory.ts @@ -28,24 +28,35 @@ import type { export interface GasFwdFactoryInterface extends utils.Interface { functions: { + "admin()": FunctionFragment; "create()": FunctionFragment; + "impl()": FunctionFragment; "owner()": FunctionFragment; + "registrar()": FunctionFragment; "renounceOwnership()": FunctionFragment; "transferOwnership(address)": FunctionFragment; "updateImplementation(address)": FunctionFragment; + "updateRegistrar(address)": FunctionFragment; }; getFunction( nameOrSignatureOrTopic: + | "admin" | "create" + | "impl" | "owner" + | "registrar" | "renounceOwnership" | "transferOwnership" | "updateImplementation" + | "updateRegistrar" ): FunctionFragment; + encodeFunctionData(functionFragment: "admin", values?: undefined): string; encodeFunctionData(functionFragment: "create", values?: undefined): string; + encodeFunctionData(functionFragment: "impl", values?: undefined): string; encodeFunctionData(functionFragment: "owner", values?: undefined): string; + encodeFunctionData(functionFragment: "registrar", values?: undefined): string; encodeFunctionData( functionFragment: "renounceOwnership", values?: undefined @@ -58,9 +69,16 @@ export interface GasFwdFactoryInterface extends utils.Interface { functionFragment: "updateImplementation", values: [PromiseOrValue] ): string; + encodeFunctionData( + functionFragment: "updateRegistrar", + values: [PromiseOrValue] + ): string; + decodeFunctionResult(functionFragment: "admin", data: BytesLike): Result; decodeFunctionResult(functionFragment: "create", data: BytesLike): Result; + decodeFunctionResult(functionFragment: "impl", data: BytesLike): Result; decodeFunctionResult(functionFragment: "owner", data: BytesLike): Result; + decodeFunctionResult(functionFragment: "registrar", data: BytesLike): Result; decodeFunctionResult( functionFragment: "renounceOwnership", data: BytesLike @@ -73,6 +91,10 @@ export interface GasFwdFactoryInterface extends utils.Interface { functionFragment: "updateImplementation", data: BytesLike ): Result; + decodeFunctionResult( + functionFragment: "updateRegistrar", + data: BytesLike + ): Result; events: { "GasFwdCreated(address)": EventFragment; @@ -129,12 +151,18 @@ export interface GasFwdFactory extends BaseContract { removeListener: OnEvent; functions: { + admin(overrides?: CallOverrides): Promise<[string]>; + create( overrides?: Overrides & { from?: PromiseOrValue } ): Promise; + impl(overrides?: CallOverrides): Promise<[string]>; + owner(overrides?: CallOverrides): Promise<[string]>; + registrar(overrides?: CallOverrides): Promise<[string]>; + renounceOwnership( overrides?: Overrides & { from?: PromiseOrValue } ): Promise; @@ -148,14 +176,25 @@ export interface GasFwdFactory extends BaseContract { _impl: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; + + updateRegistrar( + _registrar: PromiseOrValue, + overrides?: Overrides & { from?: PromiseOrValue } + ): Promise; }; + admin(overrides?: CallOverrides): Promise; + create( overrides?: Overrides & { from?: PromiseOrValue } ): Promise; + impl(overrides?: CallOverrides): Promise; + owner(overrides?: CallOverrides): Promise; + registrar(overrides?: CallOverrides): Promise; + renounceOwnership( overrides?: Overrides & { from?: PromiseOrValue } ): Promise; @@ -170,11 +209,22 @@ export interface GasFwdFactory extends BaseContract { overrides?: Overrides & { from?: PromiseOrValue } ): Promise; + updateRegistrar( + _registrar: PromiseOrValue, + overrides?: Overrides & { from?: PromiseOrValue } + ): Promise; + callStatic: { + admin(overrides?: CallOverrides): Promise; + create(overrides?: CallOverrides): Promise; + impl(overrides?: CallOverrides): Promise; + owner(overrides?: CallOverrides): Promise; + registrar(overrides?: CallOverrides): Promise; + renounceOwnership(overrides?: CallOverrides): Promise; transferOwnership( @@ -186,6 +236,11 @@ export interface GasFwdFactory extends BaseContract { _impl: PromiseOrValue, overrides?: CallOverrides ): Promise; + + updateRegistrar( + _registrar: PromiseOrValue, + overrides?: CallOverrides + ): Promise; }; filters: { @@ -203,12 +258,18 @@ export interface GasFwdFactory extends BaseContract { }; estimateGas: { + admin(overrides?: CallOverrides): Promise; + create( overrides?: Overrides & { from?: PromiseOrValue } ): Promise; + impl(overrides?: CallOverrides): Promise; + owner(overrides?: CallOverrides): Promise; + registrar(overrides?: CallOverrides): Promise; + renounceOwnership( overrides?: Overrides & { from?: PromiseOrValue } ): Promise; @@ -222,15 +283,26 @@ export interface GasFwdFactory extends BaseContract { _impl: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; + + updateRegistrar( + _registrar: PromiseOrValue, + overrides?: Overrides & { from?: PromiseOrValue } + ): Promise; }; populateTransaction: { + admin(overrides?: CallOverrides): Promise; + create( overrides?: Overrides & { from?: PromiseOrValue } ): Promise; + impl(overrides?: CallOverrides): Promise; + owner(overrides?: CallOverrides): Promise; + registrar(overrides?: CallOverrides): Promise; + renounceOwnership( overrides?: Overrides & { from?: PromiseOrValue } ): Promise; @@ -244,5 +316,10 @@ export interface GasFwdFactory extends BaseContract { _impl: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; + + updateRegistrar( + _registrar: PromiseOrValue, + overrides?: Overrides & { from?: PromiseOrValue } + ): Promise; }; } diff --git a/src/types/typechain-types/contracts/core/gasFwd/IGasFwdFactory.ts b/src/types/typechain-types/contracts/core/gasFwd/IGasFwdFactory.ts index 9bf3584c9b..3a5d1d11af 100644 --- a/src/types/typechain-types/contracts/core/gasFwd/IGasFwdFactory.ts +++ b/src/types/typechain-types/contracts/core/gasFwd/IGasFwdFactory.ts @@ -30,10 +30,14 @@ export interface IGasFwdFactoryInterface extends utils.Interface { functions: { "create()": FunctionFragment; "updateImplementation(address)": FunctionFragment; + "updateRegistrar(address)": FunctionFragment; }; getFunction( - nameOrSignatureOrTopic: "create" | "updateImplementation" + nameOrSignatureOrTopic: + | "create" + | "updateImplementation" + | "updateRegistrar" ): FunctionFragment; encodeFunctionData(functionFragment: "create", values?: undefined): string; @@ -41,12 +45,20 @@ export interface IGasFwdFactoryInterface extends utils.Interface { functionFragment: "updateImplementation", values: [PromiseOrValue] ): string; + encodeFunctionData( + functionFragment: "updateRegistrar", + values: [PromiseOrValue] + ): string; decodeFunctionResult(functionFragment: "create", data: BytesLike): Result; decodeFunctionResult( functionFragment: "updateImplementation", data: BytesLike ): Result; + decodeFunctionResult( + functionFragment: "updateRegistrar", + data: BytesLike + ): Result; events: { "GasFwdCreated(address)": EventFragment; @@ -97,6 +109,11 @@ export interface IGasFwdFactory extends BaseContract { _impl: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; + + updateRegistrar( + _impl: PromiseOrValue, + overrides?: Overrides & { from?: PromiseOrValue } + ): Promise; }; create( @@ -108,6 +125,11 @@ export interface IGasFwdFactory extends BaseContract { overrides?: Overrides & { from?: PromiseOrValue } ): Promise; + updateRegistrar( + _impl: PromiseOrValue, + overrides?: Overrides & { from?: PromiseOrValue } + ): Promise; + callStatic: { create(overrides?: CallOverrides): Promise; @@ -115,6 +137,11 @@ export interface IGasFwdFactory extends BaseContract { _impl: PromiseOrValue, overrides?: CallOverrides ): Promise; + + updateRegistrar( + _impl: PromiseOrValue, + overrides?: CallOverrides + ): Promise; }; filters: { @@ -131,6 +158,11 @@ export interface IGasFwdFactory extends BaseContract { _impl: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; + + updateRegistrar( + _impl: PromiseOrValue, + overrides?: Overrides & { from?: PromiseOrValue } + ): Promise; }; populateTransaction: { @@ -142,5 +174,10 @@ export interface IGasFwdFactory extends BaseContract { _impl: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; + + updateRegistrar( + _impl: PromiseOrValue, + overrides?: Overrides & { from?: PromiseOrValue } + ): Promise; }; } diff --git a/src/types/typechain-types/contracts/core/registrar/LocalRegistrar.ts b/src/types/typechain-types/contracts/core/registrar/LocalRegistrar.ts index a8579e08c2..b7e075ba66 100644 --- a/src/types/typechain-types/contracts/core/registrar/LocalRegistrar.ts +++ b/src/types/typechain-types/contracts/core/registrar/LocalRegistrar.ts @@ -27,24 +27,6 @@ import type { PromiseOrValue, } from "../../../common"; -export declare namespace APGoldfinchConfigLib { - export type CRVParamsStruct = { - allowedSlippage: PromiseOrValue; - }; - - export type CRVParamsStructOutput = [BigNumber] & { - allowedSlippage: BigNumber; - }; - - export type APGoldfinchConfigStruct = { - crvParams: APGoldfinchConfigLib.CRVParamsStruct; - }; - - export type APGoldfinchConfigStructOutput = [ - APGoldfinchConfigLib.CRVParamsStructOutput - ] & { crvParams: APGoldfinchConfigLib.CRVParamsStructOutput }; -} - export declare namespace LocalRegistrarLib { export type AngelProtocolParamsStruct = { routerAddr: PromiseOrValue; @@ -123,9 +105,38 @@ export declare namespace LibAccounts { }; } +export declare namespace IAccountsStrategy { + export type NetworkInfoStruct = { + chainId: PromiseOrValue; + router: PromiseOrValue; + axelarGateway: PromiseOrValue; + ibcChannel: PromiseOrValue; + transferChannel: PromiseOrValue; + gasReceiver: PromiseOrValue; + gasLimit: PromiseOrValue; + }; + + export type NetworkInfoStructOutput = [ + BigNumber, + string, + string, + string, + string, + string, + BigNumber + ] & { + chainId: BigNumber; + router: string; + axelarGateway: string; + ibcChannel: string; + transferChannel: string; + gasReceiver: string; + gasLimit: BigNumber; + }; +} + export interface LocalRegistrarInterface extends utils.Interface { functions: { - "getAPGoldfinchParams()": FunctionFragment; "getAccountsContractAddressByChain(string)": FunctionFragment; "getAngelProtocolParams()": FunctionFragment; "getFeeSettingsByFeeType(uint8)": FunctionFragment; @@ -139,8 +150,8 @@ export interface LocalRegistrarInterface extends utils.Interface { "initialize()": FunctionFragment; "isTokenAccepted(address)": FunctionFragment; "owner()": FunctionFragment; + "queryNetworkConnection(string)": FunctionFragment; "renounceOwnership()": FunctionFragment; - "setAPGoldfinchParams(((uint256)))": FunctionFragment; "setAccountsContractAddressByChain(string,string)": FunctionFragment; "setAngelProtocolParams((address,address))": FunctionFragment; "setFeeSettingsByFeesType(uint8,uint256,address)": FunctionFragment; @@ -152,11 +163,11 @@ export interface LocalRegistrarInterface extends utils.Interface { "setUniswapAddresses(address,address)": FunctionFragment; "setVaultOperatorApproved(address,bool)": FunctionFragment; "transferOwnership(address)": FunctionFragment; + "updateNetworkConnections(string,(uint256,address,address,string,string,address,uint256),uint8)": FunctionFragment; }; getFunction( nameOrSignatureOrTopic: - | "getAPGoldfinchParams" | "getAccountsContractAddressByChain" | "getAngelProtocolParams" | "getFeeSettingsByFeeType" @@ -170,8 +181,8 @@ export interface LocalRegistrarInterface extends utils.Interface { | "initialize" | "isTokenAccepted" | "owner" + | "queryNetworkConnection" | "renounceOwnership" - | "setAPGoldfinchParams" | "setAccountsContractAddressByChain" | "setAngelProtocolParams" | "setFeeSettingsByFeesType" @@ -183,12 +194,9 @@ export interface LocalRegistrarInterface extends utils.Interface { | "setUniswapAddresses" | "setVaultOperatorApproved" | "transferOwnership" + | "updateNetworkConnections" ): FunctionFragment; - encodeFunctionData( - functionFragment: "getAPGoldfinchParams", - values?: undefined - ): string; encodeFunctionData( functionFragment: "getAccountsContractAddressByChain", values: [PromiseOrValue] @@ -239,12 +247,12 @@ export interface LocalRegistrarInterface extends utils.Interface { ): string; encodeFunctionData(functionFragment: "owner", values?: undefined): string; encodeFunctionData( - functionFragment: "renounceOwnership", - values?: undefined + functionFragment: "queryNetworkConnection", + values: [PromiseOrValue] ): string; encodeFunctionData( - functionFragment: "setAPGoldfinchParams", - values: [APGoldfinchConfigLib.APGoldfinchConfigStruct] + functionFragment: "renounceOwnership", + values?: undefined ): string; encodeFunctionData( functionFragment: "setAccountsContractAddressByChain", @@ -300,11 +308,15 @@ export interface LocalRegistrarInterface extends utils.Interface { functionFragment: "transferOwnership", values: [PromiseOrValue] ): string; + encodeFunctionData( + functionFragment: "updateNetworkConnections", + values: [ + PromiseOrValue, + IAccountsStrategy.NetworkInfoStruct, + PromiseOrValue + ] + ): string; - decodeFunctionResult( - functionFragment: "getAPGoldfinchParams", - data: BytesLike - ): Result; decodeFunctionResult( functionFragment: "getAccountsContractAddressByChain", data: BytesLike @@ -352,11 +364,11 @@ export interface LocalRegistrarInterface extends utils.Interface { ): Result; decodeFunctionResult(functionFragment: "owner", data: BytesLike): Result; decodeFunctionResult( - functionFragment: "renounceOwnership", + functionFragment: "queryNetworkConnection", data: BytesLike ): Result; decodeFunctionResult( - functionFragment: "setAPGoldfinchParams", + functionFragment: "renounceOwnership", data: BytesLike ): Result; decodeFunctionResult( @@ -403,6 +415,10 @@ export interface LocalRegistrarInterface extends utils.Interface { functionFragment: "transferOwnership", data: BytesLike ): Result; + decodeFunctionResult( + functionFragment: "updateNetworkConnections", + data: BytesLike + ): Result; events: { "AccountsContractStorageUpdated(string,string)": EventFragment; @@ -410,6 +426,8 @@ export interface LocalRegistrarInterface extends utils.Interface { "FeeSettingsUpdated(uint8,uint256,address)": EventFragment; "GasFeeUpdated(address,uint256)": EventFragment; "Initialized(uint8)": EventFragment; + "NetworkConnectionPosted(uint256)": EventFragment; + "NetworkConnectionRemoved(uint256)": EventFragment; "OwnershipTransferred(address,address)": EventFragment; "RebalanceParamsUpdated()": EventFragment; "StrategyApprovalUpdated(bytes4,uint8)": EventFragment; @@ -424,6 +442,8 @@ export interface LocalRegistrarInterface extends utils.Interface { getEvent(nameOrSignatureOrTopic: "FeeSettingsUpdated"): EventFragment; getEvent(nameOrSignatureOrTopic: "GasFeeUpdated"): EventFragment; getEvent(nameOrSignatureOrTopic: "Initialized"): EventFragment; + getEvent(nameOrSignatureOrTopic: "NetworkConnectionPosted"): EventFragment; + getEvent(nameOrSignatureOrTopic: "NetworkConnectionRemoved"): EventFragment; getEvent(nameOrSignatureOrTopic: "OwnershipTransferred"): EventFragment; getEvent(nameOrSignatureOrTopic: "RebalanceParamsUpdated"): EventFragment; getEvent(nameOrSignatureOrTopic: "StrategyApprovalUpdated"): EventFragment; @@ -483,6 +503,28 @@ export type InitializedEvent = TypedEvent<[number], InitializedEventObject>; export type InitializedEventFilter = TypedEventFilter; +export interface NetworkConnectionPostedEventObject { + chainId: BigNumber; +} +export type NetworkConnectionPostedEvent = TypedEvent< + [BigNumber], + NetworkConnectionPostedEventObject +>; + +export type NetworkConnectionPostedEventFilter = + TypedEventFilter; + +export interface NetworkConnectionRemovedEventObject { + chainId: BigNumber; +} +export type NetworkConnectionRemovedEvent = TypedEvent< + [BigNumber], + NetworkConnectionRemovedEventObject +>; + +export type NetworkConnectionRemovedEventFilter = + TypedEventFilter; + export interface OwnershipTransferredEventObject { previousOwner: string; newOwner: string; @@ -570,10 +612,6 @@ export interface LocalRegistrar extends BaseContract { removeListener: OnEvent; functions: { - getAPGoldfinchParams( - overrides?: CallOverrides - ): Promise<[APGoldfinchConfigLib.APGoldfinchConfigStructOutput]>; - getAccountsContractAddressByChain( _targetChain: PromiseOrValue, overrides?: CallOverrides @@ -627,12 +665,16 @@ export interface LocalRegistrar extends BaseContract { owner(overrides?: CallOverrides): Promise<[string]>; - renounceOwnership( - overrides?: Overrides & { from?: PromiseOrValue } - ): Promise; + queryNetworkConnection( + networkName: PromiseOrValue, + overrides?: CallOverrides + ): Promise< + [IAccountsStrategy.NetworkInfoStructOutput] & { + response: IAccountsStrategy.NetworkInfoStructOutput; + } + >; - setAPGoldfinchParams( - _apGoldfinch: APGoldfinchConfigLib.APGoldfinchConfigStruct, + renounceOwnership( overrides?: Overrides & { from?: PromiseOrValue } ): Promise; @@ -702,11 +744,14 @@ export interface LocalRegistrar extends BaseContract { newOwner: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; - }; - getAPGoldfinchParams( - overrides?: CallOverrides - ): Promise; + updateNetworkConnections( + networkName: PromiseOrValue, + networkInfo: IAccountsStrategy.NetworkInfoStruct, + action: PromiseOrValue, + overrides?: Overrides & { from?: PromiseOrValue } + ): Promise; + }; getAccountsContractAddressByChain( _targetChain: PromiseOrValue, @@ -761,12 +806,12 @@ export interface LocalRegistrar extends BaseContract { owner(overrides?: CallOverrides): Promise; - renounceOwnership( - overrides?: Overrides & { from?: PromiseOrValue } - ): Promise; + queryNetworkConnection( + networkName: PromiseOrValue, + overrides?: CallOverrides + ): Promise; - setAPGoldfinchParams( - _apGoldfinch: APGoldfinchConfigLib.APGoldfinchConfigStruct, + renounceOwnership( overrides?: Overrides & { from?: PromiseOrValue } ): Promise; @@ -837,11 +882,14 @@ export interface LocalRegistrar extends BaseContract { overrides?: Overrides & { from?: PromiseOrValue } ): Promise; - callStatic: { - getAPGoldfinchParams( - overrides?: CallOverrides - ): Promise; + updateNetworkConnections( + networkName: PromiseOrValue, + networkInfo: IAccountsStrategy.NetworkInfoStruct, + action: PromiseOrValue, + overrides?: Overrides & { from?: PromiseOrValue } + ): Promise; + callStatic: { getAccountsContractAddressByChain( _targetChain: PromiseOrValue, overrides?: CallOverrides @@ -893,12 +941,12 @@ export interface LocalRegistrar extends BaseContract { owner(overrides?: CallOverrides): Promise; - renounceOwnership(overrides?: CallOverrides): Promise; - - setAPGoldfinchParams( - _apGoldfinch: APGoldfinchConfigLib.APGoldfinchConfigStruct, + queryNetworkConnection( + networkName: PromiseOrValue, overrides?: CallOverrides - ): Promise; + ): Promise; + + renounceOwnership(overrides?: CallOverrides): Promise; setAccountsContractAddressByChain( _chainName: PromiseOrValue, @@ -966,6 +1014,13 @@ export interface LocalRegistrar extends BaseContract { newOwner: PromiseOrValue, overrides?: CallOverrides ): Promise; + + updateNetworkConnections( + networkName: PromiseOrValue, + networkInfo: IAccountsStrategy.NetworkInfoStruct, + action: PromiseOrValue, + overrides?: CallOverrides + ): Promise; }; filters: { @@ -1001,6 +1056,18 @@ export interface LocalRegistrar extends BaseContract { "Initialized(uint8)"(version?: null): InitializedEventFilter; Initialized(version?: null): InitializedEventFilter; + "NetworkConnectionPosted(uint256)"( + chainId?: null + ): NetworkConnectionPostedEventFilter; + NetworkConnectionPosted(chainId?: null): NetworkConnectionPostedEventFilter; + + "NetworkConnectionRemoved(uint256)"( + chainId?: null + ): NetworkConnectionRemovedEventFilter; + NetworkConnectionRemoved( + chainId?: null + ): NetworkConnectionRemovedEventFilter; + "OwnershipTransferred(address,address)"( previousOwner?: PromiseOrValue | null, newOwner?: PromiseOrValue | null @@ -1048,8 +1115,6 @@ export interface LocalRegistrar extends BaseContract { }; estimateGas: { - getAPGoldfinchParams(overrides?: CallOverrides): Promise; - getAccountsContractAddressByChain( _targetChain: PromiseOrValue, overrides?: CallOverrides @@ -1099,12 +1164,12 @@ export interface LocalRegistrar extends BaseContract { owner(overrides?: CallOverrides): Promise; - renounceOwnership( - overrides?: Overrides & { from?: PromiseOrValue } + queryNetworkConnection( + networkName: PromiseOrValue, + overrides?: CallOverrides ): Promise; - setAPGoldfinchParams( - _apGoldfinch: APGoldfinchConfigLib.APGoldfinchConfigStruct, + renounceOwnership( overrides?: Overrides & { from?: PromiseOrValue } ): Promise; @@ -1174,13 +1239,16 @@ export interface LocalRegistrar extends BaseContract { newOwner: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; + + updateNetworkConnections( + networkName: PromiseOrValue, + networkInfo: IAccountsStrategy.NetworkInfoStruct, + action: PromiseOrValue, + overrides?: Overrides & { from?: PromiseOrValue } + ): Promise; }; populateTransaction: { - getAPGoldfinchParams( - overrides?: CallOverrides - ): Promise; - getAccountsContractAddressByChain( _targetChain: PromiseOrValue, overrides?: CallOverrides @@ -1238,12 +1306,12 @@ export interface LocalRegistrar extends BaseContract { owner(overrides?: CallOverrides): Promise; - renounceOwnership( - overrides?: Overrides & { from?: PromiseOrValue } + queryNetworkConnection( + networkName: PromiseOrValue, + overrides?: CallOverrides ): Promise; - setAPGoldfinchParams( - _apGoldfinch: APGoldfinchConfigLib.APGoldfinchConfigStruct, + renounceOwnership( overrides?: Overrides & { from?: PromiseOrValue } ): Promise; @@ -1313,5 +1381,12 @@ export interface LocalRegistrar extends BaseContract { newOwner: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; + + updateNetworkConnections( + networkName: PromiseOrValue, + networkInfo: IAccountsStrategy.NetworkInfoStruct, + action: PromiseOrValue, + overrides?: Overrides & { from?: PromiseOrValue } + ): Promise; }; } diff --git a/src/types/typechain-types/contracts/core/registrar/Registrar.ts b/src/types/typechain-types/contracts/core/registrar/Registrar.ts index 33fd9c59d5..4aae8caabd 100644 --- a/src/types/typechain-types/contracts/core/registrar/Registrar.ts +++ b/src/types/typechain-types/contracts/core/registrar/Registrar.ts @@ -27,24 +27,6 @@ import type { PromiseOrValue, } from "../../../common"; -export declare namespace APGoldfinchConfigLib { - export type CRVParamsStruct = { - allowedSlippage: PromiseOrValue; - }; - - export type CRVParamsStructOutput = [BigNumber] & { - allowedSlippage: BigNumber; - }; - - export type APGoldfinchConfigStruct = { - crvParams: APGoldfinchConfigLib.CRVParamsStruct; - }; - - export type APGoldfinchConfigStructOutput = [ - APGoldfinchConfigLib.CRVParamsStructOutput - ] & { crvParams: APGoldfinchConfigLib.CRVParamsStructOutput }; -} - export declare namespace LocalRegistrarLib { export type AngelProtocolParamsStruct = { routerAddr: PromiseOrValue; @@ -393,7 +375,6 @@ export declare namespace IAccountsStrategy { export interface RegistrarInterface extends utils.Interface { functions: { - "getAPGoldfinchParams()": FunctionFragment; "getAccountsContractAddressByChain(string)": FunctionFragment; "getAngelProtocolParams()": FunctionFragment; "getFeeSettingsByFeeType(uint8)": FunctionFragment; @@ -413,7 +394,6 @@ export interface RegistrarInterface extends utils.Interface { "queryNetworkConnection(string)": FunctionFragment; "queryTokenPriceFeed(address)": FunctionFragment; "renounceOwnership()": FunctionFragment; - "setAPGoldfinchParams(((uint256)))": FunctionFragment; "setAccountsContractAddressByChain(string,string)": FunctionFragment; "setAngelProtocolParams((address,address))": FunctionFragment; "setFeeSettingsByFeesType(uint8,uint256,address)": FunctionFragment; @@ -426,13 +406,12 @@ export interface RegistrarInterface extends utils.Interface { "setVaultOperatorApproved(address,bool)": FunctionFragment; "transferOwnership(address)": FunctionFragment; "updateConfig((address,uint256,uint256,uint256,uint256,address,address,address,address,address,address,address,address,address,address,address,address,address,address,address,address,address,address,address,address,address,address,address,address,address,address,address))": FunctionFragment; - "updateNetworkConnections(string,(uint256,address,address,string,string,address,uint256),string)": FunctionFragment; + "updateNetworkConnections(string,(uint256,address,address,string,string,address,uint256),uint8)": FunctionFragment; "updateTokenPriceFeed(address,address)": FunctionFragment; }; getFunction( nameOrSignatureOrTopic: - | "getAPGoldfinchParams" | "getAccountsContractAddressByChain" | "getAngelProtocolParams" | "getFeeSettingsByFeeType" @@ -452,7 +431,6 @@ export interface RegistrarInterface extends utils.Interface { | "queryNetworkConnection" | "queryTokenPriceFeed" | "renounceOwnership" - | "setAPGoldfinchParams" | "setAccountsContractAddressByChain" | "setAngelProtocolParams" | "setFeeSettingsByFeesType" @@ -469,10 +447,6 @@ export interface RegistrarInterface extends utils.Interface { | "updateTokenPriceFeed" ): FunctionFragment; - encodeFunctionData( - functionFragment: "getAPGoldfinchParams", - values?: undefined - ): string; encodeFunctionData( functionFragment: "getAccountsContractAddressByChain", values: [PromiseOrValue] @@ -546,10 +520,6 @@ export interface RegistrarInterface extends utils.Interface { functionFragment: "renounceOwnership", values?: undefined ): string; - encodeFunctionData( - functionFragment: "setAPGoldfinchParams", - values: [APGoldfinchConfigLib.APGoldfinchConfigStruct] - ): string; encodeFunctionData( functionFragment: "setAccountsContractAddressByChain", values: [PromiseOrValue, PromiseOrValue] @@ -613,7 +583,7 @@ export interface RegistrarInterface extends utils.Interface { values: [ PromiseOrValue, IAccountsStrategy.NetworkInfoStruct, - PromiseOrValue + PromiseOrValue ] ): string; encodeFunctionData( @@ -621,10 +591,6 @@ export interface RegistrarInterface extends utils.Interface { values: [PromiseOrValue, PromiseOrValue] ): string; - decodeFunctionResult( - functionFragment: "getAPGoldfinchParams", - data: BytesLike - ): Result; decodeFunctionResult( functionFragment: "getAccountsContractAddressByChain", data: BytesLike @@ -698,10 +664,6 @@ export interface RegistrarInterface extends utils.Interface { functionFragment: "renounceOwnership", data: BytesLike ): Result; - decodeFunctionResult( - functionFragment: "setAPGoldfinchParams", - data: BytesLike - ): Result; decodeFunctionResult( functionFragment: "setAccountsContractAddressByChain", data: BytesLike @@ -958,10 +920,6 @@ export interface Registrar extends BaseContract { removeListener: OnEvent; functions: { - getAPGoldfinchParams( - overrides?: CallOverrides - ): Promise<[APGoldfinchConfigLib.APGoldfinchConfigStructOutput]>; - getAccountsContractAddressByChain( _targetChain: PromiseOrValue, overrides?: CallOverrides @@ -1046,11 +1004,6 @@ export interface Registrar extends BaseContract { overrides?: Overrides & { from?: PromiseOrValue } ): Promise; - setAPGoldfinchParams( - _apGoldfinch: APGoldfinchConfigLib.APGoldfinchConfigStruct, - overrides?: Overrides & { from?: PromiseOrValue } - ): Promise; - setAccountsContractAddressByChain( _chainName: PromiseOrValue, _accountsContractAddress: PromiseOrValue, @@ -1126,7 +1079,7 @@ export interface Registrar extends BaseContract { updateNetworkConnections( networkName: PromiseOrValue, networkInfo: IAccountsStrategy.NetworkInfoStruct, - action: PromiseOrValue, + action: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; @@ -1137,10 +1090,6 @@ export interface Registrar extends BaseContract { ): Promise; }; - getAPGoldfinchParams( - overrides?: CallOverrides - ): Promise; - getAccountsContractAddressByChain( _targetChain: PromiseOrValue, overrides?: CallOverrides @@ -1219,11 +1168,6 @@ export interface Registrar extends BaseContract { overrides?: Overrides & { from?: PromiseOrValue } ): Promise; - setAPGoldfinchParams( - _apGoldfinch: APGoldfinchConfigLib.APGoldfinchConfigStruct, - overrides?: Overrides & { from?: PromiseOrValue } - ): Promise; - setAccountsContractAddressByChain( _chainName: PromiseOrValue, _accountsContractAddress: PromiseOrValue, @@ -1299,7 +1243,7 @@ export interface Registrar extends BaseContract { updateNetworkConnections( networkName: PromiseOrValue, networkInfo: IAccountsStrategy.NetworkInfoStruct, - action: PromiseOrValue, + action: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; @@ -1310,10 +1254,6 @@ export interface Registrar extends BaseContract { ): Promise; callStatic: { - getAPGoldfinchParams( - overrides?: CallOverrides - ): Promise; - getAccountsContractAddressByChain( _targetChain: PromiseOrValue, overrides?: CallOverrides @@ -1388,11 +1328,6 @@ export interface Registrar extends BaseContract { renounceOwnership(overrides?: CallOverrides): Promise; - setAPGoldfinchParams( - _apGoldfinch: APGoldfinchConfigLib.APGoldfinchConfigStruct, - overrides?: CallOverrides - ): Promise; - setAccountsContractAddressByChain( _chainName: PromiseOrValue, _accountsContractAddress: PromiseOrValue, @@ -1468,7 +1403,7 @@ export interface Registrar extends BaseContract { updateNetworkConnections( networkName: PromiseOrValue, networkInfo: IAccountsStrategy.NetworkInfoStruct, - action: PromiseOrValue, + action: PromiseOrValue, overrides?: CallOverrides ): Promise; @@ -1574,8 +1509,6 @@ export interface Registrar extends BaseContract { }; estimateGas: { - getAPGoldfinchParams(overrides?: CallOverrides): Promise; - getAccountsContractAddressByChain( _targetChain: PromiseOrValue, overrides?: CallOverrides @@ -1648,11 +1581,6 @@ export interface Registrar extends BaseContract { overrides?: Overrides & { from?: PromiseOrValue } ): Promise; - setAPGoldfinchParams( - _apGoldfinch: APGoldfinchConfigLib.APGoldfinchConfigStruct, - overrides?: Overrides & { from?: PromiseOrValue } - ): Promise; - setAccountsContractAddressByChain( _chainName: PromiseOrValue, _accountsContractAddress: PromiseOrValue, @@ -1728,7 +1656,7 @@ export interface Registrar extends BaseContract { updateNetworkConnections( networkName: PromiseOrValue, networkInfo: IAccountsStrategy.NetworkInfoStruct, - action: PromiseOrValue, + action: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; @@ -1740,10 +1668,6 @@ export interface Registrar extends BaseContract { }; populateTransaction: { - getAPGoldfinchParams( - overrides?: CallOverrides - ): Promise; - getAccountsContractAddressByChain( _targetChain: PromiseOrValue, overrides?: CallOverrides @@ -1826,11 +1750,6 @@ export interface Registrar extends BaseContract { overrides?: Overrides & { from?: PromiseOrValue } ): Promise; - setAPGoldfinchParams( - _apGoldfinch: APGoldfinchConfigLib.APGoldfinchConfigStruct, - overrides?: Overrides & { from?: PromiseOrValue } - ): Promise; - setAccountsContractAddressByChain( _chainName: PromiseOrValue, _accountsContractAddress: PromiseOrValue, @@ -1906,7 +1825,7 @@ export interface Registrar extends BaseContract { updateNetworkConnections( networkName: PromiseOrValue, networkInfo: IAccountsStrategy.NetworkInfoStruct, - action: PromiseOrValue, + action: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; diff --git a/src/types/typechain-types/contracts/core/registrar/interfaces/ILocalRegistrar.ts b/src/types/typechain-types/contracts/core/registrar/interfaces/ILocalRegistrar.ts index b5535bd266..6f8d791a4d 100644 --- a/src/types/typechain-types/contracts/core/registrar/interfaces/ILocalRegistrar.ts +++ b/src/types/typechain-types/contracts/core/registrar/interfaces/ILocalRegistrar.ts @@ -105,6 +105,36 @@ export declare namespace LibAccounts { }; } +export declare namespace IAccountsStrategy { + export type NetworkInfoStruct = { + chainId: PromiseOrValue; + router: PromiseOrValue; + axelarGateway: PromiseOrValue; + ibcChannel: PromiseOrValue; + transferChannel: PromiseOrValue; + gasReceiver: PromiseOrValue; + gasLimit: PromiseOrValue; + }; + + export type NetworkInfoStructOutput = [ + BigNumber, + string, + string, + string, + string, + string, + BigNumber + ] & { + chainId: BigNumber; + router: string; + axelarGateway: string; + ibcChannel: string; + transferChannel: string; + gasReceiver: string; + gasLimit: BigNumber; + }; +} + export interface ILocalRegistrarInterface extends utils.Interface { functions: { "getAccountsContractAddressByChain(string)": FunctionFragment; @@ -114,8 +144,11 @@ export interface ILocalRegistrarInterface extends utils.Interface { "getRebalanceParams()": FunctionFragment; "getStrategyApprovalState(bytes4)": FunctionFragment; "getStrategyParamsById(bytes4)": FunctionFragment; + "getUniswapFactoryAddress()": FunctionFragment; + "getUniswapRouterAddress()": FunctionFragment; "getVaultOperatorApproved(address)": FunctionFragment; "isTokenAccepted(address)": FunctionFragment; + "queryNetworkConnection(string)": FunctionFragment; "setAccountsContractAddressByChain(string,string)": FunctionFragment; "setAngelProtocolParams((address,address))": FunctionFragment; "setFeeSettingsByFeesType(uint8,uint256,address)": FunctionFragment; @@ -124,7 +157,9 @@ export interface ILocalRegistrarInterface extends utils.Interface { "setStrategyApprovalState(bytes4,uint8)": FunctionFragment; "setStrategyParams(bytes4,string,address,address,uint8)": FunctionFragment; "setTokenAccepted(address,bool)": FunctionFragment; + "setUniswapAddresses(address,address)": FunctionFragment; "setVaultOperatorApproved(address,bool)": FunctionFragment; + "updateNetworkConnections(string,(uint256,address,address,string,string,address,uint256),uint8)": FunctionFragment; }; getFunction( @@ -136,8 +171,11 @@ export interface ILocalRegistrarInterface extends utils.Interface { | "getRebalanceParams" | "getStrategyApprovalState" | "getStrategyParamsById" + | "getUniswapFactoryAddress" + | "getUniswapRouterAddress" | "getVaultOperatorApproved" | "isTokenAccepted" + | "queryNetworkConnection" | "setAccountsContractAddressByChain" | "setAngelProtocolParams" | "setFeeSettingsByFeesType" @@ -146,7 +184,9 @@ export interface ILocalRegistrarInterface extends utils.Interface { | "setStrategyApprovalState" | "setStrategyParams" | "setTokenAccepted" + | "setUniswapAddresses" | "setVaultOperatorApproved" + | "updateNetworkConnections" ): FunctionFragment; encodeFunctionData( @@ -177,6 +217,14 @@ export interface ILocalRegistrarInterface extends utils.Interface { functionFragment: "getStrategyParamsById", values: [PromiseOrValue] ): string; + encodeFunctionData( + functionFragment: "getUniswapFactoryAddress", + values?: undefined + ): string; + encodeFunctionData( + functionFragment: "getUniswapRouterAddress", + values?: undefined + ): string; encodeFunctionData( functionFragment: "getVaultOperatorApproved", values: [PromiseOrValue] @@ -185,6 +233,10 @@ export interface ILocalRegistrarInterface extends utils.Interface { functionFragment: "isTokenAccepted", values: [PromiseOrValue] ): string; + encodeFunctionData( + functionFragment: "queryNetworkConnection", + values: [PromiseOrValue] + ): string; encodeFunctionData( functionFragment: "setAccountsContractAddressByChain", values: [PromiseOrValue, PromiseOrValue] @@ -227,10 +279,22 @@ export interface ILocalRegistrarInterface extends utils.Interface { functionFragment: "setTokenAccepted", values: [PromiseOrValue, PromiseOrValue] ): string; + encodeFunctionData( + functionFragment: "setUniswapAddresses", + values: [PromiseOrValue, PromiseOrValue] + ): string; encodeFunctionData( functionFragment: "setVaultOperatorApproved", values: [PromiseOrValue, PromiseOrValue] ): string; + encodeFunctionData( + functionFragment: "updateNetworkConnections", + values: [ + PromiseOrValue, + IAccountsStrategy.NetworkInfoStruct, + PromiseOrValue + ] + ): string; decodeFunctionResult( functionFragment: "getAccountsContractAddressByChain", @@ -260,6 +324,14 @@ export interface ILocalRegistrarInterface extends utils.Interface { functionFragment: "getStrategyParamsById", data: BytesLike ): Result; + decodeFunctionResult( + functionFragment: "getUniswapFactoryAddress", + data: BytesLike + ): Result; + decodeFunctionResult( + functionFragment: "getUniswapRouterAddress", + data: BytesLike + ): Result; decodeFunctionResult( functionFragment: "getVaultOperatorApproved", data: BytesLike @@ -268,6 +340,10 @@ export interface ILocalRegistrarInterface extends utils.Interface { functionFragment: "isTokenAccepted", data: BytesLike ): Result; + decodeFunctionResult( + functionFragment: "queryNetworkConnection", + data: BytesLike + ): Result; decodeFunctionResult( functionFragment: "setAccountsContractAddressByChain", data: BytesLike @@ -300,16 +376,26 @@ export interface ILocalRegistrarInterface extends utils.Interface { functionFragment: "setTokenAccepted", data: BytesLike ): Result; + decodeFunctionResult( + functionFragment: "setUniswapAddresses", + data: BytesLike + ): Result; decodeFunctionResult( functionFragment: "setVaultOperatorApproved", data: BytesLike ): Result; + decodeFunctionResult( + functionFragment: "updateNetworkConnections", + data: BytesLike + ): Result; events: { "AccountsContractStorageUpdated(string,string)": EventFragment; "AngelProtocolParamsUpdated()": EventFragment; "FeeSettingsUpdated(uint8,uint256,address)": EventFragment; "GasFeeUpdated(address,uint256)": EventFragment; + "NetworkConnectionPosted(uint256)": EventFragment; + "NetworkConnectionRemoved(uint256)": EventFragment; "RebalanceParamsUpdated()": EventFragment; "StrategyApprovalUpdated(bytes4,uint8)": EventFragment; "StrategyParamsUpdated(bytes4,string,address,address,uint8)": EventFragment; @@ -322,6 +408,8 @@ export interface ILocalRegistrarInterface extends utils.Interface { getEvent(nameOrSignatureOrTopic: "AngelProtocolParamsUpdated"): EventFragment; getEvent(nameOrSignatureOrTopic: "FeeSettingsUpdated"): EventFragment; getEvent(nameOrSignatureOrTopic: "GasFeeUpdated"): EventFragment; + getEvent(nameOrSignatureOrTopic: "NetworkConnectionPosted"): EventFragment; + getEvent(nameOrSignatureOrTopic: "NetworkConnectionRemoved"): EventFragment; getEvent(nameOrSignatureOrTopic: "RebalanceParamsUpdated"): EventFragment; getEvent(nameOrSignatureOrTopic: "StrategyApprovalUpdated"): EventFragment; getEvent(nameOrSignatureOrTopic: "StrategyParamsUpdated"): EventFragment; @@ -373,6 +461,28 @@ export type GasFeeUpdatedEvent = TypedEvent< export type GasFeeUpdatedEventFilter = TypedEventFilter; +export interface NetworkConnectionPostedEventObject { + chainId: BigNumber; +} +export type NetworkConnectionPostedEvent = TypedEvent< + [BigNumber], + NetworkConnectionPostedEventObject +>; + +export type NetworkConnectionPostedEventFilter = + TypedEventFilter; + +export interface NetworkConnectionRemovedEventObject { + chainId: BigNumber; +} +export type NetworkConnectionRemovedEvent = TypedEvent< + [BigNumber], + NetworkConnectionRemovedEventObject +>; + +export type NetworkConnectionRemovedEventFilter = + TypedEventFilter; + export interface RebalanceParamsUpdatedEventObject {} export type RebalanceParamsUpdatedEvent = TypedEvent< [], @@ -481,6 +591,10 @@ export interface ILocalRegistrar extends BaseContract { overrides?: CallOverrides ): Promise<[LocalRegistrarLib.StrategyParamsStructOutput]>; + getUniswapFactoryAddress(overrides?: CallOverrides): Promise<[string]>; + + getUniswapRouterAddress(overrides?: CallOverrides): Promise<[string]>; + getVaultOperatorApproved( _operator: PromiseOrValue, overrides?: CallOverrides @@ -491,6 +605,15 @@ export interface ILocalRegistrar extends BaseContract { overrides?: CallOverrides ): Promise<[boolean]>; + queryNetworkConnection( + networkName: PromiseOrValue, + overrides?: CallOverrides + ): Promise< + [IAccountsStrategy.NetworkInfoStructOutput] & { + response: IAccountsStrategy.NetworkInfoStructOutput; + } + >; + setAccountsContractAddressByChain( _chainName: PromiseOrValue, _accountsContractAddress: PromiseOrValue, @@ -541,11 +664,24 @@ export interface ILocalRegistrar extends BaseContract { overrides?: Overrides & { from?: PromiseOrValue } ): Promise; + setUniswapAddresses( + _uniswapRouter: PromiseOrValue, + _uniswapFactory: PromiseOrValue, + overrides?: Overrides & { from?: PromiseOrValue } + ): Promise; + setVaultOperatorApproved( _operator: PromiseOrValue, _isApproved: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; + + updateNetworkConnections( + networkName: PromiseOrValue, + networkInfo: IAccountsStrategy.NetworkInfoStruct, + action: PromiseOrValue, + overrides?: Overrides & { from?: PromiseOrValue } + ): Promise; }; getAccountsContractAddressByChain( @@ -581,6 +717,10 @@ export interface ILocalRegistrar extends BaseContract { overrides?: CallOverrides ): Promise; + getUniswapFactoryAddress(overrides?: CallOverrides): Promise; + + getUniswapRouterAddress(overrides?: CallOverrides): Promise; + getVaultOperatorApproved( _operator: PromiseOrValue, overrides?: CallOverrides @@ -591,6 +731,11 @@ export interface ILocalRegistrar extends BaseContract { overrides?: CallOverrides ): Promise; + queryNetworkConnection( + networkName: PromiseOrValue, + overrides?: CallOverrides + ): Promise; + setAccountsContractAddressByChain( _chainName: PromiseOrValue, _accountsContractAddress: PromiseOrValue, @@ -641,12 +786,25 @@ export interface ILocalRegistrar extends BaseContract { overrides?: Overrides & { from?: PromiseOrValue } ): Promise; + setUniswapAddresses( + _uniswapRouter: PromiseOrValue, + _uniswapFactory: PromiseOrValue, + overrides?: Overrides & { from?: PromiseOrValue } + ): Promise; + setVaultOperatorApproved( _operator: PromiseOrValue, _isApproved: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; + updateNetworkConnections( + networkName: PromiseOrValue, + networkInfo: IAccountsStrategy.NetworkInfoStruct, + action: PromiseOrValue, + overrides?: Overrides & { from?: PromiseOrValue } + ): Promise; + callStatic: { getAccountsContractAddressByChain( _targetChain: PromiseOrValue, @@ -681,6 +839,10 @@ export interface ILocalRegistrar extends BaseContract { overrides?: CallOverrides ): Promise; + getUniswapFactoryAddress(overrides?: CallOverrides): Promise; + + getUniswapRouterAddress(overrides?: CallOverrides): Promise; + getVaultOperatorApproved( _operator: PromiseOrValue, overrides?: CallOverrides @@ -691,6 +853,11 @@ export interface ILocalRegistrar extends BaseContract { overrides?: CallOverrides ): Promise; + queryNetworkConnection( + networkName: PromiseOrValue, + overrides?: CallOverrides + ): Promise; + setAccountsContractAddressByChain( _chainName: PromiseOrValue, _accountsContractAddress: PromiseOrValue, @@ -741,11 +908,24 @@ export interface ILocalRegistrar extends BaseContract { overrides?: CallOverrides ): Promise; + setUniswapAddresses( + _uniswapRouter: PromiseOrValue, + _uniswapFactory: PromiseOrValue, + overrides?: CallOverrides + ): Promise; + setVaultOperatorApproved( _operator: PromiseOrValue, _isApproved: PromiseOrValue, overrides?: CallOverrides ): Promise; + + updateNetworkConnections( + networkName: PromiseOrValue, + networkInfo: IAccountsStrategy.NetworkInfoStruct, + action: PromiseOrValue, + overrides?: CallOverrides + ): Promise; }; filters: { @@ -778,6 +958,18 @@ export interface ILocalRegistrar extends BaseContract { ): GasFeeUpdatedEventFilter; GasFeeUpdated(_tokenAddr?: null, _gasFee?: null): GasFeeUpdatedEventFilter; + "NetworkConnectionPosted(uint256)"( + chainId?: null + ): NetworkConnectionPostedEventFilter; + NetworkConnectionPosted(chainId?: null): NetworkConnectionPostedEventFilter; + + "NetworkConnectionRemoved(uint256)"( + chainId?: null + ): NetworkConnectionRemovedEventFilter; + NetworkConnectionRemoved( + chainId?: null + ): NetworkConnectionRemovedEventFilter; + "RebalanceParamsUpdated()"(): RebalanceParamsUpdatedEventFilter; RebalanceParamsUpdated(): RebalanceParamsUpdatedEventFilter; @@ -845,6 +1037,10 @@ export interface ILocalRegistrar extends BaseContract { overrides?: CallOverrides ): Promise; + getUniswapFactoryAddress(overrides?: CallOverrides): Promise; + + getUniswapRouterAddress(overrides?: CallOverrides): Promise; + getVaultOperatorApproved( _operator: PromiseOrValue, overrides?: CallOverrides @@ -855,6 +1051,11 @@ export interface ILocalRegistrar extends BaseContract { overrides?: CallOverrides ): Promise; + queryNetworkConnection( + networkName: PromiseOrValue, + overrides?: CallOverrides + ): Promise; + setAccountsContractAddressByChain( _chainName: PromiseOrValue, _accountsContractAddress: PromiseOrValue, @@ -905,11 +1106,24 @@ export interface ILocalRegistrar extends BaseContract { overrides?: Overrides & { from?: PromiseOrValue } ): Promise; + setUniswapAddresses( + _uniswapRouter: PromiseOrValue, + _uniswapFactory: PromiseOrValue, + overrides?: Overrides & { from?: PromiseOrValue } + ): Promise; + setVaultOperatorApproved( _operator: PromiseOrValue, _isApproved: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; + + updateNetworkConnections( + networkName: PromiseOrValue, + networkInfo: IAccountsStrategy.NetworkInfoStruct, + action: PromiseOrValue, + overrides?: Overrides & { from?: PromiseOrValue } + ): Promise; }; populateTransaction: { @@ -946,6 +1160,14 @@ export interface ILocalRegistrar extends BaseContract { overrides?: CallOverrides ): Promise; + getUniswapFactoryAddress( + overrides?: CallOverrides + ): Promise; + + getUniswapRouterAddress( + overrides?: CallOverrides + ): Promise; + getVaultOperatorApproved( _operator: PromiseOrValue, overrides?: CallOverrides @@ -956,6 +1178,11 @@ export interface ILocalRegistrar extends BaseContract { overrides?: CallOverrides ): Promise; + queryNetworkConnection( + networkName: PromiseOrValue, + overrides?: CallOverrides + ): Promise; + setAccountsContractAddressByChain( _chainName: PromiseOrValue, _accountsContractAddress: PromiseOrValue, @@ -1006,10 +1233,23 @@ export interface ILocalRegistrar extends BaseContract { overrides?: Overrides & { from?: PromiseOrValue } ): Promise; + setUniswapAddresses( + _uniswapRouter: PromiseOrValue, + _uniswapFactory: PromiseOrValue, + overrides?: Overrides & { from?: PromiseOrValue } + ): Promise; + setVaultOperatorApproved( _operator: PromiseOrValue, _isApproved: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; + + updateNetworkConnections( + networkName: PromiseOrValue, + networkInfo: IAccountsStrategy.NetworkInfoStruct, + action: PromiseOrValue, + overrides?: Overrides & { from?: PromiseOrValue } + ): Promise; }; } diff --git a/src/types/typechain-types/contracts/core/registrar/interfaces/IRegistrar.ts b/src/types/typechain-types/contracts/core/registrar/interfaces/IRegistrar.ts index fbcc1a2548..8e401cd56c 100644 --- a/src/types/typechain-types/contracts/core/registrar/interfaces/IRegistrar.ts +++ b/src/types/typechain-types/contracts/core/registrar/interfaces/IRegistrar.ts @@ -360,6 +360,8 @@ export interface IRegistrarInterface extends utils.Interface { "getRebalanceParams()": FunctionFragment; "getStrategyApprovalState(bytes4)": FunctionFragment; "getStrategyParamsById(bytes4)": FunctionFragment; + "getUniswapFactoryAddress()": FunctionFragment; + "getUniswapRouterAddress()": FunctionFragment; "getVaultOperatorApproved(address)": FunctionFragment; "isTokenAccepted(address)": FunctionFragment; "owner()": FunctionFragment; @@ -375,8 +377,10 @@ export interface IRegistrarInterface extends utils.Interface { "setStrategyApprovalState(bytes4,uint8)": FunctionFragment; "setStrategyParams(bytes4,string,address,address,uint8)": FunctionFragment; "setTokenAccepted(address,bool)": FunctionFragment; + "setUniswapAddresses(address,address)": FunctionFragment; "setVaultOperatorApproved(address,bool)": FunctionFragment; "updateConfig((address,uint256,uint256,uint256,uint256,address,address,address,address,address,address,address,address,address,address,address,address,address,address,address,address,address,address,address,address,address,address,address,address,address,address,address))": FunctionFragment; + "updateNetworkConnections(string,(uint256,address,address,string,string,address,uint256),uint8)": FunctionFragment; "updateNetworkConnections(string,(uint256,address,address,string,string,address,uint256),string)": FunctionFragment; "updateOwner(address)": FunctionFragment; "updateTokenPriceFeed(address,address)": FunctionFragment; @@ -391,6 +395,8 @@ export interface IRegistrarInterface extends utils.Interface { | "getRebalanceParams" | "getStrategyApprovalState" | "getStrategyParamsById" + | "getUniswapFactoryAddress" + | "getUniswapRouterAddress" | "getVaultOperatorApproved" | "isTokenAccepted" | "owner" @@ -406,9 +412,11 @@ export interface IRegistrarInterface extends utils.Interface { | "setStrategyApprovalState" | "setStrategyParams" | "setTokenAccepted" + | "setUniswapAddresses" | "setVaultOperatorApproved" | "updateConfig" - | "updateNetworkConnections" + | "updateNetworkConnections(string,(uint256,address,address,string,string,address,uint256),uint8)" + | "updateNetworkConnections(string,(uint256,address,address,string,string,address,uint256),string)" | "updateOwner" | "updateTokenPriceFeed" ): FunctionFragment; @@ -441,6 +449,14 @@ export interface IRegistrarInterface extends utils.Interface { functionFragment: "getStrategyParamsById", values: [PromiseOrValue] ): string; + encodeFunctionData( + functionFragment: "getUniswapFactoryAddress", + values?: undefined + ): string; + encodeFunctionData( + functionFragment: "getUniswapRouterAddress", + values?: undefined + ): string; encodeFunctionData( functionFragment: "getVaultOperatorApproved", values: [PromiseOrValue] @@ -508,6 +524,10 @@ export interface IRegistrarInterface extends utils.Interface { functionFragment: "setTokenAccepted", values: [PromiseOrValue, PromiseOrValue] ): string; + encodeFunctionData( + functionFragment: "setUniswapAddresses", + values: [PromiseOrValue, PromiseOrValue] + ): string; encodeFunctionData( functionFragment: "setVaultOperatorApproved", values: [PromiseOrValue, PromiseOrValue] @@ -517,7 +537,15 @@ export interface IRegistrarInterface extends utils.Interface { values: [RegistrarMessages.UpdateConfigRequestStruct] ): string; encodeFunctionData( - functionFragment: "updateNetworkConnections", + functionFragment: "updateNetworkConnections(string,(uint256,address,address,string,string,address,uint256),uint8)", + values: [ + PromiseOrValue, + IAccountsStrategy.NetworkInfoStruct, + PromiseOrValue + ] + ): string; + encodeFunctionData( + functionFragment: "updateNetworkConnections(string,(uint256,address,address,string,string,address,uint256),string)", values: [ PromiseOrValue, IAccountsStrategy.NetworkInfoStruct, @@ -561,6 +589,14 @@ export interface IRegistrarInterface extends utils.Interface { functionFragment: "getStrategyParamsById", data: BytesLike ): Result; + decodeFunctionResult( + functionFragment: "getUniswapFactoryAddress", + data: BytesLike + ): Result; + decodeFunctionResult( + functionFragment: "getUniswapRouterAddress", + data: BytesLike + ): Result; decodeFunctionResult( functionFragment: "getVaultOperatorApproved", data: BytesLike @@ -618,6 +654,10 @@ export interface IRegistrarInterface extends utils.Interface { functionFragment: "setTokenAccepted", data: BytesLike ): Result; + decodeFunctionResult( + functionFragment: "setUniswapAddresses", + data: BytesLike + ): Result; decodeFunctionResult( functionFragment: "setVaultOperatorApproved", data: BytesLike @@ -627,7 +667,11 @@ export interface IRegistrarInterface extends utils.Interface { data: BytesLike ): Result; decodeFunctionResult( - functionFragment: "updateNetworkConnections", + functionFragment: "updateNetworkConnections(string,(uint256,address,address,string,string,address,uint256),uint8)", + data: BytesLike + ): Result; + decodeFunctionResult( + functionFragment: "updateNetworkConnections(string,(uint256,address,address,string,string,address,uint256),string)", data: BytesLike ): Result; decodeFunctionResult( @@ -644,6 +688,8 @@ export interface IRegistrarInterface extends utils.Interface { "AngelProtocolParamsUpdated()": EventFragment; "FeeSettingsUpdated(uint8,uint256,address)": EventFragment; "GasFeeUpdated(address,uint256)": EventFragment; + "NetworkConnectionPosted(uint256)": EventFragment; + "NetworkConnectionRemoved(uint256)": EventFragment; "RebalanceParamsUpdated()": EventFragment; "StrategyApprovalUpdated(bytes4,uint8)": EventFragment; "StrategyParamsUpdated(bytes4,string,address,address,uint8)": EventFragment; @@ -656,6 +702,8 @@ export interface IRegistrarInterface extends utils.Interface { getEvent(nameOrSignatureOrTopic: "AngelProtocolParamsUpdated"): EventFragment; getEvent(nameOrSignatureOrTopic: "FeeSettingsUpdated"): EventFragment; getEvent(nameOrSignatureOrTopic: "GasFeeUpdated"): EventFragment; + getEvent(nameOrSignatureOrTopic: "NetworkConnectionPosted"): EventFragment; + getEvent(nameOrSignatureOrTopic: "NetworkConnectionRemoved"): EventFragment; getEvent(nameOrSignatureOrTopic: "RebalanceParamsUpdated"): EventFragment; getEvent(nameOrSignatureOrTopic: "StrategyApprovalUpdated"): EventFragment; getEvent(nameOrSignatureOrTopic: "StrategyParamsUpdated"): EventFragment; @@ -707,6 +755,28 @@ export type GasFeeUpdatedEvent = TypedEvent< export type GasFeeUpdatedEventFilter = TypedEventFilter; +export interface NetworkConnectionPostedEventObject { + chainId: BigNumber; +} +export type NetworkConnectionPostedEvent = TypedEvent< + [BigNumber], + NetworkConnectionPostedEventObject +>; + +export type NetworkConnectionPostedEventFilter = + TypedEventFilter; + +export interface NetworkConnectionRemovedEventObject { + chainId: BigNumber; +} +export type NetworkConnectionRemovedEvent = TypedEvent< + [BigNumber], + NetworkConnectionRemovedEventObject +>; + +export type NetworkConnectionRemovedEventFilter = + TypedEventFilter; + export interface RebalanceParamsUpdatedEventObject {} export type RebalanceParamsUpdatedEvent = TypedEvent< [], @@ -815,6 +885,10 @@ export interface IRegistrar extends BaseContract { overrides?: CallOverrides ): Promise<[LocalRegistrarLib.StrategyParamsStructOutput]>; + getUniswapFactoryAddress(overrides?: CallOverrides): Promise<[string]>; + + getUniswapRouterAddress(overrides?: CallOverrides): Promise<[string]>; + getVaultOperatorApproved( _operator: PromiseOrValue, overrides?: CallOverrides @@ -899,6 +973,12 @@ export interface IRegistrar extends BaseContract { overrides?: Overrides & { from?: PromiseOrValue } ): Promise; + setUniswapAddresses( + _uniswapRouter: PromiseOrValue, + _uniswapFactory: PromiseOrValue, + overrides?: Overrides & { from?: PromiseOrValue } + ): Promise; + setVaultOperatorApproved( _operator: PromiseOrValue, _isApproved: PromiseOrValue, @@ -910,7 +990,14 @@ export interface IRegistrar extends BaseContract { overrides?: Overrides & { from?: PromiseOrValue } ): Promise; - updateNetworkConnections( + "updateNetworkConnections(string,(uint256,address,address,string,string,address,uint256),uint8)"( + networkName: PromiseOrValue, + networkInfo: IAccountsStrategy.NetworkInfoStruct, + action: PromiseOrValue, + overrides?: Overrides & { from?: PromiseOrValue } + ): Promise; + + "updateNetworkConnections(string,(uint256,address,address,string,string,address,uint256),string)"( networkName: PromiseOrValue, networkInfo: IAccountsStrategy.NetworkInfoStruct, action: PromiseOrValue, @@ -962,6 +1049,10 @@ export interface IRegistrar extends BaseContract { overrides?: CallOverrides ): Promise; + getUniswapFactoryAddress(overrides?: CallOverrides): Promise; + + getUniswapRouterAddress(overrides?: CallOverrides): Promise; + getVaultOperatorApproved( _operator: PromiseOrValue, overrides?: CallOverrides @@ -1040,6 +1131,12 @@ export interface IRegistrar extends BaseContract { overrides?: Overrides & { from?: PromiseOrValue } ): Promise; + setUniswapAddresses( + _uniswapRouter: PromiseOrValue, + _uniswapFactory: PromiseOrValue, + overrides?: Overrides & { from?: PromiseOrValue } + ): Promise; + setVaultOperatorApproved( _operator: PromiseOrValue, _isApproved: PromiseOrValue, @@ -1051,7 +1148,14 @@ export interface IRegistrar extends BaseContract { overrides?: Overrides & { from?: PromiseOrValue } ): Promise; - updateNetworkConnections( + "updateNetworkConnections(string,(uint256,address,address,string,string,address,uint256),uint8)"( + networkName: PromiseOrValue, + networkInfo: IAccountsStrategy.NetworkInfoStruct, + action: PromiseOrValue, + overrides?: Overrides & { from?: PromiseOrValue } + ): Promise; + + "updateNetworkConnections(string,(uint256,address,address,string,string,address,uint256),string)"( networkName: PromiseOrValue, networkInfo: IAccountsStrategy.NetworkInfoStruct, action: PromiseOrValue, @@ -1103,6 +1207,10 @@ export interface IRegistrar extends BaseContract { overrides?: CallOverrides ): Promise; + getUniswapFactoryAddress(overrides?: CallOverrides): Promise; + + getUniswapRouterAddress(overrides?: CallOverrides): Promise; + getVaultOperatorApproved( _operator: PromiseOrValue, overrides?: CallOverrides @@ -1181,6 +1289,12 @@ export interface IRegistrar extends BaseContract { overrides?: CallOverrides ): Promise; + setUniswapAddresses( + _uniswapRouter: PromiseOrValue, + _uniswapFactory: PromiseOrValue, + overrides?: CallOverrides + ): Promise; + setVaultOperatorApproved( _operator: PromiseOrValue, _isApproved: PromiseOrValue, @@ -1192,7 +1306,14 @@ export interface IRegistrar extends BaseContract { overrides?: CallOverrides ): Promise; - updateNetworkConnections( + "updateNetworkConnections(string,(uint256,address,address,string,string,address,uint256),uint8)"( + networkName: PromiseOrValue, + networkInfo: IAccountsStrategy.NetworkInfoStruct, + action: PromiseOrValue, + overrides?: CallOverrides + ): Promise; + + "updateNetworkConnections(string,(uint256,address,address,string,string,address,uint256),string)"( networkName: PromiseOrValue, networkInfo: IAccountsStrategy.NetworkInfoStruct, action: PromiseOrValue, @@ -1241,6 +1362,18 @@ export interface IRegistrar extends BaseContract { ): GasFeeUpdatedEventFilter; GasFeeUpdated(_tokenAddr?: null, _gasFee?: null): GasFeeUpdatedEventFilter; + "NetworkConnectionPosted(uint256)"( + chainId?: null + ): NetworkConnectionPostedEventFilter; + NetworkConnectionPosted(chainId?: null): NetworkConnectionPostedEventFilter; + + "NetworkConnectionRemoved(uint256)"( + chainId?: null + ): NetworkConnectionRemovedEventFilter; + NetworkConnectionRemoved( + chainId?: null + ): NetworkConnectionRemovedEventFilter; + "RebalanceParamsUpdated()"(): RebalanceParamsUpdatedEventFilter; RebalanceParamsUpdated(): RebalanceParamsUpdatedEventFilter; @@ -1308,6 +1441,10 @@ export interface IRegistrar extends BaseContract { overrides?: CallOverrides ): Promise; + getUniswapFactoryAddress(overrides?: CallOverrides): Promise; + + getUniswapRouterAddress(overrides?: CallOverrides): Promise; + getVaultOperatorApproved( _operator: PromiseOrValue, overrides?: CallOverrides @@ -1384,6 +1521,12 @@ export interface IRegistrar extends BaseContract { overrides?: Overrides & { from?: PromiseOrValue } ): Promise; + setUniswapAddresses( + _uniswapRouter: PromiseOrValue, + _uniswapFactory: PromiseOrValue, + overrides?: Overrides & { from?: PromiseOrValue } + ): Promise; + setVaultOperatorApproved( _operator: PromiseOrValue, _isApproved: PromiseOrValue, @@ -1395,7 +1538,14 @@ export interface IRegistrar extends BaseContract { overrides?: Overrides & { from?: PromiseOrValue } ): Promise; - updateNetworkConnections( + "updateNetworkConnections(string,(uint256,address,address,string,string,address,uint256),uint8)"( + networkName: PromiseOrValue, + networkInfo: IAccountsStrategy.NetworkInfoStruct, + action: PromiseOrValue, + overrides?: Overrides & { from?: PromiseOrValue } + ): Promise; + + "updateNetworkConnections(string,(uint256,address,address,string,string,address,uint256),string)"( networkName: PromiseOrValue, networkInfo: IAccountsStrategy.NetworkInfoStruct, action: PromiseOrValue, @@ -1448,6 +1598,14 @@ export interface IRegistrar extends BaseContract { overrides?: CallOverrides ): Promise; + getUniswapFactoryAddress( + overrides?: CallOverrides + ): Promise; + + getUniswapRouterAddress( + overrides?: CallOverrides + ): Promise; + getVaultOperatorApproved( _operator: PromiseOrValue, overrides?: CallOverrides @@ -1526,6 +1684,12 @@ export interface IRegistrar extends BaseContract { overrides?: Overrides & { from?: PromiseOrValue } ): Promise; + setUniswapAddresses( + _uniswapRouter: PromiseOrValue, + _uniswapFactory: PromiseOrValue, + overrides?: Overrides & { from?: PromiseOrValue } + ): Promise; + setVaultOperatorApproved( _operator: PromiseOrValue, _isApproved: PromiseOrValue, @@ -1537,7 +1701,14 @@ export interface IRegistrar extends BaseContract { overrides?: Overrides & { from?: PromiseOrValue } ): Promise; - updateNetworkConnections( + "updateNetworkConnections(string,(uint256,address,address,string,string,address,uint256),uint8)"( + networkName: PromiseOrValue, + networkInfo: IAccountsStrategy.NetworkInfoStruct, + action: PromiseOrValue, + overrides?: Overrides & { from?: PromiseOrValue } + ): Promise; + + "updateNetworkConnections(string,(uint256,address,address,string,string,address,uint256),string)"( networkName: PromiseOrValue, networkInfo: IAccountsStrategy.NetworkInfoStruct, action: PromiseOrValue, diff --git a/src/types/typechain-types/contracts/integrations/goldfinch/IRegistrarGoldfinch.ts b/src/types/typechain-types/contracts/integrations/goldfinch/IRegistrarGoldfinch.ts index 561b5d3694..82d1ee1705 100644 --- a/src/types/typechain-types/contracts/integrations/goldfinch/IRegistrarGoldfinch.ts +++ b/src/types/typechain-types/contracts/integrations/goldfinch/IRegistrarGoldfinch.ts @@ -123,6 +123,36 @@ export declare namespace LibAccounts { }; } +export declare namespace IAccountsStrategy { + export type NetworkInfoStruct = { + chainId: PromiseOrValue; + router: PromiseOrValue; + axelarGateway: PromiseOrValue; + ibcChannel: PromiseOrValue; + transferChannel: PromiseOrValue; + gasReceiver: PromiseOrValue; + gasLimit: PromiseOrValue; + }; + + export type NetworkInfoStructOutput = [ + BigNumber, + string, + string, + string, + string, + string, + BigNumber + ] & { + chainId: BigNumber; + router: string; + axelarGateway: string; + ibcChannel: string; + transferChannel: string; + gasReceiver: string; + gasLimit: BigNumber; + }; +} + export interface IRegistrarGoldfinchInterface extends utils.Interface { functions: { "getAPGoldfinchParams()": FunctionFragment; @@ -133,8 +163,11 @@ export interface IRegistrarGoldfinchInterface extends utils.Interface { "getRebalanceParams()": FunctionFragment; "getStrategyApprovalState(bytes4)": FunctionFragment; "getStrategyParamsById(bytes4)": FunctionFragment; + "getUniswapFactoryAddress()": FunctionFragment; + "getUniswapRouterAddress()": FunctionFragment; "getVaultOperatorApproved(address)": FunctionFragment; "isTokenAccepted(address)": FunctionFragment; + "queryNetworkConnection(string)": FunctionFragment; "setAccountsContractAddressByChain(string,string)": FunctionFragment; "setAngelProtocolParams((address,address))": FunctionFragment; "setFeeSettingsByFeesType(uint8,uint256,address)": FunctionFragment; @@ -143,7 +176,9 @@ export interface IRegistrarGoldfinchInterface extends utils.Interface { "setStrategyApprovalState(bytes4,uint8)": FunctionFragment; "setStrategyParams(bytes4,string,address,address,uint8)": FunctionFragment; "setTokenAccepted(address,bool)": FunctionFragment; + "setUniswapAddresses(address,address)": FunctionFragment; "setVaultOperatorApproved(address,bool)": FunctionFragment; + "updateNetworkConnections(string,(uint256,address,address,string,string,address,uint256),uint8)": FunctionFragment; }; getFunction( @@ -156,8 +191,11 @@ export interface IRegistrarGoldfinchInterface extends utils.Interface { | "getRebalanceParams" | "getStrategyApprovalState" | "getStrategyParamsById" + | "getUniswapFactoryAddress" + | "getUniswapRouterAddress" | "getVaultOperatorApproved" | "isTokenAccepted" + | "queryNetworkConnection" | "setAccountsContractAddressByChain" | "setAngelProtocolParams" | "setFeeSettingsByFeesType" @@ -166,7 +204,9 @@ export interface IRegistrarGoldfinchInterface extends utils.Interface { | "setStrategyApprovalState" | "setStrategyParams" | "setTokenAccepted" + | "setUniswapAddresses" | "setVaultOperatorApproved" + | "updateNetworkConnections" ): FunctionFragment; encodeFunctionData( @@ -201,6 +241,14 @@ export interface IRegistrarGoldfinchInterface extends utils.Interface { functionFragment: "getStrategyParamsById", values: [PromiseOrValue] ): string; + encodeFunctionData( + functionFragment: "getUniswapFactoryAddress", + values?: undefined + ): string; + encodeFunctionData( + functionFragment: "getUniswapRouterAddress", + values?: undefined + ): string; encodeFunctionData( functionFragment: "getVaultOperatorApproved", values: [PromiseOrValue] @@ -209,6 +257,10 @@ export interface IRegistrarGoldfinchInterface extends utils.Interface { functionFragment: "isTokenAccepted", values: [PromiseOrValue] ): string; + encodeFunctionData( + functionFragment: "queryNetworkConnection", + values: [PromiseOrValue] + ): string; encodeFunctionData( functionFragment: "setAccountsContractAddressByChain", values: [PromiseOrValue, PromiseOrValue] @@ -251,10 +303,22 @@ export interface IRegistrarGoldfinchInterface extends utils.Interface { functionFragment: "setTokenAccepted", values: [PromiseOrValue, PromiseOrValue] ): string; + encodeFunctionData( + functionFragment: "setUniswapAddresses", + values: [PromiseOrValue, PromiseOrValue] + ): string; encodeFunctionData( functionFragment: "setVaultOperatorApproved", values: [PromiseOrValue, PromiseOrValue] ): string; + encodeFunctionData( + functionFragment: "updateNetworkConnections", + values: [ + PromiseOrValue, + IAccountsStrategy.NetworkInfoStruct, + PromiseOrValue + ] + ): string; decodeFunctionResult( functionFragment: "getAPGoldfinchParams", @@ -288,6 +352,14 @@ export interface IRegistrarGoldfinchInterface extends utils.Interface { functionFragment: "getStrategyParamsById", data: BytesLike ): Result; + decodeFunctionResult( + functionFragment: "getUniswapFactoryAddress", + data: BytesLike + ): Result; + decodeFunctionResult( + functionFragment: "getUniswapRouterAddress", + data: BytesLike + ): Result; decodeFunctionResult( functionFragment: "getVaultOperatorApproved", data: BytesLike @@ -296,6 +368,10 @@ export interface IRegistrarGoldfinchInterface extends utils.Interface { functionFragment: "isTokenAccepted", data: BytesLike ): Result; + decodeFunctionResult( + functionFragment: "queryNetworkConnection", + data: BytesLike + ): Result; decodeFunctionResult( functionFragment: "setAccountsContractAddressByChain", data: BytesLike @@ -328,16 +404,26 @@ export interface IRegistrarGoldfinchInterface extends utils.Interface { functionFragment: "setTokenAccepted", data: BytesLike ): Result; + decodeFunctionResult( + functionFragment: "setUniswapAddresses", + data: BytesLike + ): Result; decodeFunctionResult( functionFragment: "setVaultOperatorApproved", data: BytesLike ): Result; + decodeFunctionResult( + functionFragment: "updateNetworkConnections", + data: BytesLike + ): Result; events: { "AccountsContractStorageUpdated(string,string)": EventFragment; "AngelProtocolParamsUpdated()": EventFragment; "FeeSettingsUpdated(uint8,uint256,address)": EventFragment; "GasFeeUpdated(address,uint256)": EventFragment; + "NetworkConnectionPosted(uint256)": EventFragment; + "NetworkConnectionRemoved(uint256)": EventFragment; "RebalanceParamsUpdated()": EventFragment; "StrategyApprovalUpdated(bytes4,uint8)": EventFragment; "StrategyParamsUpdated(bytes4,string,address,address,uint8)": EventFragment; @@ -350,6 +436,8 @@ export interface IRegistrarGoldfinchInterface extends utils.Interface { getEvent(nameOrSignatureOrTopic: "AngelProtocolParamsUpdated"): EventFragment; getEvent(nameOrSignatureOrTopic: "FeeSettingsUpdated"): EventFragment; getEvent(nameOrSignatureOrTopic: "GasFeeUpdated"): EventFragment; + getEvent(nameOrSignatureOrTopic: "NetworkConnectionPosted"): EventFragment; + getEvent(nameOrSignatureOrTopic: "NetworkConnectionRemoved"): EventFragment; getEvent(nameOrSignatureOrTopic: "RebalanceParamsUpdated"): EventFragment; getEvent(nameOrSignatureOrTopic: "StrategyApprovalUpdated"): EventFragment; getEvent(nameOrSignatureOrTopic: "StrategyParamsUpdated"): EventFragment; @@ -401,6 +489,28 @@ export type GasFeeUpdatedEvent = TypedEvent< export type GasFeeUpdatedEventFilter = TypedEventFilter; +export interface NetworkConnectionPostedEventObject { + chainId: BigNumber; +} +export type NetworkConnectionPostedEvent = TypedEvent< + [BigNumber], + NetworkConnectionPostedEventObject +>; + +export type NetworkConnectionPostedEventFilter = + TypedEventFilter; + +export interface NetworkConnectionRemovedEventObject { + chainId: BigNumber; +} +export type NetworkConnectionRemovedEvent = TypedEvent< + [BigNumber], + NetworkConnectionRemovedEventObject +>; + +export type NetworkConnectionRemovedEventFilter = + TypedEventFilter; + export interface RebalanceParamsUpdatedEventObject {} export type RebalanceParamsUpdatedEvent = TypedEvent< [], @@ -513,6 +623,10 @@ export interface IRegistrarGoldfinch extends BaseContract { overrides?: CallOverrides ): Promise<[LocalRegistrarLib.StrategyParamsStructOutput]>; + getUniswapFactoryAddress(overrides?: CallOverrides): Promise<[string]>; + + getUniswapRouterAddress(overrides?: CallOverrides): Promise<[string]>; + getVaultOperatorApproved( _operator: PromiseOrValue, overrides?: CallOverrides @@ -523,6 +637,15 @@ export interface IRegistrarGoldfinch extends BaseContract { overrides?: CallOverrides ): Promise<[boolean]>; + queryNetworkConnection( + networkName: PromiseOrValue, + overrides?: CallOverrides + ): Promise< + [IAccountsStrategy.NetworkInfoStructOutput] & { + response: IAccountsStrategy.NetworkInfoStructOutput; + } + >; + setAccountsContractAddressByChain( _chainName: PromiseOrValue, _accountsContractAddress: PromiseOrValue, @@ -573,11 +696,24 @@ export interface IRegistrarGoldfinch extends BaseContract { overrides?: Overrides & { from?: PromiseOrValue } ): Promise; + setUniswapAddresses( + _uniswapRouter: PromiseOrValue, + _uniswapFactory: PromiseOrValue, + overrides?: Overrides & { from?: PromiseOrValue } + ): Promise; + setVaultOperatorApproved( _operator: PromiseOrValue, _isApproved: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; + + updateNetworkConnections( + networkName: PromiseOrValue, + networkInfo: IAccountsStrategy.NetworkInfoStruct, + action: PromiseOrValue, + overrides?: Overrides & { from?: PromiseOrValue } + ): Promise; }; getAPGoldfinchParams( @@ -617,6 +753,10 @@ export interface IRegistrarGoldfinch extends BaseContract { overrides?: CallOverrides ): Promise; + getUniswapFactoryAddress(overrides?: CallOverrides): Promise; + + getUniswapRouterAddress(overrides?: CallOverrides): Promise; + getVaultOperatorApproved( _operator: PromiseOrValue, overrides?: CallOverrides @@ -627,6 +767,11 @@ export interface IRegistrarGoldfinch extends BaseContract { overrides?: CallOverrides ): Promise; + queryNetworkConnection( + networkName: PromiseOrValue, + overrides?: CallOverrides + ): Promise; + setAccountsContractAddressByChain( _chainName: PromiseOrValue, _accountsContractAddress: PromiseOrValue, @@ -677,12 +822,25 @@ export interface IRegistrarGoldfinch extends BaseContract { overrides?: Overrides & { from?: PromiseOrValue } ): Promise; + setUniswapAddresses( + _uniswapRouter: PromiseOrValue, + _uniswapFactory: PromiseOrValue, + overrides?: Overrides & { from?: PromiseOrValue } + ): Promise; + setVaultOperatorApproved( _operator: PromiseOrValue, _isApproved: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; + updateNetworkConnections( + networkName: PromiseOrValue, + networkInfo: IAccountsStrategy.NetworkInfoStruct, + action: PromiseOrValue, + overrides?: Overrides & { from?: PromiseOrValue } + ): Promise; + callStatic: { getAPGoldfinchParams( overrides?: CallOverrides @@ -721,6 +879,10 @@ export interface IRegistrarGoldfinch extends BaseContract { overrides?: CallOverrides ): Promise; + getUniswapFactoryAddress(overrides?: CallOverrides): Promise; + + getUniswapRouterAddress(overrides?: CallOverrides): Promise; + getVaultOperatorApproved( _operator: PromiseOrValue, overrides?: CallOverrides @@ -731,6 +893,11 @@ export interface IRegistrarGoldfinch extends BaseContract { overrides?: CallOverrides ): Promise; + queryNetworkConnection( + networkName: PromiseOrValue, + overrides?: CallOverrides + ): Promise; + setAccountsContractAddressByChain( _chainName: PromiseOrValue, _accountsContractAddress: PromiseOrValue, @@ -781,11 +948,24 @@ export interface IRegistrarGoldfinch extends BaseContract { overrides?: CallOverrides ): Promise; + setUniswapAddresses( + _uniswapRouter: PromiseOrValue, + _uniswapFactory: PromiseOrValue, + overrides?: CallOverrides + ): Promise; + setVaultOperatorApproved( _operator: PromiseOrValue, _isApproved: PromiseOrValue, overrides?: CallOverrides ): Promise; + + updateNetworkConnections( + networkName: PromiseOrValue, + networkInfo: IAccountsStrategy.NetworkInfoStruct, + action: PromiseOrValue, + overrides?: CallOverrides + ): Promise; }; filters: { @@ -818,6 +998,18 @@ export interface IRegistrarGoldfinch extends BaseContract { ): GasFeeUpdatedEventFilter; GasFeeUpdated(_tokenAddr?: null, _gasFee?: null): GasFeeUpdatedEventFilter; + "NetworkConnectionPosted(uint256)"( + chainId?: null + ): NetworkConnectionPostedEventFilter; + NetworkConnectionPosted(chainId?: null): NetworkConnectionPostedEventFilter; + + "NetworkConnectionRemoved(uint256)"( + chainId?: null + ): NetworkConnectionRemovedEventFilter; + NetworkConnectionRemoved( + chainId?: null + ): NetworkConnectionRemovedEventFilter; + "RebalanceParamsUpdated()"(): RebalanceParamsUpdatedEventFilter; RebalanceParamsUpdated(): RebalanceParamsUpdatedEventFilter; @@ -887,6 +1079,10 @@ export interface IRegistrarGoldfinch extends BaseContract { overrides?: CallOverrides ): Promise; + getUniswapFactoryAddress(overrides?: CallOverrides): Promise; + + getUniswapRouterAddress(overrides?: CallOverrides): Promise; + getVaultOperatorApproved( _operator: PromiseOrValue, overrides?: CallOverrides @@ -897,6 +1093,11 @@ export interface IRegistrarGoldfinch extends BaseContract { overrides?: CallOverrides ): Promise; + queryNetworkConnection( + networkName: PromiseOrValue, + overrides?: CallOverrides + ): Promise; + setAccountsContractAddressByChain( _chainName: PromiseOrValue, _accountsContractAddress: PromiseOrValue, @@ -947,11 +1148,24 @@ export interface IRegistrarGoldfinch extends BaseContract { overrides?: Overrides & { from?: PromiseOrValue } ): Promise; + setUniswapAddresses( + _uniswapRouter: PromiseOrValue, + _uniswapFactory: PromiseOrValue, + overrides?: Overrides & { from?: PromiseOrValue } + ): Promise; + setVaultOperatorApproved( _operator: PromiseOrValue, _isApproved: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; + + updateNetworkConnections( + networkName: PromiseOrValue, + networkInfo: IAccountsStrategy.NetworkInfoStruct, + action: PromiseOrValue, + overrides?: Overrides & { from?: PromiseOrValue } + ): Promise; }; populateTransaction: { @@ -992,6 +1206,14 @@ export interface IRegistrarGoldfinch extends BaseContract { overrides?: CallOverrides ): Promise; + getUniswapFactoryAddress( + overrides?: CallOverrides + ): Promise; + + getUniswapRouterAddress( + overrides?: CallOverrides + ): Promise; + getVaultOperatorApproved( _operator: PromiseOrValue, overrides?: CallOverrides @@ -1002,6 +1224,11 @@ export interface IRegistrarGoldfinch extends BaseContract { overrides?: CallOverrides ): Promise; + queryNetworkConnection( + networkName: PromiseOrValue, + overrides?: CallOverrides + ): Promise; + setAccountsContractAddressByChain( _chainName: PromiseOrValue, _accountsContractAddress: PromiseOrValue, @@ -1052,10 +1279,23 @@ export interface IRegistrarGoldfinch extends BaseContract { overrides?: Overrides & { from?: PromiseOrValue } ): Promise; + setUniswapAddresses( + _uniswapRouter: PromiseOrValue, + _uniswapFactory: PromiseOrValue, + overrides?: Overrides & { from?: PromiseOrValue } + ): Promise; + setVaultOperatorApproved( _operator: PromiseOrValue, _isApproved: PromiseOrValue, overrides?: Overrides & { from?: PromiseOrValue } ): Promise; + + updateNetworkConnections( + networkName: PromiseOrValue, + networkInfo: IAccountsStrategy.NetworkInfoStruct, + action: PromiseOrValue, + overrides?: Overrides & { from?: PromiseOrValue } + ): Promise; }; } diff --git a/src/types/typechain-types/contracts/multisigs/CharityApplications.ts b/src/types/typechain-types/contracts/multisigs/CharityApplications.ts index 8435b840f7..7613217e44 100644 --- a/src/types/typechain-types/contracts/multisigs/CharityApplications.ts +++ b/src/types/typechain-types/contracts/multisigs/CharityApplications.ts @@ -630,7 +630,7 @@ export interface CharityApplicationsInterface extends utils.Interface { "ApplicationConfirmationRevoked(uint256,address)": EventFragment; "ApplicationConfirmed(uint256,address)": EventFragment; "ApplicationExecuted(uint256)": EventFragment; - "ApplicationProposed(uint256)": EventFragment; + "ApplicationProposed(uint256,address,string,uint256)": EventFragment; "ApprovalsRequiredChanged(address,uint256)": EventFragment; "ExpiryChanged(address,uint256)": EventFragment; "GasSent(uint256,address,uint256)": EventFragment; @@ -708,9 +708,12 @@ export type ApplicationExecutedEventFilter = export interface ApplicationProposedEventObject { proposalId: BigNumber; + proposer: string; + charityName: string; + expiry: BigNumber; } export type ApplicationProposedEvent = TypedEvent< - [BigNumber], + [BigNumber, string, string, BigNumber], ApplicationProposedEventObject >; @@ -1606,10 +1609,18 @@ export interface CharityApplications extends BaseContract { ): ApplicationExecutedEventFilter; ApplicationExecuted(proposalId?: null): ApplicationExecutedEventFilter; - "ApplicationProposed(uint256)"( - proposalId?: null + "ApplicationProposed(uint256,address,string,uint256)"( + proposalId?: null, + proposer?: null, + charityName?: null, + expiry?: null + ): ApplicationProposedEventFilter; + ApplicationProposed( + proposalId?: null, + proposer?: null, + charityName?: null, + expiry?: null ): ApplicationProposedEventFilter; - ApplicationProposed(proposalId?: null): ApplicationProposedEventFilter; "ApprovalsRequiredChanged(address,uint256)"( msAddress?: null, diff --git a/src/types/typechain-types/contracts/multisigs/interfaces/ICharityApplications.ts b/src/types/typechain-types/contracts/multisigs/interfaces/ICharityApplications.ts index 8556d0d556..18d8cb2c67 100644 --- a/src/types/typechain-types/contracts/multisigs/interfaces/ICharityApplications.ts +++ b/src/types/typechain-types/contracts/multisigs/interfaces/ICharityApplications.ts @@ -358,7 +358,7 @@ export interface ICharityApplicationsInterface extends utils.Interface { "ApplicationConfirmationRevoked(uint256,address)": EventFragment; "ApplicationConfirmed(uint256,address)": EventFragment; "ApplicationExecuted(uint256)": EventFragment; - "ApplicationProposed(uint256)": EventFragment; + "ApplicationProposed(uint256,address,string,uint256)": EventFragment; "GasSent(uint256,address,uint256)": EventFragment; "SeedAssetSent(uint256,address,uint256)": EventFragment; }; @@ -410,9 +410,12 @@ export type ApplicationExecutedEventFilter = export interface ApplicationProposedEventObject { proposalId: BigNumber; + proposer: string; + charityName: string; + expiry: BigNumber; } export type ApplicationProposedEvent = TypedEvent< - [BigNumber], + [BigNumber, string, string, BigNumber], ApplicationProposedEventObject >; @@ -674,10 +677,18 @@ export interface ICharityApplications extends BaseContract { ): ApplicationExecutedEventFilter; ApplicationExecuted(proposalId?: null): ApplicationExecutedEventFilter; - "ApplicationProposed(uint256)"( - proposalId?: null + "ApplicationProposed(uint256,address,string,uint256)"( + proposalId?: null, + proposer?: null, + charityName?: null, + expiry?: null + ): ApplicationProposedEventFilter; + ApplicationProposed( + proposalId?: null, + proposer?: null, + charityName?: null, + expiry?: null ): ApplicationProposedEventFilter; - ApplicationProposed(proposalId?: null): ApplicationProposedEventFilter; "GasSent(uint256,address,uint256)"( endowmentId?: null,