Merge branch 'jribbink/update-protobuf-definitions' of github.com:onf…

…low/fcl-js into jribbink/update-protobuf-definitions
onflow · May 30, 2022 · 721dfd6 · 721dfd6
2 parents b35462a + 5b5763c
commit 721dfd6
Show file tree

Hide file tree

Showing 138 changed files with 2,857 additions and 2,237 deletions.
diff --git a/.changeset/empty-ants-switch.md b/.changeset/empty-ants-switch.md
@@ -2,5 +2,4 @@
 "@onflow/fcl": patch
 ---
 
-- Fix events subcribe block height issue
-- Add polling rate guide to docs
+Fix events subcribe block height issue and add polling rate guide to docs.
diff --git a/.changeset/friendly-berries-admire.md b/.changeset/friendly-berries-admire.md
@@ -0,0 +1,5 @@
+---
+"@onflow/transport-http": patch
+---
+
+Fix issue where httpRequest errors were thrown inside a promise and could not be caught on node
diff --git a/.changeset/grumpy-cats-flash.md b/.changeset/grumpy-cats-flash.md
@@ -0,0 +1,5 @@
+---
+"@onflow/sdk": patch
+---
+
+Allow for integer string account.keyId in authorization function
diff --git a/.changeset/itchy-pumpkins-dream.md b/.changeset/itchy-pumpkins-dream.md
@@ -0,0 +1,6 @@
+---
+"@onflow/fcl": patch
+---
+
+Update event listeners in strategies
+Fixes a bug where event listener was not being removed on close
diff --git a/.changeset/pre.json b/.changeset/pre.json
@@ -0,0 +1,30 @@
+{
+  "mode": "pre",
+  "tag": "alpha",
+  "initialVersions": {
+    "@onflow/config": "1.0.1",
+    "@onflow/fcl": "1.0.2",
+    "@onflow/protobuf": "1.0.0",
+    "@onflow/rlp": "1.0.1",
+    "@onflow/sdk": "1.0.1",
+    "@onflow/transport-grpc": "1.0.1",
+    "@onflow/transport-http": "1.2.0",
+    "@onflow/types": "1.0.1",
+    "@onflow/util-actor": "1.0.1",
+    "@onflow/util-address": "1.0.1",
+    "@onflow/util-encode-key": "1.0.1",
+    "@onflow/util-invariant": "1.0.1",
+    "@onflow/util-logger": "1.0.1",
+    "@onflow/util-node-http-modules": "1.0.2",
+    "@onflow/util-template": "1.0.1",
+    "@onflow/util-uid": "1.0.1"
+  },
+  "changesets": [
+    "empty-ants-switch",
+    "friendly-berries-admire",
+    "itchy-pumpkins-dream",
+    "short-colts-beg",
+    "smart-toys-joke",
+    "tall-zebras-tie"
+  ]
+}
diff --git a/.changeset/short-colts-beg.md b/.changeset/short-colts-beg.md
@@ -0,0 +1,5 @@
+---
+"@onflow/transport-http": minor
+---
+
+Added errorMessage property to HTTPRequestError to expose Access API errors when making requests
diff --git a/.changeset/smart-toys-joke.md b/.changeset/smart-toys-joke.md
@@ -0,0 +1,5 @@
+---
+"@onflow/sdk": patch
+---
+
+Make deprecation notice for getEvents use @onflow/util-logger instead of console.warn
diff --git a/.changeset/tall-zebras-tie.md b/.changeset/tall-zebras-tie.md
@@ -0,0 +1,5 @@
+---
+"@onflow/sdk": patch
+---
+
+Fix issue where custom decoders did not properly override default decoders
diff --git a/.prettierignore b/.prettierignore
@@ -1,2 +1,4 @@
 README.md
 *.md
+*.mdx
+packages/protobuf/src/generated/
diff --git a/docs/reference/transactions.mdx b/docs/reference/transactions.mdx
@@ -2,9 +2,9 @@
 
 Transactions let you send Cadence code to the Flow blockchain that permanently alters its state.
 
-We are assuming you have read the [Scripts Documentation](../scripts) before this, as transactions are sort of scripts with more required things.
+We are assuming you have read the [Scripts Documentation](https://docs.onflow.org/fcl/reference/scripts/) before this, as transactions are sort of scripts with more required things.
 
-While `query` is used for sending scripts to the chain, `mutate` is used for building and sending transactions. Just like [scripts](../scripts), `fcl.mutate` is a [JavaScript Tagged Template Literal](https://styled-components.com/docs/advanced#tagged-template-literals) that we can pass Cadence code into.
+While `query` is used for sending scripts to the chain, `mutate` is used for building and sending transactions. Just like [scripts](https://docs.onflow.org/fcl/reference/scripts/), `fcl.mutate` is a [JavaScript Tagged Template Literal](https://styled-components.com/docs/advanced#tagged-template-literals) that we can pass Cadence code into.
 
 Unlike scripts, they require a little more information, things like a proposer, authorizations and a payer, which may be a little confusing and overwhelming.
 
@@ -74,4 +74,4 @@ const transaction = await fcl.tx(transactionId).onceSealed()
 console.log(transaction) // The transactions status and events after being sealed
 ```
 
-To learn more about `mutate`, check out the [API documentation](./api/#mutate).
+To learn more about `mutate`, check out the [API documentation](./api/#mutate).
diff --git a/jest.config.js b/jest.config.js
@@ -1,5 +1,3 @@
 module.exports = {
-  "projects": [
-    "<rootDir>/packages/*"
-  ]
-};
+  projects: ["<rootDir>/packages/*"],
+}
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -11,5 +11,8 @@
   "dependencies": {
     "@changesets/cli": "^2.21.1",
     "@changesets/changelog-github": "^0.4.4"
+  },
+  "devDependencies": {
+    "prettier": "^2.6.2"
   }
 }
diff --git a/packages/fcl/CHANGELOG.md b/packages/fcl/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @onflow/fcl
 
+## 1.0.3-alpha.0
+
+### Patch Changes
+
+- [#1177](https://github.com/onflow/fcl-js/pull/1177) [`e38f9fe4`](https://github.com/onflow/fcl-js/commit/e38f9fe4ba030693984ab74bffd5bca387ac9a09) Thanks [@hotrungnhan](https://github.com/hotrungnhan)! - Fix events subcribe block height issue and add polling rate guide to docs.
+
+* [#1211](https://github.com/onflow/fcl-js/pull/1211) [`f4c6fb9a`](https://github.com/onflow/fcl-js/commit/f4c6fb9a05e8cf717afcd6a3b3b4c8b102f253e3) Thanks [@gregsantos](https://github.com/gregsantos)! - Update event listeners in strategies
+  Fixes a bug where event listener was not being removed on close
+* Updated dependencies [[`1654ebbe`](https://github.com/onflow/fcl-js/commit/1654ebbe45ea5e4ca13536ed2139520ce21ee314), [`d1765950`](https://github.com/onflow/fcl-js/commit/d176595021681e660ae0a06161340833280091fb)]:
+  - @onflow/sdk@1.0.2-alpha.0
+
 ## 1.0.2
 
 ### Patch Changes

diff --git a/packages/fcl/package.json b/packages/fcl/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@onflow/fcl",
-  "version": "1.0.2",
+  "version": "1.0.3-alpha.0",
   "description": "Flow Client Library",
   "license": "Apache-2.0",
   "author": "Dapper Labs <[email protected]>",
@@ -44,7 +44,7 @@
     "@onflow/config": "^1.0.1",
     "@onflow/interaction": "0.0.11",
     "@onflow/rlp": "^1.0.1",
-    "@onflow/sdk": "^1.0.1",
+    "@onflow/sdk": "^1.0.2-alpha.0",
     "@onflow/types": "^1.0.1",
     "@onflow/util-actor": "^1.0.1",
     "@onflow/util-address": "^1.0.1",

diff --git a/packages/fcl/src/config-utils.js b/packages/fcl/src/config-utils.js
@@ -48,6 +48,6 @@ export async function getDiscoveryService() {
     type: "authn",
     endpoint: discoveryWallet,
     method: discoveryWalletMethod,
-    discoveryAuthnInclude
+    discoveryAuthnInclude,
   }
 }
diff --git a/packages/fcl/src/current-user/exec-service/index.js b/packages/fcl/src/current-user/exec-service/index.js
@@ -31,33 +31,32 @@ export async function execService({service, msg = {}, opts = {}, config = {}}) {
   }
 
   try {
-    const res = await STRATEGIES[service.method](
-      service, 
-      msg, 
-      opts, 
-      fullConfig
-    )
+    const res = await STRATEGIES[service.method](service, msg, opts, fullConfig)
     if (res.status === "REDIRECT") {
       invariant(
         service.type === res.data.type,
         "Cannot shift recursive service type in execService"
       )
       return await execService({
-        service: res.data, 
-        msg, 
-        opts, 
-        config: fullConfig
+        service: res.data,
+        msg,
+        opts,
+        config: fullConfig,
       })
     } else {
       return res
     }
   } catch (error) {
-    console.error("execService({service, msg = {}, opts = {}, config = {}})", error, {
-      service,
-      msg,
-      opts,
-      config
-    })
+    console.error(
+      "execService({service, msg = {}, opts = {}, config = {}})",
+      error,
+      {
+        service,
+        msg,
+        opts,
+        config,
+      }
+    )
     throw error
   }
 }
diff --git a/packages/fcl/src/current-user/exec-service/strategies/utils/extension.js b/packages/fcl/src/current-user/exec-service/strategies/utils/extension.js
@@ -10,18 +10,22 @@ export function extension(service, opts = {}) {
   const onReady = opts.onReady || noop
   const onResponse = opts.onResponse || noop
 
-  window.addEventListener(
-    "message",
-    buildMessageHandler({close, send, onReady, onResponse, onMessage})
-  )
+  const handler = buildMessageHandler({
+    close,
+    send,
+    onReady,
+    onResponse,
+    onMessage,
+  })
+  window.addEventListener("message", handler)
 
   send({service})
 
   return {send, close}
 
   function close() {
     try {
-      window.removeEventListener("message", buildMessageHandler)
+      window.removeEventListener("message", handler)
       onClose()
     } catch (error) {
       console.error("Ext Close Error", error)

diff --git a/packages/fcl/src/current-user/exec-service/strategies/utils/fetch-service.js b/packages/fcl/src/current-user/exec-service/strategies/utils/fetch-service.js
@@ -15,5 +15,5 @@ export function fetchService(service, opts = {}) {
       "Content-Type": "application/json",
     },
     body: body,
-  }).then((d) => d.json())
+  }).then(d => d.json())
 }
diff --git a/packages/fcl/src/current-user/exec-service/strategies/utils/frame.js b/packages/fcl/src/current-user/exec-service/strategies/utils/frame.js
@@ -12,16 +12,21 @@ export function frame(service, opts = {}) {
   const onReady = opts.onReady || noop
   const onResponse = opts.onResponse || noop
 
-  window.addEventListener(
-    "message",
-    buildMessageHandler({close, send, onReady, onResponse, onMessage})
-  )
+  const handler = buildMessageHandler({
+    close,
+    send,
+    onReady,
+    onResponse,
+    onMessage,
+  })
+  window.addEventListener("message", handler)
+
   const [$frame, unmount] = renderFrame(serviceEndpoint(service))
   return {send, close}
 
   function close() {
     try {
-      window.removeEventListener("message", buildMessageHandler)
+      window.removeEventListener("message", handler)
       unmount()
       onClose()
     } catch (error) {