viem 2.22.20 → 2.22.21

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.
package/CHANGELOG.md CHANGED
@@ -1,5 +1,11 @@
1
1
  # viem
2
2
 
3
+ ## 2.22.21
4
+
5
+ ### Patch Changes
6
+
7
+ - [`c822da1966220bb80eda9b00d47829bf23e29761`](https://github.com/wevm/viem/commit/c822da1966220bb80eda9b00d47829bf23e29761) Thanks [@jxom](https://github.com/jxom)! - Fixed ERC-7821 `getExecuteError` return type.
8
+
3
9
  ## 2.22.20
4
10
 
5
11
  ### Patch Changes
@@ -1,5 +1,5 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.version = void 0;
4
- exports.version = '2.22.20';
4
+ exports.version = '2.22.21';
5
5
  //# sourceMappingURL=version.js.map
@@ -8,7 +8,7 @@ const errors_js_1 = require("../errors.js");
8
8
  function getExecuteError(e, parameters) {
9
9
  const error = e.walk((e) => 'data' in e);
10
10
  if (!error?.data)
11
- throw e;
11
+ return e;
12
12
  if (error.data ===
13
13
  AbiError.getSelector(AbiError.from('error FnSelectorNotRecognized()')))
14
14
  return new errors_js_1.FunctionSelectorNotRecognizedError();
@@ -28,13 +28,13 @@ function getExecuteError(e, parameters) {
28
28
  }
29
29
  catch { }
30
30
  }
31
- if (!matched)
32
- throw e;
33
- return (0, getContractError_js_1.getContractError)(error, {
34
- abi: matched.abi,
35
- address: matched.to,
36
- args: matched.args,
37
- functionName: matched.functionName,
38
- });
31
+ if (matched)
32
+ return (0, getContractError_js_1.getContractError)(error, {
33
+ abi: matched.abi,
34
+ address: matched.to,
35
+ args: matched.args,
36
+ functionName: matched.functionName,
37
+ });
38
+ return e;
39
39
  }
40
40
  //# sourceMappingURL=getExecuteError.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"getExecuteError.js","sourceRoot":"","sources":["../../../../experimental/erc7821/utils/getExecuteError.ts"],"names":[],"mappings":";;AA2BA,0CAsCC;AAhED,wCAAuC;AAKvC,kFAA2E;AAC3E,mFAGkD;AAClD,4CAGqB;AAarB,SAAgB,eAAe,CAC7B,CAAY,EACZ,UAA4C;IAE5C,MAAM,KAAK,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,IAAK,CAAW,CAErC,CAAA;IAEb,IAAI,CAAC,KAAK,EAAE,IAAI;QAAE,MAAM,CAAC,CAAA;IACzB,IACE,KAAK,CAAC,IAAI;QACV,QAAQ,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,iCAAiC,CAAC,CAAC;QAEtE,OAAO,IAAI,8CAAkC,EAAW,CAAA;IAE1D,IAAI,OAAO,GAAgB,IAAI,CAAA;IAC/B,KAAK,MAAM,CAAC,IAAI,UAAU,CAAC,KAAK,EAAE,CAAC;QACjC,MAAM,IAAI,GAAG,CAAS,CAAA;QACtB,IAAI,CAAC,IAAI,CAAC,GAAG;YAAE,SAAQ;QACvB,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,OAAO,CACrB,IAAA,wCAAiB,EAAC;gBAChB,GAAG,EAAE,IAAI,CAAC,GAAG;gBACb,IAAI,EAAE,KAAK,CAAC,IAAK;aAClB,CAAC,CACH,CAAA;YACD,IAAI,CAAC,OAAO;gBAAE,SAAQ;YACtB,OAAO,GAAG,IAAI,CAAA;QAChB,CAAC;QAAC,MAAM,CAAC,CAAA,CAAC;IACZ,CAAC;IACD,IAAI,CAAC,OAAO;QAAE,MAAM,CAAC,CAAA;IAErB,OAAO,IAAA,sCAAgB,EAAC,KAAkB,EAAE;QAC1C,GAAG,EAAE,OAAO,CAAC,GAAU;QACvB,OAAO,EAAE,OAAO,CAAC,EAAE;QACnB,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,YAAY,EAAE,OAAO,CAAC,YAAY;KACnC,CAAC,CAAA;AACJ,CAAC"}
1
+ {"version":3,"file":"getExecuteError.js","sourceRoot":"","sources":["../../../../experimental/erc7821/utils/getExecuteError.ts"],"names":[],"mappings":";;AA2BA,0CAuCC;AAjED,wCAAuC;AAKvC,kFAA2E;AAC3E,mFAGkD;AAClD,4CAGqB;AAarB,SAAgB,eAAe,CAC7B,CAAY,EACZ,UAA4C;IAE5C,MAAM,KAAK,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,IAAK,CAAW,CAErC,CAAA;IAEb,IAAI,CAAC,KAAK,EAAE,IAAI;QAAE,OAAO,CAAU,CAAA;IACnC,IACE,KAAK,CAAC,IAAI;QACV,QAAQ,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,iCAAiC,CAAC,CAAC;QAEtE,OAAO,IAAI,8CAAkC,EAAW,CAAA;IAE1D,IAAI,OAAO,GAAgB,IAAI,CAAA;IAC/B,KAAK,MAAM,CAAC,IAAI,UAAU,CAAC,KAAK,EAAE,CAAC;QACjC,MAAM,IAAI,GAAG,CAAS,CAAA;QACtB,IAAI,CAAC,IAAI,CAAC,GAAG;YAAE,SAAQ;QACvB,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,OAAO,CACrB,IAAA,wCAAiB,EAAC;gBAChB,GAAG,EAAE,IAAI,CAAC,GAAG;gBACb,IAAI,EAAE,KAAK,CAAC,IAAK;aAClB,CAAC,CACH,CAAA;YACD,IAAI,CAAC,OAAO;gBAAE,SAAQ;YACtB,OAAO,GAAG,IAAI,CAAA;QAChB,CAAC;QAAC,MAAM,CAAC,CAAA,CAAC;IACZ,CAAC;IACD,IAAI,OAAO;QACT,OAAO,IAAA,sCAAgB,EAAC,KAAkB,EAAE;YAC1C,GAAG,EAAE,OAAO,CAAC,GAAU;YACvB,OAAO,EAAE,OAAO,CAAC,EAAE;YACnB,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,YAAY,EAAE,OAAO,CAAC,YAAY;SACnC,CAAC,CAAA;IAEJ,OAAO,CAAU,CAAA;AACnB,CAAC"}
@@ -1,2 +1,2 @@
1
- export const version = '2.22.20';
1
+ export const version = '2.22.21';
2
2
  //# sourceMappingURL=version.js.map
@@ -5,7 +5,7 @@ import { FunctionSelectorNotRecognizedError, } from '../errors.js';
5
5
  export function getExecuteError(e, parameters) {
6
6
  const error = e.walk((e) => 'data' in e);
7
7
  if (!error?.data)
8
- throw e;
8
+ return e;
9
9
  if (error.data ===
10
10
  AbiError.getSelector(AbiError.from('error FnSelectorNotRecognized()')))
11
11
  return new FunctionSelectorNotRecognizedError();
@@ -25,13 +25,13 @@ export function getExecuteError(e, parameters) {
25
25
  }
26
26
  catch { }
27
27
  }
28
- if (!matched)
29
- throw e;
30
- return getContractError(error, {
31
- abi: matched.abi,
32
- address: matched.to,
33
- args: matched.args,
34
- functionName: matched.functionName,
35
- });
28
+ if (matched)
29
+ return getContractError(error, {
30
+ abi: matched.abi,
31
+ address: matched.to,
32
+ args: matched.args,
33
+ functionName: matched.functionName,
34
+ });
35
+ return e;
36
36
  }
37
37
  //# sourceMappingURL=getExecuteError.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"getExecuteError.js","sourceRoot":"","sources":["../../../../experimental/erc7821/utils/getExecuteError.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,QAAQ,MAAM,aAAa,CAAA;AAKvC,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAA;AAC3E,OAAO,EAEL,gBAAgB,GACjB,MAAM,2CAA2C,CAAA;AAClD,OAAO,EACL,kCAAkC,GAEnC,MAAM,cAAc,CAAA;AAarB,MAAM,UAAU,eAAe,CAC7B,CAAY,EACZ,UAA4C;IAE5C,MAAM,KAAK,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,IAAK,CAAW,CAErC,CAAA;IAEb,IAAI,CAAC,KAAK,EAAE,IAAI;QAAE,MAAM,CAAC,CAAA;IACzB,IACE,KAAK,CAAC,IAAI;QACV,QAAQ,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,iCAAiC,CAAC,CAAC;QAEtE,OAAO,IAAI,kCAAkC,EAAW,CAAA;IAE1D,IAAI,OAAO,GAAgB,IAAI,CAAA;IAC/B,KAAK,MAAM,CAAC,IAAI,UAAU,CAAC,KAAK,EAAE,CAAC;QACjC,MAAM,IAAI,GAAG,CAAS,CAAA;QACtB,IAAI,CAAC,IAAI,CAAC,GAAG;YAAE,SAAQ;QACvB,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,OAAO,CACrB,iBAAiB,CAAC;gBAChB,GAAG,EAAE,IAAI,CAAC,GAAG;gBACb,IAAI,EAAE,KAAK,CAAC,IAAK;aAClB,CAAC,CACH,CAAA;YACD,IAAI,CAAC,OAAO;gBAAE,SAAQ;YACtB,OAAO,GAAG,IAAI,CAAA;QAChB,CAAC;QAAC,MAAM,CAAC,CAAA,CAAC;IACZ,CAAC;IACD,IAAI,CAAC,OAAO;QAAE,MAAM,CAAC,CAAA;IAErB,OAAO,gBAAgB,CAAC,KAAkB,EAAE;QAC1C,GAAG,EAAE,OAAO,CAAC,GAAU;QACvB,OAAO,EAAE,OAAO,CAAC,EAAE;QACnB,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,YAAY,EAAE,OAAO,CAAC,YAAY;KACnC,CAAC,CAAA;AACJ,CAAC"}
1
+ {"version":3,"file":"getExecuteError.js","sourceRoot":"","sources":["../../../../experimental/erc7821/utils/getExecuteError.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,QAAQ,MAAM,aAAa,CAAA;AAKvC,OAAO,EAAE,iBAAiB,EAAE,MAAM,yCAAyC,CAAA;AAC3E,OAAO,EAEL,gBAAgB,GACjB,MAAM,2CAA2C,CAAA;AAClD,OAAO,EACL,kCAAkC,GAEnC,MAAM,cAAc,CAAA;AAarB,MAAM,UAAU,eAAe,CAC7B,CAAY,EACZ,UAA4C;IAE5C,MAAM,KAAK,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,IAAK,CAAW,CAErC,CAAA;IAEb,IAAI,CAAC,KAAK,EAAE,IAAI;QAAE,OAAO,CAAU,CAAA;IACnC,IACE,KAAK,CAAC,IAAI;QACV,QAAQ,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,iCAAiC,CAAC,CAAC;QAEtE,OAAO,IAAI,kCAAkC,EAAW,CAAA;IAE1D,IAAI,OAAO,GAAgB,IAAI,CAAA;IAC/B,KAAK,MAAM,CAAC,IAAI,UAAU,CAAC,KAAK,EAAE,CAAC;QACjC,MAAM,IAAI,GAAG,CAAS,CAAA;QACtB,IAAI,CAAC,IAAI,CAAC,GAAG;YAAE,SAAQ;QACvB,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,OAAO,CACrB,iBAAiB,CAAC;gBAChB,GAAG,EAAE,IAAI,CAAC,GAAG;gBACb,IAAI,EAAE,KAAK,CAAC,IAAK;aAClB,CAAC,CACH,CAAA;YACD,IAAI,CAAC,OAAO;gBAAE,SAAQ;YACtB,OAAO,GAAG,IAAI,CAAA;QAChB,CAAC;QAAC,MAAM,CAAC,CAAA,CAAC;IACZ,CAAC;IACD,IAAI,OAAO;QACT,OAAO,gBAAgB,CAAC,KAAkB,EAAE;YAC1C,GAAG,EAAE,OAAO,CAAC,GAAU;YACvB,OAAO,EAAE,OAAO,CAAC,EAAE;YACnB,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,YAAY,EAAE,OAAO,CAAC,YAAY;SACnC,CAAC,CAAA;IAEJ,OAAO,CAAU,CAAA;AACnB,CAAC"}
@@ -1,2 +1,2 @@
1
- export declare const version = "2.22.20";
1
+ export declare const version = "2.22.21";
2
2
  //# sourceMappingURL=version.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"getExecuteError.d.ts","sourceRoot":"","sources":["../../../../experimental/erc7821/utils/getExecuteError.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAO,MAAM,EAAE,MAAM,SAAS,CAAA;AAG1C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AACxD,OAAO,KAAK,EAAQ,KAAK,EAAE,MAAM,yBAAyB,CAAA;AAG1D,OAAO,EACL,KAAK,0BAA0B,EAEhC,MAAM,2CAA2C,CAAA;AAClD,OAAO,EAEL,KAAK,sCAAsC,EAC5C,MAAM,cAAc,CAAA;AAErB,MAAM,MAAM,yBAAyB,CACnC,KAAK,SAAS,SAAS,OAAO,EAAE,GAAG,SAAS,OAAO,EAAE,IACnD;IACF,wBAAwB;IACxB,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAA;CAC5B,CAAA;AAED,MAAM,MAAM,yBAAyB,GACjC,sCAAsC,GACtC,0BAA0B,CAAA;AAE9B,wBAAgB,eAAe,CAAC,KAAK,CAAC,KAAK,SAAS,SAAS,OAAO,EAAE,EACpE,CAAC,EAAE,SAAS,EACZ,UAAU,EAAE,yBAAyB,CAAC,KAAK,CAAC,GAC3C,yBAAyB,CAmC3B"}
1
+ {"version":3,"file":"getExecuteError.d.ts","sourceRoot":"","sources":["../../../../experimental/erc7821/utils/getExecuteError.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAO,MAAM,EAAE,MAAM,SAAS,CAAA;AAG1C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AACxD,OAAO,KAAK,EAAQ,KAAK,EAAE,MAAM,yBAAyB,CAAA;AAG1D,OAAO,EACL,KAAK,0BAA0B,EAEhC,MAAM,2CAA2C,CAAA;AAClD,OAAO,EAEL,KAAK,sCAAsC,EAC5C,MAAM,cAAc,CAAA;AAErB,MAAM,MAAM,yBAAyB,CACnC,KAAK,SAAS,SAAS,OAAO,EAAE,GAAG,SAAS,OAAO,EAAE,IACnD;IACF,wBAAwB;IACxB,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAA;CAC5B,CAAA;AAED,MAAM,MAAM,yBAAyB,GACjC,sCAAsC,GACtC,0BAA0B,CAAA;AAE9B,wBAAgB,eAAe,CAAC,KAAK,CAAC,KAAK,SAAS,SAAS,OAAO,EAAE,EACpE,CAAC,EAAE,SAAS,EACZ,UAAU,EAAE,yBAAyB,CAAC,KAAK,CAAC,GAC3C,yBAAyB,CAoC3B"}
package/errors/version.ts CHANGED
@@ -1 +1 @@
1
- export const version = '2.22.20'
1
+ export const version = '2.22.21'
@@ -33,7 +33,7 @@ export function getExecuteError<const calls extends readonly unknown[]>(
33
33
  | (BaseError & { data?: Hex | undefined })
34
34
  | undefined
35
35
 
36
- if (!error?.data) throw e
36
+ if (!error?.data) return e as never
37
37
  if (
38
38
  error.data ===
39
39
  AbiError.getSelector(AbiError.from('error FnSelectorNotRecognized()'))
@@ -55,12 +55,13 @@ export function getExecuteError<const calls extends readonly unknown[]>(
55
55
  matched = call
56
56
  } catch {}
57
57
  }
58
- if (!matched) throw e
58
+ if (matched)
59
+ return getContractError(error as BaseError, {
60
+ abi: matched.abi as Abi,
61
+ address: matched.to,
62
+ args: matched.args,
63
+ functionName: matched.functionName,
64
+ })
59
65
 
60
- return getContractError(error as BaseError, {
61
- abi: matched.abi as Abi,
62
- address: matched.to,
63
- args: matched.args,
64
- functionName: matched.functionName,
65
- })
66
+ return e as never
66
67
  }
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "viem",
3
3
  "description": "TypeScript Interface for Ethereum",
4
- "version": "2.22.20",
4
+ "version": "2.22.21",
5
5
  "main": "./_cjs/index.js",
6
6
  "module": "./_esm/index.js",
7
7
  "types": "./_types/index.d.ts",