Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PKG -- [sdk] TS voucher #1803

Merged
Merged
Changes from 1 commit
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
b4b3bcc
Nialexsan/add types (#1710)
nialexsan Aug 4, 2023
9fca84a
Implement typescript for several branches & adjust configuration (#1750)
jribbink Aug 15, 2023
81d4b40
Convert @onflow/types to TS (#1760)
jribbink Aug 25, 2023
0960cdc
PKG -- [util-actor] Enhance TS support (#1761)
jribbink Sep 1, 2023
9554e0b
PKG -- [types] Simplify generics for @onflow/types (#1772)
jribbink Sep 8, 2023
6b81c1f
PKG -- [config] Convert @onflow/config to TS (#1731)
jribbink Sep 12, 2023
60d4b35
Fix JSDoc type generation (#1780)
jribbink Sep 14, 2023
86ce9f7
restore changeset
nialexsan Nov 1, 2023
a381814
align packages
nialexsan Nov 1, 2023
ac4e161
pre typescript
nialexsan Nov 1, 2023
04bd73e
any type for config
nialexsan Nov 1, 2023
da3bc15
update package lock
nialexsan Nov 1, 2023
df3dbac
PKG -- [util-encode-key] eslint ts config
nialexsan Aug 9, 2023
e04367c
more ts
nialexsan Aug 15, 2023
869ab99
move interaction types
nialexsan Aug 25, 2023
d1d5e5e
fix types
nialexsan Aug 25, 2023
dbf6bf8
more types
nialexsan Aug 25, 2023
0d47959
authz types
nialexsan Aug 25, 2023
fbb91f7
fix export
nialexsan Aug 25, 2023
6c4ecba
fix imports
nialexsan Aug 25, 2023
ac04e6b
fixed tests
nialexsan Aug 25, 2023
8662e4a
fix paths
nialexsan Aug 26, 2023
9783a33
fix path
nialexsan Aug 26, 2023
e111013
fix some tests
nialexsan Aug 30, 2023
503aded
clean console log
nialexsan Sep 12, 2023
7c28b15
fix logic
nialexsan Sep 12, 2023
3ce27e2
addressing PR comments
nialexsan Sep 25, 2023
3aca2d3
fix build arguments
nialexsan Sep 25, 2023
79a34d5
shallow copy acct
nialexsan Sep 25, 2023
31b7122
convert encode
nialexsan Sep 13, 2023
1050275
fix references
nialexsan Sep 13, 2023
bd2a320
revert changes
nialexsan Sep 13, 2023
eb422ea
ts resolve signature
nialexsan Sep 13, 2023
9313eff
fix resolve accounts and interaction types
nialexsan Nov 2, 2023
b73afdf
fixed types
nialexsan Nov 2, 2023
ffe5d30
fix path to interactions
nialexsan Nov 2, 2023
fa3db8c
Merge remote-tracking branch 'origin/master' into nialexsan/ts-conver…
nialexsan Nov 7, 2023
1921cbf
revert changes to changelogs
nialexsan Nov 7, 2023
8980a9e
Merge branch 'nialexsan/ts-conversion-fixed-merge-conflicts' into nia…
nialexsan Nov 7, 2023
cb56493
fix types for resolve-accounts
nialexsan Nov 8, 2023
e0d0d5d
Merge branch 'master' into nialexsan/ts-conversion-fixed-merge-conflicts
nialexsan Nov 8, 2023
29e7af0
Merge branch 'nialexsan/ts-conversion-fixed-merge-conflicts' into nia…
nialexsan Nov 9, 2023
03600db
Merge remote-tracking branch 'origin/master' into nialexsan/ts-conver…
nialexsan Nov 16, 2023
103a4ff
address comments
nialexsan Nov 27, 2023
e50b20d
changeset
nialexsan Nov 27, 2023
1a7a8ae
Merge remote-tracking branch 'origin/nialexsan/ts-conversion-fixed-me…
nialexsan Nov 27, 2023
3d70a23
Merge remote-tracking branch 'origin/master' into nialexsan/ts-conver…
nialexsan Nov 27, 2023
452e6f7
more descriptive names
nialexsan Nov 27, 2023
d2fceef
PKG -- [sdk] rename interfaces
nialexsan Nov 29, 2023
ba1dd47
PKG -- [typedefs] fix merge conflict
nialexsan Nov 29, 2023
7fb02aa
PKG -- [typedefs] fix merge conflicts
nialexsan Nov 29, 2023
9a5d701
Merge remote-tracking branch 'origin/master' into nialexsan/ts-conver…
nialexsan Nov 29, 2023
cbd92f2
PKG -- [sdk] fix interface imports
nialexsan Nov 29, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix paths
nialexsan committed Nov 2, 2023
commit 8662e4ab9a2203af7088790b3b652d8c0d3c1c58
18 changes: 9 additions & 9 deletions packages/sdk/src/resolve/resolve-cadence.test.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {interaction, pipe, put, makeScript} from "../interaction/interaction"
import {initInteraction, pipe, put, makeScript} from "../interaction/interaction"
import {resolveCadence} from "./resolve-cadence.js"
import {config} from "@onflow/config"

@@ -13,7 +13,7 @@ describe("resolveCadence", () => {
makeScript,
put("ix.cadence", CADENCE),
resolveCadence,
])(interaction())
])(initInteraction())

expect(ix.message.cadence).toBe(CADENCE)
})
@@ -27,7 +27,7 @@ describe("resolveCadence", () => {
makeScript,
put("ix.cadence", CADENCE),
resolveCadence,
])(interaction())
])(initInteraction())

expect(ix.message.cadence).toBe(await CADENCE())
})
@@ -59,7 +59,7 @@ describe("resolveCadence", () => {
makeScript,
put("ix.cadence", CADENCE),
resolveCadence,
])(interaction())
])(initInteraction())

expect(ix.message.cadence).toEqual(await RESULT())
})
@@ -111,7 +111,7 @@ describe("resolveCadence", () => {
makeScript,
put("ix.cadence", CADENCE),
resolveCadence,
])(interaction())
])(initInteraction())

expect(ix.message.cadence).toEqual(await RESULT())
})
@@ -138,7 +138,7 @@ pub fun main(): Address {
makeScript,
put("ix.cadence", CADENCE),
resolveCadence,
])(interaction())
])(initInteraction())

expect(ix.message.cadence).toEqual(expected)
})
@@ -165,7 +165,7 @@ pub fun main(): Address {
makeScript,
put("ix.cadence", CADENCE),
resolveCadence,
])(interaction())
])(initInteraction())

expect(ix.message.cadence).toEqual(expected)
})
@@ -193,7 +193,7 @@ pub fun main(): Address {
makeScript,
put("ix.cadence", CADENCE),
resolveCadence,
])(interaction())
])(initInteraction())

expect(ix.message.cadence).toEqual(expected)
})
@@ -218,7 +218,7 @@ pub fun main(): Address {
makeScript,
put("ix.cadence", CADENCE),
resolveCadence,
])(interaction())
])(initInteraction())

expect(ix.message.cadence).toEqual(expected)
})
6 changes: 3 additions & 3 deletions packages/sdk/src/resolve/resolve-compute-limit.test.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {interaction, pipe, makeTransaction} from "../interaction/interaction"
import {initInteraction, pipe, makeTransaction} from "../interaction/interaction"
import {config} from "@onflow/config"
import {resolveComputeLimit} from "./resolve-compute-limit.js"

@@ -21,7 +21,7 @@ describe("resolveComputeLimit", () => {
},
}),
resolveComputeLimit,
])(interaction())
])(initInteraction())

expect(ix.message.computeLimit).toBe(TRANSACTION_COMPUTE_LIMIT)
}
@@ -36,7 +36,7 @@ describe("resolveComputeLimit", () => {
},
async () => {
const ix = await pipe([makeTransaction, resolveComputeLimit])(
interaction()
initInteraction()
)
expect(ix.message.computeLimit).toBe(CONFIG_COMPUTE_LIMIT)
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {isTransaction, Ok} from "../interaction/interaction"
import * as ixModule from "../interaction/interaction"
import {response as responseModule} from "../response/response.js"
import {response as responseModule} from "../response/response"
import {config} from "@onflow/config"
import {decodeResponse} from "../decode/decode.js"
import {getAccount} from "../build/build-get-account.js"
2 changes: 1 addition & 1 deletion packages/sdk/src/resolve/resolve-ref-block-id.js
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ import {
pipe,
} from "../interaction/interaction"
import * as ixModule from "../interaction/interaction"
import {response} from "../response/response.js"
import {response} from "../response/response"
import {config} from "@onflow/config"
import {decodeResponse} from "../decode/decode.js"
import {getBlock} from "../build/build-get-block.js"
2 changes: 1 addition & 1 deletion packages/sdk/src/resolve/resolve.js
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ import {invariant} from "@onflow/util-invariant"
import {Buffer} from "@onflow/rlp"
import {send as defaultSend} from "@onflow/transport-http"
import * as ixModule from "../interaction/interaction"
import {response} from "../response/response.js"
import {response} from "../response/response"
import {build} from "../build/build.js"
import {getBlock} from "../build/build-get-block.js"
import {getAccount} from "../build/build-get-account.js"
2 changes: 1 addition & 1 deletion packages/sdk/src/sdk.ts
Original file line number Diff line number Diff line change
@@ -75,7 +75,7 @@ export {resolveFinalNormalization} from "./resolve/resolve-final-normalization"
export {resolveProposerSequenceNumber} from "./resolve/resolve-proposer-sequence-number"
export {resolveArguments} from "./resolve/resolve-arguments.js"
export {resolveAccounts} from "./resolve/resolve-accounts.js"
export {response} from "./response/response.js"
export {response} from "./response/response"
export {resolveSignatures} from "./resolve/resolve-signatures.js"
export {resolveValidators} from "./resolve/resolve-validators.js"
export {resolveRefBlockId} from "./resolve/resolve-ref-block-id.js"
2 changes: 1 addition & 1 deletion packages/sdk/src/send/send.js
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ import {send as defaultSend} from "@onflow/transport-http"
import {initInteraction, pipe} from "../interaction/interaction"
import * as ixModule from "../interaction/interaction"
import {invariant} from "../build/build-invariant.js"
import {response} from "../response/response.js"
import {response} from "../response/response"
import {config} from "@onflow/config"
import {resolve as defaultResolve} from "../resolve/resolve.js"

4 changes: 2 additions & 2 deletions packages/transport-http/src/sdk-send-http.ts
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@ export {sendGetCollection} from "./send-get-collection.js"
export {sendGetEvents} from "./send-get-events.js"
export {sendGetTransaction} from "./send-get-transaction.js"
export {sendGetTransactionStatus} from "./send-get-transaction-status.js"
export {sendPing} from "./send-ping.js"
export {sendPing} from "./send-ping"
export {sendTransaction} from "./send-transaction.js"
export {sendGetNetworkParameters} from "./send-get-network-parameters.js"
export {send} from "./send-http.js"
export {send} from "./send-http"
2 changes: 1 addition & 1 deletion packages/transport-http/src/send-ping.test.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {sendPing} from "./send-ping.js"
import {sendPing} from "./send-ping"
import {Buffer} from "@onflow/rlp"
import {build, ping, resolve, response as responseADT} from "@onflow/sdk"