PKG -- [fcl-core] Remove unnecessary config overload (#1911)

onflow · Jun 14, 2024 · 6ca1353 · 6ca1353
1 parent e547e66
commit 6ca1353
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 110 deletions.
diff --git a/.changeset/spicy-meals-explode.md b/.changeset/spicy-meals-explode.md
@@ -0,0 +1,5 @@
+---
+"@onflow/fcl-core": patch
+---
+
+Remove unnecessary config.overload call in query/mutate functions (causes unnecessary WalletConnect errors to show in console)
diff --git a/packages/fcl-core/src/exec/mutate.js b/packages/fcl-core/src/exec/mutate.js
@@ -63,25 +63,24 @@ export const getMutate = ({platform}) => {
       // prettier-ignore
       const authz = await sdk.config().get("fcl.authz", currentUser().authorization)
 
-      txid = sdk.config().overload(opts.dependencies || {}, async () =>
-        // prettier-ignore
-        sdk.send([
-        sdk.transaction(opts.cadence),
+      txid = sdk
+        .send([
+          sdk.transaction(opts.cadence),
 
-        sdk.args(normalizeArgs(opts.args || [])),
+          sdk.args(normalizeArgs(opts.args || [])),
 
-        opts.limit && isNumber(opts.limit) && sdk.limit(opts.limit),
+          opts.limit && isNumber(opts.limit) && sdk.limit(opts.limit),
 
-        // opts.proposer > opts.authz > authz
-        sdk.proposer(opts.proposer || opts.authz || authz),
+          // opts.proposer > opts.authz > authz
+          sdk.proposer(opts.proposer || opts.authz || authz),
 
-        // opts.payer > opts.authz > authz
-        sdk.payer(opts.payer || opts.authz || authz),
+          // opts.payer > opts.authz > authz
+          sdk.payer(opts.payer || opts.authz || authz),
 
-        // opts.authorizations > [opts.authz > authz]
-        sdk.authorizations(opts.authorizations || [opts.authz || authz]),
-      ]).then(sdk.decode)
-      )
+          // opts.authorizations > [opts.authz > authz]
+          sdk.authorizations(opts.authorizations || [opts.authz || authz]),
+        ])
+        .then(sdk.decode)
 
       return txid
     } catch (error) {

diff --git a/packages/fcl-core/src/exec/query.js b/packages/fcl-core/src/exec/query.js
@@ -35,12 +35,11 @@ export async function query(opts = {}) {
   await preQuery(opts)
   opts = await prepTemplateOpts(opts)
 
-  return sdk.config().overload(opts.dependencies || {}, async () =>
-    // prettier-ignore
-    sdk.send([
+  return sdk
+    .send([
       sdk.script(opts.cadence),
       sdk.args(normalizeArgs(opts.args || [])),
-      opts.limit && typeof opts.limit === "number" && sdk.limit(opts.limit)
-    ]).then(sdk.decode)
-  )
+      opts.limit && typeof opts.limit === "number" && sdk.limit(opts.limit),
+    ])
+    .then(sdk.decode)
 }
diff --git a/packages/fcl-core/src/exec/utils/derive-dependencies.js b/packages/fcl-core/src/exec/utils/derive-dependencies.js
diff --git a/packages/fcl-core/src/exec/utils/prep-template-opts.js b/packages/fcl-core/src/exec/utils/prep-template-opts.js
@@ -1,6 +1,5 @@
 import {retrieve} from "../../document/document.js"
 import {deriveCadenceByNetwork} from "../../interaction-template-utils/derive-cadence-by-network/derive-cadence-by-network.js"
-import {deriveDependencies} from "./derive-dependencies"
 import {isString} from "../../utils/is"
 import {getChainId} from "../../utils"
 
@@ -9,11 +8,6 @@ export async function prepTemplateOpts(opts) {
     opts.template = await retrieve({url: opts?.template})
   }
 
-  let dependencies = {}
-  if (opts?.template) {
-    dependencies = await deriveDependencies({template: opts.template})
-  }
-
   const cadence =
     opts.cadence ||
     (await deriveCadenceByNetwork({
@@ -22,7 +16,6 @@ export async function prepTemplateOpts(opts) {
     }))
 
   opts.cadence = cadence
-  opts.dependencies = dependencies
 
   return opts
 }
diff --git a/packages/fcl-core/src/exec/utils/prep-template-opts.test.js b/packages/fcl-core/src/exec/utils/prep-template-opts.test.js
@@ -47,9 +47,6 @@ describe("Prepare template options for template version 1.0.0", () => {
     expect(resultMainnet.cadence).toEqual(
       "import FungibleToken from 0xf233dcee88fe0abe\n"
     )
-    expect(resultMainnet.dependencies).toEqual({
-      "0xFUNGIBLETOKENADDRESS": "0xf233dcee88fe0abe",
-    })
   })
 
   test("It prepares cadence and dependencies from template version 1.0.0 for testnet", async () => {
@@ -63,9 +60,6 @@ describe("Prepare template options for template version 1.0.0", () => {
     expect(resultTestnet.cadence).toEqual(
       "import FungibleToken from 0x9a0766d93b6608b7\n"
     )
-    expect(resultTestnet.dependencies).toEqual({
-      "0xFUNGIBLETOKENADDRESS": "0x9a0766d93b6608b7",
-    })
   })
 
   test("It fails to prepare cadence and dependencies from template version 1.0.0 for unknown network", async () => {
@@ -161,9 +155,6 @@ describe("Prepare template options for template version 1.1.0", () => {
     expect(resultMainnet.cadence).toEqual(
       "import FungibleToken from 0xf233dcee88fe0abe\n"
     )
-    expect(resultMainnet.dependencies).toEqual({
-      FungibleToken: "0xf233dcee88fe0abe",
-    })
   })
 
   test("It prepares cadence and dependencies from template version 1.1.0 for testnet", async () => {
@@ -177,9 +168,6 @@ describe("Prepare template options for template version 1.1.0", () => {
     expect(resultTestnet.cadence).toEqual(
       "import FungibleToken from 0x9a0766d93b6608b7\n"
     )
-    expect(resultTestnet.dependencies).toEqual({
-      FungibleToken: "0x9a0766d93b6608b7",
-    })
   })
 
   test("It fails to prepare cadence and dependencies from template version 1.1.0 for unknown network", async () => {