Skip to content
Merged
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
49 changes: 14 additions & 35 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,41 +4,20 @@ jobs:
lint:
runs-on: ubuntu-latest
steps:
- name: Checkout repo
uses: actions/checkout@v2

- name: Install Node
uses: actions/setup-node@v2
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 18
node-version: 20
cache: 'npm'
registry-url: 'https://registry.npmjs.org'

- name: Node version
run: node -v

- name: Npm version
run: npm -v

- name: Set version in env
run: |
echo "node-version=$(node -v)" >> $GITHUB_ENV
echo "npm-version=$(npm -v)" >> $GITHUB_ENV

- name: Cache node modules
uses: actions/cache@v2
env:
cache-name: cache-node-modules
- run: npm ci
- run: npm run lint
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
path: '**/node_modules'
key: ${{ runner.os }}-${{ env.cache-name }}-node${{ env.node-version }}-npm${{ env.npm-version }}-${{ hashFiles('**/package-lock.json') }}
restore-keys: |
${{ runner.os }}-${{ env.cache-name }}-node${{ env.node-version }}-npm${{ env.npm-version }}-

- name: Install dependencies
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
run: npm install

- name: Lint
run: npm run lint
node-version: 20
cache: 'npm'
- run: npm ci
- run: npm run build
16 changes: 13 additions & 3 deletions connectors.ts
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,11 @@ function connectors(environment: Environment): ClientWithChain {
walletConnectWallet({ chains, projectId }),
braveWallet({ chains, shimDisconnect }),
environment.MAGIC_API_KEY
? emailConnector({ chains, apiKey: environment.MAGIC_API_KEY })
? emailConnector({
chains,
apiKey: environment.MAGIC_API_KEY,
alchemyApiKey: environment.ALCHEMY_API_KEY,
})
: undefined,
].filter(Boolean),
},
Expand Down Expand Up @@ -95,10 +99,16 @@ function connectors(environment: Environment): ClientWithChain {
function emailConnector({
chains,
apiKey,
alchemyApiKey,
}: {
chains: Chain[]
apiKey: string
alchemyApiKey: string | undefined
}): Wallet {
if (!alchemyApiKey)
throw new Error(
'env NEXT_PUBLIC_ALCHEMY_API_KEY is required for email connector',
)
return {
id: 'magic',
name: 'Magic',
Expand All @@ -112,8 +122,8 @@ function emailConnector({
networks: chains.map((chain) => ({
chainId: chain.id,
rpcUrl:
chain.id === 1 // the default provider for Ethereum Mainnet (cloudflare) is not working with Magic
? 'https://rpc.ankr.com/eth'
chain.id === 1 // the default provider for Ethereum Mainnet is not working with Magic, only Alchemy is
? 'https://eth-mainnet.g.alchemy.com/v2/' + alchemyApiKey
: chain.rpcUrls.default.http[0]!,
})),
},
Expand Down
22 changes: 20 additions & 2 deletions environment.ts
Original file line number Diff line number Diff line change
Expand Up @@ -241,8 +241,26 @@ const getEnvironment = async (): Promise<Environment> => {
CHAINS: [
ethereumMainnet,
ethereumSepolia,
bscTestnet,
bsc,
{
...bsc,
rpcUrls: {
...bsc.rpcUrls,
alchemy: {
http: ['https://bnb-mainnet.g.alchemy.com/v2'],
webSocket: ['wss://bnb-mainnet.g.alchemy.com/v2'],
},
},
},
{
...bscTestnet,
rpcUrls: {
...bscTestnet.rpcUrls,
alchemy: {
http: ['https://bnb-testnet.g.alchemy.com/v2'],
webSocket: ['wss://bnb-testnet.g.alchemy.com/v2'],
},
},
},
polygon,
{
id: 80_002,
Expand Down
Loading