Merge pull request #298 from amanusk/fix/estimate_fee_units

Seperate message fee estimates for all but estimateMessageFee transac…

Author: leo-starkware

api/starknet_api_openrpc.json

@@ -650,7 +650,7 @@
       ],
       "result": {
         "name": "result",
-        "description": "the fee estimations",
+        "description": "The fee estimations",
         "schema": {
           "title": "Estimation",
           "type": "array",
@@ -694,9 +694,9 @@
       ],
       "result": {
         "name": "result",
-        "description": "the fee estimation",
+        "description": "The fee estimation",
         "schema": {
-          "$ref": "#/components/schemas/FEE_ESTIMATE"
+          "$ref": "#/components/schemas/MESSAGE_FEE_ESTIMATE"
         }
       },
       "errors": [
@@ -3481,13 +3481,30 @@
         "enum": ["SKIP_VALIDATE"],
         "description": "Flags that indicate how to simulate a given transaction. By default, the sequencer behavior is replicated locally"
       },
-      "PRICE_UNIT": {
-        "title": "price unit",
+      "PRICE_UNIT_WEI": {
+        "title": "Price unit wei",
         "type": "string",
-        "enum": ["WEI", "FRI"]
+        "enum": ["WEI"]
       },
-      "FEE_ESTIMATE": {
-        "title": "Fee estimation",
+      "PRICE_UNIT_FRI": {
+        "title": "Price unit fri",
+        "type": "string",
+        "enum": ["FRI"]
+      },
+      "PRICE_UNIT": {
+        "title": "Price unit",
+        "description": "Units in which the fee is given",
+        "oneOf": [
+          {
+            "$ref": "#/components/schemas/PRICE_UNIT_WEI"
+          },
+          {
+            "$ref": "#/components/schemas/PRICE_UNIT_FRI"
+          }
+        ]
+      },
+      "FEE_ESTIMATE_COMMON": {
+        "title": "Fee estimation common fields",
         "type": "object",
         "properties": {
           "l1_gas_consumed": {
@@ -3524,11 +3541,6 @@
             "title": "Overall fee",
             "description": "The estimated fee for the transaction (in wei or fri, depending on the tx version), equals to l1_gas_consumed*l1_gas_price + l1_data_gas_consumed*l1_data_gas_price + l2_gas_consumed*l2_gas_price",
             "$ref": "#/components/schemas/u128"
-          },
-          "unit": {
-            "title": "Fee unit",
-            "description": "units in which the fee is given",
-            "$ref": "#/components/schemas/PRICE_UNIT"
           }
         },
         "required": [
@@ -3538,8 +3550,45 @@
           "l2_gas_price",
           "l1_data_gas_consumed",
           "l1_data_gas_price",
-          "overall_fee",
-          "unit"
+          "overall_fee"
+        ]
+      },
+      "FEE_ESTIMATE": {
+        "title": "Fee estimation",
+        "allOf": [
+          {
+            "$ref": "#/components/schemas/FEE_ESTIMATE_COMMON"
+          },
+          {
+            "type": "object",
+            "properties": {
+              "unit": {
+                "title": "Fee unit",
+                "description": "Units in which the fee is given, can only be FRI",
+                "$ref": "#/components/schemas/PRICE_UNIT_FRI"
+              }
+            },
+            "required": ["unit"]
+          }
+        ]
+      },
+      "MESSAGE_FEE_ESTIMATE": {
+        "title": "Message fee estimation",
+        "allOf": [
+          {
+            "$ref": "#/components/schemas/FEE_ESTIMATE_COMMON"
+          },
+          {
+            "type": "object",
+            "properties": {
+              "unit": {
+                "title": "Fee unit",
+                "description": "Units in which the fee is given, can only be WEI",
+                "$ref": "#/components/schemas/PRICE_UNIT_WEI"
+              }
+            },
+            "required": ["unit"]
+          }
         ]
       },
       "FEE_PAYMENT": {