[GatewayAPI] - Make gas input optional in Gateway + Gateway refactori…

…ng (MystenLabs#1877) * * moved coin selection to gateway * gas is now optional, the gateway will choose one from the signer's possession (feature migrated from wallet) * transaction creation endpoints (sui_transferCoin, sui_moveCall etc) now accepts ObjectID instead of reference, the TransactionByte response will contain the gas object ref and input objects for client to verify the object and version used are correct * Refactoring to make naming consistent in GatewayAPI * update schema file * Update sui_core/src/gateway_state.rs Co-authored-by: ade <[email protected]> Co-authored-by: ade <[email protected]>
nigolov · May 11, 2022 · 0a315ed · 0a315ed
1 parent f0d3ad7
commit 0a315ed
Show file tree

Hide file tree

Showing 9 changed files with 271 additions and 266 deletions.
diff --git a/faucet/src/faucet/simple_faucet.rs b/faucet/src/faucet/simple_faucet.rs
@@ -116,7 +116,7 @@ impl SimpleFaucet {
                 signer,
                 coin_id,
                 amounts.to_vec().clone(),
-                gas_object_id,
+                Some(gas_object_id),
                 budget,
             )
             .await?;
@@ -146,7 +146,7 @@ impl SimpleFaucet {
 
         let data = context
             .gateway
-            .transfer_coin(signer, coin_id, gas_object_id, budget, recipient)
+            .transfer_coin(signer, coin_id, Some(gas_object_id), budget, recipient)
             .await?;
         let signature = context
             .keystore

diff --git a/sui/open_rpc/spec/openrpc.json b/sui/open_rpc/spec/openrpc.json
@@ -62,10 +62,9 @@
           }
         },
         {
-          "name": "gas_payment",
+          "name": "gas",
           "summary": "",
           "description": "",
-          "required": true,
           "schema": {
             "$ref": "#/components/schemas/ObjectID"
           }
@@ -166,10 +165,9 @@
           }
         },
         {
-          "name": "gas_object_id",
+          "name": "gas",
           "summary": "",
           "description": "",
-          "required": true,
           "schema": {
             "$ref": "#/components/schemas/ObjectID"
           }
@@ -222,10 +220,9 @@
           }
         },
         {
-          "name": "gas_object_id",
+          "name": "gas",
           "summary": "",
           "description": "",
-          "required": true,
           "schema": {
             "$ref": "#/components/schemas/ObjectID"
           }
@@ -289,10 +286,9 @@
           }
         },
         {
-          "name": "gas_payment",
+          "name": "gas",
           "summary": "",
           "description": "",
-          "required": true,
           "schema": {
             "$ref": "#/components/schemas/ObjectID"
           }
@@ -351,10 +347,9 @@
           }
         },
         {
-          "name": "gas_payment",
+          "name": "gas",
           "summary": "",
           "description": "",
-          "required": true,
           "schema": {
             "$ref": "#/components/schemas/ObjectID"
           }
@@ -900,6 +895,59 @@
       "Identifier": {
         "type": "string"
       },
+      "InputObjectKind": {
+        "oneOf": [
+          {
+            "type": "object",
+            "required": [
+              "MovePackage"
+            ],
+            "properties": {
+              "MovePackage": {
+                "$ref": "#/components/schemas/ObjectID"
+              }
+            },
+            "additionalProperties": false
+          },
+          {
+            "type": "object",
+            "required": [
+              "ImmOrOwnedMoveObject"
+            ],
+            "properties": {
+              "ImmOrOwnedMoveObject": {
+                "type": "array",
+                "items": [
+                  {
+                    "$ref": "#/components/schemas/ObjectID"
+                  },
+                  {
+                    "$ref": "#/components/schemas/SequenceNumber"
+                  },
+                  {
+                    "$ref": "#/components/schemas/ObjectDigest"
+                  }
+                ],
+                "maxItems": 3,
+                "minItems": 3
+              }
+            },
+            "additionalProperties": false
+          },
+          {
+            "type": "object",
+            "required": [
+              "SharedMoveObject"
+            ],
+            "properties": {
+              "SharedMoveObject": {
+                "$ref": "#/components/schemas/ObjectID"
+              }
+            },
+            "additionalProperties": false
+          }
+        ]
+      },
       "MergeCoinResponse": {
         "type": "object",
         "required": [
@@ -1602,9 +1650,33 @@
       "TransactionBytes": {
         "type": "object",
         "required": [
+          "gas",
+          "input_objects",
           "tx_bytes"
         ],
         "properties": {
+          "gas": {
+            "type": "array",
+            "items": [
+              {
+                "$ref": "#/components/schemas/ObjectID"
+              },
+              {
+                "$ref": "#/components/schemas/SequenceNumber"
+              },
+              {
+                "$ref": "#/components/schemas/ObjectDigest"
+              }
+            ],
+            "maxItems": 3,
+            "minItems": 3
+          },
+          "input_objects": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/InputObjectKind"
+            }
+          },
           "tx_bytes": {
             "$ref": "#/components/schemas/Base64"
           }