fix: failed requests reach the page with an error code and the node's data (closes #533)
A request the node refuses now reaches the page with the node's own JSON-RPC code and data: a reverting eth_call, an eth_sendTransaction whose gas estimate reverts, a failed broadcast. Every other refusal from the background carries a code too: 4100 when there is no address, -32603 for a failure inside the wallet, -32602 for a transaction request the wallet refuses as malformed. On the transaction path the page keeps the wallet's own sentence. nodeError(), which finds the node's error inside an ethers error, lives in src/shared/approvalVerify.js beside failureTexts(), which did the same lookup. Not run in a browser. Model: opus-5-5
This commit was merged in pull request #565.
This commit is contained in:
@@ -1161,9 +1161,12 @@ describe("a nonce collision is reported as a transaction that did not go out", (
|
||||
const pending = bg.requestTx();
|
||||
await settle();
|
||||
|
||||
// As ethers throws it: its own classification, and the node's
|
||||
// JSON-RPC error under info.error.
|
||||
bg.broadcastTransaction.mockRejectedValue(
|
||||
Object.assign(new Error("nonce too low"), {
|
||||
code: "NONCE_EXPIRED",
|
||||
info: { error: { code: -32000, message: "nonce too low" } },
|
||||
}),
|
||||
);
|
||||
const answer = bg.send(
|
||||
@@ -1182,8 +1185,10 @@ describe("a nonce collision is reported as a transaction that did not go out", (
|
||||
retryable: false,
|
||||
stage: "nonce",
|
||||
});
|
||||
// The wallet's sentence, with the node's own code.
|
||||
expect(pending.result()).toEqual({
|
||||
error: {
|
||||
code: -32000,
|
||||
message: expect.stringMatching(
|
||||
/transaction was not sent, because its nonce/,
|
||||
),
|
||||
@@ -1233,6 +1238,7 @@ describe("a nonce collision is reported as a transaction that did not go out", (
|
||||
});
|
||||
expect(second.result()).toEqual({
|
||||
error: {
|
||||
code: -32603,
|
||||
message: expect.stringMatching(/nonce had already been used/),
|
||||
},
|
||||
});
|
||||
@@ -1323,6 +1329,7 @@ describe("what the approval is verified against", () => {
|
||||
);
|
||||
expect(pending.result()).toEqual({
|
||||
error: {
|
||||
code: -32603,
|
||||
message: expect.stringMatching(/approved maximum fee per gas/),
|
||||
},
|
||||
});
|
||||
@@ -1382,7 +1389,10 @@ describe("what the approval is verified against", () => {
|
||||
expect.objectContaining({ retryable: false, stage: "verify" }),
|
||||
);
|
||||
expect(pending.result()).toEqual({
|
||||
error: { message: expect.stringMatching(/active address changed/) },
|
||||
error: {
|
||||
code: -32603,
|
||||
message: expect.stringMatching(/active address changed/),
|
||||
},
|
||||
});
|
||||
});
|
||||
|
||||
@@ -1526,7 +1536,10 @@ describe("what the approval is verified against", () => {
|
||||
}),
|
||||
);
|
||||
expect(pending.result()).toEqual({
|
||||
error: { message: expect.stringMatching(/active address changed/) },
|
||||
error: {
|
||||
code: -32603,
|
||||
message: expect.stringMatching(/active address changed/),
|
||||
},
|
||||
});
|
||||
});
|
||||
|
||||
@@ -1576,7 +1589,9 @@ describe("what the approval is verified against", () => {
|
||||
error: refusal,
|
||||
retryable: false,
|
||||
});
|
||||
expect(pending.result()).toEqual({ error: { message: refusal } });
|
||||
expect(pending.result()).toEqual({
|
||||
error: { code: -32603, message: refusal },
|
||||
});
|
||||
});
|
||||
|
||||
// ethers signs a `bool` field sent as the string "false" as true, and one
|
||||
@@ -1611,7 +1626,9 @@ describe("what the approval is verified against", () => {
|
||||
error: refusal,
|
||||
retryable: false,
|
||||
});
|
||||
expect(pending.result()).toEqual({ error: { message: refusal } });
|
||||
expect(pending.result()).toEqual({
|
||||
error: { code: -32603, message: refusal },
|
||||
});
|
||||
},
|
||||
);
|
||||
|
||||
@@ -1649,6 +1666,7 @@ describe("what the approval is verified against", () => {
|
||||
|
||||
expect(pending.result()).toEqual({
|
||||
error: {
|
||||
code: -32603,
|
||||
message: expect.stringMatching(
|
||||
/active address changed while this transaction was being prepared/,
|
||||
),
|
||||
@@ -1671,8 +1689,11 @@ describe("what the approval is verified against", () => {
|
||||
const pending = bg.requestTx();
|
||||
await settle();
|
||||
|
||||
// A failure with no node error in it is answered as the wallet's own;
|
||||
// tests/rpcErrorCodes.test.js has the node's own revert.
|
||||
expect(pending.result()).toEqual({
|
||||
error: {
|
||||
code: -32603,
|
||||
message: expect.stringMatching(
|
||||
/could not be prepared.*execution reverted/,
|
||||
),
|
||||
|
||||
Reference in New Issue
Block a user