Skip to content

Commit

Permalink
Merge pull request #749 from magiclabs/hcote-update-intermediary-types
Browse files Browse the repository at this point in the history 
update intermediary types
  • Loading branch information
@hcote
hcote authored Jun 7, 2024
2 parents e9fe1b5 + ddc1f1c commit e88f396
Show file tree
Hide file tree
Showing 3 changed files with 71 additions and 50 deletions.
5 changes: 4 additions & 1 deletion packages/@magic-sdk/types/src/modules/intermediary-types.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import {
UpdateEmailEventEmit,
UpdateEmailEventOnReceived,
} from './auth-types';
import { NftCheckoutIntermediaryEvents } from './nft-types';

import { WalletEventOnReceived } from './wallet-types';

Expand All @@ -32,4 +33,6 @@ export type IntermediaryEvents =
| `${UpdateEmailEventEmit}`
// Auth Events
| `${AuthEventOnReceived}`
| `${WalletEventOnReceived}`;
| `${WalletEventOnReceived}`
// Nft Checkout Events
| `${NftCheckoutIntermediaryEvents}`;
18 changes: 18 additions & 0 deletions packages/@magic-sdk/types/src/modules/nft-types.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,24 @@ export interface NFTCheckoutRequest {

export type NFTCheckoutResponse = NFTResponse;

export type NFTCheckoutEvents = {
disconnect: () => void;
'nft-checkout-initiated': (rawTransaction: string) => void;
};

export enum NftCheckoutIntermediaryEvents {
Success = 'nft-checkout-success',
Failure = 'nft-checkout-failure',
Initiated = 'nft-checkout-initiated',
Disconnect = 'disconnect',
}

export type NftCheckoutEventHandler = {
[NftCheckoutIntermediaryEvents.Initiated]: (rawTransaction: string) => void;
[NftCheckoutIntermediaryEvents.Success]: (signedTransaction: string) => void;
[NftCheckoutIntermediaryEvents.Failure]: () => void;
};

export interface NFTTransferRequest {
tokenId: string;
contractAddress: string;
Expand Down
98 changes: 49 additions & 49 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2045,7 +2045,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "@magic-ext/algorand@workspace:packages/@magic-ext/algorand"
dependencies:
"@magic-sdk/commons": ^24.0.3
"@magic-sdk/commons": ^24.0.4
languageName: unknown
linkType: soft

Expand All @@ -2054,8 +2054,8 @@ __metadata:
resolution: "@magic-ext/aptos@workspace:packages/@magic-ext/aptos"
dependencies:
"@aptos-labs/wallet-adapter-core": ^2.2.0
"@magic-sdk/commons": ^24.0.3
"@magic-sdk/provider": ^28.0.3
"@magic-sdk/commons": ^24.0.4
"@magic-sdk/provider": ^28.0.4
aptos: ^1.8.5
peerDependencies:
"@aptos-labs/wallet-adapter-core": ^2.2.0
Expand All @@ -2067,47 +2067,47 @@ __metadata:
version: 0.0.0-use.local
resolution: "@magic-ext/avalanche@workspace:packages/@magic-ext/avalanche"
dependencies:
"@magic-sdk/commons": ^24.0.3
"@magic-sdk/commons": ^24.0.4
languageName: unknown
linkType: soft

"@magic-ext/bitcoin@workspace:packages/@magic-ext/bitcoin":
version: 0.0.0-use.local
resolution: "@magic-ext/bitcoin@workspace:packages/@magic-ext/bitcoin"
dependencies:
"@magic-sdk/commons": ^24.0.3
"@magic-sdk/commons": ^24.0.4
languageName: unknown
linkType: soft

"@magic-ext/conflux@workspace:packages/@magic-ext/conflux":
version: 0.0.0-use.local
resolution: "@magic-ext/conflux@workspace:packages/@magic-ext/conflux"
dependencies:
"@magic-sdk/commons": ^24.0.3
"@magic-sdk/commons": ^24.0.4
languageName: unknown
linkType: soft

"@magic-ext/cosmos@workspace:packages/@magic-ext/cosmos":
version: 0.0.0-use.local
resolution: "@magic-ext/cosmos@workspace:packages/@magic-ext/cosmos"
dependencies:
"@magic-sdk/commons": ^24.0.3
"@magic-sdk/commons": ^24.0.4
languageName: unknown
linkType: soft

"@magic-ext/ed25519@workspace:packages/@magic-ext/ed25519":
version: 0.0.0-use.local
resolution: "@magic-ext/ed25519@workspace:packages/@magic-ext/ed25519"
dependencies:
"@magic-sdk/commons": ^24.0.3
"@magic-sdk/commons": ^24.0.4
languageName: unknown
linkType: soft

"@magic-ext/flow@workspace:packages/@magic-ext/flow":
version: 0.0.0-use.local
resolution: "@magic-ext/flow@workspace:packages/@magic-ext/flow"
dependencies:
"@magic-sdk/commons": ^24.0.3
"@magic-sdk/commons": ^24.0.4
"@onflow/fcl": ^1.4.1
"@onflow/types": ^1.1.0
peerDependencies:
Expand All @@ -2120,8 +2120,8 @@ __metadata:
version: 0.0.0-use.local
resolution: "@magic-ext/gdkms@workspace:packages/@magic-ext/gdkms"
dependencies:
"@magic-sdk/commons": ^24.0.3
"@magic-sdk/types": ^24.0.2
"@magic-sdk/commons": ^24.0.4
"@magic-sdk/types": ^24.0.3
"@peculiar/webcrypto": ^1.4.3
languageName: unknown
linkType: soft
Expand All @@ -2130,7 +2130,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "@magic-ext/harmony@workspace:packages/@magic-ext/harmony"
dependencies:
"@magic-sdk/commons": ^24.0.3
"@magic-sdk/commons": ^24.0.4
languageName: unknown
linkType: soft

Expand All @@ -2148,33 +2148,33 @@ __metadata:
version: 0.0.0-use.local
resolution: "@magic-ext/icon@workspace:packages/@magic-ext/icon"
dependencies:
"@magic-sdk/commons": ^24.0.3
"@magic-sdk/commons": ^24.0.4
languageName: unknown
linkType: soft

"@magic-ext/near@workspace:packages/@magic-ext/near":
version: 0.0.0-use.local
resolution: "@magic-ext/near@workspace:packages/@magic-ext/near"
dependencies:
"@magic-sdk/commons": ^24.0.3
"@magic-sdk/commons": ^24.0.4
languageName: unknown
linkType: soft

"@magic-ext/oauth2@workspace:packages/@magic-ext/oauth2":
version: 0.0.0-use.local
resolution: "@magic-ext/oauth2@workspace:packages/@magic-ext/oauth2"
dependencies:
"@magic-sdk/commons": ^24.0.3
"@magic-sdk/commons": ^24.0.4
"@types/crypto-js": ~3.1.47
crypto-js: ^3.3.0
languageName: unknown
linkType: soft

"@magic-ext/oauth@^22.0.4, @magic-ext/oauth@workspace:packages/@magic-ext/oauth":
"@magic-ext/oauth@^22.0.5, @magic-ext/oauth@workspace:packages/@magic-ext/oauth":
version: 0.0.0-use.local
resolution: "@magic-ext/oauth@workspace:packages/@magic-ext/oauth"
dependencies:
"@magic-sdk/commons": ^24.0.3
"@magic-sdk/commons": ^24.0.4
"@types/crypto-js": ~3.1.47
crypto-js: ^3.3.0
languageName: unknown
Expand All @@ -2184,24 +2184,24 @@ __metadata:
version: 0.0.0-use.local
resolution: "@magic-ext/oidc@workspace:packages/@magic-ext/oidc"
dependencies:
"@magic-sdk/commons": ^24.0.3
"@magic-sdk/commons": ^24.0.4
languageName: unknown
linkType: soft

"@magic-ext/polkadot@workspace:packages/@magic-ext/polkadot":
version: 0.0.0-use.local
resolution: "@magic-ext/polkadot@workspace:packages/@magic-ext/polkadot"
dependencies:
"@magic-sdk/commons": ^24.0.3
"@magic-sdk/commons": ^24.0.4
languageName: unknown
linkType: soft

"@magic-ext/react-native-bare-oauth@workspace:packages/@magic-ext/react-native-bare-oauth":
version: 0.0.0-use.local
resolution: "@magic-ext/react-native-bare-oauth@workspace:packages/@magic-ext/react-native-bare-oauth"
dependencies:
"@magic-sdk/react-native-bare": ^29.0.3
"@magic-sdk/types": ^24.0.2
"@magic-sdk/react-native-bare": ^29.0.4
"@magic-sdk/types": ^24.0.3
"@types/crypto-js": ~3.1.47
crypto-js: ^3.3.0
react-native-device-info: ^10.3.0
Expand All @@ -2216,7 +2216,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "@magic-ext/react-native-expo-oauth@workspace:packages/@magic-ext/react-native-expo-oauth"
dependencies:
"@magic-sdk/react-native-expo": ^29.0.3
"@magic-sdk/react-native-expo": ^29.0.4
"@magic-sdk/types": ^10.0.0
"@types/crypto-js": ~3.1.47
crypto-js: ^3.3.0
Expand All @@ -2231,7 +2231,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "@magic-ext/solana@workspace:packages/@magic-ext/solana"
dependencies:
"@magic-sdk/commons": ^24.0.3
"@magic-sdk/commons": ^24.0.4
"@solana/web3.js": ^1.87.2
peerDependencies:
"@solana/web3.js": ^1.87.2
Expand All @@ -2242,56 +2242,56 @@ __metadata:
version: 0.0.0-use.local
resolution: "@magic-ext/sui@workspace:packages/@magic-ext/sui"
dependencies:
"@magic-sdk/commons": ^24.0.3
"@magic-sdk/commons": ^24.0.4
languageName: unknown
linkType: soft

"@magic-ext/taquito@workspace:packages/@magic-ext/taquito":
version: 0.0.0-use.local
resolution: "@magic-ext/taquito@workspace:packages/@magic-ext/taquito"
dependencies:
"@magic-sdk/commons": ^24.0.3
"@magic-sdk/commons": ^24.0.4
languageName: unknown
linkType: soft

"@magic-ext/terra@workspace:packages/@magic-ext/terra":
version: 0.0.0-use.local
resolution: "@magic-ext/terra@workspace:packages/@magic-ext/terra"
dependencies:
"@magic-sdk/commons": ^24.0.3
"@magic-sdk/commons": ^24.0.4
languageName: unknown
linkType: soft

"@magic-ext/tezos@workspace:packages/@magic-ext/tezos":
version: 0.0.0-use.local
resolution: "@magic-ext/tezos@workspace:packages/@magic-ext/tezos"
dependencies:
"@magic-sdk/commons": ^24.0.3
"@magic-sdk/commons": ^24.0.4
languageName: unknown
linkType: soft

"@magic-ext/webauthn@workspace:packages/@magic-ext/webauthn":
version: 0.0.0-use.local
resolution: "@magic-ext/webauthn@workspace:packages/@magic-ext/webauthn"
dependencies:
"@magic-sdk/commons": ^24.0.3
"@magic-sdk/commons": ^24.0.4
languageName: unknown
linkType: soft

"@magic-ext/zilliqa@workspace:packages/@magic-ext/zilliqa":
version: 0.0.0-use.local
resolution: "@magic-ext/zilliqa@workspace:packages/@magic-ext/zilliqa"
dependencies:
"@magic-sdk/commons": ^24.0.3
"@magic-sdk/commons": ^24.0.4
languageName: unknown
linkType: soft

"@magic-sdk/commons@^24.0.3, @magic-sdk/commons@workspace:packages/@magic-sdk/commons":
"@magic-sdk/commons@^24.0.4, @magic-sdk/commons@workspace:packages/@magic-sdk/commons":
version: 0.0.0-use.local
resolution: "@magic-sdk/commons@workspace:packages/@magic-sdk/commons"
dependencies:
"@magic-sdk/provider": ^28.0.3
"@magic-sdk/types": ^24.0.2
"@magic-sdk/provider": ^28.0.4
"@magic-sdk/types": ^24.0.3
peerDependencies:
"@magic-sdk/provider": ">=18.6.0"
"@magic-sdk/types": ">=15.8.0"
Expand All @@ -2315,17 +2315,17 @@ __metadata:
"@babel/core": ^7.9.6
"@babel/plugin-proposal-optional-chaining": ^7.9.0
"@babel/runtime": ^7.9.6
"@magic-ext/oauth": ^22.0.4
magic-sdk: ^28.0.4
"@magic-ext/oauth": ^22.0.5
magic-sdk: ^28.0.5
languageName: unknown
linkType: soft

"@magic-sdk/provider@^28.0.3, @magic-sdk/provider@workspace:packages/@magic-sdk/provider":
"@magic-sdk/provider@^28.0.4, @magic-sdk/provider@workspace:packages/@magic-sdk/provider":
version: 0.0.0-use.local
resolution: "@magic-sdk/provider@workspace:packages/@magic-sdk/provider"
dependencies:
"@babel/plugin-transform-modules-commonjs": ^7.9.6
"@magic-sdk/types": ^24.0.2
"@magic-sdk/types": ^24.0.3
"@peculiar/webcrypto": ^1.1.7
eventemitter3: ^4.0.4
localforage: ^1.7.4
Expand All @@ -2337,17 +2337,17 @@ __metadata:
languageName: unknown
linkType: soft

"@magic-sdk/react-native-bare@^29.0.3, @magic-sdk/react-native-bare@workspace:packages/@magic-sdk/react-native-bare":
"@magic-sdk/react-native-bare@^29.0.4, @magic-sdk/react-native-bare@workspace:packages/@magic-sdk/react-native-bare":
version: 0.0.0-use.local
resolution: "@magic-sdk/react-native-bare@workspace:packages/@magic-sdk/react-native-bare"
dependencies:
"@aveq-research/localforage-asyncstorage-driver": ^3.0.1
"@babel/core": ^7.15.0
"@babel/plugin-transform-flow-strip-types": ^7.14.5
"@babel/runtime": ~7.10.4
"@magic-sdk/commons": ^24.0.3
"@magic-sdk/provider": ^28.0.3
"@magic-sdk/types": ^24.0.2
"@magic-sdk/commons": ^24.0.4
"@magic-sdk/provider": ^28.0.4
"@magic-sdk/types": ^24.0.3
"@react-native-async-storage/async-storage": ^1.15.5
"@react-native-community/netinfo": ">11.0.0"
"@testing-library/react-native": ^12.4.0
Expand Down Expand Up @@ -2377,17 +2377,17 @@ __metadata:
languageName: unknown
linkType: soft

"@magic-sdk/react-native-expo@^29.0.3, @magic-sdk/react-native-expo@workspace:packages/@magic-sdk/react-native-expo":
"@magic-sdk/react-native-expo@^29.0.4, @magic-sdk/react-native-expo@workspace:packages/@magic-sdk/react-native-expo":
version: 0.0.0-use.local
resolution: "@magic-sdk/react-native-expo@workspace:packages/@magic-sdk/react-native-expo"
dependencies:
"@aveq-research/localforage-asyncstorage-driver": ^3.0.1
"@babel/core": ^7.15.0
"@babel/plugin-transform-flow-strip-types": ^7.14.5
"@babel/runtime": ~7.10.4
"@magic-sdk/commons": ^24.0.3
"@magic-sdk/provider": ^28.0.3
"@magic-sdk/types": ^24.0.2
"@magic-sdk/commons": ^24.0.4
"@magic-sdk/provider": ^28.0.4
"@magic-sdk/types": ^24.0.3
"@react-native-async-storage/async-storage": ^1.15.5
"@react-native-community/netinfo": ">11.0.0"
"@testing-library/react-native": ^12.4.0
Expand Down Expand Up @@ -2417,7 +2417,7 @@ __metadata:
languageName: unknown
linkType: soft

"@magic-sdk/types@^24.0.2, @magic-sdk/types@workspace:packages/@magic-sdk/types":
"@magic-sdk/types@^24.0.3, @magic-sdk/types@workspace:packages/@magic-sdk/types":
version: 0.0.0-use.local
resolution: "@magic-sdk/types@workspace:packages/@magic-sdk/types"
languageName: unknown
Expand Down Expand Up @@ -12762,16 +12762,16 @@ fsevents@^2.3.2:
languageName: unknown
linkType: soft

"magic-sdk@^28.0.4, magic-sdk@workspace:packages/magic-sdk":
"magic-sdk@^28.0.5, magic-sdk@workspace:packages/magic-sdk":
version: 0.0.0-use.local
resolution: "magic-sdk@workspace:packages/magic-sdk"
dependencies:
"@babel/core": ^7.9.6
"@babel/plugin-proposal-optional-chaining": ^7.9.0
"@babel/runtime": ^7.9.6
"@magic-sdk/commons": ^24.0.3
"@magic-sdk/provider": ^28.0.3
"@magic-sdk/types": ^24.0.2
"@magic-sdk/commons": ^24.0.4
"@magic-sdk/provider": ^28.0.4
"@magic-sdk/types": ^24.0.3
localforage: ^1.7.4
localforage-driver-memory: ^1.0.5
languageName: unknown
Expand Down

0 comments on commit e88f396

Please sign in to comment.