dequanto 0.2.45 → 0.2.46
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/txs/agents/BatchAgent.js +24 -7
- package/lib/cjs/txs/agents/BatchAgent.js.map +1 -1
- package/lib/esm/txs/agents/BatchAgent.js.map +1 -1
- package/lib/esm/txs/agents/BatchAgent.mjs +24 -7
- package/lib/types/txs/agents/BatchAgent.d.ts +8 -2
- package/package.json +1 -1
- package/src/txs/agents/BatchAgent.ts +26 -7
|
@@ -61,22 +61,39 @@ class BatchAgent {
|
|
|
61
61
|
return inner;
|
|
62
62
|
}
|
|
63
63
|
/**
|
|
64
|
-
*
|
|
64
|
+
* Executes the queued transactions.
|
|
65
|
+
*
|
|
66
|
+
* By default, duplicate transactions are skipped. If the account is Safe or Timelock,
|
|
65
67
|
* prepares the corresponding calldata and submits it as a batch transaction.
|
|
68
|
+
*
|
|
69
|
+
* @param options.includeDuplicates Include duplicate transactions in the execution batch.
|
|
66
70
|
*/
|
|
67
|
-
async execute() {
|
|
71
|
+
async execute(options) {
|
|
68
72
|
this.disable();
|
|
73
|
+
let txs = this.transactions;
|
|
74
|
+
if (options?.includeDuplicates !== true) {
|
|
75
|
+
txs = (0, alot_1.default)(txs).distinctBy(x => {
|
|
76
|
+
const data = x.outerWriter.builder.data;
|
|
77
|
+
const acc = x.account ?? x.sender;
|
|
78
|
+
// remove duplicates by [from,to,data]
|
|
79
|
+
return [
|
|
80
|
+
acc.address.toLowerCase(),
|
|
81
|
+
data.to?.toLowerCase() ?? '',
|
|
82
|
+
data.data ?? ''
|
|
83
|
+
].join('');
|
|
84
|
+
}).toArray();
|
|
85
|
+
}
|
|
69
86
|
let groupStart = 0;
|
|
70
87
|
let writers = [];
|
|
71
|
-
for (let i = 0; i <
|
|
72
|
-
let tx =
|
|
73
|
-
let next = i <
|
|
74
|
-
?
|
|
88
|
+
for (let i = 0; i < txs.length; i++) {
|
|
89
|
+
let tx = txs[i];
|
|
90
|
+
let next = i < txs.length - 1
|
|
91
|
+
? txs[i + 1]
|
|
75
92
|
: null;
|
|
76
93
|
let acc0 = tx.account?.address ?? tx.sender?.address;
|
|
77
94
|
let acc1 = next?.account?.address ?? next?.sender?.address;
|
|
78
95
|
if (next == null || _address_1.$address.eq(acc0, acc1) === false) {
|
|
79
|
-
let arr = await this.executeGroup(
|
|
96
|
+
let arr = await this.executeGroup(txs.slice(groupStart, i + 1));
|
|
80
97
|
writers.push(...arr);
|
|
81
98
|
groupStart = i + 1;
|
|
82
99
|
}
|
|
@@ -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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"}
|
|
@@ -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
|
}
|
|
@@ -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
|
*/
|
package/package.json
CHANGED
|
@@ -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
|
}
|