From 5b2f1f5bc4e83b4177bc56d513d46a8c6754d0bd Mon Sep 17 00:00:00 2001
From: lightclient <14004106+lightclient@users.noreply.github.com>
Date: Thu, 11 Aug 2022 15:23:39 -0600
Subject: [PATCH] Use generic tx for `eth_sign` + `eth_sendtransaction` and add
 `from` field (#290)

* use generic tx for eth_sign + eth_sendtransaction and add from field

* remove transaction with sender as it is no longer used
---
 src/eth/sign.yaml            |  2 +-
 src/eth/submit.yaml          |  2 +-
 src/schemas/transaction.yaml | 14 +++-----------
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/src/eth/sign.yaml b/src/eth/sign.yaml
index 590457ac2..0d6f50d20 100644
--- a/src/eth/sign.yaml
+++ b/src/eth/sign.yaml
@@ -19,7 +19,7 @@
     - name: Transaction
       required: true
       schema:
-        $ref: '#/components/schemas/TransactionWithSender'
+        $ref: '#/components/schemas/GenericTransaction'
   result:
     name: Encoded transaction
     schema:
diff --git a/src/eth/submit.yaml b/src/eth/submit.yaml
index 9e19222c3..000e2bfe6 100644
--- a/src/eth/submit.yaml
+++ b/src/eth/submit.yaml
@@ -4,7 +4,7 @@
     - name: Transaction
       required: true
       schema:
-        $ref: '#/components/schemas/TransactionWithSender'
+        $ref: '#/components/schemas/GenericTransaction'
   result:
     name: Transaction hash
     schema:
diff --git a/src/schemas/transaction.yaml b/src/schemas/transaction.yaml
index 7d0b658f0..bf8166af6 100644
--- a/src/schemas/transaction.yaml
+++ b/src/schemas/transaction.yaml
@@ -13,17 +13,6 @@ AccessList:
   type: array
   items:
     $ref: '#/components/schemas/AccessListEntry'
-TransactionWithSender:
-  title: Transaction object with sender
-  type: object
-  allOf:
-    - required:
-        - from
-      properties:
-        from:
-          title: from
-          $ref: '#/components/schemas/address'
-    - $ref: '#/components/schemas/TransactionUnsigned'
 Transaction1559Unsigned:
   type: object
   title: EIP-1559 transaction.
@@ -265,6 +254,9 @@ GenericTransaction:
     to:
       title: to address
       $ref: '#/components/schemas/address'
+    from:
+      title: from address
+      $ref: '#/components/schemas/address'
     gas:
       title: gas limit
       $ref: '#/components/schemas/uint'