Skip to content

Commit

Permalink
feat(core): wallet provider updates (#183)
Browse files Browse the repository at this point in the history
* feat(core): updates to all wallet clients

* test(core): update wallet tests

* chore: minor type changes

* feat: update signTransactions in adapter packages

* feat: update wallet icons

* feat: update Kibisis logo

* chore: update Kibisis logo

* test: add tests for new utility functions

* chore: remove unused utility functions
  • Loading branch information
drichar authored Jun 12, 2024
1 parent 9a7203d commit 1b7720a
Show file tree
Hide file tree
Showing 33 changed files with 3,251 additions and 4,177 deletions.
4 changes: 2 additions & 2 deletions packages/use-wallet-react/src/__tests__/useWallet.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -202,11 +202,11 @@ describe('useWallet', () => {

// Simulate calling signTransactions and transactionSigner
await act(async () => {
await result.current.signTransactions([], [], true)
await result.current.signTransactions([], [])
await result.current.transactionSigner([], [])
})

expect(mocks.signTransactions).toHaveBeenCalledWith([], [], true)
expect(mocks.signTransactions).toHaveBeenCalledWith([], [])
expect(mocks.transactionSigner).toHaveBeenCalledWith([], [])
})

Expand Down
16 changes: 9 additions & 7 deletions packages/use-wallet-react/src/useWallet.ts
Original file line number Diff line number Diff line change
Expand Up @@ -57,18 +57,20 @@ export function useWallet() {
const activeNetwork = useStore(manager.store, (state) => state.activeNetwork)
const setActiveNetwork = manager.setActiveNetwork

const signTransactions = (
txnGroup: algosdk.Transaction[] | algosdk.Transaction[][] | Uint8Array[] | Uint8Array[][],
indexesToSign?: number[],
returnGroup?: boolean
) => {
const signTransactions = <T extends algosdk.Transaction[] | Uint8Array[]>(
txnGroup: T | T[],
indexesToSign?: number[]
): Promise<Uint8Array[]> => {
if (!activeWallet) {
throw new Error('No active wallet')
}
return activeWallet.signTransactions(txnGroup, indexesToSign, returnGroup)
return activeWallet.signTransactions(txnGroup, indexesToSign)
}

const transactionSigner = (txnGroup: algosdk.Transaction[], indexesToSign: number[]) => {
const transactionSigner = (
txnGroup: algosdk.Transaction[],
indexesToSign: number[]
): Promise<Uint8Array[]> => {
if (!activeWallet) {
throw new Error('No active wallet')
}
Expand Down
4 changes: 2 additions & 2 deletions packages/use-wallet-solid/src/__tests__/useWallet.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ const TestComponent = () => {
</button>
<button
data-testid={`sign-transactions-btn-${wallet.id}`}
onClick={() => wallet.signTransactions([], [], true)}
onClick={() => wallet.signTransactions([], [])}
disabled={!isWalletActive(wallet.id)}
>
Sign Transactions
Expand Down Expand Up @@ -386,7 +386,7 @@ describe('useWallet', () => {

const signTransactionsButton = screen.getByTestId('sign-transactions-btn-defly')
fireEvent.click(signTransactionsButton)
expect(mocks.signTransactions).toHaveBeenCalledWith([], [], true)
expect(mocks.signTransactions).toHaveBeenCalledWith([], [])

const transactionSignerButton = screen.getByTestId('transaction-signer-btn-defly')
fireEvent.click(transactionSignerButton)
Expand Down
16 changes: 9 additions & 7 deletions packages/use-wallet-solid/src/useWallet.ts
Original file line number Diff line number Diff line change
Expand Up @@ -66,19 +66,21 @@ export function useWallet() {
// @todo: Not reactive when intDecoding is changed
const algodClient = createMemo(() => manager().algodClient)

const signTransactions = (
txnGroup: algosdk.Transaction[] | algosdk.Transaction[][] | Uint8Array[] | Uint8Array[][],
indexesToSign?: number[],
returnGroup?: boolean
) => {
const signTransactions = <T extends algosdk.Transaction[] | Uint8Array[]>(
txnGroup: T | T[],
indexesToSign?: number[]
): Promise<Uint8Array[]> => {
const wallet = activeWallet()
if (!wallet) {
throw new Error('No active wallet')
}
return wallet.signTransactions(txnGroup, indexesToSign, returnGroup)
return wallet.signTransactions(txnGroup, indexesToSign)
}

const transactionSigner = (txnGroup: algosdk.Transaction[], indexesToSign: number[]) => {
const transactionSigner = (
txnGroup: algosdk.Transaction[],
indexesToSign: number[]
): Promise<Uint8Array[]> => {
const wallet = activeWallet()
if (!wallet) {
throw new Error('No active wallet')
Expand Down
4 changes: 2 additions & 2 deletions packages/use-wallet-vue/src/__tests__/useWallet.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -203,10 +203,10 @@ describe('useWallet', () => {
}))

// Simulate signTransactions and transactionSigner
await signTransactions([], [], true)
await signTransactions([], [])
await transactionSigner([], [])

expect(mocks.signTransactions).toHaveBeenCalledWith([], [], true)
expect(mocks.signTransactions).toHaveBeenCalledWith([], [])
expect(mocks.transactionSigner).toHaveBeenCalledWith([], [])
})

Expand Down
16 changes: 9 additions & 7 deletions packages/use-wallet-vue/src/useWallet.ts
Original file line number Diff line number Diff line change
Expand Up @@ -75,18 +75,20 @@ export function useWallet() {
return activeAccount.value?.address ?? null
})

const signTransactions = (
txnGroup: algosdk.Transaction[] | algosdk.Transaction[][] | Uint8Array[] | Uint8Array[][],
indexesToSign?: number[],
returnGroup?: boolean
) => {
const signTransactions = <T extends algosdk.Transaction[] | Uint8Array[]>(
txnGroup: T | T[],
indexesToSign?: number[]
): Promise<Uint8Array[]> => {
if (!activeWallet.value) {
throw new Error('No active wallet')
}
return activeWallet.value.signTransactions(txnGroup, indexesToSign, returnGroup)
return activeWallet.value.signTransactions(txnGroup, indexesToSign)
}

const transactionSigner = (txnGroup: algosdk.Transaction[], indexesToSign: number[]) => {
const transactionSigner = (
txnGroup: algosdk.Transaction[],
indexesToSign: number[]
): Promise<Uint8Array[]> => {
if (!activeWallet.value) {
throw new Error('No active wallet')
}
Expand Down
1 change: 0 additions & 1 deletion packages/use-wallet/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@
"@walletconnect/modal-core": "^2.6.2",
"@walletconnect/sign-client": "^2.10.2",
"@walletconnect/types": "^2.10.2",
"algo-msgpack-with-bigint": "^2.1.1",
"lute-connect": "^1.2.0",
"magic-sdk": "^28.0.3",
"tsup": "^8.0.0",
Expand Down
Loading

0 comments on commit 1b7720a

Please sign in to comment.