Merge pull request #5285 from connext/staging

chore: typechain changed
connext · Dec 6, 2023 · 6601deb · 6601deb
2 parents 7038c3c + 151d687
commit 6601deb
Show file tree

Hide file tree

Showing 6 changed files with 78 additions and 22 deletions.
diff --git a/...ployments/contracts/abi/contracts/core/connext/helpers/RelayerProxy.sol/RelayerProxy.json b/...ployments/contracts/abi/contracts/core/connext/helpers/RelayerProxy.sol/RelayerProxy.json
@@ -19,7 +19,7 @@
   "event ConnextChanged(address updated, address previous)",
   "event FeeCollectorChanged(address updated, address previous)",
   "event FinalizeCooldownChanged(uint256 finalizeCooldown, uint256 oldFinalizeCooldown)",
-  "event FundsDeducted(uint256 amount, uint256 balance)",
+  "event FundsDeducted(address token, uint256 amount, uint256 balance)",
   "event FundsReceived(uint256 amount, uint256 balance)",
   "event GelatoRelayerChanged(address updated, address previous)",
   "event Keep3rChanged(address updated, address previous)",
@@ -62,5 +62,5 @@
   "function setProposeAggregateRootCooldown(uint256 _proposeCooldown)",
   "function setSpokeConnector(address _spokeConnector)",
   "function spokeConnector() view returns (address)",
-  "function withdraw()"
+  "function withdraw(address _token)"
 ]
diff --git a/...nts/contracts/abi/contracts/core/connext/helpers/RelayerProxyHub.sol/RelayerProxyHub.json b/...nts/contracts/abi/contracts/core/connext/helpers/RelayerProxyHub.sol/RelayerProxyHub.json
@@ -26,7 +26,7 @@
   "event ConnextChanged(address updated, address previous)",
   "event FeeCollectorChanged(address updated, address previous)",
   "event FinalizeCooldownChanged(uint256 finalizeCooldown, uint256 oldFinalizeCooldown)",
-  "event FundsDeducted(uint256 amount, uint256 balance)",
+  "event FundsDeducted(address token, uint256 amount, uint256 balance)",
   "event FundsReceived(uint256 amount, uint256 balance)",
   "event GelatoRelayerChanged(address updated, address previous)",
   "event HubConnectorChanged(address hubConnector, address oldHubConnector, uint32 chain)",
@@ -95,5 +95,5 @@
   "function setRootManager(address _rootManager)",
   "function setSpokeConnector(address _spokeConnector)",
   "function spokeConnector() view returns (address)",
-  "function withdraw()"
+  "function withdraw(address _token)"
 ]
diff --git a/...racts/src/typechain-types/contracts/core/connext/helpers/RelayerProxy.sol/RelayerProxy.ts b/...racts/src/typechain-types/contracts/core/connext/helpers/RelayerProxy.sol/RelayerProxy.ts
@@ -174,7 +174,7 @@ export interface RelayerProxyInterface extends utils.Interface {
     "setProposeAggregateRootCooldown(uint256)": FunctionFragment;
     "setSpokeConnector(address)": FunctionFragment;
     "spokeConnector()": FunctionFragment;
-    "withdraw()": FunctionFragment;
+    "withdraw(address)": FunctionFragment;
   };
 
   getFunction(
@@ -345,7 +345,10 @@ export interface RelayerProxyInterface extends utils.Interface {
     functionFragment: "spokeConnector",
     values?: undefined
   ): string;
-  encodeFunctionData(functionFragment: "withdraw", values?: undefined): string;
+  encodeFunctionData(
+    functionFragment: "withdraw",
+    values: [PromiseOrValue<string>]
+  ): string;
 
   decodeFunctionResult(
     functionFragment: "acceptProposedOwner",
@@ -446,7 +449,7 @@ export interface RelayerProxyInterface extends utils.Interface {
     "ConnextChanged(address,address)": EventFragment;
     "FeeCollectorChanged(address,address)": EventFragment;
     "FinalizeCooldownChanged(uint256,uint256)": EventFragment;
-    "FundsDeducted(uint256,uint256)": EventFragment;
+    "FundsDeducted(address,uint256,uint256)": EventFragment;
     "FundsReceived(uint256,uint256)": EventFragment;
     "GelatoRelayerChanged(address,address)": EventFragment;
     "Keep3rChanged(address,address)": EventFragment;
@@ -511,11 +514,12 @@ export type FinalizeCooldownChangedEventFilter =
   TypedEventFilter<FinalizeCooldownChangedEvent>;
 
 export interface FundsDeductedEventObject {
+  token: string;
   amount: BigNumber;
   balance: BigNumber;
 }
 export type FundsDeductedEvent = TypedEvent<
-  [BigNumber, BigNumber],
+  [string, BigNumber, BigNumber],
   FundsDeductedEventObject
 >;
 
@@ -779,6 +783,7 @@ export interface RelayerProxy extends BaseContract {
     spokeConnector(overrides?: CallOverrides): Promise<[string]>;
 
     withdraw(
+      _token: PromiseOrValue<string>,
       overrides?: Overrides & { from?: PromiseOrValue<string> }
     ): Promise<ContractTransaction>;
   };
@@ -914,6 +919,7 @@ export interface RelayerProxy extends BaseContract {
   spokeConnector(overrides?: CallOverrides): Promise<string>;
 
   withdraw(
+    _token: PromiseOrValue<string>,
     overrides?: Overrides & { from?: PromiseOrValue<string> }
   ): Promise<ContractTransaction>;
 
@@ -1044,7 +1050,10 @@ export interface RelayerProxy extends BaseContract {
 
     spokeConnector(overrides?: CallOverrides): Promise<string>;
 
-    withdraw(overrides?: CallOverrides): Promise<void>;
+    withdraw(
+      _token: PromiseOrValue<string>,
+      overrides?: CallOverrides
+    ): Promise<void>;
   };
 
   filters: {
@@ -1072,11 +1081,16 @@ export interface RelayerProxy extends BaseContract {
       oldFinalizeCooldown?: null
     ): FinalizeCooldownChangedEventFilter;
 
-    "FundsDeducted(uint256,uint256)"(
+    "FundsDeducted(address,uint256,uint256)"(
+      token?: null,
+      amount?: null,
+      balance?: null
+    ): FundsDeductedEventFilter;
+    FundsDeducted(
+      token?: null,
       amount?: null,
       balance?: null
     ): FundsDeductedEventFilter;
-    FundsDeducted(amount?: null, balance?: null): FundsDeductedEventFilter;
 
     "FundsReceived(uint256,uint256)"(
       amount?: null,
@@ -1272,6 +1286,7 @@ export interface RelayerProxy extends BaseContract {
     spokeConnector(overrides?: CallOverrides): Promise<BigNumber>;
 
     withdraw(
+      _token: PromiseOrValue<string>,
       overrides?: Overrides & { from?: PromiseOrValue<string> }
     ): Promise<BigNumber>;
   };
@@ -1412,6 +1427,7 @@ export interface RelayerProxy extends BaseContract {
     spokeConnector(overrides?: CallOverrides): Promise<PopulatedTransaction>;
 
     withdraw(
+      _token: PromiseOrValue<string>,
       overrides?: Overrides & { from?: PromiseOrValue<string> }
     ): Promise<PopulatedTransaction>;
   };

diff --git a/...src/typechain-types/contracts/core/connext/helpers/RelayerProxyHub.sol/RelayerProxyHub.ts b/...src/typechain-types/contracts/core/connext/helpers/RelayerProxyHub.sol/RelayerProxyHub.ts
@@ -212,7 +212,7 @@ export interface RelayerProxyHubInterface extends utils.Interface {
     "setRootManager(address)": FunctionFragment;
     "setSpokeConnector(address)": FunctionFragment;
     "spokeConnector()": FunctionFragment;
-    "withdraw()": FunctionFragment;
+    "withdraw(address)": FunctionFragment;
   };
 
   getFunction(
@@ -536,7 +536,10 @@ export interface RelayerProxyHubInterface extends utils.Interface {
     functionFragment: "spokeConnector",
     values?: undefined
   ): string;
-  encodeFunctionData(functionFragment: "withdraw", values?: undefined): string;
+  encodeFunctionData(
+    functionFragment: "withdraw",
+    values: [PromiseOrValue<string>]
+  ): string;
 
   decodeFunctionResult(
     functionFragment: "acceptProposedOwner",
@@ -725,7 +728,7 @@ export interface RelayerProxyHubInterface extends utils.Interface {
     "ConnextChanged(address,address)": EventFragment;
     "FeeCollectorChanged(address,address)": EventFragment;
     "FinalizeCooldownChanged(uint256,uint256)": EventFragment;
-    "FundsDeducted(uint256,uint256)": EventFragment;
+    "FundsDeducted(address,uint256,uint256)": EventFragment;
     "FundsReceived(uint256,uint256)": EventFragment;
     "GelatoRelayerChanged(address,address)": EventFragment;
     "HubConnectorChanged(address,address,uint32)": EventFragment;
@@ -823,11 +826,12 @@ export type FinalizeCooldownChangedEventFilter =
   TypedEventFilter<FinalizeCooldownChangedEvent>;
 
 export interface FundsDeductedEventObject {
+  token: string;
   amount: BigNumber;
   balance: BigNumber;
 }
 export type FundsDeductedEvent = TypedEvent<
-  [BigNumber, BigNumber],
+  [string, BigNumber, BigNumber],
   FundsDeductedEventObject
 >;
 
@@ -1259,6 +1263,7 @@ export interface RelayerProxyHub extends BaseContract {
     spokeConnector(overrides?: CallOverrides): Promise<[string]>;
 
     withdraw(
+      _token: PromiseOrValue<string>,
       overrides?: Overrides & { from?: PromiseOrValue<string> }
     ): Promise<ContractTransaction>;
   };
@@ -1525,6 +1530,7 @@ export interface RelayerProxyHub extends BaseContract {
   spokeConnector(overrides?: CallOverrides): Promise<string>;
 
   withdraw(
+    _token: PromiseOrValue<string>,
     overrides?: Overrides & { from?: PromiseOrValue<string> }
   ): Promise<ContractTransaction>;
 
@@ -1784,7 +1790,10 @@ export interface RelayerProxyHub extends BaseContract {
 
     spokeConnector(overrides?: CallOverrides): Promise<string>;
 
-    withdraw(overrides?: CallOverrides): Promise<void>;
+    withdraw(
+      _token: PromiseOrValue<string>,
+      overrides?: CallOverrides
+    ): Promise<void>;
   };
 
   filters: {
@@ -1832,11 +1841,16 @@ export interface RelayerProxyHub extends BaseContract {
       oldFinalizeCooldown?: null
     ): FinalizeCooldownChangedEventFilter;
 
-    "FundsDeducted(uint256,uint256)"(
+    "FundsDeducted(address,uint256,uint256)"(
+      token?: null,
+      amount?: null,
+      balance?: null
+    ): FundsDeductedEventFilter;
+    FundsDeducted(
+      token?: null,
       amount?: null,
       balance?: null
     ): FundsDeductedEventFilter;
-    FundsDeducted(amount?: null, balance?: null): FundsDeductedEventFilter;
 
     "FundsReceived(uint256,uint256)"(
       amount?: null,
@@ -2192,6 +2206,7 @@ export interface RelayerProxyHub extends BaseContract {
     spokeConnector(overrides?: CallOverrides): Promise<BigNumber>;
 
     withdraw(
+      _token: PromiseOrValue<string>,
       overrides?: Overrides & { from?: PromiseOrValue<string> }
     ): Promise<BigNumber>;
   };
@@ -2463,6 +2478,7 @@ export interface RelayerProxyHub extends BaseContract {
     spokeConnector(overrides?: CallOverrides): Promise<PopulatedTransaction>;
 
     withdraw(
+      _token: PromiseOrValue<string>,
       overrides?: Overrides & { from?: PromiseOrValue<string> }
     ): Promise<PopulatedTransaction>;
   };

diff --git a/...-types/factories/contracts/core/connext/helpers/RelayerProxy.sol/RelayerProxy__factory.ts b/...-types/factories/contracts/core/connext/helpers/RelayerProxy.sol/RelayerProxy__factory.ts
diff --git a/.../factories/contracts/core/connext/helpers/RelayerProxyHub.sol/RelayerProxyHub__factory.ts b/.../factories/contracts/core/connext/helpers/RelayerProxyHub.sol/RelayerProxyHub__factory.ts