diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 004f3ca8..bd76306b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1,4 +1,8 @@ -lockfileVersion: '6.0' +lockfileVersion: '6.1' + +settings: + autoInstallPeers: true + excludeLinksFromLockfile: false dependencies: '@ethersproject/abi': diff --git a/src/helpers.ts b/src/helpers.ts index e8638c70..e2f43818 100644 --- a/src/helpers.ts +++ b/src/helpers.ts @@ -1225,6 +1225,9 @@ export function addHelpers( } } + checkABIConflict = options.proxy.checkABIConflict ?? checkABIConflict; + checkProxyAdmin = options.proxy.checkProxyAdmin ?? checkProxyAdmin; + if (options.proxy.proxyContract) { if (typeof options.proxy.proxyContract === 'string') { try { @@ -1305,7 +1308,7 @@ export function addHelpers( ); // ensure no clash const mergedABI = mergeABIs([proxyContract.abi, artifact.abi], { - check: checkABIConflict, // TODO options for custom proxy ? + check: checkABIConflict, skipSupportsInterface: true, // TODO options for custom proxy ? }).filter((v) => v.type !== 'constructor'); mergedABI.push(proxyContractConstructor); // use proxy constructor abi diff --git a/types.ts b/types.ts index aae0311b..3d7a5a2c 100644 --- a/types.ts +++ b/types.ts @@ -113,6 +113,8 @@ type ProxyOptionsBase = { artifact?: string | ArtifactData; }; implementationName?: string; + checkABIConflict?: boolean; + checkProxyAdmin?: boolean; }; export type ProxyOptions =