Merge master to feature

.changeset/blue-suns-accept.md

@@ -0,0 +1,5 @@
+---
+"@onflow/kit": patch
+---
+
+Make `useFlowChainId` args consistent with other hooks

packages/fcl-core/CHANGELOG.md

@@ -1,5 +1,40 @@
 # @onflow/fcl
 
+## 1.19.0
+
+### Minor Changes
+
+- [#2201](https://github.com/onflow/fcl-js/pull/2201) [`b9c4ed3b95c2dc73698e45f353a6ef9a48f23cab`](https://github.com/onflow/fcl-js/commit/b9c4ed3b95c2dc73698e45f353a6ef9a48f23cab) Thanks [@jribbink](https://github.com/jribbink)! - Add real-time streaming methods `subscribe` and `subscribeRaw`.
+
+  These are only available when using a REST API endpoint and not supported by the deprecated GRPC transport.
+
+  The following topics are now available:
+
+  - `blocks`
+  - `block_headers`
+  - `block_digests`
+  - `transaction_statues`
+  - `events`
+  - `account_statuses`
+
+  Developers using `fcl.tx` and `fcl.events` will not need to make any changes to their existing app to realize the latency improvements of this change and will automatically benefit by upgrading to this version.
+
+  Please see the [Flow Developer Documentation](https://developers.flow.com/clients/fcl-js/) for more details on how to use these new methods.
+
+### Patch Changes
+
+- [#2461](https://github.com/onflow/fcl-js/pull/2461) [`2637889fdb47a2294ad2db9d06a16fac1d805a12`](https://github.com/onflow/fcl-js/commit/2637889fdb47a2294ad2db9d06a16fac1d805a12) Thanks [@jribbink](https://github.com/jribbink)! - Unsubscribe from transaction statuses when sealed
+
+- Updated dependencies [[`3ac616d64c9abcda32f0c450119f22fa479d5e89`](https://github.com/onflow/fcl-js/commit/3ac616d64c9abcda32f0c450119f22fa479d5e89), [`0b83658f62a428a70074d33875f264fbd48aff1e`](https://github.com/onflow/fcl-js/commit/0b83658f62a428a70074d33875f264fbd48aff1e), [`b9c4ed3b95c2dc73698e45f353a6ef9a48f23cab`](https://github.com/onflow/fcl-js/commit/b9c4ed3b95c2dc73698e45f353a6ef9a48f23cab), [`b9c4ed3b95c2dc73698e45f353a6ef9a48f23cab`](https://github.com/onflow/fcl-js/commit/b9c4ed3b95c2dc73698e45f353a6ef9a48f23cab), [`b9c4ed3b95c2dc73698e45f353a6ef9a48f23cab`](https://github.com/onflow/fcl-js/commit/b9c4ed3b95c2dc73698e45f353a6ef9a48f23cab), [`694cd76807b7ca4441d1f8425ac4f8426cbc18fa`](https://github.com/onflow/fcl-js/commit/694cd76807b7ca4441d1f8425ac4f8426cbc18fa), [`4d3bb084c1442552d6a1de1f53435d1aa3f600b0`](https://github.com/onflow/fcl-js/commit/4d3bb084c1442552d6a1de1f53435d1aa3f600b0)]:
+  - @onflow/sdk@1.9.0
+  - @onflow/transport-http@1.13.0
+
+## 1.19.0-alpha.2
+
+### Patch Changes
+
+- [#2461](https://github.com/onflow/fcl-js/pull/2461) [`2637889fdb47a2294ad2db9d06a16fac1d805a12`](https://github.com/onflow/fcl-js/commit/2637889fdb47a2294ad2db9d06a16fac1d805a12) Thanks [@jribbink](https://github.com/jribbink)! - Unsubscribe from transaction statuses when sealed
+
 ## 1.19.0-alpha.1
 
 ### Patch Changes
@@ -11,7 +46,7 @@
 
 ### Minor Changes
 
-- [#2201](https://github.com/onflow/fcl-js/pull/2201) [`b9c4ed3b95c2dc73698e45f353a6ef9a48f23cab`](https://github.com/onflow/fcl-js/commit/b9c4ed3b95c2dc73698e45f353a6ef9a48f23cab) Thanks [@jribbink](https://github.com/jribbink)! - Add real-time streaming methods `subscribe` and `rawSubscribe`.
+- [#2201](https://github.com/onflow/fcl-js/pull/2201) [`b9c4ed3b95c2dc73698e45f353a6ef9a48f23cab`](https://github.com/onflow/fcl-js/commit/b9c4ed3b95c2dc73698e45f353a6ef9a48f23cab) Thanks [@jribbink](https://github.com/jribbink)! - Add real-time streaming methods `subscribe` and `subscribeRaw`.
 
   These are only available when using a REST API endpoint and not supported by the deprecated GRPC trasnport.
 

packages/fcl-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onflow/fcl-core",
-  "version": "1.19.0-alpha.1",
+  "version": "1.19.0",
   "description": "Flow Client Library",
   "license": "Apache-2.0",
   "author": "Flow Foundation",
@@ -20,7 +20,7 @@
   },
   "devDependencies": {
     "@onflow/fcl-bundle": "1.7.0",
-    "@onflow/typedefs": "1.6.0-alpha.0",
+    "@onflow/typedefs": "1.6.0",
     "@types/estree": "^1.0.6",
     "@types/jest": "^29.5.13",
     "@types/node": "^18.19.57",
@@ -52,8 +52,8 @@
     "@onflow/config": "1.5.2",
     "@onflow/interaction": "0.0.11",
     "@onflow/rlp": "1.2.3",
-    "@onflow/sdk": "1.9.0-alpha.1",
-    "@onflow/transport-http": "1.13.0-alpha.0",
+    "@onflow/sdk": "1.9.0",
+    "@onflow/transport-http": "1.13.0",
     "@onflow/types": "1.4.1",
     "@onflow/util-actor": "1.3.4",
     "@onflow/util-address": "1.2.3",

packages/fcl-core/src/fcl-core.ts

@@ -72,7 +72,7 @@ export {invariant} from "@onflow/sdk"
 
 // Subscriptions
 export {subscribe} from "@onflow/sdk"
-export {rawSubscribe} from "@onflow/sdk"
+export {subscribeRaw} from "@onflow/sdk"
 
 import {watchForChainIdChanges} from "./utils"
 

packages/fcl-core/src/transaction/transaction.test.ts

@@ -120,6 +120,46 @@ describe("transaction", () => {
     expect(() => transaction(txId)).toThrow("Invalid transactionId")
   })
 
+  test("should unsubscribe once the transaction has sealed", async () => {
+    jest.resetModules()
+    const txId =
+      "4234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef"
+    const callback = jest.fn()
+    transaction(txId).subscribe(callback)
+
+    // Flush the event loop
+    await new Promise(resolve => setTimeout(resolve, 0))
+
+    // Mock the observable to emit a SEALED status
+    const subscribeParams = jest.mocked(subscribe).mock
+      .calls[0][0] as Parameters<
+      typeof subscribe<SubscriptionTopic.TRANSACTION_STATUSES>
+    >[0]
+
+    subscribeParams.onData({
+      status: TransactionExecutionStatus.PENDING,
+      blockId: "",
+      statusCode: 0,
+      errorMessage: "",
+      events: [],
+      statusString: "PENDING",
+    })
+
+    subscribeParams.onData({
+      status: TransactionExecutionStatus.SEALED,
+      blockId: "",
+      statusCode: 0,
+      errorMessage: "",
+      events: [],
+      statusString: "SEALED",
+    })
+
+    await new Promise(resolve => setTimeout(resolve, 100))
+
+    const unsubMock = jest.mocked(subscribe).mock.results[0].value
+    expect(unsubMock.unsubscribe).toHaveBeenCalledTimes(1)
+  })
+
   test("subscribe should fallback to polling if real-time streaming is not supported", async () => {
     const txId =
       "2234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef"

packages/fcl-core/src/transaction/transaction.ts

@@ -84,29 +84,26 @@ export function transaction(
     return function innerOnce(opts = {suppress: false}) {
       const suppress = opts.suppress || false
       return new Promise((resolve, reject) => {
-        const unsub = subscribe(((
-          txStatus?: TransactionStatus,
-          error?: Error
-        ) => {
-          if ((error || txStatus?.statusCode) && !suppress) {
-            if (error != null) {
-              reject(error)
-              unsub()
-            } else if (txStatus?.statusCode === 1) {
+        const unsub = subscribe(
+          (txStatus: TransactionStatus) => {
+            if (txStatus.statusCode === 1) {
               const transactionError = TransactionError.fromErrorMessage(
                 txStatus.errorMessage
               )
               reject(transactionError)
               unsub()
+            } else if (predicate(txStatus)) {
+              resolve(txStatus)
+              unsub()
+            }
+          },
+          err => {
+            if (!suppress) {
+              reject(err)
+              unsub()
             }
-            return
-          }
-
-          if (predicate(txStatus!)) {
-            resolve(txStatus!)
-            unsub()
           }
-        }) as any)
+        )
       }) as Promise<TransactionStatus>
     }
   }
@@ -168,14 +165,24 @@ function createObservable(
   // Subscribe to transaction status updates
   function subscribeTransactionStatuses() {
     // Subscribe to transaction status updates
-    sdkSubscribe({
+    const subscription = sdkSubscribe({
       topic: SubscriptionTopic.TRANSACTION_STATUSES,
       args: {transactionId: txId},
       onData: txStatus => {
         if (isDiff(value, txStatus)) {
           value = txStatus
           next(txStatus)
         }
+
+        // Clean up the subscription if the transaction is sealed
+        // Wait for next tick to ensure unsubscribe is defined
+        if (isSealed(txStatus)) {
+          new Promise(resolve => setTimeout(resolve, 0)).then(() => {
+            if (isSealed(txStatus)) {
+              subscription.unsubscribe()
+            }
+          })
+        }
       },
       onError: (err: Error) => {
         if (err instanceof SubscriptionsNotSupportedError) {
@@ -192,13 +199,21 @@ function createObservable(
 
   function fallbackLegacyPolling() {
     // Poll for transaction status updates
-    legacyTransaction(txId, opts).subscribe(
+    const unsubscribe = legacyTransaction(txId, opts).subscribe(
       (txStatus?: TransactionStatus, err?: Error) => {
         if (err) {
           error(err)
-        } else if (txStatus) {
+        } else if (txStatus && isDiff(value, txStatus)) {
           value = txStatus
           next(txStatus)
+
+          // Clean up the subscription if the transaction is sealed
+          // Wait for next tick to ensure unsubscribe is defined
+          if (isSealed(txStatus)) {
+            new Promise(resolve => setTimeout(resolve, 0)).then(() => {
+              unsubscribe()
+            })
+          }
         }
       }
     )

packages/fcl-ethereum-provider/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @onflow/fcl-ethereum-provider
 
+## 0.0.5
+
+### Patch Changes
+
+- Updated dependencies [[`0b83658f62a428a70074d33875f264fbd48aff1e`](https://github.com/onflow/fcl-js/commit/0b83658f62a428a70074d33875f264fbd48aff1e), [`b9c4ed3b95c2dc73698e45f353a6ef9a48f23cab`](https://github.com/onflow/fcl-js/commit/b9c4ed3b95c2dc73698e45f353a6ef9a48f23cab)]:
+  - @onflow/fcl@1.18.0
+  - @onflow/fcl-wc@6.0.3
+
+## 0.0.5-alpha.2
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @onflow/fcl@1.18.0-alpha.2
+  - @onflow/fcl-wc@6.0.3-alpha.2
+
 ## 0.0.5-alpha.1
 
 ### Patch Changes

packages/fcl-ethereum-provider/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onflow/fcl-ethereum-provider",
-  "version": "0.0.5-alpha.1",
+  "version": "0.0.5",
   "description": "Ethereum provider for FCL-compatible wallets",
   "license": "Apache-2.0",
   "author": "Dapper Labs <dev@dapperlabs.com>",
@@ -15,7 +15,7 @@
   "devDependencies": {
     "@babel/preset-typescript": "^7.25.7",
     "@onflow/fcl-bundle": "1.7.0",
-    "@onflow/typedefs": "^1.6.0-alpha.0",
+    "@onflow/typedefs": "^1.6.0",
     "@types/jest": "^29.5.13",
     "@typescript-eslint/eslint-plugin": "^6.21.0",
     "@typescript-eslint/parser": "^6.21.0",
@@ -40,7 +40,7 @@
     "@ethersproject/bytes": "^5.7.0",
     "@ethersproject/hash": "^5.7.0",
     "@noble/hashes": "^1.7.1",
-    "@onflow/fcl-wc": "6.0.3-alpha.1",
+    "@onflow/fcl-wc": "6.0.3",
     "@onflow/rlp": "^1.2.3",
     "@walletconnect/ethereum-provider": "^2.20.2",
     "@walletconnect/jsonrpc-http-connection": "^1.0.8",
@@ -50,6 +50,6 @@
     "@walletconnect/utils": "^2.20.2"
   },
   "peerDependencies": {
-    "@onflow/fcl": "1.18.0-alpha.1"
+    "@onflow/fcl": "1.18.0"
   }
 }

packages/fcl-rainbowkit-adapter/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @onflow/fcl-rainbowkit-adapter
 
+## 0.2.1
+
+### Patch Changes
+
+- Updated dependencies [[`0b83658f62a428a70074d33875f264fbd48aff1e`](https://github.com/onflow/fcl-js/commit/0b83658f62a428a70074d33875f264fbd48aff1e), [`b9c4ed3b95c2dc73698e45f353a6ef9a48f23cab`](https://github.com/onflow/fcl-js/commit/b9c4ed3b95c2dc73698e45f353a6ef9a48f23cab)]:
+  - @onflow/fcl@1.18.0
+  - @onflow/fcl-ethereum-provider@0.0.5
+  - @onflow/fcl-wagmi-adapter@0.0.5
+
+## 0.2.1-alpha.2
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @onflow/fcl@1.18.0-alpha.2
+  - @onflow/fcl-ethereum-provider@0.0.5-alpha.2
+  - @onflow/fcl-wagmi-adapter@0.0.5-alpha.2
+
 ## 0.2.1-alpha.1
 
 ### Patch Changes

packages/fcl-rainbowkit-adapter/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onflow/fcl-rainbowkit-adapter",
-  "version": "0.2.1-alpha.1",
+  "version": "0.2.1",
   "description": "Rainbowkit adapter for FCL-compatible wallets",
   "license": "Apache-2.0",
   "author": "Dapper Labs <dev@dapperlabs.com>",
@@ -15,7 +15,7 @@
   "devDependencies": {
     "@babel/preset-typescript": "^7.25.7",
     "@onflow/fcl-bundle": "1.7.0",
-    "@onflow/typedefs": "^1.6.0-alpha.0",
+    "@onflow/typedefs": "^1.6.0",
     "@types/jest": "^29.5.13",
     "@typescript-eslint/eslint-plugin": "^6.21.0",
     "@typescript-eslint/parser": "^6.21.0",
@@ -40,8 +40,8 @@
     "@babel/runtime": "^7.25.7",
     "@ethersproject/bytes": "^5.7.0",
     "@ethersproject/hash": "^5.7.0",
-    "@onflow/fcl-ethereum-provider": "0.0.5-alpha.1",
-    "@onflow/fcl-wagmi-adapter": "0.0.5-alpha.1",
+    "@onflow/fcl-ethereum-provider": "0.0.5",
+    "@onflow/fcl-wagmi-adapter": "0.0.5",
     "@onflow/rlp": "^1.2.3",
     "@wagmi/core": "^2.16.3",
     "mipd": "^0.0.7",
@@ -50,7 +50,7 @@
     "wagmi": "^2.14.11"
   },
   "peerDependencies": {
-    "@onflow/fcl": "1.18.0-alpha.1",
+    "@onflow/fcl": "1.18.0",
     "@rainbow-me/rainbowkit": "^2.2.3",
     "react": "17.x || 18.x || 19.x"
   }

packages/fcl-react-native/CHANGELOG.md

@@ -1,5 +1,39 @@
 # @onflow/fcl-react-native
 
+## 1.12.0
+
+### Minor Changes
+
+- [#2201](https://github.com/onflow/fcl-js/pull/2201) [`b9c4ed3b95c2dc73698e45f353a6ef9a48f23cab`](https://github.com/onflow/fcl-js/commit/b9c4ed3b95c2dc73698e45f353a6ef9a48f23cab) Thanks [@jribbink](https://github.com/jribbink)! - Add real-time streaming methods `subscribe` and `subscribeRaw`.
+
+  These are only available when using a REST API endpoint and not supported by the deprecated GRPC trasnport.
+
+  The following topics are now available:
+
+  - `blocks`
+  - `block_headers`
+  - `block_digests`
+  - `transaction_statues`
+  - `events`
+  - `account_statuses`
+
+  Developers using `fcl.tx` and `fcl.events` will not need to make any changes to their existing app to realize the latency improvements of this change and will automatically benefit by upgrading to this version.
+
+  Please see the [Flow Developer Documentation](https://developers.flow.com/clients/fcl-js/) for more details on how to use these new methods.
+
+### Patch Changes
+
+- Updated dependencies [[`3ac616d64c9abcda32f0c450119f22fa479d5e89`](https://github.com/onflow/fcl-js/commit/3ac616d64c9abcda32f0c450119f22fa479d5e89), [`0b83658f62a428a70074d33875f264fbd48aff1e`](https://github.com/onflow/fcl-js/commit/0b83658f62a428a70074d33875f264fbd48aff1e), [`b9c4ed3b95c2dc73698e45f353a6ef9a48f23cab`](https://github.com/onflow/fcl-js/commit/b9c4ed3b95c2dc73698e45f353a6ef9a48f23cab), [`b9c4ed3b95c2dc73698e45f353a6ef9a48f23cab`](https://github.com/onflow/fcl-js/commit/b9c4ed3b95c2dc73698e45f353a6ef9a48f23cab), [`2637889fdb47a2294ad2db9d06a16fac1d805a12`](https://github.com/onflow/fcl-js/commit/2637889fdb47a2294ad2db9d06a16fac1d805a12), [`4d3bb084c1442552d6a1de1f53435d1aa3f600b0`](https://github.com/onflow/fcl-js/commit/4d3bb084c1442552d6a1de1f53435d1aa3f600b0)]:
+  - @onflow/sdk@1.9.0
+  - @onflow/fcl-core@1.19.0
+
+## 1.12.0-alpha.2
+
+### Patch Changes
+
+- Updated dependencies [[`2637889fdb47a2294ad2db9d06a16fac1d805a12`](https://github.com/onflow/fcl-js/commit/2637889fdb47a2294ad2db9d06a16fac1d805a12)]:
+  - @onflow/fcl-core@1.19.0-alpha.2
+
 ## 1.12.0-alpha.1
 
 ### Patch Changes
@@ -12,7 +46,7 @@
 
 ### Minor Changes
 
-- [#2201](https://github.com/onflow/fcl-js/pull/2201) [`b9c4ed3b95c2dc73698e45f353a6ef9a48f23cab`](https://github.com/onflow/fcl-js/commit/b9c4ed3b95c2dc73698e45f353a6ef9a48f23cab) Thanks [@jribbink](https://github.com/jribbink)! - Add real-time streaming methods `subscribe` and `rawSubscribe`.
+- [#2201](https://github.com/onflow/fcl-js/pull/2201) [`b9c4ed3b95c2dc73698e45f353a6ef9a48f23cab`](https://github.com/onflow/fcl-js/commit/b9c4ed3b95c2dc73698e45f353a6ef9a48f23cab) Thanks [@jribbink](https://github.com/jribbink)! - Add real-time streaming methods `subscribe` and `subscribeRaw`.
 
   These are only available when using a REST API endpoint and not supported by the deprecated GRPC trasnport.