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
ethereum · Aug 11, 2022 · 5b2f1f5 · 5b2f1f5
1 parent 53c28e1
commit 5b2f1f5
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 13 deletions.
diff --git 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
@@ -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
@@ -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'