fix: revert graphql subscriptions PR (#1333)

FuelLabs · Oct 11, 2023 · bec5938 · bec5938
1 parent f3c3817
commit bec5938
Show file tree

Hide file tree

Showing 13 changed files with 208 additions and 531 deletions.
diff --git a/.changeset/chilled-elephants-smile.md b/.changeset/chilled-elephants-smile.md
@@ -0,0 +1,6 @@
+---
+"@fuel-ts/errors": minor
+"@fuel-ts/providers": minor
+---
+
+Reverted GraphQL subscriptions, thus removing `Provider.operations.statusChange`.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -25,12 +25,6 @@ module.exports = {
     // Disable error on devDependencies importing since this isn't a TS library
     'import/no-extraneous-dependencies': ['error', { devDependencies: true }],
     'no-await-in-loop': 0,
-    'no-restricted-syntax': [
-      'off',
-      {
-        selector: 'ForOfStatement',
-      },
-    ],
     'prefer-destructuring': 0,
     'no-bitwise': 0,
     'no-underscore-dangle': 'off',

diff --git a/.github/actions/ci-setup/action.yaml b/.github/actions/ci-setup/action.yaml
@@ -2,7 +2,7 @@ name: "CI setup"
 inputs:
   node-version:
     description: "Node version"
-    default: 18.18.0
+    default: 18.14.1
   pnpm-version:
     description: "PNPM version"
     default: 8.6.1

diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-18.18.0
+18.14.1
diff --git a/package.json b/package.json
@@ -5,10 +5,10 @@
   "author": "Fuel Labs <[email protected]> (https://fuel.network/)",
   "private": true,
   "engines": {
-    "node": ">= 18.18.0",
-    "pnpm": ">= 8.6.1"
+    "node": ">= 18.14.1",
+    "pnpm": ">= 8.1.1"
   },
-  "packageManager": "pnpm@8.6.1",
+  "packageManager": "pnpm@8.1.1",
   "scripts": {
     "dev": "nodemon --config nodemon.config.json -x 'pnpm build:packages'",
     "build": "turbo run build",
@@ -88,5 +88,10 @@
     "tsx": "^3.12.7",
     "turbo": "^1.8.8",
     "typescript": "~5.1.6"
+  },
+  "pnpm": {
+    "overrides": {
+      "cross-fetch": "4.0.0"
+    }
   }
 }
diff --git a/packages/errors/src/error-codes.ts b/packages/errors/src/error-codes.ts
@@ -11,7 +11,7 @@ export enum ErrorCode {
   TYPE_NOT_FOUND = 'type-not-found',
   TYPE_NOT_SUPPORTED = 'type-not-supported',
   INVALID_DECODE_VALUE = 'invalid-decode-value',
-  JSON_ABI_ERROR = 'json-abi-error',
+  JSON_ABI_ERROR = 'abi-main-method-missing',
   TYPE_ID_NOT_FOUND = 'type-id-not-found',
   BIN_FILE_NOT_FOUND = 'bin-file-not-found',
   CODER_NOT_FOUND = 'coder-not-found',
@@ -87,9 +87,6 @@ export enum ErrorCode {
   SCRIPT_REVERTED = 'script-reverted',
   SCRIPT_RETURN_INVALID_TYPE = 'script-return-invalid-type',
 
-  // general
-  FUEL_NODE_ERROR = 'fuel-node-error',
-
   // coder
   // ...
 }
diff --git a/packages/providers/codegen.json b/packages/providers/codegen.json
@@ -1,19 +1,13 @@
 {
   "$schema": "https://www.graphql-code-generator.com/config.schema.json",
   "schema": "./fuel-core-schema.graphql",
+  "documents": "./src/operations.graphql",
   "generates": {
     "./src/__generated__/operations.ts": {
-      "documents": "./src/operations.graphql",
       "plugins": [
         { "typescript": {} },
-        {
-          "typescript-operations": {}
-        },
-        {
-          "typescript-generic-sdk": {
-            "dedupeFragments": true
-          }
-        }
+        { "typescript-operations": {} },
+        { "typescript-graphql-request": {} }
       ],
       "config": {
         "scalars": {

diff --git a/packages/providers/package.json b/packages/providers/package.json
@@ -39,7 +39,6 @@
     "graphql": "^16.6.0",
     "graphql-request": "^5.0.0",
     "graphql-tag": "^2.12.6",
-    "graphql-sse": "^2.2.1",
     "ramda": "^0.29.0",
     "tai64": "^1.0.0"
   },
@@ -49,8 +48,8 @@
     "@graphql-codegen/typescript": "^2.8.0",
     "@graphql-codegen/typescript-graphql-request": "^4.5.7",
     "@graphql-codegen/typescript-operations": "^2.5.5",
-    "@graphql-codegen/typescript-generic-sdk": "^3.1.0",
     "@types/ramda": "^0.29.3",
-    "get-graphql-schema": "^2.1.2"
+    "get-graphql-schema": "^2.1.2",
+    "typescript": "^4.8.4"
   }
 }
diff --git a/packages/providers/src/operations.graphql b/packages/providers/src/operations.graphql
@@ -4,31 +4,6 @@
 # generate `operations.ts` from this file.
 
 # Fragments
-
-fragment transactionStatusFragment on TransactionStatus {
-  type: __typename
-  ... on SubmittedStatus {
-    time
-  }
-  ... on SuccessStatus {
-    block {
-      id
-    }
-    time
-    programState {
-      returnType
-      data
-    }
-  }
-  ... on FailureStatus {
-    block {
-      id
-    }
-    time
-    reason
-  }
-}
-
 fragment transactionFragment on Transaction {
   id
   rawPayload
@@ -37,7 +12,27 @@ fragment transactionFragment on Transaction {
     ...receiptFragment
   }
   status {
-    ...transactionStatusFragment
+    type: __typename
+    ... on SubmittedStatus {
+      time
+    }
+    ... on SuccessStatus {
+      block {
+        id
+      }
+      time
+      programState {
+        returnType
+        data
+      }
+    }
+    ... on FailureStatus {
+      block {
+        id
+      }
+      time
+      reason
+    }
   }
 }
 
@@ -473,15 +468,3 @@ mutation produceBlocks(
     startTimestamp: $startTimestamp
   )
 }
-
-subscription submitAndAwait($encodedTransaction: HexString!) {
-  submitAndAwait(tx: $encodedTransaction) {
-    ...transactionStatusFragment
-  }
-}
-
-subscription statusChange($transactionId: TransactionId!) {
-  statusChange(id: $transactionId) {
-    ...transactionStatusFragment
-  }
-}