From 578667e8f1f4410e3792f4b39119fa594dae42ae Mon Sep 17 00:00:00 2001 From: Mortiemi <145274170+Mortiemi@users.noreply.github.com> Date: Thu, 8 Aug 2024 01:25:27 +0200 Subject: [PATCH] Revert "Update EIP-5792: multi-chain wallet_sendCalls" This reverts commit 2f46d4dd395cd672cfa6b8b7d8e34cac129ed0bf. --- EIPS/eip-5792.md | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/EIPS/eip-5792.md b/EIPS/eip-5792.md index a54f08d657442a..0529af9f54e553 100644 --- a/EIPS/eip-5792.md +++ b/EIPS/eip-5792.md @@ -40,13 +40,13 @@ The capabilities field is how an app can communicate with a wallet about capabil The wallet: -* MUST send the calls in the order specified in the request -* MUST send the calls on the same chain identified by the call's `chainId` property -* MUST NOT await for any calls to be finalized to complete the batch +* MUST send these calls in the order specified in the request +* MUST send the calls on the same chain identified by the request's `chainId` property * MUST NOT send any calls from the request if the user rejects the request * MAY revert all calls if any call fails -* MAY send all calls as part of one or more transactions, depending on wallet capability +* MAY send all the function calls as part of one transaction or multiple transactions, depending on wallet capability * SHOULD stop executing the calls if any call fails +* MAY reject the request if the request chain ID does not match the currently selected chain ID * MAY reject the request if the from address does not match the enabled account * MAY reject the request if one or more calls in the batch is expected to fail, when simulated sequentially @@ -55,12 +55,12 @@ The wallet: ```typescript type SendCallsParams = { version: string; + chainId: `0x${string}`; // Hex chain id from: `0x${string}`; calls: { to?: `0x${string}` | undefined; data?: `0x${string}` | undefined; value?: `0x${string}` | undefined; // Hex value - chainId?: `0x${string}` | undefined; // Hex chain id }[]; capabilities?: Record | undefined; }; @@ -74,19 +74,18 @@ type SendCallsResult = string; [ { "version": "1.0", + "chainId": "0x01", "from": "0xd46e8dd67c5d32be8058bb8eb970870f07244567", "calls": [ { "to": "0xd46e8dd67c5d32be8058bb8eb970870f07244567", "value": "0x9184e72a", - "data": "0xd46e8dd67c5d32be8d46e8dd67c5d32be8058bb8eb970870f072445675058bb8eb970870f072445675", - "chainId": "0x01", + "data": "0xd46e8dd67c5d32be8d46e8dd67c5d32be8058bb8eb970870f072445675058bb8eb970870f072445675" }, { "to": "0xd46e8dd67c5d32be8058bb8eb970870f07244567", "value": "0x182183", - "data": "0xfbadbaf01", - "chainId": "0x01", + "data": "0xfbadbaf01" } ], "capabilities": { @@ -129,7 +128,6 @@ type GetCallsResult = { topics: `0x${string}`[]; }[]; status: `0x${string}`; // Hex 1 or 0 for success or failure, respectively - chainId: `0x${string}`; blockHash: `0x${string}`; blockNumber: `0x${string}`; gasUsed: `0x${string}`; @@ -165,7 +163,6 @@ As with the return value of `wallet_sendCalls`, the batch identifier may be any } ], "status": "0x1", - "chainId": "0x01", "blockHash": "0xf19bbafd9fd0124ec110b848e8de4ab4f62bf60c189524e54213285e7f540d4a", "blockNumber": "0xabcd", "gasUsed": "0xdef", @@ -249,8 +246,6 @@ The capabilities below are for illustrative purposes. Like the illustrative examples given above and other capabilities to be defined in future EIPs, the capability to execute calls delivered via the above-defined methods in a single transaction can be attested by the wallet in boolean form. -This capability is expressed separately on each chain and should be interpreted as a guarantee only for batches of transactions on that chain; batches including calls to multiple chains is out of scope of this capability and this specification. - If a wallet has affirmatively expressed this `atomicBatch` capability to a calling application, it MUST submit calls submitted with `wallet_sendCalls` as part of a single transaction. #### `atomicBatch` Capability Specification