Merge branch 'develop' into maciej/blockstore-v2

FuelLabs · Oct 3, 2023 · 89a03c9 · 89a03c9
2 parents c19e77a + ab70a95
commit 89a03c9
Show file tree

Hide file tree

Showing 105 changed files with 9,918 additions and 1,175 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -15,7 +15,7 @@ env:
   REGISTRY: ghcr.io
   SEGMENT_DOWNLOAD_TIMEOUT_MINS: 2
   SQLX_OFFLINE: true
-  RUSTC_VERSION: 1.72.0
+  RUSTC_VERSION: 1.72.1
   BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
   IS_MASTER: ${{ github.head_ref == 'master' || github.ref_name == 'master' }}
   IS_DEVELOP: ${{ github.head_ref == 'develop' || github.ref_name == 'develop' }}

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -60,30 +60,30 @@ edition = "2021"
 homepage = "https://fuel.network/"
 license = "Apache-2.0"
 repository = "https://github.com/FuelLabs/fuel-indexer"
-rust-version = "1.72.0"
-version = "0.20.11"
+rust-version = "1.72.1"
+version = "0.21.0"
 
 [workspace.dependencies]
 async-graphql-parser = "5.0"
 async-graphql-value = "5.0"
 bincode = "1.3"
 clap = "3.1"
-forc-index = { version = "0.20.11", path = "./plugins/forc-index" }
-forc-postgres = { version = "0.20.11", path = "./plugins/forc-postgres" }
-fuel-indexer = { version = "0.20.11", path = "./packages/fuel-indexer" }
-fuel-indexer-api-server = { version = "0.20.11", path = "./packages/fuel-indexer-api-server" }
-fuel-indexer-database = { version = "0.20.11", path = "./packages/fuel-indexer-database" }
-fuel-indexer-database-types = { version = "0.20.11", path = "./packages/fuel-indexer-database/database-types" }
-fuel-indexer-graphql = { version = "0.20.11", path = "./packages/fuel-indexer-graphql" }
-fuel-indexer-lib = { version = "0.20.11", path = "./packages/fuel-indexer-lib" }
-fuel-indexer-macro-utils = { version = "0.20.11", path = "./packages/fuel-indexer-macros/macro-utils" }
-fuel-indexer-macros = { version = "0.20.11", path = "./packages/fuel-indexer-macros", default-features = false }
-fuel-indexer-metrics = { version = "0.20.11", path = "./packages/fuel-indexer-metrics" }
-fuel-indexer-plugin = { version = "0.20.11", path = "./packages/fuel-indexer-plugin", default-features = false }
-fuel-indexer-postgres = { version = "0.20.11", path = "./packages/fuel-indexer-database/postgres" }
-fuel-indexer-schema = { version = "0.20.11", path = "./packages/fuel-indexer-schema", default-features = false }
-fuel-indexer-types = { version = "0.20.11", path = "./packages/fuel-indexer-types" }
-fuel-indexer-utils = { version = "0.20.11", path = "./packages/fuel-indexer-utils" }
+forc-index = { version = "0.21.0", path = "./plugins/forc-index" }
+forc-postgres = { version = "0.21.0", path = "./plugins/forc-postgres" }
+fuel-indexer = { version = "0.21.0", path = "./packages/fuel-indexer" }
+fuel-indexer-api-server = { version = "0.21.0", path = "./packages/fuel-indexer-api-server" }
+fuel-indexer-database = { version = "0.21.0", path = "./packages/fuel-indexer-database" }
+fuel-indexer-database-types = { version = "0.21.0", path = "./packages/fuel-indexer-database/database-types" }
+fuel-indexer-graphql = { version = "0.21.0", path = "./packages/fuel-indexer-graphql" }
+fuel-indexer-lib = { version = "0.21.0", path = "./packages/fuel-indexer-lib" }
+fuel-indexer-macro-utils = { version = "0.21.0", path = "./packages/fuel-indexer-macros/macro-utils" }
+fuel-indexer-macros = { version = "0.21.0", path = "./packages/fuel-indexer-macros", default-features = false }
+fuel-indexer-metrics = { version = "0.21.0", path = "./packages/fuel-indexer-metrics" }
+fuel-indexer-plugin = { version = "0.21.0", path = "./packages/fuel-indexer-plugin", default-features = false }
+fuel-indexer-postgres = { version = "0.21.0", path = "./packages/fuel-indexer-database/postgres" }
+fuel-indexer-schema = { version = "0.21.0", path = "./packages/fuel-indexer-schema", default-features = false }
+fuel-indexer-types = { version = "0.21.0", path = "./packages/fuel-indexer-types" }
+fuel-indexer-utils = { version = "0.21.0", path = "./packages/fuel-indexer-utils" }
 fuel-tx = { version = "=0.35.3", default-features = false }
 fuel-types = { version = "=0.35.3", default-features = false, features = ["serde"] }
 fuel-vm = { version = "=0.35.3", default-features = false }

diff --git a/ci/Dockerfile.fuel-node b/ci/Dockerfile.fuel-node
@@ -1,5 +1,5 @@
 # Stage 1: Build
-FROM lukemathwalker/cargo-chef:latest-rust-1.72.0 AS chef
+FROM lukemathwalker/cargo-chef:latest-rust-1.72.1 AS chef
 
 WORKDIR /build/
 

diff --git a/deployment/Dockerfile b/deployment/Dockerfile
@@ -1,6 +1,6 @@
 # Stage 1: Build
 FROM --platform=$BUILDPLATFORM tonistiigi/xx AS xx
-FROM --platform=$BUILDPLATFORM rust:1.72.0 AS chef
+FROM --platform=$BUILDPLATFORM rust:1.72.1 AS chef
 
 ARG TARGETPLATFORM
 RUN cargo install cargo-chef

diff --git a/docs/src/designing-a-schema/directives.md b/docs/src/designing-a-schema/directives.md
@@ -55,7 +55,7 @@ The `@join` directive is used to relate a field in one type to others by referen
 ```graphql
 type Book @entity {
     id: ID!
-    name: Charfield! @unique
+    name: String! @unique
 }
 
 type Library @entity {

diff --git a/docs/src/designing-a-schema/relationships.md b/docs/src/designing-a-schema/relationships.md
@@ -19,7 +19,7 @@ Let's learn how to use each foreign key type by looking at some GraphQL schema e
 ```graphql
 type Library @entity {
     id: ID!
-    name: Charfield!
+    name: String!
 }
 
 type Book @entity {
@@ -35,7 +35,7 @@ Given the above schema, two entities will be created: a `Book` entity, and a `Li
 ```graphql
 type Library @entity {
     id: ID!
-    name: Charfield! @unique
+    name: String! @unique
 }
 
 type Book @entity {

diff --git a/docs/src/designing-a-schema/scalars.md b/docs/src/designing-a-schema/scalars.md
@@ -6,31 +6,23 @@ The Fuel indexer has a collection of GraphQL scalars that cover virtually any va
 --- | --- | ---
 | Address | `u8[32]` |
 | AssetId | `u8[32]` |
-| Blob | `Vec<u8>` | Byte blob of arbitary size |
-| BlockId | `u8[32]` | 32-byte block ID |
 | Boolean | `bool` |
-| Bytes4 | `u8[4]` |
-| Bytes8 | `u8[8]` |
+| Bytes | `Vec<u8>` | Byte blob of arbitary size |
 | Bytes32 | `u8[32]` |
+| Bytes4 | `u8[4]` |
 | Bytes64 | `u8[64]` |
-| Charfield | `String` | String of arbitrary size |
+| Bytes8 | `u8[8]` |
 | ContractId | `u8[32]` |
 | HexString | `Vec<u8>` | Byte blob of arbitrary size |
+| I128 | `i128` |
+| I32 | `i32` |
+| I64 | `i64` |
+| I8 | `i8` |
 | ID | `SizedAsciiString<64>` | Alias of `UID`
-| Int1 | `i8` |
-| Int4 | `i32` |
-| Int8 | `i64` |
-| Int16 | `i128` |
 | Json | `String` | JSON string of arbitary size |
-| MessageId | `u8[32]` |
-| Nonce | `u8[32]` |
-| Salt | `u8[32]` |
-| Signature | `u8[64]` | 64-byte signature |
-| Tai64Timestamp | `Tai64` | `Tai64` timestamp |
-| Timestamp | `u64` |
+| U128 | `u128` |
+| U32 | `u32` |
+| U64 | `u64` |
+| U8 | `u8` |
 | UID | `SizedAsciiString<64>` | 32-byte unique ID |
-| UInt1 | `u8` |
-| UInt4 | `u32` |
-| UInt8 | `u64` |
-| UInt16 | `u128` |
-| Virtual | `String` | Used to store types tagged with `@virtual` directive |
+| String | `String` | String of arbitrary size |