use sdk types

onflow · Dec 17, 2024 · afba192 · afba192
1 parent 0c0e95b
commit afba192
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 10 deletions.
diff --git a/lib/flow/account.ts b/lib/flow/account.ts
@@ -53,7 +53,7 @@ export async function createAccount(
   publicKey: string,
   sigAlgo: number,
   hashAlgo: number,
-  authorization: fcl.Authorization
+  authorization: typeof fcl.authorization
 ) {
   const result = await sendTransaction({
     transaction: txCreateAccount,
@@ -69,7 +69,7 @@ export async function createAccount(
   })
 
   const accountCreatedEvent = result.events.find(
-    (event: fcl.Event) => event.type === accountCreatedEventType
+    event => event.type === accountCreatedEventType
   )
 
   if (!accountCreatedEvent) {

diff --git a/lib/flow/fund.ts b/lib/flow/fund.ts
@@ -90,7 +90,7 @@ export const tokens: Tokens = {
 export async function fundAccount(
   address: string,
   token: TokenType,
-  authorization: fcl.Authorization
+  authorization: typeof fcl.authorization
 ) {
   const addressType = getAddressType(address)
 

diff --git a/lib/flow/index.ts b/lib/flow/index.ts
@@ -5,8 +5,8 @@ import publicConfig from "../publicConfig"
 
 fcl.config().put("accessNode.api", publicConfig.accessAPIHost)
 
-export const getAuthorization = (keyIndex: number): fcl.Authorization => {
-  return async (account = {}) => {
+export const getAuthorization = (keyIndex: number) => {
+  return async (account: {addr?: string} = {}) => {
     return {
       ...account,
       tempId: `${account.addr}-${keyIndex}`,

diff --git a/lib/flow/send.ts b/lib/flow/send.ts
@@ -1,4 +1,5 @@
 import * as fcl from "@onflow/fcl"
+import * as sdk from "@onflow/sdk"
 
 export async function sendTransaction({
   transaction,
@@ -8,10 +9,10 @@ export async function sendTransaction({
   payer,
 }: {
   transaction: string
-  args: fcl.TransactionArg[]
-  proposer: fcl.Authorization
-  authorizations: fcl.Authorization[]
-  payer: fcl.Authorization
+  args: sdk.CadenceArgument<any>[]
+  proposer: typeof fcl.authorization
+  authorizations: (typeof fcl.authorization)[]
+  payer: typeof fcl.authorization
 }) {
   const response = await fcl.send([
     fcl.transaction(transaction),
@@ -30,7 +31,7 @@ export async function sendScript({
   args,
 }: {
   script: string
-  args: fcl.TransactionArg[]
+  args: sdk.CadenceArgument<any>[]
 }) {
   return fcl.send([fcl.script(script), fcl.args(args)]).then(fcl.decode)
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -21,6 +21,7 @@
   "dependencies": {
     "@hcaptcha/react-hcaptcha": "^1.8.1",
     "@onflow/fcl": "^1.13.3",
+    "@onflow/sdk": "^1.5.5",
     "@onflow/types": "^1.4.1",
     "@prisma/client": "^5.2.0",
     "@theme-ui/match-media": "^0.16.2",