Merge pull request #451 from eonian-core/feature/allow-use-custom-uup…

…s-proxy Allow override custom proxy params
wighawag · Jun 24, 2023 · b2f8d6d · b2f8d6d
2 parents 5d0973d + f877342
commit b2f8d6d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/helpers.ts b/src/helpers.ts
@@ -1226,6 +1226,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 {
@@ -1306,7 +1309,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
@@ -116,6 +116,8 @@ type ProxyOptionsBase = {
         artifact?: string | ArtifactData;
       };
   implementationName?: string;
+  checkABIConflict?: boolean;
+  checkProxyAdmin?: boolean;
 };
 
 export type ProxyOptions =