PKG -- [sdk] Allow for integer string acct.keyId in authorization function

.changeset/grumpy-cats-flash.md

@@ -0,0 +1,5 @@
+---
+"@onflow/sdk": patch
+---
+
+Allow for integer string account.keyId in authorization function

packages/sdk/src/interaction/interaction.js

@@ -138,6 +138,16 @@ const makeIx = wat => ix => {
   return Ok(ix)
 }
 
+const prepAccountKeyId = acct => {
+  if (acct.keyId == null || acct.keyId == undefined) return acct
+
+  invariant(!isNaN(parseInt(acct.keyId)), "account.keyId must be an integer")
+  return {
+    ...acct,
+    keyId: parseInt(acct.keyId),
+  }
+}
+
 export const prepAccount = (acct, opts = {}) => ix => {
   invariant(
     typeof acct === "function" || typeof acct === "object",
@@ -149,9 +159,19 @@ export const prepAccount = (acct, opts = {}) => ix => {
   const role = opts.role
   const tempId = uuid()
 
-  if (acct.authorization && isFn(acct.authorization)) acct = {resolve: acct.authorization}
+  if (acct.authorization && isFn(acct.authorization))
+    acct = {resolve: acct.authorization}
   if (!acct.authorization && isFn(acct)) acct = {resolve: acct}
 
+  const resolve = acct.resolve
+  if (resolve)
+    acct.resolve = async acct =>
+      await [resolve, prepAccountKeyId].reduce(
+        async (d, fn) => fn(await d),
+        acct
+      )
+  acct = prepAccountKeyId(acct)
+
   ix.accounts[tempId] = {
     ...ACCOUNT,
     tempId,
@@ -184,7 +204,9 @@ export const makeArgument = arg => ix => {
   ix.arguments[tempId].asArgument = arg.asArgument
   ix.arguments[tempId].xform = arg.xform
   ix.arguments[tempId].resolve = arg.resolve
-  ix.arguments[tempId].resolveArgument = isFn(arg.resolveArgument) ? arg.resolveArgument.bind(arg) : arg.resolveArgument
+  ix.arguments[tempId].resolveArgument = isFn(arg.resolveArgument)
+    ? arg.resolveArgument.bind(arg)
+    : arg.resolveArgument
 
   return Ok(ix)
 }

packages/sdk/src/interaction/interaction.test.js

@@ -1,3 +1,42 @@
-test("placeholder", () => {
-    expect(1).toBe(1)
-})
+import {resolveAccounts} from "../sdk"
+import {prepAccount} from "./interaction"
+
+describe("prepAccount", () => {
+  test("prepAccount converts account object keyId to integer", async () => {
+    const keyId = "1"
+    const acct = {
+      addr: "f8d6e0586b0a20c7",
+      keyId,
+      signingFunction: () => ({
+        addr: "f8d6e0586b0a20c7",
+        signature: "abc123",
+      }),
+    }
+
+    const ix = prepAccount(acct, {role: "proposer"})({accounts: {}})
+    expect(ix.accounts[ix.proposer].keyId).toBe(parseInt(keyId))
+  })
+
+  test("prepAccount converts authorization function keyId to integer", async () => {
+    const keyId = "1"
+    const authz = acct => {
+      return {
+        ...acct,
+        addr: "f8d6e0586b0a20c7",
+        keyId,
+        signingFunction: () => ({
+          addr: "f8d6e0586b0a20c7",
+          signature: "abc123",
+        }),
+      }
+    }
+
+    const ix = await resolveAccounts(
+      prepAccount(authz, {role: "proposer"})({
+        accounts: {},
+      })
+    )
+    ix.accounts[ix.proposer] = await ix.accounts[ix.proposer].resolve()
+    expect(ix.accounts[ix.proposer].keyId).toBe(parseInt(keyId))
+  })
+})