@rocketh/proxy 0.19.10 → 0.19.11

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. package/dist/index.d.ts +6 -1
  2. package/dist/index.d.ts.map +1 -1
  3. package/dist/index.js +10 -9
  4. package/dist/index.js.map +1 -1
  5. package/package.json +3 -3
  6. package/src/index.ts +72 -63
package/dist/index.d.ts CHANGED
@@ -4,7 +4,12 @@ import type { EIP1193Account } from 'eip-1193';
4
4
  import { DeployOptions } from '@rocketh/deploy';
5
5
  export type { Abi, AbiFunction, Artifact, DeploymentConstruction, Deployment, Environment };
6
6
  export type PredefinedProxyContract = 'ERC173Proxy' | 'ERC173ProxyWithReceive' | 'UUPS' | 'SharedAdminOpenZeppelinTransparentProxy' | 'SharedAdminOptimizedTransparentProxy';
7
- export type ProxyDeployOptions = Omit<DeployOptions, 'skipIfAlreadyDeployed' | 'alwaysOverride'> & {
7
+ type DeployMutuallyExclusiveOptions = {
8
+ alwaysOverride?: boolean;
9
+ } | {
10
+ strictBytecodeMatch?: boolean;
11
+ };
12
+ export type ProxyDeployOptions = Omit<DeployOptions, 'skipIfAlreadyDeployed' | 'alwaysOverride' | 'strictBytecodeMatch'> & DeployMutuallyExclusiveOptions & {
8
13
  proxyDisabled?: boolean;
9
14
  owner?: EIP1193Account;
10
15
  execute?: string | {
package/dist/index.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
package/dist/index.js CHANGED
@@ -17,17 +17,21 @@ export function deployViaProxy(env) {
17
17
  const _read = read(env);
18
18
  const _execute = execute(env);
19
19
  return async (name, params, options) => {
20
+ const alwaysOverride = options && 'alwaysOverride' in options && options.alwaysOverride;
21
+ const strictBytecodeMatch = !alwaysOverride && options && 'strictBytecodeMatch' in options && options.strictBytecodeMatch;
22
+ const skipIfAlreadyDeployed = alwaysOverride ? false : true;
20
23
  let optionsForImplementation = options
21
24
  ? {
22
- alwaysOverride: false,
25
+ strictBytecodeMatch: strictBytecodeMatch,
26
+ alwaysOverride: alwaysOverride,
23
27
  deterministic: options.deterministic || options.deterministicImplementation,
24
28
  libraries: options.libraries,
25
29
  }
26
30
  : undefined;
27
31
  let optionsForProxy = options
28
32
  ? ((options) => {
29
- const { owner, checkABIConflict, checkProxyAdmin, execute, deterministicImplementation, proxyContract, proxyDisabled, upgradeIndex, linkedData, ...optionsForProxy } = options;
30
- return optionsForProxy;
33
+ const { owner, checkABIConflict, checkProxyAdmin, execute, deterministicImplementation, proxyContract, proxyDisabled, upgradeIndex, linkedData, ...rest } = options;
34
+ return { ...rest, strictBytecodeMatch: false }; // strictBytecodeMatch is never applied to proxy
31
35
  })(options)
32
36
  : undefined;
33
37
  const proxyName = `${name}_Proxy`;
@@ -37,14 +41,14 @@ export function deployViaProxy(env) {
37
41
  if (typeof params.artifact === 'function') {
38
42
  return params.artifact(name, params, {
39
43
  ...optionsForProxy,
40
- skipIfAlreadyDeployed: true,
44
+ skipIfAlreadyDeployed,
41
45
  linkedData: options.linkedData,
42
46
  });
43
47
  }
44
48
  else {
45
49
  return _deploy(name, params, {
46
50
  ...optionsForProxy,
47
- skipIfAlreadyDeployed: true,
51
+ skipIfAlreadyDeployed,
48
52
  linkedData: options.linkedData,
49
53
  });
50
54
  }
@@ -238,10 +242,7 @@ export function deployViaProxy(env) {
238
242
  proxyAdmin: proxyAdmin,
239
243
  data: postUpgradeCalldata ? postUpgradeCalldata : '0x',
240
244
  }),
241
- }, {
242
- skipIfAlreadyDeployed: true,
243
- deterministic: options?.deterministic,
244
- });
245
+ }, optionsForProxy);
245
246
  // logger.info(`proxy deployed at ${proxy.address}`);
246
247
  existingDeployment = await env.save(name, {
247
248
  ...proxy,
package/dist/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,kBAAkB,EAAE,WAAW,EAAC,MAAM,MAAM,CAAC;AACrD,OAAO,EAAC,IAAI,EAAC,MAAM,YAAY,CAAC;AAChC,OAAO,EAAC,MAAM,EAAgB,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAC,iBAAiB,EAAE,mBAAmB,EAAC,MAAM,YAAY,CAAC;AAClE,OAAO,YAAY,MAAM,+CAA+C,CAAC;AACzE,OAAO,WAAW,MAAM,8CAA8C,CAAC;AACvE,OAAO,sBAAsB,MAAM,yDAAyD,CAAC;AAC7F,OAAO,2BAA2B,MAAM,8DAA8D,CAAC;AACvG,OAAO,oCAAoC,MAAM,uEAAuE,CAAC;AACzH,OAAO,iBAAiB,MAAM,6CAA6C,CAAC;AAC5E,OAAO,EAAC,OAAO,EAAE,IAAI,EAAC,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAC,SAAS,EAAC,MAAM,yBAAyB,CAAC;AAClD,OAAO,EAAC,0BAA0B,EAAC,MAAM,oBAAoB,CAAC;AAE9D,MAAM,MAAM,GAAG,IAAI,CAAC,gBAAgB,CAAC,CAAC;AA0FtC,MAAM,UAAU,cAAc,CAC7B,GAAgB;IAMhB,MAAM,OAAO,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;IAC5B,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC;IACxB,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;IAC9B,OAAO,KAAK,EACX,IAAY,EACZ,MAAiD,EACjD,OAA4B,EAC3B,EAAE;QACH,IAAI,wBAAwB,GAAG,OAAO;YACrC,CAAC,CAAC;gBACA,cAAc,EAAE,KAAK;gBACrB,aAAa,EAAE,OAAO,CAAC,aAAa,IAAI,OAAO,CAAC,2BAA2B;gBAC3E,SAAS,EAAE,OAAO,CAAC,SAAS;aAC5B;YACF,CAAC,CAAC,SAAS,CAAC;QACb,IAAI,eAAe,GAAG,OAAO;YAC5B,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,EAAE;gBACb,MAAM,EACL,KAAK,EACL,gBAAgB,EAChB,eAAe,EACf,OAAO,EACP,2BAA2B,EAC3B,aAAa,EACb,aAAa,EACb,YAAY,EACZ,UAAU,EACV,GAAG,eAAe,EAClB,GAAG,OAAO,CAAC;gBACZ,OAAO,eAAe,CAAC;YACxB,CAAC,CAAC,CAAC,OAAO,CAAC;YACZ,CAAC,CAAC,SAAS,CAAC;QAEb,MAAM,SAAS,GAAG,GAAG,IAAI,QAAQ,CAAC;QAClC,MAAM,kBAAkB,GAAG,GAAG,IAAI,iBAAiB,CAAC;QAEpD,IAAI,kBAAkB,GAAG,GAAG,CAAC,SAAS,CAAO,IAAI,CAAC,CAAC;QAEnD,IAAI,OAAO,EAAE,aAAa,EAAE,CAAC;YAC5B,IAAI,OAAO,MAAM,CAAC,QAAQ,KAAK,UAAU,EAAE,CAAC;gBAC3C,OAAO,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE;oBACpC,GAAG,eAAe;oBAClB,qBAAqB,EAAE,IAAI;oBAC3B,UAAU,EAAE,OAAO,CAAC,UAAU;iBAC9B,CAAC,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACP,OAAO,OAAO,CAAO,IAAI,EAAE,MAAsC,EAAE;oBAClE,GAAG,eAAe;oBAClB,qBAAqB,EAAE,IAAI;oBAC3B,UAAU,EAAE,OAAO,CAAC,UAAU;iBAC9B,CAAC,CAAC;YACJ,CAAC;QACF,CAAC;QACD,MAAM,YAAY,GAAG,iBAAiB,CAAC,kBAAkB,EAAE,OAAO,EAAE,YAAY,CAAC,CAAC;QAClF,IAAI,YAAY,EAAE,CAAC;YAClB,OAAO,YAAY,CAAC;QACrB,CAAC;QAED,MAAM,EAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,QAAQ,EAAC,GAAG,MAAM,CAAC;QAEtD,IAAI,CAAC,OAAO,EAAE,CAAC;YACd,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;QACzC,CAAC;QACD,MAAM,OAAO,GAAG,GAAG,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QAE5C,IAAI,gBAAyF,CAAC;QAE9F,IAAI,iBAAiB,GAAG,CAAC,kBAAkB,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC;QAClE,IAAI,aAAa,GAAa,WAAW,CAAC;QAC1C,IAAI,gBAAgB,GAAuB,CAAC,mBAAmB,CAAC,CAAC;QACjE,IAAI,eAAe,GAAG,IAAI,CAAC;QAC3B,IAAI,OAAO,EAAE,aAAa,EAAE,CAAC;YAC5B,IAAI,OAAO,OAAO,CAAC,aAAa,KAAK,QAAQ,IAAI,OAAO,CAAC,aAAa,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;gBAC1F,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC,QAAQ,CAAC;gBAC/C,iBAAiB,GAAG,OAAO,CAAC,aAAa,CAAC,IAAI,IAAI,CAAC,kBAAkB,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC;YAC7F,CAAC;iBAAM,CAAC;gBACP,MAAM,uBAAuB,GAC5B,OAAO,OAAO,CAAC,aAAa,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC;gBAEhG,QAAQ,uBAAuB,EAAE,CAAC;oBACjC,KAAK,aAAa;wBACjB,aAAa,GAAG,WAAW,CAAC;wBAC5B,iBAAiB,GAAG,CAAC,kBAAkB,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC;wBAC9D,MAAM;oBACP,KAAK,wBAAwB;wBAC5B,aAAa,GAAG,sBAAsB,CAAC;wBACvC,iBAAiB,GAAG,CAAC,kBAAkB,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC;wBAC9D,MAAM;oBACP,KAAK,MAAM;wBACV,gBAAgB,GAAG,KAAK,CAAC;wBACzB,eAAe,GAAG,KAAK,CAAC;wBACxB,aAAa,GAAG,YAAY,CAAC;wBAC7B,iBAAiB,GAAG,CAAC,kBAAkB,EAAE,QAAQ,CAAC,CAAC;wBACnD,MAAM;oBACP,KAAK,yCAAyC;wBAC7C,gBAAgB,GAAG,KAAK,CAAC;wBACzB,aAAa,GAAG,2BAA2B,CAAC;wBAC5C,iBAAiB,GAAG,CAAC,kBAAkB,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC;wBAC9D,gBAAgB,GAAG;4BAClB,YAAY,EAAE,mBAAmB;4BACjC,cAAc,EACb,CAAC,OAAO,OAAO,CAAC,aAAa,KAAK,QAAQ,IAAI,OAAO,CAAC,aAAa,CAAC,cAAc,CAAC;gCACnF,mBAAmB;yBACpB,CAAC;wBACF,MAAM;oBACP,KAAK,sCAAsC;wBAC1C,gBAAgB,GAAG,KAAK,CAAC;wBACzB,aAAa,GAAG,oCAAoC,CAAC;wBACrD,iBAAiB,GAAG,CAAC,kBAAkB,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC;wBAC9D,gBAAgB,GAAG;4BAClB,YAAY,EAAE,mBAAmB;4BACjC,cAAc,EACb,CAAC,OAAO,OAAO,CAAC,aAAa,KAAK,QAAQ,IAAI,OAAO,CAAC,aAAa,CAAC,cAAc,CAAC;gCACnF,mBAAmB;yBACpB,CAAC;wBACF,MAAM;oBACP;wBACC,MAAM,IAAI,KAAK,CAAC,0BAA0B,OAAO,CAAC,aAAa,EAAE,CAAC,CAAC;gBACrE,CAAC;YACF,CAAC;QACF,CAAC;QAED,gBAAgB,GAAG,OAAO,EAAE,gBAAgB,IAAI,gBAAgB,CAAC;QACjE,eAAe,GAAG,OAAO,EAAE,eAAe,IAAI,eAAe,CAAC;QAE9D,MAAM,wBAAwB,GAC7B,OAAO,MAAM,CAAC,QAAQ,KAAK,UAAU;YACpC,CAAC,CAAC,MAAM,MAAM,CAAC,QAAQ,CAAC,kBAAkB,EAAE,EAAC,GAAG,MAAM,EAAC,EAAE,wBAAwB,CAAC;YAClF,CAAC,CAAC,MAAM,OAAO,CACb,kBAAkB,EAClB;gBACC,GAAG,QAAQ;gBACX,IAAI;gBACJ,QAAQ;gBACR,OAAO,EAAE,OAAO;aACgB,EACjC,wBAAwB,CACxB,CAAC;QAEL,iGAAiG;QAEjG,MAAM,EACL,OAAO,EAAE,qBAAqB,EAC9B,QAAQ,EAAE,sBAAsB,EAChC,WAAW,EACX,aAAa,EAAE,2BAA2B,EAC1C,GAAG,oCAAoC,EACvC,GAAG,wBAAwB,CAAC;QAE7B,kDAAkD;QAClD,MAAM,aAAa,GAAG,oCAAoC,CAAC;QAC3D,MAAM,EAAC,SAAS,EAAC,GAAG,SAAS,CAC5B;YACC,EAAC,IAAI,EAAE,kBAAkB,EAAE,GAAG,EAAE,oCAAoC,CAAC,GAAG,EAAC;YACzE,EAAC,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,aAAa,CAAC,GAAG,EAAC;SACzC,EACD,EAAC,iBAAiB,EAAE,gBAAgB,EAAC,CACrC,CAAC;QAEF,uEAAuE;QAEvE,MAAM,aAAa,GAAG,OAAO,EAAE,KAAK,IAAI,OAAO,CAAC;QAChD,IAAI,UAAU,GAAG,aAAa,CAAC;QAE/B,IAAI,kBAKQ,CAAC;QACb,IAAI,gBAAgB,EAAE,YAAY,KAAK,mBAAmB,EAAE,CAAC;YAC5D,MAAM,eAAe,GAAG,aAAa,CAAC;YACtC,MAAM,cAAc,GAAG,gBAAgB,CAAC,cAAc,CAAC;YACvD,IAAI,kBAAkB,GAAoD,GAAG,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;YAExG,IAAI,CAAC,kBAAkB,EAAE,CAAC;gBACzB,MAAM,oBAAoB,GAAG,MAAM,OAAO,CACzC,cAAc,EACd;oBACC,GAAG,MAAM;oBACT,QAAQ,EAAE,iBAAiB;oBAC3B,IAAI,EAAE,CAAC,eAAe,CAAC;iBACvB,EACD;oBACC,aAAa,EAAE,OAAO,EAAE,aAAa;iBACrC,CACD,CAAC;gBACF,kBAAkB,GAAG,oBAAoB,CAAC;YAC3C,CAAC;YAED,MAAM,sBAAsB,GAAG,MAAM,KAAK,CAAC,kBAAkB,EAAE,EAAC,YAAY,EAAE,OAAO,EAAC,CAAC,CAAC;YAExF,IAAI,sBAAsB,CAAC,WAAW,EAAE,KAAK,aAAa,CAAC,WAAW,EAAE,EAAE,CAAC;gBAC1E,MAAM,IAAI,KAAK,CAAC,gEAAgE,cAAc,EAAE,CAAC,CAAC;YACnG,CAAC;YACD,IAAI,sBAAsB,KAAK,WAAW,EAAE,CAAC;gBAC5C,MAAM,IAAI,KAAK,CAAC,oBAAoB,cAAc,2DAA2D,CAAC,CAAC;YAChH,CAAC;YACD,UAAU,GAAG,kBAAkB,CAAC,OAAO,CAAC;YAExC,kBAAkB,GAAG;gBACpB,UAAU,EAAE,kBAAkB;gBAC9B,KAAK,EAAE,sBAAsB,CAAC,WAAW,EAAmB;aAC5D,CAAC;QACH,CAAC;QAED,IAAI,mBAA8C,CAAC;QACnD,IAAI,OAAO,EAAE,OAAO,EAAE,CAAC;YACtB,IAAI,SAKQ,CAAC;YACb,IAAI,OAAO,OAAO,CAAC,OAAO,IAAI,QAAQ,EAAE,CAAC;gBACxC,SAAS,GAAG;oBACX,UAAU,EAAE,OAAO,CAAC,OAAO;oBAC3B,IAAI,EAAE,IAAa;iBACnB,CAAC;YACH,CAAC;iBAAM,IAAI,YAAY,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;gBAC5C,SAAS,GAAG;oBACX,UAAU,EAAE,OAAO,CAAC,OAAO,CAAC,UAAU;oBACtC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,IAAI,IAAK,IAAc;iBAC7C,CAAC;YACH,CAAC;iBAAM,CAAC;gBACP,IAAI,kBAAkB,EAAE,CAAC;oBACxB,IAAI,OAAO,OAAO,CAAC,OAAO,CAAC,SAAS,KAAK,QAAQ,EAAE,CAAC;wBACnD,SAAS,GAAG;4BACX,UAAU,EAAE,OAAO,CAAC,OAAO,CAAC,SAAS;4BACrC,IAAI,EAAE,IAAa;yBACnB,CAAC;oBACH,CAAC;yBAAM,IAAI,OAAO,OAAO,CAAC,OAAO,CAAC,SAAS,KAAK,QAAQ,EAAE,CAAC;wBAC1D,SAAS,GAAG;4BACX,UAAU,EAAE,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,UAAU;4BAChD,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,IAAK,IAAc;yBACvD,CAAC;oBACH,CAAC;gBACF,CAAC;qBAAM,CAAC;oBACP,IAAI,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;wBAC9C,SAAS,GAAG;4BACX,UAAU,EAAE,OAAO,CAAC,OAAO,CAAC,IAAI;4BAChC,IAAI,EAAE,IAAa;yBACnB,CAAC;oBACH,CAAC;yBAAM,IAAI,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;wBACrD,SAAS,GAAG;4BACX,UAAU,EAAE,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU;4BAC3C,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,IAAK,IAAc;yBAClD,CAAC;oBACH,CAAC;gBACF,CAAC;YACF,CAAC;YAED,IAAI,SAAS,EAAE,CAAC;gBACf,MAAM,MAAM,GAA4B,aAAa,CAAC,GAAG,CAAC,IAAI,CAC7D,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,UAAU,IAAI,CAAC,CAAC,IAAI,KAAK,SAAS,CAAC,UAAU,CAChD,CAAC;gBACjB,IAAI,MAAM,EAAE,CAAC;oBACZ,mBAAmB,GAAG,kBAAkB,CAAC;wBACxC,GAAG,QAAQ;wBACX,IAAI,EAAE,SAAS,CAAC,IAAI;wBACpB,OAAO,EAAE,OAAO;wBAChB,GAAG,EAAE,CAAC,MAAM,CAAC;wBACb,YAAY,EAAE,MAAM,CAAC,IAAI;qBACzB,CAAC,CAAC;gBACJ,CAAC;qBAAM,CAAC;oBACP,MAAM,IAAI,KAAK,CAAC,UAAU,SAAS,CAAC,UAAU,uCAAuC,IAAI,EAAE,CAAC,CAAC;gBAC9F,CAAC;YACF,CAAC;QACF,CAAC;QACD,qDAAqD;QACrD,6BAA6B;QAC7B,mEAAmE;QACnE,kEAAkE;QAClE,qBAAqB;QACrB,iBAAiB;QACjB,+GAA+G;QAC/G,KAAK;QACL,IAAI;QAEJ,IAAI,CAAC,kBAAkB,EAAE,CAAC;YACzB,MAAM,EAAC,aAAa,EAAE,GAAG,KAAK,EAAC,GAAG,MAAM,OAAO,CAC9C,SAAS,EACT;gBACC,GAAG,MAAM;gBACT,QAAQ,EAAE,aAAa;gBACvB,IAAI,EAAE,mBAAmB,CAAC,iBAAiB,EAAE;oBAC5C,qBAAqB,EAAE,wBAAwB,CAAC,OAAO;oBACvD,UAAU,EAAE,UAAU;oBACtB,IAAI,EAAE,mBAAmB,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,IAAI;iBACtD,CAAC;aACF,EACD;gBACC,qBAAqB,EAAE,IAAI;gBAC3B,aAAa,EAAE,OAAO,EAAE,aAAa;aACrC,CACD,CAAC;YAEF,qDAAqD;YAErD,kBAAkB,GAAG,MAAM,GAAG,CAAC,IAAI,CAAO,IAAI,EAAE;gBAC/C,GAAG,KAAK;gBACR,GAAG,aAAa;gBAChB,GAAG,EAAE,SAA4B;gBACjC,UAAU,EAAE,0BAA0B,CAAC,OAAO,EAAE,UAAU,CAAC;aAC3D,CAAC,CAAC;YAEH,oCAAoC;QACrC,CAAC;aAAM,CAAC;YACP,MAAM,eAAe,GAAG,GAAG,CAAC,SAAS,CAA2B,SAAS,CAAC,CAAC;YAC3E,IAAI,CAAC,eAAe,EAAE,CAAC;gBACtB,MAAM,IAAI,KAAK,CAAC,mBAAmB,IAAI,+BAA+B,CAAC,CAAC;YACzE,CAAC;YAED,MAAM,sBAAsB,GAAG,MAAM,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC;gBACjE,MAAM,EAAE,kBAAkB;gBAC1B,MAAM,EAAE;oBACP,eAAe,CAAC,OAAO;oBACvB,oEAAoE;oBACpE,QAAQ;iBACR;aACD,CAAC,CAAC;YACH,MAAM,4BAA4B,GAAG,KAAK,sBAAsB,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC;YAE/E,IAAI,4BAA4B,CAAC,WAAW,EAAE,KAAK,wBAAwB,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE,CAAC;gBACnG,eAAe;gBACf,yHAAyH;gBACzH,KAAK;gBAEL,+CAA+C;gBAC/C,QAAQ;gBACR,4EAA4E;gBAC5E,gCAAgC;gBAChC,YAAY;gBACZ,6BAA6B;gBAC7B,IAAI;gBACJ,uBAAuB;gBACvB,MAAM,aAAa,GAAG,MAAM,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC;oBACxD,MAAM,EAAE,kBAAkB;oBAC1B,MAAM,EAAE;wBACP,eAAe,CAAC,OAAO;wBACvB,oEAAoE;wBACpE,QAAQ;qBACR;iBACD,CAAC,CAAC;gBACH,IAAI,YAAY,GAAG,KAAK,aAAa,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC;gBAEpD,IAAI,YAAY,KAAK,WAAW,EAAE,CAAC;oBAClC,IAAI,CAAC;wBACJ,MAAM,KAAK,GAAG,MAAM,KAAK,CAAC,kBAAyB,EAAE,EAAC,YAAY,EAAE,OAAO,EAAC,CAAC,CAAC;wBAC9E,YAAY,GAAI,KAAgB,CAAC,WAAW,EAAmB,CAAC;oBACjE,CAAC;oBAAC,OAAO,GAAG,EAAE,CAAC,CAAA,CAAC;gBACjB,CAAC;gBAED,IAAI,YAAY,KAAK,WAAW,EAAE,CAAC;oBAClC,IAAI,eAAe,EAAE,CAAC;wBACrB,MAAM,IAAI,KAAK,CAAC,4DAA4D,CAAC,CAAC;oBAC/E,CAAC;gBACF,CAAC;qBAAM,IAAI,YAAY,CAAC,WAAW,EAAE,KAAK,UAAU,CAAC,WAAW,EAAE,EAAE,CAAC;oBACpE,MAAM,IAAI,KAAK,CACd,+EAA+E,YAAY,EAAE,CAC7F,CAAC;gBACH,CAAC;gBAED,4BAA4B;gBAC5B,8BAA8B;gBAC9B,yCAAyC;gBACzC,uBAAuB;gBACvB,8CAA8C;gBAC9C,8EAA8E;gBAC9E,wBAAwB;gBACxB,QAAQ;gBACR,YAAY;gBACZ,yCAAyC;gBACzC,uBAAuB;gBACvB,8CAA8C;gBAC9C,+DAA+D;gBAC/D,wBAAwB;gBACxB,QAAQ;gBACR,KAAK;gBACL,SAAS;gBAET,MAAM,yBAAyB,GAAG,OAAO,EAAE,aAAa,KAAK,MAAM,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,eAAe,CAAC;gBAE3G,IAAI,mBAAmB,GAAG,CAAC,CAAC,mBAAmB,CAAC;gBAChD,IAAI,CAAC,mBAAmB,EAAE,CAAC;oBAC1B,IAAI,CAAC,yBAAyB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,UAAU,IAAI,CAAC,CAAC,IAAI,KAAK,WAAW,CAAC,EAAE,CAAC;wBACjG,mBAAmB,GAAG,IAAI,CAAC;oBAC5B,CAAC;gBACF,CAAC;gBAED,IAAI,kBAAkB,EAAE,CAAC;oBACxB,IAAI,mBAAmB,EAAE,CAAC;wBACzB,MAAM,QAAQ,CAAC,kBAAkB,CAAC,UAAU,EAAE;4BAC7C,OAAO,EAAE,kBAAkB,CAAC,KAAK;4BACjC,YAAY,EAAE,gBAAgB;4BAC9B,IAAI,EAAE,CAAC,eAAe,CAAC,OAAO,EAAE,wBAAwB,CAAC,OAAO,EAAE,mBAAmB,IAAI,IAAI,CAAC;4BAC9F,KAAK,EAAE,EAAE,EAAE,OAAO;yBAClB,CAAC,CAAC;oBACJ,CAAC;yBAAM,CAAC;wBACP,MAAM,QAAQ,CAAC,kBAAkB,CAAC,UAAU,EAAE;4BAC7C,OAAO,EAAE,kBAAkB,CAAC,KAAK;4BACjC,YAAY,EAAE,SAAS;4BACvB,IAAI,EAAE,CAAC,eAAe,CAAC,OAAO,EAAE,wBAAwB,CAAC,OAAO,CAAC;yBACjE,CAAC,CAAC;oBACJ,CAAC;gBACF,CAAC;qBAAM,CAAC;oBACP,IAAI,mBAAmB,EAAE,CAAC;wBACzB,MAAM,QAAQ,CAAC,yBAAyB,EAAE;4BACzC,OAAO,EAAE,YAAY;4BACrB,YAAY,EAAE,kBAAkB;4BAChC,IAAI,EAAE,CAAC,wBAAwB,CAAC,OAAO,EAAE,mBAAmB,IAAI,IAAI,CAAC;4BACrE,KAAK,EAAE,EAAE,EAAE,OAAO;yBAClB,CAAC,CAAC;oBACJ,CAAC;yBAAM,CAAC;wBACP,MAAM,QAAQ,CAAC,yBAAyB,EAAE;4BACzC,OAAO,EAAE,YAAY;4BACrB,YAAY,EAAE,WAAW;4BACzB,IAAI,EAAE,CAAC,wBAAwB,CAAC,OAAO,CAAC;yBACxC,CAAC,CAAC;oBACJ,CAAC;gBACF,CAAC;gBACD,kBAAkB,GAAG,MAAM,GAAG,CAAC,IAAI,CAAO,IAAI,EAAE;oBAC/C,GAAG,eAAe;oBAClB,GAAG,aAAa;oBAChB,GAAG,EAAE,SAA4B;oBACjC,UAAU,EAAE,0BAA0B,CAAC,OAAO,EAAE,UAAU,CAAC;iBAC3D,CAAC,CAAC;gBACH,oCAAoC;YACrC,CAAC;QACF,CAAC;QACD,OAAO,kBAAkB,CAAC;IAC3B,CAAC,CAAC;AACH,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@rocketh/proxy",
3
- "version": "0.19.10",
3
+ "version": "0.19.11",
4
4
  "description": "provide proxy-enabled deploy function for rocketh",
5
5
  "keywords": [
6
6
  "rocketh",
@@ -52,8 +52,8 @@
52
52
  "named-logs": "^0.4.1",
53
53
  "viem": "^2.48.2",
54
54
  "@rocketh/core": "0.19.3",
55
- "@rocketh/read-execute": "0.19.3",
56
- "@rocketh/deploy": "0.19.5"
55
+ "@rocketh/deploy": "0.19.6",
56
+ "@rocketh/read-execute": "0.19.3"
57
57
  },
58
58
  "devDependencies": {
59
59
  "as-soon": "^0.1.6",
package/src/index.ts CHANGED
@@ -26,60 +26,66 @@ export type PredefinedProxyContract =
26
26
  | 'SharedAdminOpenZeppelinTransparentProxy'
27
27
  | 'SharedAdminOptimizedTransparentProxy';
28
28
 
29
- export type ProxyDeployOptions = Omit<DeployOptions, 'skipIfAlreadyDeployed' | 'alwaysOverride'> & {
30
- proxyDisabled?: boolean;
31
- owner?: EIP1193Account;
32
- execute?:
33
- | string
34
- | {
35
- methodName: string;
36
- args?: any[];
37
- }
38
- | {
39
- init:
40
- | string
41
- | {
42
- methodName: string;
43
- args?: any[];
44
- };
45
- onUpgrade?:
46
- | string
47
- | {
48
- methodName: string;
49
- args?: any[];
50
- };
51
- };
52
- upgradeIndex?: number;
53
- checkProxyAdmin?: boolean;
54
- checkABIConflict?: boolean;
55
- deterministicImplementation?: boolean;
56
- proxyContract?:
57
- | PredefinedProxyContract
58
- | ({type: PredefinedProxyContract} & {
59
- type: 'SharedAdminOpenZeppelinTransparentProxy' | 'SharedAdminOptimizedTransparentProxy';
60
- proxyAdminName?: string;
61
- // TODO allow custom proxyAdmin artifact?
62
- })
63
- | {
64
- type: 'custom';
65
- artifact: Artifact;
66
- args?: ('{implementation}' | '{admin}' | '{data}')[]; // default to ['{implementation}', '{admin}', '{data}']
67
- // TODO allow viaAdminContract for custom proxy artifacts
68
- // We could just use boolean | {proxyAdminName: string}
69
- // viaAdminContract?:
70
- // | string
71
- // | {
72
- // name: string;
73
- // artifact?: string | ArtifactData;
74
- // };
75
- // viaAdminContract = {
76
- // artifactName: 'DefaultProxyAdmin',
77
- // proxyAdminName:
78
- // (typeof options.proxyContract === 'object' && options.proxyContract.proxyAdminName) ||
79
- // 'DefaultProxyAdmin',
80
- // };
81
- };
82
- };
29
+ type DeployMutuallyExclusiveOptions = {alwaysOverride?: boolean} | {strictBytecodeMatch?: boolean};
30
+
31
+ export type ProxyDeployOptions = Omit<
32
+ DeployOptions,
33
+ 'skipIfAlreadyDeployed' | 'alwaysOverride' | 'strictBytecodeMatch'
34
+ > &
35
+ DeployMutuallyExclusiveOptions & {
36
+ proxyDisabled?: boolean;
37
+ owner?: EIP1193Account;
38
+ execute?:
39
+ | string
40
+ | {
41
+ methodName: string;
42
+ args?: any[];
43
+ }
44
+ | {
45
+ init:
46
+ | string
47
+ | {
48
+ methodName: string;
49
+ args?: any[];
50
+ };
51
+ onUpgrade?:
52
+ | string
53
+ | {
54
+ methodName: string;
55
+ args?: any[];
56
+ };
57
+ };
58
+ upgradeIndex?: number;
59
+ checkProxyAdmin?: boolean;
60
+ checkABIConflict?: boolean;
61
+ deterministicImplementation?: boolean;
62
+ proxyContract?:
63
+ | PredefinedProxyContract
64
+ | ({type: PredefinedProxyContract} & {
65
+ type: 'SharedAdminOpenZeppelinTransparentProxy' | 'SharedAdminOptimizedTransparentProxy';
66
+ proxyAdminName?: string;
67
+ // TODO allow custom proxyAdmin artifact?
68
+ })
69
+ | {
70
+ type: 'custom';
71
+ artifact: Artifact;
72
+ args?: ('{implementation}' | '{admin}' | '{data}')[]; // default to ['{implementation}', '{admin}', '{data}']
73
+ // TODO allow viaAdminContract for custom proxy artifacts
74
+ // We could just use boolean | {proxyAdminName: string}
75
+ // viaAdminContract?:
76
+ // | string
77
+ // | {
78
+ // name: string;
79
+ // artifact?: string | ArtifactData;
80
+ // };
81
+ // viaAdminContract = {
82
+ // artifactName: 'DefaultProxyAdmin',
83
+ // proxyAdminName:
84
+ // (typeof options.proxyContract === 'object' && options.proxyContract.proxyAdminName) ||
85
+ // 'DefaultProxyAdmin',
86
+ // };
87
+ };
88
+ };
83
89
 
84
90
  export type ImplementationDeployer<TAbi extends Abi> = (
85
91
  name: string,
@@ -120,9 +126,15 @@ export function deployViaProxy(
120
126
  params: ProxyEnhancedDeploymentConstruction<TAbi>,
121
127
  options?: ProxyDeployOptions,
122
128
  ) => {
129
+ const alwaysOverride = options && 'alwaysOverride' in options && options.alwaysOverride;
130
+ const strictBytecodeMatch =
131
+ !alwaysOverride && options && 'strictBytecodeMatch' in options && options.strictBytecodeMatch;
132
+ const skipIfAlreadyDeployed = alwaysOverride ? false : true;
133
+
123
134
  let optionsForImplementation = options
124
135
  ? {
125
- alwaysOverride: false,
136
+ strictBytecodeMatch: strictBytecodeMatch,
137
+ alwaysOverride: alwaysOverride,
126
138
  deterministic: options.deterministic || options.deterministicImplementation,
127
139
  libraries: options.libraries,
128
140
  }
@@ -139,9 +151,9 @@ export function deployViaProxy(
139
151
  proxyDisabled,
140
152
  upgradeIndex,
141
153
  linkedData,
142
- ...optionsForProxy
154
+ ...rest
143
155
  } = options;
144
- return optionsForProxy;
156
+ return {...rest, strictBytecodeMatch: false}; // strictBytecodeMatch is never applied to proxy
145
157
  })(options)
146
158
  : undefined;
147
159
 
@@ -154,13 +166,13 @@ export function deployViaProxy(
154
166
  if (typeof params.artifact === 'function') {
155
167
  return params.artifact(name, params, {
156
168
  ...optionsForProxy,
157
- skipIfAlreadyDeployed: true,
169
+ skipIfAlreadyDeployed,
158
170
  linkedData: options.linkedData,
159
171
  });
160
172
  } else {
161
173
  return _deploy<TAbi>(name, params as DeploymentConstruction<TAbi>, {
162
174
  ...optionsForProxy,
163
- skipIfAlreadyDeployed: true,
175
+ skipIfAlreadyDeployed,
164
176
  linkedData: options.linkedData,
165
177
  });
166
178
  }
@@ -403,10 +415,7 @@ export function deployViaProxy(
403
415
  data: postUpgradeCalldata ? postUpgradeCalldata : '0x',
404
416
  }),
405
417
  },
406
- {
407
- skipIfAlreadyDeployed: true,
408
- deterministic: options?.deterministic,
409
- },
418
+ optionsForProxy,
410
419
  );
411
420
 
412
421
  // logger.info(`proxy deployed at ${proxy.address}`);