dequanto 0.2.32 → 0.2.34

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 (54) hide show
  1. package/lib/cjs/clients/ClientPool.js +2 -2
  2. package/lib/cjs/clients/ClientPool.js.map +1 -1
  3. package/lib/cjs/clients/Web3BatchRequests.js +2 -2
  4. package/lib/cjs/clients/Web3BatchRequests.js.map +1 -1
  5. package/lib/cjs/clients/Web3Client.js +4 -4
  6. package/lib/cjs/clients/Web3Client.js.map +1 -1
  7. package/lib/cjs/config/ConfigDefaults.js +1 -0
  8. package/lib/cjs/config/ConfigDefaults.js.map +1 -1
  9. package/lib/cjs/contracts/ContractReader.js +2 -2
  10. package/lib/cjs/contracts/ContractReader.js.map +1 -1
  11. package/lib/cjs/rpc/RpcBase.js +7 -1
  12. package/lib/cjs/rpc/RpcBase.js.map +1 -1
  13. package/lib/cjs/rpc/RpcContract.js +16 -4
  14. package/lib/cjs/rpc/RpcContract.js.map +1 -1
  15. package/lib/cjs/safe/SafeTx.js +8 -2
  16. package/lib/cjs/safe/SafeTx.js.map +1 -1
  17. package/lib/cjs/utils/$traces.js +8 -0
  18. package/lib/cjs/utils/$traces.js.map +1 -1
  19. package/lib/esm/clients/ClientPool.js.map +1 -1
  20. package/lib/esm/clients/ClientPool.mjs +2 -2
  21. package/lib/esm/clients/Web3BatchRequests.js.map +1 -1
  22. package/lib/esm/clients/Web3BatchRequests.mjs +2 -2
  23. package/lib/esm/clients/Web3Client.js.map +1 -1
  24. package/lib/esm/clients/Web3Client.mjs +4 -4
  25. package/lib/esm/config/ConfigDefaults.js.map +1 -1
  26. package/lib/esm/config/ConfigDefaults.mjs +1 -0
  27. package/lib/esm/contracts/ContractReader.js.map +1 -1
  28. package/lib/esm/contracts/ContractReader.mjs +2 -2
  29. package/lib/esm/rpc/RpcBase.js.map +1 -1
  30. package/lib/esm/rpc/RpcBase.mjs +7 -1
  31. package/lib/esm/rpc/RpcContract.js.map +1 -1
  32. package/lib/esm/rpc/RpcContract.mjs +16 -4
  33. package/lib/esm/safe/SafeTx.js.map +1 -1
  34. package/lib/esm/safe/SafeTx.mjs +8 -2
  35. package/lib/esm/utils/$traces.js.map +1 -1
  36. package/lib/esm/utils/$traces.mjs +8 -0
  37. package/lib/types/clients/ClientPool.d.ts +3 -1
  38. package/lib/types/clients/Web3BatchRequests.d.ts +3 -1
  39. package/lib/types/clients/Web3Client.d.ts +6 -2
  40. package/lib/types/config/interface/IConfigData.d.ts +1 -0
  41. package/lib/types/contracts/ContractReader.d.ts +3 -1
  42. package/lib/types/rpc/RpcBase.d.ts +3 -1
  43. package/lib/types/rpc/RpcContract.d.ts +3 -1
  44. package/package.json +1 -1
  45. package/src/clients/ClientPool.ts +4 -2
  46. package/src/clients/Web3BatchRequests.ts +4 -2
  47. package/src/clients/Web3Client.ts +8 -4
  48. package/src/config/ConfigDefaults.ts +1 -0
  49. package/src/config/interface/IConfigData.ts +1 -0
  50. package/src/contracts/ContractReader.ts +4 -2
  51. package/src/rpc/RpcBase.ts +10 -2
  52. package/src/rpc/RpcContract.ts +18 -4
  53. package/src/safe/SafeTx.ts +9 -2
  54. package/src/utils/$traces.ts +13 -4
package/lib/esm/rpc/RpcContract.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"RpcContract.js","sourceRoot":"","sources":["../../../src/rpc/RpcContract.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"RpcContract.js","sourceRoot":"","sources":["../../../src/rpc/RpcContract.ts"],"names":[],"mappings":"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"}
package/lib/esm/rpc/RpcContract.mjs CHANGED
@@ -32,18 +32,30 @@ export class RpcContract {
32
32
  throw err;
33
33
  }
34
34
  }
35
- async batch(req) {
35
+ async batch(req, options) {
36
36
  let requests = await this.getCallRequestsRaw(req);
37
37
  try {
38
- let responseArr = await this.client.batch(requests.map(x => x.methodRequest));
38
+ let responseArr = await this.client.batch(requests.map(x => x.methodRequest), options);
39
39
  return responseArr.map((resp, i) => {
40
40
  let abi = requests[i].methodAbi;
41
41
  if (abi == null) {
42
42
  return resp;
43
43
  }
44
- let outputs = abi.outputs;
44
+ let returnABI = abi.outputs;
45
+ if (resp != null && typeof resp === 'object' && 'error' in resp) {
46
+ let defaults = null;
47
+ try {
48
+ const defaultHex = $abiCoder.encode(returnABI, [null]);
49
+ defaults = utils.deserializeOutput(defaultHex, returnABI);
50
+ }
51
+ catch (error) { }
52
+ return {
53
+ defaults,
54
+ ...resp
55
+ };
56
+ }
45
57
  let hex = typeof resp === 'string' ? resp : resp.data;
46
- let result = utils.deserializeOutput(hex, outputs);
58
+ let result = utils.deserializeOutput(hex, returnABI);
47
59
  return result;
48
60
  });
49
61
  }
package/lib/esm/safe/SafeTx.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"SafeTx.js","sourceRoot":"","sources":["../../../src/safe/SafeTx.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"SafeTx.js","sourceRoot":"","sources":["../../../src/safe/SafeTx.ts"],"names":[],"mappings":"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"}
package/lib/esm/safe/SafeTx.mjs CHANGED
@@ -32,8 +32,14 @@ export class SafeTx {
32
32
  return $abiUtils.encodePacked([`uint8`, tx.operation], [`address`, tx.to], [`uint256`, tx.value], [`uint256`, $hex.getBytesLength(tx.data ?? '0x')], [`bytes`, tx.data]);
33
33
  });
34
34
  let transactionsHex = $hex.concat(transactionsHexArr);
35
- const multiSendAddress = this.options?.contracts?.[this.client.network]?.MultiSend
36
- ?? config.safe?.contracts?.[this.client.network]?.MultiSend;
35
+ let isCallOnly = txData.every(tx => !tx.operation /** 0: call, 1: delegatecall */);
36
+ let getAddress = (key) => {
37
+ return this.options?.contracts?.[this.client.network]?.[key]
38
+ ?? config.safe?.contracts?.[this.client.network]?.[key];
39
+ };
40
+ const multiSendAddress = isCallOnly
41
+ ? (getAddress('MultiSendCallOnly') ?? getAddress('MultiSend'))
42
+ : (getAddress('MultiSend'));
37
43
  $require.Address(multiSendAddress, `MultiSend contract for ${this.client.network}`);
38
44
  const safeMultiSendContract = new MultiSend(multiSendAddress, this.client);
39
45
  const data = await safeMultiSendContract.$data().multiSend(sender, transactionsHex);
package/lib/esm/utils/$traces.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"$traces.js","sourceRoot":"","sources":["../../../src/utils/$traces.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"$traces.js","sourceRoot":"","sources":["../../../src/utils/$traces.ts"],"names":[],"mappings":"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"}
package/lib/esm/utils/$traces.mjs CHANGED
@@ -4,6 +4,7 @@ import { $bigint } from './$bigint.mjs';
4
4
  import { $hex } from './$hex.mjs';
5
5
  import { $color } from './$color.mjs';
6
6
  import alot from 'alot';
7
+ import { $contract } from './$contract.mjs';
7
8
  export var $traces;
8
9
  (function ($traces) {
9
10
  const CALL_OPS = new Set(['CALL', 'STATICCALL', 'DELEGATECALL', 'CALLCODE']);
@@ -409,6 +410,13 @@ export var $traces;
409
410
  // Fall back to raw bytes if decoding fails.
410
411
  }
411
412
  }
413
+ if (frame.failed) {
414
+ let abis = $contract.store.getFlattened();
415
+ let error = $contract.decodeCustomError(frame.output, abis);
416
+ if (error) {
417
+ return JSON.stringify(error);
418
+ }
419
+ }
412
420
  return shortHex(frame.output, 18, 10);
413
421
  }
414
422
  function getOutputMeta(log) {
package/lib/types/clients/ClientPool.d.ts CHANGED
@@ -132,7 +132,9 @@ export declare class WClient {
132
132
  sendTransaction(tx: any): PromiseEvent<TEth.TxReceipt>;
133
133
  sign(address: TEth.Address, message: string): Promise<string>;
134
134
  signTypedData(address: TEth.Address, typedData: DataLike<RpcTypes.TypedData>): Promise<TEth.Hex>;
135
- callBatched<TResult = any>(requests: TRpc.IRpcAction[]): Promise<TResult[]>;
135
+ callBatched<TResult = any>(requests: TRpc.IRpcAction[], options?: {
136
+ allowErrors?: boolean;
137
+ }): Promise<TResult[]>;
136
138
  call<TResult extends PromiseLike<any>>(fn: (wClient: WClient) => TResult, options?: {
137
139
  batchRequestCount?: number;
138
140
  }): Promise<{
package/lib/types/clients/Web3BatchRequests.d.ts CHANGED
@@ -16,6 +16,8 @@ export declare namespace Web3BatchRequests {
16
16
  private rpc;
17
17
  private requests;
18
18
  constructor(rpc: Rpc, requests: TRpc.IRpcAction[]);
19
- execute(): Promise<any[]>;
19
+ execute(options?: {
20
+ allowErrors?: boolean;
21
+ }): Promise<any[]>;
20
22
  }
21
23
  }
package/lib/types/clients/Web3Client.d.ts CHANGED
@@ -34,7 +34,9 @@ export declare abstract class Web3Client implements IWeb3Client {
34
34
  constructor(options: IWeb3ClientOptions);
35
35
  constructor(endpoints: IRpcConfig[]);
36
36
  request<TResult = any>(req: TRpc.IRpcAction): Promise<TResult>;
37
- batch(requests: TRpc.IRpcAction[]): Promise<any[]>;
37
+ batch(requests: TRpc.IRpcAction[], options?: {
38
+ allowErrors?: boolean;
39
+ }): Promise<any[]>;
38
40
  getEventStream(address: TEth.Address, abi: TAbiItem[], event: string): ClientEventsStream<any>;
39
41
  with<TResult>(fn: (wClient: WClient) => Promise<TResult>): Promise<TResult>;
40
42
  getWeb3(options?: IPoolWeb3Request): Promise<void>;
@@ -44,7 +46,9 @@ export declare abstract class Web3Client implements IWeb3Client {
44
46
  subscribe(type: 'newHeads' | 'newBlockHeaders', callback?: (error: Error, blockHeader: TEth.Block) => void): Promise<RpcSubscription<TEth.Block>>;
45
47
  subscribe(type: 'newPendingTransactions' | 'pendingTransactions', callback?: (error: Error, transactionHash: TEth.Hex) => void): Promise<RpcSubscription<TEth.Hex>>;
46
48
  readContract(req: TRpcContractCall): Promise<any>;
47
- readContractBatch(requests: TRpcContractCall[]): Promise<any[]>;
49
+ readContractBatch(requests: TRpcContractCall[], options?: {
50
+ allowErrors?: boolean;
51
+ }): Promise<any[]>;
48
52
  getBalance(address: TEth.Address, blockNumber?: DataLike<RpcTypes.BlockNumberOrTagOrHash>): Promise<bigint>;
49
53
  getBalances(addresses: TEth.Address[], blockNumber?: DataLike<RpcTypes.BlockNumberOrTagOrHash>): Promise<bigint[]>;
50
54
  getTransactionCount(address: TEth.Address, blockNumber?: DataLike<RpcTypes.BlockNumberOrTagOrHash>): Promise<bigint>;
package/lib/types/config/interface/IConfigData.d.ts CHANGED
@@ -57,6 +57,7 @@ export interface IConfigData {
57
57
  SafeL2?: TAddress;
58
58
  SafeProxyFactory: TAddress;
59
59
  MultiSend: TAddress;
60
+ MultiSendCallOnly?: TAddress;
60
61
  CreateCall?: TAddress;
61
62
  }>;
62
63
  };
package/lib/types/contracts/ContractReader.d.ts CHANGED
@@ -87,5 +87,7 @@ export declare namespace ContractReaderUtils {
87
87
  type TIContractReadParamsInferredMany<T extends IContractReadParams[]> = {
88
88
  [P in keyof T]: T[P] extends IContractReadParams<infer P> ? P : never;
89
89
  };
90
- function readAsyncBatch(client: Web3Client, requests: (IContractReadParams | null)[]): Promise<any[]>;
90
+ function readAsyncBatch(client: Web3Client, requests: (IContractReadParams | null)[], options?: {
91
+ allowErrors?: boolean;
92
+ }): Promise<any[]>;
91
93
  }
package/lib/types/rpc/RpcBase.d.ts CHANGED
@@ -8,7 +8,9 @@ export declare abstract class RpcBase {
8
8
  };
9
9
  constructor(transportInfo?: TTransport.Options.Any);
10
10
  request<TResult = any>(req: TRpc.IRpcAction): Promise<TResult>;
11
- batch(arr: TRpc.IRpcAction[]): Promise<any[]>;
11
+ batch(arr: TRpc.IRpcAction[], options?: {
12
+ allowErrors?: boolean;
13
+ }): Promise<any[]>;
12
14
  extend(rpcInfos: {
13
15
  name: string;
14
16
  call: string;
package/lib/types/rpc/RpcContract.d.ts CHANGED
@@ -24,7 +24,9 @@ export declare class RpcContract {
24
24
  private defaults?;
25
25
  constructor(client: Web3Client, defaults?: TRpcContract);
26
26
  request(req: TRpcContractCall): Promise<any>;
27
- batch(req: TRpcContractCall[]): Promise<any[]>;
27
+ batch(req: TRpcContractCall[], options?: {
28
+ allowErrors?: boolean;
29
+ }): Promise<any[]>;
28
30
  private getCallRequestsRaw;
29
31
  private getCallRequestRaw;
30
32
  static createCalldata(request: TRpcContractCall, options?: {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "dequanto",
3
- "version": "0.2.32",
3
+ "version": "0.2.34",
4
4
  "author": {
5
5
  "name": "Alex Kit",
6
6
  "email": "alex.kit@atmajs.com"
package/src/clients/ClientPool.ts CHANGED
@@ -911,7 +911,9 @@ export class WClient {
911
911
  .eth_signTypedData_v4(address, typedData);
912
912
  }
913
913
 
914
- async callBatched<TResult = any>(requests: TRpc.IRpcAction[]): Promise<TResult[]> {
914
+ async callBatched<TResult = any>(requests: TRpc.IRpcAction[], options?: {
915
+ allowErrors?: boolean
916
+ }): Promise<TResult[]> {
915
917
  let total = requests.length;
916
918
  let spanLimit = this.getSpanLimit(requests.length);
917
919
  let output = [] as TResult[];
@@ -925,7 +927,7 @@ export class WClient {
925
927
  }
926
928
  let { status, error, result: pageResult } = await this.call(async (client) => {
927
929
  let batch = new Web3BatchRequests.BatchRequest(client.rpc, page);
928
- let results = await batch.execute();
930
+ let results = await batch.execute(options);
929
931
  return results;
930
932
  });
931
933
  if (status === ClientStatus.Ok) {
package/src/clients/Web3BatchRequests.ts CHANGED
@@ -38,13 +38,15 @@ export namespace Web3BatchRequests {
38
38
  constructor(private rpc: Rpc, private requests: TRpc.IRpcAction[]) {
39
39
  }
40
40
 
41
- async execute(): Promise<any[]> {
41
+ async execute(options?: {
42
+ allowErrors?: boolean
43
+ }): Promise<any[]> {
42
44
  if (this.requests.length === 0) {
43
45
  return [];
44
46
  }
45
47
 
46
48
  let rpc = this.rpc;
47
- let response = await rpc.batch(this.requests);
49
+ let response = await rpc.batch(this.requests, options);
48
50
  return response;
49
51
  }
50
52
 
package/src/clients/Web3Client.ts CHANGED
@@ -97,9 +97,11 @@ export abstract class Web3Client implements IWeb3Client {
97
97
  });
98
98
  }
99
99
 
100
- async batch(requests: TRpc.IRpcAction[]): Promise<any[]> {
100
+ async batch(requests: TRpc.IRpcAction[], options?: {
101
+ allowErrors?: boolean
102
+ }): Promise<any[]> {
101
103
  return this.with (async web3 => {
102
- return web3.callBatched(requests);
104
+ return web3.callBatched(requests, options);
103
105
  });
104
106
  }
105
107
 
@@ -187,9 +189,11 @@ export abstract class Web3Client implements IWeb3Client {
187
189
  return result;
188
190
  }
189
191
 
190
- async readContractBatch(requests: TRpcContractCall[]) {
192
+ async readContractBatch(requests: TRpcContractCall[], options?: {
193
+ allowErrors?: boolean
194
+ }) {
191
195
  let reader = new RpcContract(this);
192
- let result = await reader.batch(requests);
196
+ let result = await reader.batch(requests, options);
193
197
  return result;
194
198
  }
195
199
 
package/src/config/ConfigDefaults.ts CHANGED
@@ -415,6 +415,7 @@ export const ConfigDefaults = <IConfigData> {
415
415
  "SafeL2": "0x29fcB43b46531BcA003ddC8FCB67FFE91900C762",
416
416
  "SafeProxyFactory": "0x4e1DCf7AD4e460CfD30791CCC4F9c8a4f820ec67",
417
417
  "MultiSend": "0x38869bf66a61cF6bDB996A6aE40D5853Fd43B526",
418
+ "MultiSendCallOnly": "0xA83c336B20401Af773B6219BA5027174338D1836",
418
419
  "CreateCall": "0x9b35Af71d77eaf8d7e40252370304687390A1A52"
419
420
  },
420
421
  "eth:goerli": {
package/src/config/interface/IConfigData.ts CHANGED
@@ -64,6 +64,7 @@ export interface IConfigData {
64
64
  SafeL2?: TAddress;
65
65
  SafeProxyFactory: TAddress;
66
66
  MultiSend: TAddress;
67
+ MultiSendCallOnly?: TAddress;
67
68
  CreateCall?: TAddress;
68
69
  }>;
69
70
  };
package/src/contracts/ContractReader.ts CHANGED
@@ -354,7 +354,9 @@ export namespace ContractReaderUtils {
354
354
 
355
355
  ;
356
356
 
357
- export async function readAsyncBatch(client: Web3Client, requests: (IContractReadParams | null)[]) {
357
+ export async function readAsyncBatch(client: Web3Client, requests: (IContractReadParams | null)[], options?: {
358
+ allowErrors?: boolean
359
+ }) {
358
360
 
359
361
  let rpcRequests = await alot(requests).map(async request => {
360
362
  if (request == null) {
@@ -389,7 +391,7 @@ export namespace ContractReaderUtils {
389
391
  mapped[i] = idx;
390
392
  }
391
393
 
392
- let outputs = await client.readContractBatch(rpcRequestsNotEmpty);
394
+ let outputs = await client.readContractBatch(rpcRequestsNotEmpty, options);
393
395
  return rpcRequests.map((_, i) => {
394
396
  return outputs[mapped[i]] ?? null;
395
397
  });
package/src/rpc/RpcBase.ts CHANGED
@@ -39,7 +39,9 @@ export abstract class RpcBase {
39
39
  return this._deserialize(req.method, result);
40
40
  }
41
41
 
42
- async batch (arr: TRpc.IRpcAction[]): Promise<any[]> {
42
+ async batch (arr: TRpc.IRpcAction[], options?: {
43
+ allowErrors?: boolean
44
+ }): Promise<any[]> {
43
45
  let body = arr.map(req => this._wrapBody(req));
44
46
  let resp = await this._transport.request(body);
45
47
  if (Array.isArray(resp) === false && arr.length === 1 && 'error' in resp === false && 'result' in resp === true) {
@@ -56,9 +58,14 @@ export abstract class RpcBase {
56
58
  return resp.map((resp, i) => {
57
59
  let req = arr[i];
58
60
  if ('error' in resp) {
61
+ if (options?.allowErrors) {
62
+ return {
63
+ error: new Error(resp.error.message),
64
+ request: req
65
+ };
66
+ }
59
67
  throw new RpcError(resp.error, `BatchRequest ${i + 1}/${arr.length} (${req.method} ${JSON.stringify(req.params)})`);
60
68
  }
61
-
62
69
  let result = this._unwrapBody(resp);
63
70
  return this._deserialize(req.method, result);
64
71
  });
@@ -85,6 +92,7 @@ export abstract class RpcBase {
85
92
  let body = this._wrapBody(req);
86
93
  let subscription = await this._transport.subscribe<TReturn>(body);
87
94
 
95
+
88
96
  let mapped = RpcSubscription.createMapping(subscription, this._transport, x => this._deserialize(`${req.method}.${req.params[0]}`, x))
89
97
  return mapped as RpcSubscription<TReturn>;
90
98
  //return subscription.map(x => this._deserialize(`${req.method}.${req.params[0]}`, x));
package/src/rpc/RpcContract.ts CHANGED
@@ -63,20 +63,34 @@ export class RpcContract {
63
63
  }
64
64
  }
65
65
 
66
- async batch (req: TRpcContractCall[]) {
66
+ async batch (req: TRpcContractCall[], options?: {
67
+ allowErrors?: boolean
68
+ }) {
67
69
 
68
70
  let requests = await this.getCallRequestsRaw(req);
69
71
  try {
70
- let responseArr = await this.client.batch(requests.map(x => x.methodRequest));
72
+ let responseArr = await this.client.batch(requests.map(x => x.methodRequest), options);
71
73
 
72
74
  return responseArr.map((resp, i) => {
73
75
  let abi = requests[i].methodAbi;
74
76
  if (abi == null) {
75
77
  return resp;
76
78
  }
77
- let outputs = abi.outputs;
79
+ let returnABI = abi.outputs;
80
+
81
+ if (resp != null && typeof resp === 'object' && 'error' in resp) {
82
+ let defaults = null;
83
+ try {
84
+ const defaultHex = $abiCoder.encode(returnABI, [null]);
85
+ defaults = utils.deserializeOutput(defaultHex, returnABI);
86
+ } catch (error) {}
87
+ return {
88
+ defaults,
89
+ ...resp
90
+ };
91
+ }
78
92
  let hex = typeof resp === 'string' ? resp : resp.data;
79
- let result = utils.deserializeOutput(hex, outputs);
93
+ let result = utils.deserializeOutput(hex, returnABI);
80
94
  return result;
81
95
  });
82
96
 
package/src/safe/SafeTx.ts CHANGED
@@ -54,9 +54,16 @@ export class SafeTx {
54
54
  });
55
55
 
56
56
  let transactionsHex = $hex.concat(transactionsHexArr);
57
+ let isCallOnly = txData.every(tx => !tx.operation /** 0: call, 1: delegatecall */);
58
+ let getAddress = (key: 'MultiSend' | 'MultiSendCallOnly') => {
59
+ return this.options?.contracts?.[this.client.network]?.[key]
60
+ ?? config.safe?.contracts?.[this.client.network]?.[key];
61
+ }
62
+
63
+ const multiSendAddress = isCallOnly
64
+ ? (getAddress('MultiSendCallOnly') ?? getAddress('MultiSend'))
65
+ : (getAddress('MultiSend'))
57
66
 
58
- const multiSendAddress = this.options?.contracts?.[this.client.network]?.MultiSend
59
- ?? config.safe?.contracts?.[this.client.network]?.MultiSend;
60
67
 
61
68
  $require.Address(multiSendAddress, `MultiSend contract for ${this.client.network}`);
62
69
  const safeMultiSendContract = new MultiSend(multiSendAddress, this.client);
package/src/utils/$traces.ts CHANGED
@@ -6,6 +6,7 @@ import { $bigint } from './$bigint';
6
6
  import { $hex } from '@dequanto/utils/$hex';
7
7
  import { $color, ColorData } from './$color';
8
8
  import alot from 'alot';
9
+ import { $contract } from './$contract';
9
10
 
10
11
  export namespace $traces {
11
12
 
@@ -335,10 +336,11 @@ export namespace $traces {
335
336
  }
336
337
 
337
338
  function formatFrameLabel(frame: TTraceFrame, contractName: string | null, abi: TEth.Abi.Item | null, params: {
338
- shortAddress?: boolean
339
- color?: boolean
340
- addresses?: Record<string, string>
341
- }): string {
339
+ shortAddress?: boolean
340
+ color?: boolean
341
+ addresses?: Record<string, string>
342
+ }
343
+ ): string {
342
344
  let head = color('gray', frame.callOp.toLowerCase(), params);
343
345
  let suffix = '';
344
346
 
@@ -513,6 +515,13 @@ export namespace $traces {
513
515
  // Fall back to raw bytes if decoding fails.
514
516
  }
515
517
  }
518
+ if (frame.failed) {
519
+ let abis = $contract.store.getFlattened();
520
+ let error = $contract.decodeCustomError(frame.output, abis);
521
+ if (error) {
522
+ return JSON.stringify(error);
523
+ }
524
+ }
516
525
  return shortHex(frame.output, 18, 10);
517
526
  }
518
527