viem 0.0.0-main.20230819T063450 → 0.0.0-main.20230820T044020
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/dist/cjs/actions/public/waitForTransactionReceipt.js +35 -30
- package/dist/cjs/actions/public/waitForTransactionReceipt.js.map +1 -1
- package/dist/cjs/errors/version.js +1 -1
- package/dist/esm/actions/public/waitForTransactionReceipt.js +39 -34
- package/dist/esm/actions/public/waitForTransactionReceipt.js.map +1 -1
- package/dist/esm/errors/version.js +1 -1
- package/dist/types/actions/public/waitForTransactionReceipt.d.ts.map +1 -1
- package/dist/types/errors/version.d.ts +1 -1
- package/package.json +1 -1
- package/src/actions/public/waitForTransactionReceipt.ts +48 -44
- package/src/errors/version.ts +1 -1
@@ -62,38 +62,43 @@ async function waitForTransactionReceipt(client, { confirmations = 1, hash, onRe
|
|
62
62
|
if (transaction &&
|
63
63
|
(err instanceof transaction_js_1.TransactionNotFoundError ||
|
64
64
|
err instanceof transaction_js_1.TransactionReceiptNotFoundError)) {
|
65
|
-
|
66
|
-
|
67
|
-
|
68
|
-
|
69
|
-
|
70
|
-
|
71
|
-
nonce === replacedTransaction.
|
72
|
-
|
73
|
-
|
74
|
-
|
75
|
-
|
76
|
-
|
77
|
-
|
78
|
-
|
79
|
-
|
80
|
-
|
81
|
-
replacementTransaction.
|
82
|
-
|
65
|
+
try {
|
66
|
+
replacedTransaction = transaction;
|
67
|
+
const block = await (0, getBlock_js_1.getBlock)(client, {
|
68
|
+
blockNumber,
|
69
|
+
includeTransactions: true,
|
70
|
+
});
|
71
|
+
const replacementTransaction = block.transactions.find(({ from, nonce }) => from === replacedTransaction.from &&
|
72
|
+
nonce === replacedTransaction.nonce);
|
73
|
+
if (!replacementTransaction)
|
74
|
+
return;
|
75
|
+
receipt = await (0, getTransactionReceipt_js_1.getTransactionReceipt)(client, {
|
76
|
+
hash: replacementTransaction.hash,
|
77
|
+
});
|
78
|
+
if (blockNumber - receipt.blockNumber + 1n < confirmations)
|
79
|
+
return;
|
80
|
+
let reason = 'replaced';
|
81
|
+
if (replacementTransaction.to === replacedTransaction.to &&
|
82
|
+
replacementTransaction.value === replacedTransaction.value) {
|
83
|
+
reason = 'repriced';
|
84
|
+
}
|
85
|
+
else if (replacementTransaction.from === replacementTransaction.to &&
|
86
|
+
replacementTransaction.value === 0n) {
|
87
|
+
reason = 'cancelled';
|
88
|
+
}
|
89
|
+
done(() => {
|
90
|
+
emit.onReplaced?.({
|
91
|
+
reason,
|
92
|
+
replacedTransaction: replacedTransaction,
|
93
|
+
transaction: replacementTransaction,
|
94
|
+
transactionReceipt: receipt,
|
95
|
+
});
|
96
|
+
emit.resolve(receipt);
|
97
|
+
});
|
83
98
|
}
|
84
|
-
|
85
|
-
|
86
|
-
reason = 'cancelled';
|
99
|
+
catch (err_) {
|
100
|
+
done(() => emit.reject(err_));
|
87
101
|
}
|
88
|
-
done(() => {
|
89
|
-
emit.onReplaced?.({
|
90
|
-
reason,
|
91
|
-
replacedTransaction: replacedTransaction,
|
92
|
-
transaction: replacementTransaction,
|
93
|
-
transactionReceipt: receipt,
|
94
|
-
});
|
95
|
-
emit.resolve(receipt);
|
96
|
-
});
|
97
102
|
}
|
98
103
|
else {
|
99
104
|
done(() => emit.reject(err));
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"waitForTransactionReceipt.js","sourceRoot":"","sources":["../../../../src/actions/public/waitForTransactionReceipt.ts"],"names":[],"mappings":"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
|
1
|
+
{"version":3,"file":"waitForTransactionReceipt.js","sourceRoot":"","sources":["../../../../src/actions/public/waitForTransactionReceipt.ts"],"names":[],"mappings":"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"}
|
@@ -107,42 +107,47 @@ export async function waitForTransactionReceipt(client, { confirmations = 1, has
|
|
107
107
|
if (transaction &&
|
108
108
|
(err instanceof TransactionNotFoundError ||
|
109
109
|
err instanceof TransactionReceiptNotFoundError)) {
|
110
|
-
|
111
|
-
|
112
|
-
|
113
|
-
|
114
|
-
|
115
|
-
|
116
|
-
|
117
|
-
nonce === replacedTransaction.
|
118
|
-
|
119
|
-
|
120
|
-
|
121
|
-
|
122
|
-
|
123
|
-
|
124
|
-
|
125
|
-
|
126
|
-
|
127
|
-
|
128
|
-
|
129
|
-
|
130
|
-
replacementTransaction.
|
131
|
-
|
110
|
+
try {
|
111
|
+
replacedTransaction = transaction;
|
112
|
+
// Let's retrieve the transactions from the current block.
|
113
|
+
const block = await getBlock(client, {
|
114
|
+
blockNumber,
|
115
|
+
includeTransactions: true,
|
116
|
+
});
|
117
|
+
const replacementTransaction = block.transactions.find(({ from, nonce }) => from === replacedTransaction.from &&
|
118
|
+
nonce === replacedTransaction.nonce);
|
119
|
+
// If we couldn't find a replacement transaction, continue polling.
|
120
|
+
if (!replacementTransaction)
|
121
|
+
return;
|
122
|
+
// If we found a replacement transaction, return it's receipt.
|
123
|
+
receipt = await getTransactionReceipt(client, {
|
124
|
+
hash: replacementTransaction.hash,
|
125
|
+
});
|
126
|
+
// Check if we have enough confirmations. If not, continue polling.
|
127
|
+
if (blockNumber - receipt.blockNumber + 1n < confirmations)
|
128
|
+
return;
|
129
|
+
let reason = 'replaced';
|
130
|
+
if (replacementTransaction.to === replacedTransaction.to &&
|
131
|
+
replacementTransaction.value === replacedTransaction.value) {
|
132
|
+
reason = 'repriced';
|
133
|
+
}
|
134
|
+
else if (replacementTransaction.from === replacementTransaction.to &&
|
135
|
+
replacementTransaction.value === 0n) {
|
136
|
+
reason = 'cancelled';
|
137
|
+
}
|
138
|
+
done(() => {
|
139
|
+
emit.onReplaced?.({
|
140
|
+
reason,
|
141
|
+
replacedTransaction: replacedTransaction,
|
142
|
+
transaction: replacementTransaction,
|
143
|
+
transactionReceipt: receipt,
|
144
|
+
});
|
145
|
+
emit.resolve(receipt);
|
146
|
+
});
|
132
147
|
}
|
133
|
-
|
134
|
-
|
135
|
-
reason = 'cancelled';
|
148
|
+
catch (err_) {
|
149
|
+
done(() => emit.reject(err_));
|
136
150
|
}
|
137
|
-
done(() => {
|
138
|
-
emit.onReplaced?.({
|
139
|
-
reason,
|
140
|
-
replacedTransaction: replacedTransaction,
|
141
|
-
transaction: replacementTransaction,
|
142
|
-
transactionReceipt: receipt,
|
143
|
-
});
|
144
|
-
emit.resolve(receipt);
|
145
|
-
});
|
146
151
|
}
|
147
152
|
else {
|
148
153
|
done(() => emit.reject(err));
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"waitForTransactionReceipt.js","sourceRoot":"","sources":["../../../../src/actions/public/waitForTransactionReceipt.ts"],"names":[],"mappings":"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
|
1
|
+
{"version":3,"file":"waitForTransactionReceipt.js","sourceRoot":"","sources":["../../../../src/actions/public/waitForTransactionReceipt.ts"],"names":[],"mappings":"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"}
|
@@ -1,2 +1,2 @@
|
|
1
|
-
export const version = '0.0.0-main.
|
1
|
+
export const version = '0.0.0-main.20230820T044020';
|
2
2
|
//# sourceMappingURL=version.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"waitForTransactionReceipt.d.ts","sourceRoot":"","sources":["../../../../src/actions/public/waitForTransactionReceipt.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,+BAA+B,CAAA;AAC3D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,6CAA6C,CAAA;AAM5E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAA;AAC/C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAA;AAU7D,OAAO,EACL,KAAK,+BAA+B,EAErC,MAAM,4BAA4B,CAAA;AAGnC,MAAM,MAAM,iBAAiB,GAAG,WAAW,GAAG,UAAU,GAAG,UAAU,CAAA;AACrE,MAAM,MAAM,qBAAqB,CAC/B,MAAM,SAAS,KAAK,GAAG,SAAS,GAAG,KAAK,GAAG,SAAS,IAClD;IACF,MAAM,EAAE,iBAAiB,CAAA;IACzB,mBAAmB,EAAE,WAAW,CAAA;IAChC,WAAW,EAAE,WAAW,CAAA;IACxB,kBAAkB,EAAE,+BAA+B,CAAC,MAAM,CAAC,CAAA;CAC5D,CAAA;AAED,MAAM,MAAM,mCAAmC,CAC7C,MAAM,SAAS,KAAK,GAAG,SAAS,GAAG,KAAK,GAAG,SAAS,IAClD,+BAA+B,CAAC,MAAM,CAAC,CAAA;AAE3C,MAAM,MAAM,mCAAmC,CAC7C,MAAM,SAAS,KAAK,GAAG,SAAS,GAAG,KAAK,GAAG,SAAS,IAClD;IACF;;;OAGG;IACH,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,mCAAmC;IACnC,IAAI,EAAE,IAAI,CAAA;IACV,sEAAsE;IACtE,UAAU,CAAC,EAAE,CAAC,QAAQ,EAAE,qBAAqB,CAAC,MAAM,CAAC,KAAK,IAAI,CAAA;IAC9D;;;OAGG;IACH,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,0EAA0E;IAC1E,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB,CAAA;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqCG;AACH,wBAAsB,yBAAyB,CAC7C,MAAM,SAAS,KAAK,GAAG,SAAS,EAEhC,MAAM,EAAE,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,EACjC,EACE,aAAiB,EACjB,IAAI,EACJ,UAAU,EACV,eAAwC,EACxC,OAAO,GACR,EAAE,mCAAmC,CAAC,MAAM,CAAC,GAC7C,OAAO,CAAC,mCAAmC,CAAC,MAAM,CAAC,CAAC,
|
1
|
+
{"version":3,"file":"waitForTransactionReceipt.d.ts","sourceRoot":"","sources":["../../../../src/actions/public/waitForTransactionReceipt.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,+BAA+B,CAAA;AAC3D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,6CAA6C,CAAA;AAM5E,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAA;AAC/C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAA;AAU7D,OAAO,EACL,KAAK,+BAA+B,EAErC,MAAM,4BAA4B,CAAA;AAGnC,MAAM,MAAM,iBAAiB,GAAG,WAAW,GAAG,UAAU,GAAG,UAAU,CAAA;AACrE,MAAM,MAAM,qBAAqB,CAC/B,MAAM,SAAS,KAAK,GAAG,SAAS,GAAG,KAAK,GAAG,SAAS,IAClD;IACF,MAAM,EAAE,iBAAiB,CAAA;IACzB,mBAAmB,EAAE,WAAW,CAAA;IAChC,WAAW,EAAE,WAAW,CAAA;IACxB,kBAAkB,EAAE,+BAA+B,CAAC,MAAM,CAAC,CAAA;CAC5D,CAAA;AAED,MAAM,MAAM,mCAAmC,CAC7C,MAAM,SAAS,KAAK,GAAG,SAAS,GAAG,KAAK,GAAG,SAAS,IAClD,+BAA+B,CAAC,MAAM,CAAC,CAAA;AAE3C,MAAM,MAAM,mCAAmC,CAC7C,MAAM,SAAS,KAAK,GAAG,SAAS,GAAG,KAAK,GAAG,SAAS,IAClD;IACF;;;OAGG;IACH,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,mCAAmC;IACnC,IAAI,EAAE,IAAI,CAAA;IACV,sEAAsE;IACtE,UAAU,CAAC,EAAE,CAAC,QAAQ,EAAE,qBAAqB,CAAC,MAAM,CAAC,KAAK,IAAI,CAAA;IAC9D;;;OAGG;IACH,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,0EAA0E;IAC1E,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB,CAAA;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqCG;AACH,wBAAsB,yBAAyB,CAC7C,MAAM,SAAS,KAAK,GAAG,SAAS,EAEhC,MAAM,EAAE,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,EACjC,EACE,aAAiB,EACjB,IAAI,EACJ,UAAU,EACV,eAAwC,EACxC,OAAO,GACR,EAAE,mCAAmC,CAAC,MAAM,CAAC,GAC7C,OAAO,CAAC,mCAAmC,CAAC,MAAM,CAAC,CAAC,CAoJtD"}
|
@@ -1,2 +1,2 @@
|
|
1
|
-
export declare const version = "0.0.0-main.
|
1
|
+
export declare const version = "0.0.0-main.20230820T044020";
|
2
2
|
//# sourceMappingURL=version.d.ts.map
|
package/package.json
CHANGED
@@ -192,56 +192,60 @@ export async function waitForTransactionReceipt<
|
|
192
192
|
(err instanceof TransactionNotFoundError ||
|
193
193
|
err instanceof TransactionReceiptNotFoundError)
|
194
194
|
) {
|
195
|
-
|
196
|
-
|
197
|
-
// Let's retrieve the transactions from the current block.
|
198
|
-
const block = await getBlock(client, {
|
199
|
-
blockNumber,
|
200
|
-
includeTransactions: true,
|
201
|
-
})
|
202
|
-
|
203
|
-
const replacementTransaction = (
|
204
|
-
block.transactions as Transaction[]
|
205
|
-
).find(
|
206
|
-
({ from, nonce }) =>
|
207
|
-
from === replacedTransaction!.from &&
|
208
|
-
nonce === replacedTransaction!.nonce,
|
209
|
-
)
|
195
|
+
try {
|
196
|
+
replacedTransaction = transaction
|
210
197
|
|
211
|
-
|
212
|
-
|
198
|
+
// Let's retrieve the transactions from the current block.
|
199
|
+
const block = await getBlock(client, {
|
200
|
+
blockNumber,
|
201
|
+
includeTransactions: true,
|
202
|
+
})
|
213
203
|
|
214
|
-
|
215
|
-
|
216
|
-
|
217
|
-
|
204
|
+
const replacementTransaction = (
|
205
|
+
block.transactions as Transaction[]
|
206
|
+
).find(
|
207
|
+
({ from, nonce }) =>
|
208
|
+
from === replacedTransaction!.from &&
|
209
|
+
nonce === replacedTransaction!.nonce,
|
210
|
+
)
|
218
211
|
|
219
|
-
|
220
|
-
|
221
|
-
return
|
212
|
+
// If we couldn't find a replacement transaction, continue polling.
|
213
|
+
if (!replacementTransaction) return
|
222
214
|
|
223
|
-
|
224
|
-
|
225
|
-
|
226
|
-
|
227
|
-
|
228
|
-
|
229
|
-
|
230
|
-
|
231
|
-
replacementTransaction.value === 0n
|
232
|
-
) {
|
233
|
-
reason = 'cancelled'
|
234
|
-
}
|
215
|
+
// If we found a replacement transaction, return it's receipt.
|
216
|
+
receipt = await getTransactionReceipt(client, {
|
217
|
+
hash: replacementTransaction.hash,
|
218
|
+
})
|
219
|
+
|
220
|
+
// Check if we have enough confirmations. If not, continue polling.
|
221
|
+
if (blockNumber - receipt.blockNumber + 1n < confirmations)
|
222
|
+
return
|
235
223
|
|
236
|
-
|
237
|
-
|
238
|
-
|
239
|
-
|
240
|
-
|
241
|
-
|
224
|
+
let reason: ReplacementReason = 'replaced'
|
225
|
+
if (
|
226
|
+
replacementTransaction.to === replacedTransaction.to &&
|
227
|
+
replacementTransaction.value === replacedTransaction.value
|
228
|
+
) {
|
229
|
+
reason = 'repriced'
|
230
|
+
} else if (
|
231
|
+
replacementTransaction.from === replacementTransaction.to &&
|
232
|
+
replacementTransaction.value === 0n
|
233
|
+
) {
|
234
|
+
reason = 'cancelled'
|
235
|
+
}
|
236
|
+
|
237
|
+
done(() => {
|
238
|
+
emit.onReplaced?.({
|
239
|
+
reason,
|
240
|
+
replacedTransaction: replacedTransaction!,
|
241
|
+
transaction: replacementTransaction,
|
242
|
+
transactionReceipt: receipt,
|
243
|
+
})
|
244
|
+
emit.resolve(receipt)
|
242
245
|
})
|
243
|
-
|
244
|
-
|
246
|
+
} catch (err_) {
|
247
|
+
done(() => emit.reject(err_))
|
248
|
+
}
|
245
249
|
} else {
|
246
250
|
done(() => emit.reject(err))
|
247
251
|
}
|
package/src/errors/version.ts
CHANGED
@@ -1 +1 @@
|
|
1
|
-
export const version = '0.0.0-main.
|
1
|
+
export const version = '0.0.0-main.20230820T044020'
|