Merge branch 'master' into feature/separate-input-schemas

Author: zaychenko-sergei

Cargo.lock

@@ -409,7 +409,7 @@ type AddData {
 	Last offset of the previous data slice, if any. Must be equal to the
 	last non-empty `newData.offsetInterval.end`.
 	"""
-	prevOffset: Int
+	prevOffset: Uint64
 	"""
 	Describes output data written during this transaction, if any.
 	"""
@@ -610,7 +610,7 @@ type Checkpoint {
 	"""
 	Size of checkpoint file in bytes.
 	"""
-	size: Int!
+	size: Uint64!
 }
 
 type CliProtocolDesc {
@@ -1070,7 +1070,7 @@ type DataSlice {
 	"""
 	Size of data file in bytes.
 	"""
-	size: Int!
+	size: Uint64!
 }
 
 input DataTypeInput {
@@ -1986,7 +1986,7 @@ type ExecuteTransform {
 	Last offset of the previous data slice, if any. Must be equal to the
 	last non-empty `newData.offsetInterval.end`.
 	"""
-	prevOffset: Int
+	prevOffset: Uint64
 	"""
 	Describes output data written during this transaction, if any.
 	"""
@@ -2039,14 +2039,14 @@ type ExecuteTransformInput {
 	half-open `(prevOffset, newOffset]` interval of data records that will
 	be considered in this transaction.
 	"""
-	prevOffset: Int
+	prevOffset: Uint64
 	"""
 	Offset of the last data record that will be incorporated into the
 	derivative transformation, if any. When present, defines a half-open
 	`(prevOffset, newOffset]` interval of data records that will be
 	considered in this transaction.
 	"""
-	newOffset: Int
+	newOffset: Uint64
 }
 
 scalar ExtraAttributes
@@ -2097,7 +2097,7 @@ type FetchStepEthereumLogs {
 	for RPC endpoint lookup as well as asserting that provided `nodeUrl`
 	corresponds to the expected chain.
 	"""
-	chainId: Int
+	chainId: Uint64
 	"""
 	Url of the node.
 	"""
@@ -3261,11 +3261,11 @@ type OffsetInterval {
 	"""
 	Start of the closed interval [start; end].
 	"""
-	start: Int!
+	start: Uint64!
 	"""
 	End of the closed interval [start; end].
 	"""
-	end: Int!
+	end: Uint64!
 }
 
 enum OrderingDirection {
@@ -4355,6 +4355,8 @@ type TriggerFlowSuccess implements TriggerFlowResult {
 
 scalar URL
 
+scalar Uint64
+
 interface UnsetRoleResult {
 	message: String!
 }

resources/schema.gql

@@ -0,0 +1,61 @@
+// Copyright Kamu Data, Inc. and contributors. All rights reserved.
+//
+// Use of this software is governed by the Business Source License
+// included in the LICENSE file.
+//
+// As of the Change Date specified in that file, in accordance with
+// the Business Source License, use of this software will be governed
+// by the Apache License, Version 2.0.
+
+use async_graphql::{InputValueError, InputValueResult, Scalar, ScalarType, Value};
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub struct UInt64(pub u64);
+
+impl From<u64> for UInt64 {
+    fn from(value: u64) -> Self {
+        Self(value)
+    }
+}
+
+impl From<UInt64> for u64 {
+    fn from(value: UInt64) -> Self {
+        value.0
+    }
+}
+
+#[Scalar]
+impl ScalarType for UInt64 {
+    fn parse(value: Value) -> InputValueResult<Self> {
+        match value {
+            Value::String(s) => {
+                let val = s
+                    .parse::<u64>()
+                    .map_err(|e| InputValueError::custom(format!("Invalid UInt64: {e}")))?;
+                Ok(Self(val))
+            }
+            Value::Number(n) => {
+                let n = n.to_string();
+
+                Err(InputValueError::custom(format!(
+                    "Invalid UInt64: the value is expected to be a string (\"{n}\") instead of a \
+                     number ({n})"
+                )))
+            }
+            v @ (Value::Null
+            | Value::Boolean(_)
+            | Value::Binary(_)
+            | Value::Enum(_)
+            | Value::List(_)
+            | Value::Object(_)) => Err(InputValueError::expected_type(v)),
+        }
+    }
+
+    fn to_value(&self) -> Value {
+        Value::String(self.0.to_string())
+    }
+}
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

src/adapter/graphql/src/scalars/int64.rs

@@ -51,7 +51,7 @@ impl MetadataBlockExtended {
             system_time: block.system_time,
             author,
             event: block.event,
-            sequence_number: block.sequence_number,
+            sequence_number: block.sequence_number.into(),
             block: original_block,
         })
     }

src/adapter/graphql/src/scalars/metadata.rs

@@ -37,6 +37,7 @@ mod flow_retry_policy;
 mod flow_scalars;
 mod flow_trigger;
 mod gql_url;
+mod int64;
 mod key_value;
 mod metadata;
 mod multihash;
@@ -80,6 +81,7 @@ pub use flow_retry_policy::*;
 pub use flow_scalars::{TimeUnit, *};
 pub use flow_trigger::{FlowTrigger, *};
 pub use gql_url::*;
+pub use int64::*;
 pub use key_value::*;
 pub use metadata::*;
 pub use multihash::*;