ProxyUtils type cleanup (#30)

asaj/suffix
Asa Oines 3 years ago committed by GitHub
parent 9835dac5a3
commit dfd00d9284
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 17
      typescript/optics-deploy/src/proxyUtils.ts

@ -1,11 +1,8 @@
import { BytesLike, ethers } from 'ethers'; import { BytesLike, ethers } from 'ethers';
import * as contracts from '@optics-xyz/ts-interface/dist/optics-core'; import * as contracts from '@optics-xyz/ts-interface/dist/optics-core';
import { Deploy } from './deploy';
import { CoreDeploy } from './core/CoreDeploy'; import { CoreDeploy } from './core/CoreDeploy';
import { BridgeDeploy } from './bridge/BridgeDeploy';
import TestBridgeDeploy from './bridge/TestBridgeDeploy';
type Deploy = CoreDeploy | BridgeDeploy | TestBridgeDeploy;
export type ProxyNames = export type ProxyNames =
| 'Home' | 'Home'
@ -47,7 +44,7 @@ export type ProxyAddresses = {
*/ */
export async function deployProxy<T extends ethers.Contract>( export async function deployProxy<T extends ethers.Contract>(
name: ProxyNames, name: ProxyNames,
deploy: Deploy, deploy: Deploy<any>,
factory: ethers.ContractFactory, factory: ethers.ContractFactory,
initData: BytesLike, initData: BytesLike,
...deployArgs: any[] ...deployArgs: any[]
@ -100,7 +97,7 @@ export async function deployProxy<T extends ethers.Contract>(
*/ */
export async function duplicate<T extends ethers.Contract>( export async function duplicate<T extends ethers.Contract>(
name: ProxyNames, name: ProxyNames,
deploy: Deploy, deploy: Deploy<any>,
prev: BeaconProxy<T>, prev: BeaconProxy<T>,
initData: BytesLike, initData: BytesLike,
): Promise<BeaconProxy<T>> { ): Promise<BeaconProxy<T>> {
@ -131,7 +128,7 @@ export async function duplicate<T extends ethers.Contract>(
*/ */
export async function deployImplementation<T extends ethers.Contract>( export async function deployImplementation<T extends ethers.Contract>(
name: ProxyNames, name: ProxyNames,
deploy: Deploy, deploy: Deploy<any>,
factory: ethers.ContractFactory, factory: ethers.ContractFactory,
...deployArgs: any[] ...deployArgs: any[]
): Promise<T> { ): Promise<T> {
@ -177,7 +174,7 @@ export function overrideBeaconProxyImplementation<T extends ethers.Contract>(
* @param deployArgs - The arguments to pass to the implementation constructor * @param deployArgs - The arguments to pass to the implementation constructor
*/ */
async function _deployImplementation<T extends ethers.Contract>( async function _deployImplementation<T extends ethers.Contract>(
deploy: Deploy, deploy: Deploy<any>,
factory: ethers.ContractFactory, factory: ethers.ContractFactory,
deployArgs: any[] deployArgs: any[]
): Promise<T> { ): Promise<T> {
@ -195,7 +192,7 @@ async function _deployImplementation<T extends ethers.Contract>(
* @param implementation - The implementation * @param implementation - The implementation
*/ */
async function _deployBeacon( async function _deployBeacon(
deploy: Deploy, deploy: Deploy<any>,
implementation: ethers.Contract, implementation: ethers.Contract,
): Promise<contracts.UpgradeBeacon> { ): Promise<contracts.UpgradeBeacon> {
let factory = new contracts.UpgradeBeacon__factory(deploy.chain.deployer); let factory = new contracts.UpgradeBeacon__factory(deploy.chain.deployer);
@ -219,7 +216,7 @@ async function _deployBeacon(
* @param implementation - The implementation * @param implementation - The implementation
*/ */
async function _deployProxy<T>( async function _deployProxy<T>(
deploy: Deploy, deploy: Deploy<any>,
beacon: contracts.UpgradeBeacon, beacon: contracts.UpgradeBeacon,
initData: BytesLike, initData: BytesLike,
): Promise<contracts.UpgradeBeaconProxy> { ): Promise<contracts.UpgradeBeaconProxy> {

Loading…
Cancel
Save