Apply fixes on eth_getStorage

Apply fixes on engine_forkchoiceUpdated
erigontech · Jun 18, 2024 · 0502b44 · 0502b44
1 parent 3ae3d29
commit 0502b44
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 7 deletions.
diff --git a/src/engine/openrpc/methods/forkchoice.yaml b/src/engine/openrpc/methods/forkchoice.yaml
@@ -11,7 +11,10 @@
     - name: Payload attributes
       required: false
       schema:
-        $ref: '#/components/schemas/PayloadAttributesV1'
+        oneOf:
+          - title: No payload attributes (null)
+            type: 'null'
+          - $ref: '#/components/schemas/PayloadAttributesV1'
   result:
     name: Response object
     schema:
@@ -55,7 +58,10 @@
     - name: Payload attributes
       required: false
       schema:
-        $ref: '#/components/schemas/PayloadAttributesV2'
+        oneOf:
+          - title: No payload attributes (null)
+            type: 'null'
+          - $ref: '#/components/schemas/PayloadAttributesV2'
   result:
     name: Response object
     schema:
@@ -108,7 +114,10 @@
     - name: Payload attributes
       required: false
       schema:
-        $ref: '#/components/schemas/PayloadAttributesV3'
+        oneOf:
+          - title: No payload attributes (null)
+            type: 'null'
+          - $ref: '#/components/schemas/PayloadAttributesV3'
   result:
     name: Response object
     schema:

diff --git a/src/eth/state.yaml b/src/eth/state.yaml
@@ -23,15 +23,15 @@
     - name: Storage slot
       required: true
       schema:
-        $ref: '#/components/schemas/uint256'
+        $ref: '#/components/schemas/bytesMax32'
     - name: Block
       required: true
       schema:
         $ref: '#/components/schemas/BlockNumberOrTagOrHash'
   result:
     name: Value
     schema:
-      $ref: '#/components/schemas/bytes'
+      $ref: '#/components/schemas/bytes32'
 - name: eth_getTransactionCount
   summary: Returns the number of transactions sent from an address.
   params:

diff --git a/src/schemas/base-types.yaml b/src/schemas/base-types.yaml
@@ -55,11 +55,11 @@ uint:
 uint64:
   title: hex encoded 64 bit unsigned integer
   type: string
-  pattern: ^0x([1-9a-f]+[0-9a-f]{0,15})|0$
+  pattern: ^0x([1-9a-f]+[0-9a-f]*|0)$
 uint256:
   title: hex encoded 256 bit unsigned integer
   type: string
-  pattern: ^0x([1-9a-f]+[0-9a-f]{0,31})|0$
+  pattern: ^0x([1-9a-f]+[0-9a-f]{0,63})|0$
 hash32:
   title: 32 byte hex value
   type: string