dequanto 0.2.45 → 0.2.47
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/lib/cjs/clients/ClientPool.js +14 -0
- package/lib/cjs/clients/ClientPool.js.map +1 -1
- package/lib/cjs/clients/Web3Client.js +4 -1
- package/lib/cjs/clients/Web3Client.js.map +1 -1
- package/lib/cjs/clients/model/ClientStatus.js +1 -0
- package/lib/cjs/clients/model/ClientStatus.js.map +1 -1
- package/lib/cjs/clients/utils/ClientErrorUtil.js +9 -0
- package/lib/cjs/clients/utils/ClientErrorUtil.js.map +1 -1
- package/lib/cjs/config/ConfigDefaults.js +0 -3
- package/lib/cjs/config/ConfigDefaults.js.map +1 -1
- package/lib/cjs/contracts/ContractCreationResolver.js +1 -0
- package/lib/cjs/contracts/ContractCreationResolver.js.map +1 -1
- package/lib/cjs/rpc/RpcBase.js +4 -1
- package/lib/cjs/rpc/RpcBase.js.map +1 -1
- package/lib/cjs/solidity/utils/$str.js +1 -1
- package/lib/cjs/solidity/utils/$str.js.map +1 -1
- package/lib/cjs/txs/agents/BatchAgent.js +24 -7
- package/lib/cjs/txs/agents/BatchAgent.js.map +1 -1
- package/lib/cjs/utils/$base.js +1 -1
- package/lib/cjs/utils/$base.js.map +1 -1
- package/lib/cjs/utils/$crypto.js.map +1 -1
- package/lib/cjs/utils/$hex.js +15 -3
- package/lib/cjs/utils/$hex.js.map +1 -1
- package/lib/esm/clients/ClientPool.js.map +1 -1
- package/lib/esm/clients/ClientPool.mjs +14 -0
- package/lib/esm/clients/Web3Client.js.map +1 -1
- package/lib/esm/clients/Web3Client.mjs +4 -1
- package/lib/esm/clients/model/ClientStatus.js.map +1 -1
- package/lib/esm/clients/model/ClientStatus.mjs +1 -0
- package/lib/esm/clients/utils/ClientErrorUtil.js.map +1 -1
- package/lib/esm/clients/utils/ClientErrorUtil.mjs +9 -0
- package/lib/esm/config/ConfigDefaults.js.map +1 -1
- package/lib/esm/config/ConfigDefaults.mjs +0 -3
- package/lib/esm/contracts/ContractCreationResolver.js.map +1 -1
- package/lib/esm/contracts/ContractCreationResolver.mjs +1 -0
- package/lib/esm/rpc/RpcBase.js.map +1 -1
- package/lib/esm/rpc/RpcBase.mjs +4 -1
- package/lib/esm/solidity/utils/$str.js.map +1 -1
- package/lib/esm/solidity/utils/$str.mjs +1 -1
- package/lib/esm/txs/agents/BatchAgent.js.map +1 -1
- package/lib/esm/txs/agents/BatchAgent.mjs +24 -7
- package/lib/esm/utils/$base.js.map +1 -1
- package/lib/esm/utils/$base.mjs +1 -1
- package/lib/esm/utils/$crypto.js.map +1 -1
- package/lib/esm/utils/$hex.js.map +1 -1
- package/lib/esm/utils/$hex.mjs +15 -3
- package/lib/types/clients/ClientPool.d.ts +2 -0
- package/lib/types/clients/model/ClientStatus.d.ts +1 -0
- package/lib/types/clients/utils/ClientErrorUtil.d.ts +4 -0
- package/lib/types/rpc/RpcBase.d.ts +1 -0
- package/lib/types/txs/agents/BatchAgent.d.ts +8 -2
- package/lib/types/utils/$crypto.d.ts +3 -0
- package/lib/types/utils/$hex.d.ts +2 -0
- package/package.json +1 -1
- package/src/clients/ClientPool.ts +17 -1
- package/src/clients/Web3Client.ts +4 -1
- package/src/clients/model/ClientStatus.ts +1 -0
- package/src/clients/utils/ClientErrorUtil.ts +8 -0
- package/src/config/ConfigDefaults.ts +0 -3
- package/src/contracts/ContractCreationResolver.ts +1 -0
- package/src/rpc/RpcBase.ts +5 -1
- package/src/solidity/utils/$str.ts +1 -1
- package/src/txs/agents/BatchAgent.ts +26 -7
- package/src/utils/$base.ts +1 -1
- package/src/utils/$crypto.ts +1 -0
- package/src/utils/$hex.ts +12 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BatchAgent.js","sourceRoot":"","sources":["../../../../src/txs/agents/BatchAgent.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AAIxB,0CAAgG;AAEhG,uEAAoE;AACpE,2CAA2D;AAE3D,iDAA8C;AAE9C,uDAAoD;AACpD,qDAAkD;AAClD,kDAA+C;AAC/C,2FAAwF;AACxF,wFAAqF;AAErF,yDAAsD;AACtD,uDAAoD;AACpD,uDAAoD;AAGpD,MAAa,UAAU;IAInB,YAAoB,OAGnB;QAHmB,YAAO,GAAP,OAAO,CAG1B;QALM,iBAAY,GAAmB,EAAE,CAAA;IAOxC,CAAC;IAED,MAAM;QACF,mBAAQ,CAAC,QAAQ,CAAC,KAAK,GAAG,IAAI,CAAC;QAC/B,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,OAAO;QACH,mBAAQ,CAAC,QAAQ,CAAC,KAAK,GAAG,IAAI,CAAC;QAC/B,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,SAAS;QACL,OAAO,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE;YAC9B,IAAI,IAAI,GAAG,EAAE,CAAC,WAAW,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC;YAC9C,OAAO;gBACH,EAAE,EAAE,IAAI,CAAC,EAAE;gBACX,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,OAAO,EAAE,IAAI,CAAC,OAAO;gBAErB,MAAM,EAAE,EAAE,CAAC,MAAM;gBACjB,OAAO,EAAE,EAAE,CAAC,OAAO;aACtB,CAAC;QACN,CAAC,CAAC,CAAC;IACP,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,OAAO,CAAE,SAA6B,EAAE,OAAsB,EAAE,WAAqB;QAEvF,IAAI,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,IAAI,IAAI,IAAI,CAAC,OAAO,EAAE,sBAAsB,IAAI,KAAK,EAAE;YACtF,OAAO,IAAI,CAAC;SACf;QAED,IAAI,MAAM,GAAG,OAAO,SAAS,KAAK,QAAQ;YACtC,CAAC,CAAC,MAAM,yCAAmB,CAAC,GAAG,CAAC,SAAS,CAAc;YACvD,CAAC,CAAC,SAAS,CAAC;QAEhB,IAAI,KAAK,GAAG,IAAI,YAAY,CACxB,MAAM,EACN,OAAO,EACP,WAAW,CACd,CAAC;QAEF,IAAI,KAAK,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;QACrD,iBAAO,CAAC,GAAG,CAAC,gBAAgB,KAAK,EAAE,CAAC,CAAC;QAErC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC9B,MAAM,KAAK,CAAC,OAAO,EAAE,CAAC;QACtB,OAAO,KAAK,CAAC;IACjB,CAAC;IAED
|
|
1
|
+
{"version":3,"file":"BatchAgent.js","sourceRoot":"","sources":["../../../../src/txs/agents/BatchAgent.ts"],"names":[],"mappings":"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"}
|
|
@@ -55,22 +55,39 @@ export class BatchAgent {
|
|
|
55
55
|
return inner;
|
|
56
56
|
}
|
|
57
57
|
/**
|
|
58
|
-
*
|
|
58
|
+
* Executes the queued transactions.
|
|
59
|
+
*
|
|
60
|
+
* By default, duplicate transactions are skipped. If the account is Safe or Timelock,
|
|
59
61
|
* prepares the corresponding calldata and submits it as a batch transaction.
|
|
62
|
+
*
|
|
63
|
+
* @param options.includeDuplicates Include duplicate transactions in the execution batch.
|
|
60
64
|
*/
|
|
61
|
-
async execute() {
|
|
65
|
+
async execute(options) {
|
|
62
66
|
this.disable();
|
|
67
|
+
let txs = this.transactions;
|
|
68
|
+
if (options?.includeDuplicates !== true) {
|
|
69
|
+
txs = alot(txs).distinctBy(x => {
|
|
70
|
+
const data = x.outerWriter.builder.data;
|
|
71
|
+
const acc = x.account ?? x.sender;
|
|
72
|
+
// remove duplicates by [from,to,data]
|
|
73
|
+
return [
|
|
74
|
+
acc.address.toLowerCase(),
|
|
75
|
+
data.to?.toLowerCase() ?? '',
|
|
76
|
+
data.data ?? ''
|
|
77
|
+
].join('');
|
|
78
|
+
}).toArray();
|
|
79
|
+
}
|
|
63
80
|
let groupStart = 0;
|
|
64
81
|
let writers = [];
|
|
65
|
-
for (let i = 0; i <
|
|
66
|
-
let tx =
|
|
67
|
-
let next = i <
|
|
68
|
-
?
|
|
82
|
+
for (let i = 0; i < txs.length; i++) {
|
|
83
|
+
let tx = txs[i];
|
|
84
|
+
let next = i < txs.length - 1
|
|
85
|
+
? txs[i + 1]
|
|
69
86
|
: null;
|
|
70
87
|
let acc0 = tx.account?.address ?? tx.sender?.address;
|
|
71
88
|
let acc1 = next?.account?.address ?? next?.sender?.address;
|
|
72
89
|
if (next == null || $address.eq(acc0, acc1) === false) {
|
|
73
|
-
let arr = await this.executeGroup(
|
|
90
|
+
let arr = await this.executeGroup(txs.slice(groupStart, i + 1));
|
|
74
91
|
writers.push(...arr);
|
|
75
92
|
groupStart = i + 1;
|
|
76
93
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"$base.js","sourceRoot":"","sources":["../../../src/utils/$base.ts"],"names":[],"mappings":";;;AACA,iCAA8B;AAC9B,uCAAoC;AAEpC,IAAiB,KAAK,CA8DrB;AA9DD,WAAiB,KAAK;IAClB,iHAAiH;IAEjH,MAAM,IAAI;QAGN,YAAoB,QAAgB;YAAhB,aAAQ,GAAR,QAAQ,CAAQ;YAChC,IAAI,CAAC,IAAI,GAAG,QAAQ,CAAC,MAAM,CAAC;YAC5B,IAAI,CAAC,GAAG,GAAG,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACpC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;gBAChC,IAAI,CAAC,GAAG,CAAE,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAE,GAAG,CAAC,CAAC;YACpC,CAAC,CAAC,CAAC;QACP,CAAC;QAEM,MAAM,CAAE,GAAa;YACxB,GAAG,GAAG,WAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;YAC5B,GAAG,GAAG,WAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"$base.js","sourceRoot":"","sources":["../../../src/utils/$base.ts"],"names":[],"mappings":"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"}
|
package/lib/esm/utils/$base.mjs
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"$crypto.js","sourceRoot":"","sources":["../../../src/utils/$crypto.ts"],"names":[],"mappings":";;;AACA,uCAAoC;AACpC,yCAAsC;AACtC,+BAA4B;
|
|
1
|
+
{"version":3,"file":"$crypto.js","sourceRoot":"","sources":["../../../src/utils/$crypto.ts"],"names":[],"mappings":";;;AACA,uCAAoC;AACpC,yCAAsC;AACtC,+BAA4B;AAwB5B,MAAM,WAAW,GAAG,aAAa,CAAC;AAElC,MAAe,UAAU;IAOrB,KAAK,CAAC,MAAM,CAAE,GAAmC,EAAE,IAAsC;QACrF,MAAM,MAAM,GAAG,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QACnC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QAC5C,IAAI,IAAI,EAAE,QAAQ,KAAK,KAAK,EAAE;YAC1B,OAAO,iBAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;SAC9B;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAKD,KAAK,CAAC,OAAO,CAAC,GAAmC,EAAE,IAAuB;QACtE,MAAM,MAAM,GAAG,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QACnC,mBAAQ,CAAC,EAAE,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,uCAAuC,CAAC,CAAC;QACvE,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAC3B,mBAAQ,CAAC,QAAQ,CAAC,MAAM,EAAE,4BAA4B,CAAC,CAAC;QACxD,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;QAEtD,IAAI,SAAS,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;QAC9D,QAAQ,IAAI,CAAC,QAAQ,EAAE;YACnB,KAAK,KAAK;gBACN,OAAO,iBAAO,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;YACpC,KAAK,MAAM;gBACP,OAAO,iBAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;YACvC;gBACI,OAAO,SAAS,CAAC;SACxB;IACL,CAAC;IAKD,KAAK,CAAC,OAAO,CAAC,GAA0B,EAAE,IAAuB;QAC7D,MAAM,MAAM,GAAG,iBAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACnC,mBAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,EAAE,uCAAuC,CAAC,CAAC;QACxE,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAC3B,mBAAQ,CAAC,EAAE,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,4BAA4B,CAAC,CAAC;QAC5D,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;QAEtD,IAAI,SAAS,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;QAC9D,QAAQ,IAAI,CAAC,QAAQ,EAAE;YACnB,KAAK,KAAK;gBACN,OAAO,iBAAO,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;YACpC,KAAK,MAAM;gBACP,OAAO,iBAAO,CAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;YAC/C;gBACI,OAAO,SAAS,CAAC;SACxB;IACL,CAAC;IAMO,KAAK,CAAC,aAAa,CAAE,MAAsC;QAC/D,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,SAAG,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,KAAK,EAAE;YAChE,IAAI,MAAM,GAAG,iBAAO,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;YACxC,OAAO,MAAM,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;SACzC;QACD,OAAO,iBAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAClC,CAAC;CACJ;AAED,IAAU,aAAa,CA8DtB;AA9DD,WAAU,aAAa;IACnB,MAAa,SAAU,SAAQ,UAAU;QAAzC;;YACI,WAAM,GAAG,MAAM,CAAC;QA2DpB,CAAC;QAzDG,WAAW,CAAC,IAAY;YACpB,IAAI,KAAK,GAAG,IAAI,UAAU,CAAC,IAAI,CAAC,CAAC;YACjC,IAAI,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;YAC7C,OAAO,GAAG,CAAC;QACf,CAAC;QACD,UAAU;YACN,OAAO,IAAI,CAAC,MAAM,CAAC,UAAU,EAAyD,CAAC;QAC3F,CAAC;QACD,UAAU,CAAC,KAAa;YACpB,uCAAuC;YACvC,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;QAC9C,CAAC;QACD,KAAK,CAAC,YAAY,CAAC,MAAkB,EAAE,MAAkB;YACrD,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;YACjD,MAAM,EAAE,GAAG,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;YAChC,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAC/C;gBACI,IAAI,EAAE,SAAS;gBACf,EAAE;aACL,EACD,GAAG,EACH,MAAM,CACT,CAAC;YACF,MAAM,SAAS,GAAG,iBAAO,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,IAAI,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;YACnE,OAAO,SAAS,CAAC;QACrB,CAAC;QACD,KAAK,CAAC,YAAY,CAAC,MAAkB,EAAE,MAAkB;YAErD,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;YACjD,MAAM,EAAE,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YAC/B,MAAM,SAAS,GAAG,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;YAEnC,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,OAAO,CACtC;gBACE,IAAI,EAAE,SAAS;gBACf,EAAE,EAAE,EAAE;aACP,EACD,GAAG,EACH,SAAS,CACV,CAAC;YACJ,OAAO,IAAI,UAAU,CAAC,MAAM,CAAC,CAAC;QAClC,CAAC;QACO,KAAK,CAAC,iBAAiB,CAAC,MAAkB;YAE9C,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE;gBAChE,IAAI,EAAE,SAAS;gBACf,MAAM,EAAE,GAAG;aACd,EACG,IAAI,EACJ,CAAC,SAAS,EAAE,SAAS,CAAC,CACzB,CAAC;YACF,OAAO,SAAS,CAAC;QACrB,CAAC;QACS,KAAK,CAAC,WAAW,CAAC,MAAkB;YAC1C,MAAM,WAAW,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;YAClE,OAAO,IAAI,UAAU,CAAC,WAAW,CAAC,CAAC;QACvC,CAAC;KACJ;IA5DY,uBAAS,YA4DrB,CAAA;AACL,CAAC,EA9DS,aAAa,KAAb,aAAa,QA8DtB;AAED,IAAU,cAAc,CAuCvB;AAvCD,WAAU,cAAc;IACpB,MAAa,UAAW,SAAQ,UAAU;QAA1C;;YACI,WAAM,GAA4B,OAAO,CAAC,QAAQ,CAAC,CAAC;QAoCxD,CAAC;QAlCG,WAAW,CAAC,IAAY;YACpB,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;YAC5C,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,UAAU;YACN,OAAO,IAAI,CAAC,MAAM,CAAC,UAAU,EAAyD,CAAC;QAC3F,CAAC;QACD,UAAU,CAAC,KAAa;YACpB,OAAO,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;QACzC,CAAC;QAES,KAAK,CAAC,YAAY,CAAC,MAAkB,EAAE,MAAkB;YAC/D,mBAAQ,CAAC,EAAE,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,uCAAuC,CAAC,CAAC;YAEvE,MAAM,GAAG,GAAG,MAAM,CAAC;YACnB,MAAM,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;YACvC,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,WAAW,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;YAEhE,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YACzC,MAAM,SAAS,GAAG,iBAAO,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,UAAU,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;YACnE,OAAO,SAAS,CAAC;QACrB,CAAC;QACS,KAAK,CAAC,YAAY,CAAC,MAAkB,EAAE,MAAkB;YAC/D,MAAM,GAAG,GAAG,MAAM,CAAC;YACnB,MAAM,EAAE,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YAC/B,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,WAAW,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;YACpE,MAAM,SAAS,GAAG,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;YACnC,MAAM,MAAM,GAAG,iBAAO,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;YAC9E,OAAO,MAAM,CAAC;QAClB,CAAC;QAES,KAAK,CAAC,WAAW,CAAC,MAAkB;YAC1C,OAAO,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,CAAA;QACnE,CAAC;KACJ;IArCY,yBAAU,aAqCtB,CAAA;AACL,CAAC,EAvCS,cAAc,KAAd,cAAc,QAuCvB;AAEY,QAAA,OAAO,GAAY,OAAO,MAAM,KAAK,WAAW;IACzD,CAAC,CAAC,IAAI,cAAc,CAAC,UAAU,EAAE;IACjC,CAAC,CAAC,IAAI,aAAa,CAAC,SAAS,EAAE,CAC9B;AAEQ,QAAA,WAAW,GAAG;IACvB,GAAG,EAAE,aAAa,CAAC,SAAS;IAC5B,IAAI,EAAE,cAAc,CAAC,UAAU;CAClC,CAAC;AAGF,IAAU,KAAK,CAOd;AAPD,WAAU,KAAK;IACX,SAAgB,QAAQ,CAAE,GAAmC;QACzD,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,SAAG,CAAC,UAAU,CAAC,GAAG,CAAC,KAAK,KAAK,EAAE;YAC1D,OAAO,iBAAO,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;SAClC;QACD,OAAO,iBAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAC/B,CAAC;IALe,cAAQ,WAKvB,CAAA;AACL,CAAC,EAPS,KAAK,KAAL,KAAK,QAOd"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"$hex.js","sourceRoot":"","sources":["../../../src/utils/$hex.ts"],"names":[],"mappings":";;;AACA,uCAAoC;AACpC,yCAAsC;AACtC,IAAiB,IAAI,
|
|
1
|
+
{"version":3,"file":"$hex.js","sourceRoot":"","sources":["../../../src/utils/$hex.ts"],"names":[],"mappings":";;;AACA,uCAAoC;AACpC,yCAAsC;AACtC,IAAiB,IAAI,CAoJpB;AApJD,WAAiB,IAAI;IAEJ,SAAI,GAAG,IAAI,CAAA;IAExB;;;;OAIG;IACH,SAAgB,QAAQ,CAAC,GAAa,EAAE,QAAgB,EAAE,IAA2B;QACjF,IAAI,MAAM,GAAG,QAAQ,GAAG,CAAC,CAAC;QAC1B,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;QAClB,IAAI,GAAG,CAAC,MAAM,KAAK,MAAM,GAAG,CAAC,EAAE;YAC3B,OAAO,GAAG,CAAC;SACd;QACD,GAAG,GAAG,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAE,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAE,CAAC,MAAM,EAAE,GAAG,CAAa,CAAC;QACxF,OAAO,KAAK,GAAG,EAAE,CAAC;IACtB,CAAC;IARe,aAAQ,WAQvB,CAAA;IAED;;OAEG;IACH,SAAgB,SAAS,CAAC,GAAa;QACnC,OAAO,YAAY,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC;IAC7C,CAAC;IAFe,cAAS,YAExB,CAAA;IACD,SAAgB,cAAc,CAAC,GAAa;QACxC,IAAI,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,KAAK,EAAE;YAClC,OAAO,GAAG,CAAC;SACd;QACD,OAAO,GAAG,CAAC,OAAO,CAAC,YAAY,EAAE,IAAI,CAAa,CAAC;IACvD,CAAC;IALe,mBAAc,iBAK7B,CAAA;IACD,SAAgB,YAAY,CAAC,GAAa;QACtC,IAAI,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,KAAK,EAAE;YAC9B,OAAO,GAAG,CAAC;SACd;QACD,OAAO,GAAG,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAa,CAAC;IACnD,CAAC;IALe,iBAAY,eAK3B,CAAA;IACD,SAAgB,0BAA0B,CAAC,GAAW;QAClD,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;QAC/B,OAAO,GAAG,KAAK,EAAE,CAAA,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE,CAAC;IAC1C,CAAC;IAHe,+BAA0B,6BAGzC,CAAA;IAED,SAAgB,QAAQ,CAAE,GAAW,EAAE,MAAc,EAAE,MAAc;QACjE,IAAI,KAAK,GAAG,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACzC,IAAI,WAAW,GAAG,MAAM,GAAG,CAAC,CAAC;QAC7B,IAAI,WAAW,GAAG,MAAM,GAAG,CAAC,CAAC;QAC7B,OAAO,CAAC,IAAI,GAAG,GAAG,CAAC,SAAS,CAAC,KAAK,GAAG,WAAW,EAAE,KAAK,GAAG,WAAW,GAAG,WAAW,CAAC,CAAa,CAAC;IACtG,CAAC;IALe,aAAQ,WAKvB,CAAA;IACD,SAAgB,cAAc,CAAE,GAAW;QACvC,IAAI,GAAG,GAAG,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACvC,IAAI,KAAK,GAAG,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC;QAC7B,mBAAQ,CAAC,IAAI,CAAC,KAAK,GAAG,CAAC,KAAK,CAAC,EAAE,0CAA0C,KAAK,EAAE,CAAC,CAAC;QAClF,OAAO,KAAK,GAAG,CAAC,CAAC;IACrB,CAAC;IALe,mBAAc,iBAK7B,CAAA;IAED,SAAgB,SAAS,CAAE,GAAW,EAAE,SAAiB,EAAE,aAAqB,CAAC;QAC7E,IAAI,KAAK,GAAG,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACzC,IAAI,CAAC,GAAG,KAAK,GAAG,SAAS,GAAG,CAAC,CAAC;QAC9B,OAAO,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,UAAU,CAAC,EAAE,EAAE,CAAC,CAAC;IAC9D,CAAC;IAJe,cAAS,YAIxB,CAAA;IAED,SAAgB,GAAG,CAAE,GAAW;QAC5B,OAAO,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC;YACvB,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC;YAClB,CAAC,CAAC,GAAG,CAAC;IACd,CAAC;IAJe,QAAG,MAIlB,CAAA;IAED,SAAgB,MAAM,CAAE,GAAuC;QAC3D,OAAO,CAAC,IAAI,GAAG,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAa,CAAC;IAClE,CAAC;IAFe,WAAM,SAErB,CAAA;IAED,SAAgB,KAAK,CAAE,GAAa,EAAE,QAAgB,EAAE;QACpD,IAAI,GAAG,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC;QACnB,IAAI,IAAI,GAAG,EAAE,CAAC;QACd,OAAO,GAAG,CAAC,MAAM,GAAG,CAAC,EAAE;YACnB,IAAI,CAAC,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC,SAAS,CAAC,CAAC,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC;YAC9C,GAAG,GAAG,GAAG,CAAC,SAAS,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;SAClC;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IARe,UAAK,QAQpB,CAAA;IAED,SAAgB,KAAK,CAAE,KAAyC;QAC5D,QAAQ,OAAO,KAAK,EAAE;YAClB,KAAK,QAAQ,CAAC,CAAC;gBACX,IAAI,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;oBACxB,OAAO,KAAiB,CAAC;iBAC5B;gBACD,OAAO,iBAAO,CAAC,KAAK,CAAC,iBAAO,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC;aACnD;YACD,KAAK,QAAQ,CAAC;YACd,KAAK,QAAQ;gBACT,IAAI,GAAG,GAAG,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;gBAC7B,OAAO,CAAC,IAAI,GAAG,GAAG,CAAa,CAAC;YACpC,KAAK,SAAS;gBACV,OAAO,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC;SACpC;QACD,MAAM,IAAI,KAAK,CAAC,oCAAoC,KAAK,EAAE,CAAC,CAAC;IACjE,CAAC;IAhBe,UAAK,QAgBpB,CAAA;IACD,SAAgB,WAAW,CAAE,KAAyC;QAClE,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC;QACrB,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,KAAK,CAAC,EAAE;YACxB,KAAK,GAAG,KAAK,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;SACtC;QACD,OAAO,KAAiB,CAAC;IAC7B,CAAC;IANe,gBAAW,cAM1B,CAAA;IAED,SAAgB,OAAO,CAAE,GAAW,EAAE,OAA2D;QAC7F,IAAI,OAAO,KAAK,MAAM,EAAE;YACpB,OAAO,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;SAC/B;QACD,IAAI,WAAW,GAAG,mBAAmB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACpD,IAAI,WAAW,EAAE;YACb,IAAI,IAAI,GAAG,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,IAAI,GAAG,CAAC,CAAC;YAClD,IAAI,IAAI,GAAG,EAAE,EAAE;gBACX,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC;aACtB;YACD,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC;SACtB;QAED,OAAO,GAAG,CAAC;IACf,CAAC;IAde,YAAO,UActB,CAAA;IAED;;OAEG;IACH,SAAgB,MAAM,CAAE,GAAoD;QACxE,IAAI,GAAG,IAAI,IAAI,EAAE;YACb,OAAO,IAAI,CAAC;SACf;QACD,IAAI,GAAG,YAAY,UAAU,EAAE;YAC3B,GAAG,GAAG,iBAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;SAC5B;QACD,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;YACpD,OAAO,KAAK,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,CAAC;SAClC;QACD,IAAI,OAAO,GAAG,KAAI,SAAS,EAAE;YACzB,OAAO,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC;SAC9B;QACD,mBAAQ,CAAC,KAAK,CAAC,kBAAkB,EAAE,GAAG,EAAE,aAAa,CAAC,CAAC;QACvD,IAAI,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;YACtB,OAAO,GAAe,CAAC;SAC1B;QACD,OAAO,KAAK,GAAG,EAAE,CAAC;IACtB,CAAC;IAlBe,WAAM,SAkBrB,CAAA;IAED,SAAgB,OAAO,CAAE,GAAW;QAChC,OAAO,GAAG,IAAI,IAAI,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC,IAAI,GAAG,KAAK,IAAI,CAAC;IAC3D,CAAC;IAFe,YAAO,UAEtB,CAAA;AACL,CAAC,EApJgB,IAAI,GAAJ,YAAI,KAAJ,YAAI,QAoJpB"}
|
package/lib/esm/utils/$hex.mjs
CHANGED
|
@@ -22,12 +22,23 @@ export var $hex;
|
|
|
22
22
|
* Trims '00' bytes from start or end, e.g. 0x68656c6c6f000000 => 0x68656c6c6f
|
|
23
23
|
*/
|
|
24
24
|
function trimBytes(hex) {
|
|
25
|
-
|
|
25
|
+
return trimBytesEnd(trimBytesStart(hex));
|
|
26
|
+
}
|
|
27
|
+
$hex.trimBytes = trimBytes;
|
|
28
|
+
function trimBytesStart(hex) {
|
|
29
|
+
if (hex.startsWith('0x00') === false) {
|
|
26
30
|
return hex;
|
|
27
31
|
}
|
|
28
|
-
return hex.replace(/^0x(0{2})+/, '0x')
|
|
32
|
+
return hex.replace(/^0x(0{2})+/, '0x');
|
|
29
33
|
}
|
|
30
|
-
$hex.
|
|
34
|
+
$hex.trimBytesStart = trimBytesStart;
|
|
35
|
+
function trimBytesEnd(hex) {
|
|
36
|
+
if (hex.endsWith('00') === false) {
|
|
37
|
+
return hex;
|
|
38
|
+
}
|
|
39
|
+
return hex.replace(/(0{2})+$/, '');
|
|
40
|
+
}
|
|
41
|
+
$hex.trimBytesEnd = trimBytesEnd;
|
|
31
42
|
function trimLeadingZerosFromNumber(hex) {
|
|
32
43
|
hex = hex.replace(/^0x0*/, '');
|
|
33
44
|
return hex === '' ? '0x0' : `0x${hex}`;
|
|
@@ -130,6 +141,7 @@ export var $hex;
|
|
|
130
141
|
if (typeof mix === 'boolean') {
|
|
131
142
|
return mix ? '0x1' : '0x0';
|
|
132
143
|
}
|
|
144
|
+
$require.match(/^(0x)?[\da-f]*$/i, mix, 'NotValidHex');
|
|
133
145
|
if (mix.startsWith('0x')) {
|
|
134
146
|
return mix;
|
|
135
147
|
}
|
|
@@ -53,6 +53,8 @@ export interface IPoolWeb3Request {
|
|
|
53
53
|
method?: string;
|
|
54
54
|
batchRequestCount?: number;
|
|
55
55
|
blockRangeCount?: number;
|
|
56
|
+
/** Try another node when the RPC succeeds but returns null, e.g. tx not found on one provider. */
|
|
57
|
+
tryNextOnNull?: boolean;
|
|
56
58
|
}
|
|
57
59
|
export declare class ClientPool {
|
|
58
60
|
private discoveredPartial;
|
|
@@ -23,10 +23,16 @@ export declare class BatchAgent implements ITxWriterAgent {
|
|
|
23
23
|
*/
|
|
24
24
|
process(senderMix: string | EoAccount, account: TEth.IAccount, outerWriter: TxWriter): Promise<MockTxWriter>;
|
|
25
25
|
/**
|
|
26
|
-
*
|
|
26
|
+
* Executes the queued transactions.
|
|
27
|
+
*
|
|
28
|
+
* By default, duplicate transactions are skipped. If the account is Safe or Timelock,
|
|
27
29
|
* prepares the corresponding calldata and submits it as a batch transaction.
|
|
30
|
+
*
|
|
31
|
+
* @param options.includeDuplicates Include duplicate transactions in the execution batch.
|
|
28
32
|
*/
|
|
29
|
-
execute(
|
|
33
|
+
execute(options?: {
|
|
34
|
+
includeDuplicates?: boolean;
|
|
35
|
+
}): Promise<TxWriter[]>;
|
|
30
36
|
/**
|
|
31
37
|
* Format all queued transactions for display.
|
|
32
38
|
*/
|
|
@@ -3,6 +3,9 @@ interface ICrypto {
|
|
|
3
3
|
randomBytes(size: number): Uint8Array;
|
|
4
4
|
randomUUID(): `${string}-${string}-${string}-${string}-${string}`;
|
|
5
5
|
createECDH(curve: string): any;
|
|
6
|
+
sha256(mix: string | TEth.Hex | Uint8Array, opts?: {
|
|
7
|
+
encoding: 'hex';
|
|
8
|
+
}): Promise<TEth.Hex>;
|
|
6
9
|
sha256(mix: string | TEth.Hex | Uint8Array): Promise<Uint8Array>;
|
|
7
10
|
encrypt(buffer: string | TEth.Hex | Uint8Array, opts: IEncryptionParams & {
|
|
8
11
|
encoding?: undefined | 'binary';
|
|
@@ -13,6 +13,8 @@ export declare namespace $hex {
|
|
|
13
13
|
* Trims '00' bytes from start or end, e.g. 0x68656c6c6f000000 => 0x68656c6c6f
|
|
14
14
|
*/
|
|
15
15
|
function trimBytes(hex: TEth.Hex): TEth.Hex;
|
|
16
|
+
function trimBytesStart(hex: TEth.Hex): TEth.Hex;
|
|
17
|
+
function trimBytesEnd(hex: TEth.Hex): TEth.Hex;
|
|
16
18
|
function trimLeadingZerosFromNumber(hex: string): string;
|
|
17
19
|
function getBytes(hex: string, offset: number, length: number): TEth.Hex;
|
|
18
20
|
function getBytesLength(hex: string): number;
|
package/package.json
CHANGED
|
@@ -93,6 +93,9 @@ export interface IPoolWeb3Request {
|
|
|
93
93
|
|
|
94
94
|
// When fetching logs, specifies the desired block range to query
|
|
95
95
|
blockRangeCount?: number
|
|
96
|
+
|
|
97
|
+
/** Try another node when the RPC succeeds but returns null, e.g. tx not found on one provider. */
|
|
98
|
+
tryNextOnNull?: boolean
|
|
96
99
|
}
|
|
97
100
|
|
|
98
101
|
export class ClientPool {
|
|
@@ -156,12 +159,18 @@ export class ClientPool {
|
|
|
156
159
|
// Client - Retries
|
|
157
160
|
let used = new Map<WClient, number>();
|
|
158
161
|
let errors = [];
|
|
162
|
+
let dataIsNull: boolean;
|
|
159
163
|
|
|
160
164
|
while (true) {
|
|
161
165
|
let wClient = await this.next(used, opts);
|
|
162
166
|
if (wClient == null) {
|
|
163
167
|
let error = errors.pop();
|
|
164
168
|
if (error == null) {
|
|
169
|
+
if (dataIsNull) {
|
|
170
|
+
// No provider returned an error, but none found the requested data
|
|
171
|
+
return null;
|
|
172
|
+
}
|
|
173
|
+
|
|
165
174
|
let urls = this
|
|
166
175
|
.clients
|
|
167
176
|
.map(x => ` ${x.config.url}`)
|
|
@@ -182,7 +191,6 @@ export class ClientPool {
|
|
|
182
191
|
?.trace
|
|
183
192
|
?.onComplete({ status, error, time, url: wClient.config.url })
|
|
184
193
|
|
|
185
|
-
|
|
186
194
|
if (wClientUsage == null) {
|
|
187
195
|
// By default, NO_RETRIES
|
|
188
196
|
used.set(wClient, 0);
|
|
@@ -194,6 +202,12 @@ export class ClientPool {
|
|
|
194
202
|
errors.push(error ?? result);
|
|
195
203
|
|
|
196
204
|
if (status == ClientStatus.Ok) {
|
|
205
|
+
if (opts?.tryNextOnNull === true) {
|
|
206
|
+
if (result == null) {
|
|
207
|
+
dataIsNull = true;
|
|
208
|
+
continue;
|
|
209
|
+
}
|
|
210
|
+
}
|
|
197
211
|
return result;
|
|
198
212
|
}
|
|
199
213
|
if (status == ClientStatus.RateLimited) {
|
|
@@ -994,6 +1008,8 @@ export class WClient {
|
|
|
994
1008
|
l`yellow<New BatchLimit> for "${this.config.url}" bold<${limit}>`;
|
|
995
1009
|
this.batchLimit = limit;
|
|
996
1010
|
}
|
|
1011
|
+
} else if (ClientErrorUtil.isNodeConfigurationError(error)) {
|
|
1012
|
+
status = ClientStatus.NodeConfigurationError;
|
|
997
1013
|
} else if (ClientErrorUtil.isConnectionFailed(error)) {
|
|
998
1014
|
status = ClientStatus.NetworkError;
|
|
999
1015
|
}
|
|
@@ -227,7 +227,10 @@ export abstract class Web3Client implements IWeb3Client {
|
|
|
227
227
|
getTransaction(txHash: TEth.Hex, opts?: IPoolWeb3Request): Promise<TEth.Tx> {
|
|
228
228
|
return this.pool.call(web3 => {
|
|
229
229
|
return web3.rpc.eth_getTransactionByHash(txHash);
|
|
230
|
-
},
|
|
230
|
+
}, {
|
|
231
|
+
tryNextOnNull: true,
|
|
232
|
+
...(opts ?? {})
|
|
233
|
+
});
|
|
231
234
|
}
|
|
232
235
|
getTransactions(txHashes: TEth.Hex[], opts?: IPoolWeb3Request): Promise<TEth.Tx[]> {
|
|
233
236
|
return this.pool.call(async web3 => {
|
|
@@ -14,6 +14,14 @@ export namespace ClientErrorUtil {
|
|
|
14
14
|
}
|
|
15
15
|
return false;
|
|
16
16
|
}
|
|
17
|
+
export function isNodeConfigurationError (error: Error & { code?, reason? }) {
|
|
18
|
+
let str = error.message ?? error.stack;
|
|
19
|
+
let noHistory = /history unavailable/i.test(str);
|
|
20
|
+
if (noHistory) {
|
|
21
|
+
return true;
|
|
22
|
+
}
|
|
23
|
+
return false;
|
|
24
|
+
}
|
|
17
25
|
export function isAlreadyKnown (error: Error & { code?, reason? }) {
|
|
18
26
|
return /already known/i.test(error.message);
|
|
19
27
|
}
|
|
@@ -72,6 +72,7 @@ class BlockchainExplorerDateResolver {
|
|
|
72
72
|
throw error;
|
|
73
73
|
}
|
|
74
74
|
let tx = await this.client.getTransaction(info.txHash);
|
|
75
|
+
$require.notNull(tx, `Tx not found: ${info.txHash} in ${this.client.network} (${this.client.options?.endpoints?.[0]?.url})`);
|
|
75
76
|
let block = await this.client.getBlock(tx.blockNumber);
|
|
76
77
|
return {
|
|
77
78
|
tx: tx.hash,
|
package/src/rpc/RpcBase.ts
CHANGED
|
@@ -122,7 +122,7 @@ export abstract class RpcBase {
|
|
|
122
122
|
};
|
|
123
123
|
}
|
|
124
124
|
private _unwrapBody (resp: any): any {
|
|
125
|
-
return resp
|
|
125
|
+
return RpcBase.unwrapBody(resp);
|
|
126
126
|
}
|
|
127
127
|
private _deserialize (method: string, result: any) {
|
|
128
128
|
let { methods, schemas } = this.returnSchemas;
|
|
@@ -141,6 +141,10 @@ export abstract class RpcBase {
|
|
|
141
141
|
|
|
142
142
|
|
|
143
143
|
protected abstract returnSchemas
|
|
144
|
+
|
|
145
|
+
static unwrapBody (resp: any) {
|
|
146
|
+
return resp.result;
|
|
147
|
+
}
|
|
144
148
|
}
|
|
145
149
|
|
|
146
150
|
|
|
@@ -84,25 +84,44 @@ export class BatchAgent implements ITxWriterAgent {
|
|
|
84
84
|
}
|
|
85
85
|
|
|
86
86
|
/**
|
|
87
|
-
*
|
|
87
|
+
* Executes the queued transactions.
|
|
88
|
+
*
|
|
89
|
+
* By default, duplicate transactions are skipped. If the account is Safe or Timelock,
|
|
88
90
|
* prepares the corresponding calldata and submits it as a batch transaction.
|
|
91
|
+
*
|
|
92
|
+
* @param options.includeDuplicates Include duplicate transactions in the execution batch.
|
|
89
93
|
*/
|
|
90
|
-
async execute (
|
|
94
|
+
async execute (options?: {
|
|
95
|
+
includeDuplicates?: boolean
|
|
96
|
+
}): Promise<TxWriter[]> {
|
|
91
97
|
this.disable();
|
|
92
98
|
|
|
99
|
+
let txs = this.transactions;
|
|
100
|
+
if (options?.includeDuplicates !== true) {
|
|
101
|
+
txs = alot(txs).distinctBy(x => {
|
|
102
|
+
const data = x.outerWriter.builder.data;
|
|
103
|
+
const acc = x.account ?? x.sender;
|
|
104
|
+
// remove duplicates by [from,to,data]
|
|
105
|
+
return [
|
|
106
|
+
acc.address.toLowerCase(),
|
|
107
|
+
data.to?.toLowerCase() ?? '',
|
|
108
|
+
data.data ?? ''
|
|
109
|
+
].join('');
|
|
110
|
+
}).toArray();
|
|
111
|
+
}
|
|
93
112
|
let groupStart = 0;
|
|
94
113
|
let writers = [];
|
|
95
|
-
for (let i = 0; i <
|
|
96
|
-
let tx =
|
|
97
|
-
let next = i <
|
|
98
|
-
?
|
|
114
|
+
for (let i = 0; i < txs.length; i++) {
|
|
115
|
+
let tx = txs[i];
|
|
116
|
+
let next = i < txs.length - 1
|
|
117
|
+
? txs[i + 1]
|
|
99
118
|
: null;
|
|
100
119
|
|
|
101
120
|
let acc0 = tx.account?.address ?? tx.sender?.address;
|
|
102
121
|
let acc1 = next?.account?.address ?? next?.sender?.address;
|
|
103
122
|
|
|
104
123
|
if (next == null || $address.eq(acc0, acc1) === false) {
|
|
105
|
-
let arr = await this.executeGroup(
|
|
124
|
+
let arr = await this.executeGroup(txs.slice(groupStart, i + 1));
|
|
106
125
|
writers.push(...arr);
|
|
107
126
|
groupStart = i + 1;
|
|
108
127
|
}
|
package/src/utils/$base.ts
CHANGED
package/src/utils/$crypto.ts
CHANGED
|
@@ -8,6 +8,7 @@ interface ICrypto {
|
|
|
8
8
|
randomUUID(): `${string}-${string}-${string}-${string}-${string}`;
|
|
9
9
|
createECDH(curve: string)
|
|
10
10
|
|
|
11
|
+
sha256 (mix: string | TEth.Hex | Uint8Array, opts?: { encoding: 'hex' }): Promise<TEth.Hex>;
|
|
11
12
|
sha256 (mix: string | TEth.Hex | Uint8Array): Promise<Uint8Array>;
|
|
12
13
|
|
|
13
14
|
encrypt(buffer: string | TEth.Hex | Uint8Array, opts: IEncryptionParams & { encoding?: undefined | 'binary' }): Promise<Uint8Array>
|
package/src/utils/$hex.ts
CHANGED
|
@@ -24,10 +24,19 @@ export namespace $hex {
|
|
|
24
24
|
* Trims '00' bytes from start or end, e.g. 0x68656c6c6f000000 => 0x68656c6c6f
|
|
25
25
|
*/
|
|
26
26
|
export function trimBytes(hex: TEth.Hex): TEth.Hex {
|
|
27
|
-
|
|
27
|
+
return trimBytesEnd(trimBytesStart(hex));
|
|
28
|
+
}
|
|
29
|
+
export function trimBytesStart(hex: TEth.Hex): TEth.Hex {
|
|
30
|
+
if (hex.startsWith('0x00') === false) {
|
|
28
31
|
return hex;
|
|
29
32
|
}
|
|
30
|
-
return hex.replace(/^0x(0{2})+/, '0x')
|
|
33
|
+
return hex.replace(/^0x(0{2})+/, '0x') as TEth.Hex;
|
|
34
|
+
}
|
|
35
|
+
export function trimBytesEnd(hex: TEth.Hex): TEth.Hex {
|
|
36
|
+
if (hex.endsWith('00') === false) {
|
|
37
|
+
return hex;
|
|
38
|
+
}
|
|
39
|
+
return hex.replace(/(0{2})+$/, '') as TEth.Hex;
|
|
31
40
|
}
|
|
32
41
|
export function trimLeadingZerosFromNumber(hex: string) {
|
|
33
42
|
hex = hex.replace(/^0x0*/, '');
|
|
@@ -114,7 +123,6 @@ export namespace $hex {
|
|
|
114
123
|
return hex;
|
|
115
124
|
}
|
|
116
125
|
|
|
117
|
-
|
|
118
126
|
/**
|
|
119
127
|
* Adds `0x` to the start if not present
|
|
120
128
|
*/
|
|
@@ -131,6 +139,7 @@ export namespace $hex {
|
|
|
131
139
|
if (typeof mix ==='boolean') {
|
|
132
140
|
return mix ? '0x1' : '0x0';
|
|
133
141
|
}
|
|
142
|
+
$require.match(/^(0x)?[\da-f]*$/i, mix, 'NotValidHex');
|
|
134
143
|
if (mix.startsWith('0x')) {
|
|
135
144
|
return mix as TEth.Hex;
|
|
136
145
|
}
|