Skip to content

Commit

Permalink
Merge pull request #649 from magiclabs/jayhwang-sc-88513-nft-checkout…
Browse files Browse the repository at this point in the history 
…-sdk-parameter-validation

Change NFTCheckoutRequest type
  • Loading branch information
@octave08
octave08 authored Oct 19, 2023
2 parents 2080535 + 900c04e commit aaf70cf
Show file tree
Hide file tree
Showing 2 changed files with 49 additions and 51 deletions.
6 changes: 2 additions & 4 deletions packages/@magic-sdk/types/src/modules/nft-types.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,12 @@ export type NFTPurchaseResponse = NFTResponse & {
export interface NFTCheckoutRequest {
// given by magic / found in the developer dashboard in future
contractId: string;
contractAddress: string;
// in contract, if ERC1155… for ERC721, use token ID = 0
tokenId: string;
name: string;
imageUrl: string;
quantity: number;
// Checkout UI compares against session wallet, if == then show “Magic Wallet”
walletAddress?: string;
quantity?: number; // default is 1
walletAddress?: string; // default is user's wallet address
}

export type NFTCheckoutResponse = NFTResponse;
Expand Down
94 changes: 47 additions & 47 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2817,7 +2817,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "@magic-ext/algorand@workspace:packages/@magic-ext/algorand"
dependencies:
"@magic-sdk/commons": ^17.0.0
"@magic-sdk/commons": ^17.1.0
languageName: unknown
linkType: soft

Expand All @@ -2826,8 +2826,8 @@ __metadata:
resolution: "@magic-ext/aptos@workspace:packages/@magic-ext/aptos"
dependencies:
"@aptos-labs/wallet-adapter-core": ^2.2.0
"@magic-sdk/commons": ^17.0.0
"@magic-sdk/provider": ^21.0.0
"@magic-sdk/commons": ^17.1.0
"@magic-sdk/provider": ^21.1.0
aptos: ^1.8.5
peerDependencies:
"@aptos-labs/wallet-adapter-core": ^2.2.0
Expand All @@ -2839,55 +2839,55 @@ __metadata:
version: 0.0.0-use.local
resolution: "@magic-ext/auth@workspace:packages/@magic-ext/auth"
dependencies:
"@magic-sdk/commons": ^17.0.0
"@magic-sdk/commons": ^17.1.0
languageName: unknown
linkType: soft

"@magic-ext/avalanche@workspace:packages/@magic-ext/avalanche":
version: 0.0.0-use.local
resolution: "@magic-ext/avalanche@workspace:packages/@magic-ext/avalanche"
dependencies:
"@magic-sdk/commons": ^17.0.0
"@magic-sdk/commons": ^17.1.0
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": ^17.0.0
"@magic-sdk/commons": ^17.1.0
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": ^17.0.0
"@magic-sdk/commons": ^17.1.0
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": ^17.0.0
"@magic-sdk/commons": ^17.1.0
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": ^17.0.0
"@magic-sdk/commons": ^17.1.0
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": ^17.0.0
"@magic-sdk/commons": ^17.1.0
"@onflow/fcl": ^1.4.1
"@onflow/types": ^1.1.0
peerDependencies:
Expand All @@ -2900,8 +2900,8 @@ __metadata:
version: 0.0.0-use.local
resolution: "@magic-ext/gdkms@workspace:packages/@magic-ext/gdkms"
dependencies:
"@magic-sdk/commons": ^17.0.0
"@magic-sdk/types": ^17.0.2
"@magic-sdk/commons": ^17.1.0
"@magic-sdk/types": ^17.1.0
"@peculiar/webcrypto": ^1.4.3
languageName: unknown
linkType: soft
Expand All @@ -2910,7 +2910,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "@magic-ext/harmony@workspace:packages/@magic-ext/harmony"
dependencies:
"@magic-sdk/commons": ^17.0.0
"@magic-sdk/commons": ^17.1.0
languageName: unknown
linkType: soft

Expand All @@ -2928,23 +2928,23 @@ __metadata:
version: 0.0.0-use.local
resolution: "@magic-ext/icon@workspace:packages/@magic-ext/icon"
dependencies:
"@magic-sdk/commons": ^17.0.0
"@magic-sdk/commons": ^17.1.0
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": ^17.0.0
"@magic-sdk/commons": ^17.1.0
languageName: unknown
linkType: soft

"@magic-ext/oauth@^15.0.0, @magic-ext/oauth@workspace:packages/@magic-ext/oauth":
"@magic-ext/oauth@^15.1.0, @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": ^17.0.0
"@magic-sdk/commons": ^17.1.0
"@types/crypto-js": ~3.1.47
crypto-js: ^3.3.0
languageName: unknown
Expand All @@ -2954,23 +2954,23 @@ __metadata:
version: 0.0.0-use.local
resolution: "@magic-ext/oidc@workspace:packages/@magic-ext/oidc"
dependencies:
"@magic-sdk/commons": ^17.0.0
"@magic-sdk/commons": ^17.1.0
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": ^17.0.0
"@magic-sdk/commons": ^17.1.0
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": ^22.0.0
"@magic-sdk/react-native-bare": ^22.1.0
"@magic-sdk/types": ^10.0.1
"@types/crypto-js": ~3.1.47
crypto-js: ^3.3.0
Expand All @@ -2986,7 +2986,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": ^22.0.0
"@magic-sdk/react-native-expo": ^22.1.0
"@magic-sdk/types": ^10.0.0
"@types/crypto-js": ~3.1.47
crypto-js: ^3.3.0
Expand All @@ -3001,56 +3001,56 @@ __metadata:
version: 0.0.0-use.local
resolution: "@magic-ext/solana@workspace:packages/@magic-ext/solana"
dependencies:
"@magic-sdk/commons": ^17.0.0
"@magic-sdk/commons": ^17.1.0
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": ^17.0.0
"@magic-sdk/commons": ^17.1.0
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": ^17.0.0
"@magic-sdk/commons": ^17.1.0
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": ^17.0.0
"@magic-sdk/commons": ^17.1.0
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": ^17.0.0
"@magic-sdk/commons": ^17.1.0
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": ^17.0.0
"@magic-sdk/commons": ^17.1.0
languageName: unknown
linkType: soft

"@magic-sdk/commons@^17.0.0, @magic-sdk/commons@workspace:packages/@magic-sdk/commons":
"@magic-sdk/commons@^17.1.0, @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": ^21.0.0
"@magic-sdk/types": ^17.0.2
"@magic-sdk/provider": ^21.1.0
"@magic-sdk/types": ^17.1.0
peerDependencies:
"@magic-sdk/provider": ">=18.6.0"
"@magic-sdk/types": ">=15.8.0"
Expand All @@ -3074,17 +3074,17 @@ __metadata:
"@babel/core": ^7.9.6
"@babel/plugin-proposal-optional-chaining": ^7.9.0
"@babel/runtime": ^7.9.6
"@magic-ext/oauth": ^15.0.0
magic-sdk: ^21.0.0
"@magic-ext/oauth": ^15.1.0
magic-sdk: ^21.1.0
languageName: unknown
linkType: soft

"@magic-sdk/provider@^21.0.0, @magic-sdk/provider@workspace:packages/@magic-sdk/provider":
"@magic-sdk/provider@^21.1.0, @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": ^17.0.2
"@magic-sdk/types": ^17.1.0
"@peculiar/webcrypto": ^1.1.7
eventemitter3: ^4.0.4
localforage: ^1.7.4
Expand All @@ -3096,17 +3096,17 @@ __metadata:
languageName: unknown
linkType: soft

"@magic-sdk/react-native-bare@^22.0.0, @magic-sdk/react-native-bare@workspace:packages/@magic-sdk/react-native-bare":
"@magic-sdk/react-native-bare@^22.1.0, @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": ^17.0.0
"@magic-sdk/provider": ^21.0.0
"@magic-sdk/types": ^17.0.2
"@magic-sdk/commons": ^17.1.0
"@magic-sdk/provider": ^21.1.0
"@magic-sdk/types": ^17.1.0
"@react-native-async-storage/async-storage": ^1.15.5
"@types/lodash": ^4.14.158
buffer: ~5.6.0
Expand All @@ -3132,17 +3132,17 @@ __metadata:
languageName: unknown
linkType: soft

"@magic-sdk/react-native-expo@^22.0.0, @magic-sdk/react-native-expo@workspace:packages/@magic-sdk/react-native-expo":
"@magic-sdk/react-native-expo@^22.1.0, @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": ^17.0.0
"@magic-sdk/provider": ^21.0.0
"@magic-sdk/types": ^17.0.2
"@magic-sdk/commons": ^17.1.0
"@magic-sdk/provider": ^21.1.0
"@magic-sdk/types": ^17.1.0
"@react-native-async-storage/async-storage": ^1.15.5
"@types/lodash": ^4.14.158
buffer: ~5.6.0
Expand All @@ -3168,7 +3168,7 @@ __metadata:
languageName: unknown
linkType: soft

"@magic-sdk/types@^17.0.2, @magic-sdk/types@workspace:packages/@magic-sdk/types":
"@magic-sdk/types@^17.1.0, @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 @@ -12827,16 +12827,16 @@ fsevents@^2.3.2:
languageName: unknown
linkType: soft

"magic-sdk@^21.0.0, magic-sdk@workspace:packages/magic-sdk":
"magic-sdk@^21.1.0, 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": ^17.0.0
"@magic-sdk/provider": ^21.0.0
"@magic-sdk/types": ^17.0.2
"@magic-sdk/commons": ^17.1.0
"@magic-sdk/provider": ^21.1.0
"@magic-sdk/types": ^17.1.0
localforage: ^1.7.4
localforage-driver-memory: ^1.0.5
languageName: unknown
Expand Down

0 comments on commit aaf70cf

Please sign in to comment.