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

3627 remove isdev from exposed interface #193

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .env.example
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
DEVMODE=false
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,6 @@ dist/
.cache
package-lock.json
coverage

.env
env.ts
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ interface CreateConfigOptions {
chainId: number
}>
ethAuth?: EthAuthSettings
isDev?: boolean

wagmiConfig?: WagmiConfig // optional wagmiConfig overrides

Expand Down
2 changes: 1 addition & 1 deletion examples/components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
},
"dependencies": {
"@radix-ui/react-popover": "^1.0.7",
"typescript": "latest"
"typescript": "^5.6.3"
},
"peerDependencies": {
"@0xsequence/design-system": "*",
Expand Down
2 changes: 1 addition & 1 deletion examples/next/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,6 @@
"eslint": "^8",
"eslint-config-next": "14.2.3",
"postcss": "^8",
"typescript": "^5"
"typescript": "^5.6.3"
}
}
2 changes: 1 addition & 1 deletion examples/react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"framer-motion": "^8.5.2",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"typescript": "^5.4.5",
"typescript": "^5.6.3",
"viem": "^2.12.0",
"wagmi": "^2.9.5"
},
Expand Down
2 changes: 0 additions & 2 deletions examples/react/src/components/Connected.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,6 @@ export const Connected = () => {
currencyAddress,
collectionAddress,
creditCardProviders: ['sardine'],
isDev: true,
copyrightText: 'ⓒ2024 Sequence',
onSuccess: (txnHash: string) => {
console.log('success!', txnHash)
Expand Down Expand Up @@ -382,7 +381,6 @@ export const Connected = () => {
nftId: checkoutTokenId,
nftAddress: checkoutTokenContractAddress,
nftQuantity,
isDev: true,
approvedSpenderAddress: orderbookAddress,
calldata: getOrderbookCalldata({
orderId: checkoutOrderId,
Expand Down
1 change: 0 additions & 1 deletion examples/react/src/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ export const kitConfig: KitConfig = {
projectName: 'Kit Demo',
useMock: isDebugMode
},
isDev: isDebugMode,
displayedAssets: [
// Native token
{
Expand Down
1 change: 0 additions & 1 deletion examples/react/src/utils/helpers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ export interface GetCheckoutSettings {
calldata: string
approvedSpenderAddress?: string
nftDecimals?: string
isDev?: boolean
}

export const getCheckoutSettings = (args: GetCheckoutSettings) => {
Expand Down
6 changes: 5 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
"license": "Apache-2.0",
"sideEffects": false,
"scripts": {
"copy-env": "(cp -n .env.example .env) || echo '.env already exists'",
"generate-env": "node ./scripts/generate-env.js",
"postinstall": "pnpm run copy-env && pnpm run generate-env",
"build": "turbo run build --filter={packages/*}",
"build:clean": "turbo run build:clean",
"dev": "turbo run dev --filter={packages/*}",
Expand Down Expand Up @@ -39,6 +42,7 @@
"@typescript-eslint/parser": "^7.10.0",
"@vanilla-extract/css": "^1.15.2",
"@vanilla-extract/recipes": "^0.5.3",
"dotenv": "^16.4.5",
"eslint": "^8.27.0",
"eslint-config-prettier": "^8.10.0",
"eslint-plugin-import": "^2.29.1",
Expand All @@ -49,7 +53,7 @@
"react-dom": "^18.3.1",
"rimraf": "^5.0.7",
"turbo": "2.0.1",
"typescript": "~5.4.5",
"typescript": "^5.6.3",
"wagmi": "^2.9.5"
},
"resolutions": {},
Expand Down
1 change: 0 additions & 1 deletion packages/checkout/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,6 @@ const creditCardCheckout = {
nftId: checkoutTokenId,
nftAddress: checkoutTokenContractAddress,
nftQuantity,
isDev: true,
calldata: getOrderbookCalldata({
orderId: checkoutOrderId,
quantity: nftQuantity,
Expand Down
14 changes: 7 additions & 7 deletions packages/checkout/src/api/data.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ import { ChainId, networks } from '@0xsequence/network'

import { CreditCardCheckout } from '../contexts'

import { DEVMODE } from '@0xsequence/kit'

export interface FetchSardineClientTokenReturn {
token: string
orderId: string
Expand All @@ -14,20 +16,18 @@ export interface MethodArguments {

export interface FetchSardineClientTokenArgs {
order: CreditCardCheckout
isDev: boolean
projectAccessKey: string
tokenMetadata?: TokenMetadata
}

export const fetchSardineClientToken = async ({
order,
isDev,
projectAccessKey,
tokenMetadata
}: FetchSardineClientTokenArgs): Promise<FetchSardineClientTokenReturn> => {
// Test credentials: https://docs.sardine.ai/docs/integrate-payments/nft-checkout-testing-credentials
const accessKey = isDev ? '17xhjK4yjRf1fr0am8kgKfICAAAAAAAAA' : projectAccessKey
const url = isDev
const accessKey = DEVMODE ? '17xhjK4yjRf1fr0am8kgKfICAAAAAAAAA' : projectAccessKey
const url = DEVMODE
? 'https://dev-api.sequence.app/rpc/API/SardineGetNFTCheckoutToken'
: 'https://api.sequence.app/rpc/API/SardineGetNFTCheckoutToken'

Expand Down Expand Up @@ -68,10 +68,10 @@ export const fetchSardineClientToken = async ({
}
}

export const fetchSardineOrderStatus = async (orderId: string, isDev: boolean, projectAccessKey: string) => {
export const fetchSardineOrderStatus = async (orderId: string, projectAccessKey: string) => {
// Test credentials: https://docs.sardine.ai/docs/integrate-payments/nft-checkout-testing-credentials
const accessKey = isDev ? '17xhjK4yjRf1fr0am8kgKfICAAAAAAAAA' : projectAccessKey
const url = isDev
const accessKey = DEVMODE ? '17xhjK4yjRf1fr0am8kgKfICAAAAAAAAA' : projectAccessKey
const url = DEVMODE
? 'https://dev-api.sequence.app/rpc/API/SardineGetNFTCheckoutOrderStatus'
: 'https://api.sequence.app/rpc/API/SardineGetNFTCheckoutOrderStatus'
const response = await fetch(url, {
Expand Down
1 change: 0 additions & 1 deletion packages/checkout/src/contexts/CheckoutModal.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ export interface CreditCardCheckout {
calldata: string
onSuccess?: (transactionHash: string, settings: CreditCardCheckout) => void
onError?: (error: Error, settings: CreditCardCheckout) => void
isDev?: boolean
approvedSpenderAddress?: string
}

Expand Down
3 changes: 1 addition & 2 deletions packages/checkout/src/contexts/SelectPaymentModal.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export interface Collectible {
quantity: string
decimals?: number
price?: string
}
}

export interface SelectPaymentSettings {
collectibles: Collectible[]
Expand All @@ -21,7 +21,6 @@ export interface SelectPaymentSettings {
collectionAddress: string | Hex
recipientAddress: string | Hex
approvedSpenderAddress?: string
isDev?: boolean
transactionConfirmations?: number
onSuccess?: (txHash: string) => void
onError?: (error: Error) => void
Expand Down
12 changes: 9 additions & 3 deletions packages/checkout/src/hooks/useSelectPaymentModal.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ export const getERC1155SaleContractConfig = ({
recipientAddress,
collectibles,
collectionAddress,
isDev = false,
...restProps
}: ERC1155SaleContractSettings): SelectPaymentSettings => {
const erc1155SalesContractAbi = [
Expand All @@ -43,7 +42,15 @@ export const getERC1155SaleContractConfig = ({
const purchaseTransactionData = encodeFunctionData({
abi: erc1155SalesContractAbi,
functionName: 'mint',
args: [recipientAddress, collectibles.map(c => BigInt(c.tokenId)), collectibles.map(c => BigInt(c.quantity)), toHex(0), currencyAddress, price, [toHex(0, { size: 32 })]]
args: [
recipientAddress,
collectibles.map(c => BigInt(c.tokenId)),
collectibles.map(c => BigInt(c.quantity)),
toHex(0),
currencyAddress,
price,
[toHex(0, { size: 32 })]
]
})

return {
Expand All @@ -53,7 +60,6 @@ export const getERC1155SaleContractConfig = ({
recipientAddress,
collectibles,
collectionAddress,
isDev,
txData: purchaseTransactionData,
...restProps
}
Expand Down
9 changes: 5 additions & 4 deletions packages/checkout/src/utils/sardine.ts
Original file line number Diff line number Diff line change
@@ -1,21 +1,22 @@
import { ChainId, networks } from '@0xsequence/network'
import { ethers } from 'ethers'

import { DEVMODE } from '@0xsequence/kit'

export interface CheckSardineWhitelistStatusArgs {
isDev: boolean
chainId: number
marketplaceAddress: string
}

export const checkSardineWhitelistStatus = async (
{ isDev, chainId, marketplaceAddress }: CheckSardineWhitelistStatusArgs,
{ chainId, marketplaceAddress }: CheckSardineWhitelistStatusArgs,
projectAccessKey: string
) => {
const referenceId = `sequence-kit-sardine-whitelist-check`

const accessKey = isDev ? '17xhjK4yjRf1fr0am8kgKfICAAAAAAAAA' : projectAccessKey
const accessKey = DEVMODE ? '17xhjK4yjRf1fr0am8kgKfICAAAAAAAAA' : projectAccessKey

const url = isDev
const url = DEVMODE
? 'https://dev-api.sequence.app/rpc/API/SardineGetNFTCheckoutToken'
: 'https://api.sequence.app/rpc/API/SardineGetNFTCheckoutToken'

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ export const PayWithCreditCard = ({ settings, disableButtons }: PayWithCreditCar
collectibles,
collectionAddress,
approvedSpenderAddress,
isDev = false,
onSuccess = () => {},
onError = () => {},
creditCardProviders = []
Expand Down Expand Up @@ -93,7 +92,6 @@ export const PayWithCreditCard = ({ settings, disableButtons }: PayWithCreditCar
nftAddress: collectionAddress,
nftQuantity: collectible.quantity,
nftDecimals: collectible.decimals === undefined ? undefined : String(collectible.decimals),
isDev,
calldata: txData,
approvedSpenderAddress: approvedSpenderAddress || targetContractAddress
}
Expand Down
10 changes: 4 additions & 6 deletions packages/checkout/src/views/PendingTransaction.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ import { fetchSardineOrderStatus } from '../api'
import { TransactionPendingNavigation } from '../contexts'
import { useNavigation, useCheckoutModal, useSardineClientToken, useTransactionStatusModal } from '../hooks'

import { DEVMODE } from '@0xsequence/kit'

const POLLING_TIME = 10 * 1000

export const PendingTransaction = () => {
Expand All @@ -26,14 +28,11 @@ export const PendingTransaction = () => {
)
const tokenMetadata = tokensMetadata ? tokensMetadata[0] : undefined

const isDev = settings?.creditCardCheckout?.isDev || false

const disableSardineClientTokenFetch = isLoadingTokenMetadata

const { data, isLoading, isError } = useSardineClientToken(
{
order: creditCardCheckout,
isDev,
projectAccessKey: projectAccessKey,
tokenMetadata: tokenMetadata
},
Expand All @@ -42,7 +41,7 @@ export const PendingTransaction = () => {

const authToken = data?.token

const url = isDev
const url = DEVMODE
? `https://sardine-checkout-sandbox.sequence.info?api_url=https://sardine-api-sandbox.sequence.info&client_token=${authToken}&show_features=true`
: `https://sardine-checkout.sequence.info?api_url=https://sardine-api.sequence.info&client_token=${authToken}&show_features=true`

Expand All @@ -55,9 +54,8 @@ export const PendingTransaction = () => {
const { orderId } = data

console.log('Polling for transaction status')
const isDev = creditCardCheckout?.isDev || false

const pollResponse = await fetchSardineOrderStatus(orderId, isDev, projectAccessKey)
const pollResponse = await fetchSardineOrderStatus(orderId, projectAccessKey)
const status = pollResponse.resp.status
const transactionHash = pollResponse.resp?.transactionHash

Expand Down
1 change: 0 additions & 1 deletion packages/kit/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ interface CreateConfigOptions {
chainId: number
}>
ethAuth?: EthAuthSettings
isDev?: boolean

wagmiConfig?: WagmiConfig // optional wagmiConfig overrides

Expand Down
12 changes: 4 additions & 8 deletions packages/kit/src/config/defaultConnectors.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ export interface CommonConnectorOptions {
export interface DefaultWaasConnectorOptions extends CommonConnectorOptions {
waasConfigKey: string
enableConfirmationModal?: boolean
isDev?: boolean

email?: boolean

Expand Down Expand Up @@ -98,7 +97,7 @@ export const getDefaultConnectors = <T extends WalletType>(walletType: T, option
}

export const getDefaultWaasConnectors = (options: DefaultWaasConnectorOptions): CreateConnectorFn[] => {
const { projectAccessKey, waasConfigKey, appName, enableConfirmationModal, defaultChainId, isDev } = options
const { projectAccessKey, waasConfigKey, appName, enableConfirmationModal, defaultChainId } = options

const wallets: Wallet[] = []

Expand All @@ -108,8 +107,7 @@ export const getDefaultWaasConnectors = (options: DefaultWaasConnectorOptions):
projectAccessKey,
waasConfigKey,
enableConfirmationModal,
network: defaultChainId,
isDev
network: defaultChainId
})
)
}
Expand All @@ -123,8 +121,7 @@ export const getDefaultWaasConnectors = (options: DefaultWaasConnectorOptions):
waasConfigKey,
googleClientId,
enableConfirmationModal,
network: defaultChainId,
isDev
network: defaultChainId
})
)
}
Expand All @@ -140,8 +137,7 @@ export const getDefaultWaasConnectors = (options: DefaultWaasConnectorOptions):
appleClientId,
appleRedirectURI,
enableConfirmationModal,
network: defaultChainId,
isDev
network: defaultChainId
})
)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,14 @@ import { createConnector } from 'wagmi'

import { LocalStorageKey } from '../../constants/localStorage'

import { DEVMODE } from '../../env'

export interface SequenceWaasConnectConfig {
googleClientId?: string
appleClientId?: string
appleRedirectURI?: string
enableConfirmationModal?: boolean
loginType: 'email' | 'google' | 'apple'
isDev?: boolean
}

export type BaseSequenceWaasConnectorOptions = SequenceConfig & SequenceWaasConnectConfig & Partial<ExtendedSequenceConfig>
Expand All @@ -51,8 +52,7 @@ export function sequenceWaasWallet(params: BaseSequenceWaasConnectorOptions) {
[LocalStorageKey.WaasSignInEmail]: string
}

const isDev = !!params?.isDev
const nodesUrl = isDev ? 'https://dev-nodes.sequence.app' : 'https://nodes.sequence.app'
const nodesUrl = DEVMODE ? 'https://dev-nodes.sequence.app' : 'https://nodes.sequence.app'

const showConfirmationModal = params.enableConfirmationModal ?? false

Expand Down
1 change: 1 addition & 0 deletions packages/kit/src/env.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export const DEVMODE = false
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file should simply reexport the process.env.DEVMODE

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

or process.env.DEVMODE should just be used directly instead

Loading