diff --git a/.github/workflows/gcp-deploy-frontend.yaml b/.github/workflows/gcp-deploy-frontend.yaml index c25d63a7..f5cc1409 100644 --- a/.github/workflows/gcp-deploy-frontend.yaml +++ b/.github/workflows/gcp-deploy-frontend.yaml @@ -54,7 +54,7 @@ jobs: steps: - name: Cancel Existing Runs - uses: styfle/cancel-workflow-action@0.10.0 + uses: styfle/cancel-workflow-action@0.12.0 with: access_token: ${{github.token}} diff --git a/.github/workflows/gcp-deploy-pr.yaml b/.github/workflows/gcp-deploy-pr.yaml index e8bc880d..b3f351a1 100644 --- a/.github/workflows/gcp-deploy-pr.yaml +++ b/.github/workflows/gcp-deploy-pr.yaml @@ -59,7 +59,7 @@ jobs: steps: - name: Cancel Existing Runs - uses: styfle/cancel-workflow-action@0.10.0 + uses: styfle/cancel-workflow-action@0.12.0 with: access_token: ${{github.token}} diff --git a/docker/frontend/Dockerfile b/docker/frontend/Dockerfile index d22986db..784cb978 100644 --- a/docker/frontend/Dockerfile +++ b/docker/frontend/Dockerfile @@ -55,6 +55,7 @@ ARG GCAL_CALENDAR_ID ARG GCAL_PRIVATE_KEY ARG GCAL_CLIENT_EMAIL ARG GCAL_PROJECT_NUMBER +ARG ALCHEMY_API_KEY ARG WEB3_STORAGE_DID ARG WEB3_STORAGE_KEY ARG WEB3_STORAGE_PROOF @@ -72,6 +73,7 @@ ENV NEXT_PUBLIC_GOOGLE_ANALYTICS_ID $GOOGLE_ANALYTICS_ID ENV NEXT_PUBLIC_USERBACK_TOKEN $USERBACK_TOKEN ENV NEXT_PUBLIC_CERAMIC_URL $CERAMIC_URL ENV NEXT_PUBLIC_GCAL_CALENDAR_ID $GCAL_CALENDAR_ID +ENV NEXT_PUBLIC_ALCHEMY_API_KEY $ALCHEMY_API_KEY ENV NEXT_PUBLIC_WEB3_STORAGE_DID $WEB3_STORAGE_DID ENV NEXT_PUBLIC_WEB3_STORAGE_KEY $WEB3_STORAGE_KEY ENV NEXT_PUBLIC_WEB3_STORAGE_PROOF $WEB3_STORAGE_PROOF diff --git a/packages/web/pages/_app.tsx b/packages/web/pages/_app.tsx index 7160e185..8e9b3845 100644 --- a/packages/web/pages/_app.tsx +++ b/packages/web/pages/_app.tsx @@ -23,13 +23,13 @@ const config = createConfig( chains: [optimism, polygon, mainnet], transports: { [optimism.id]: http( - `https://opt-mainnet.g.alchemy.com/v2/${process.env.NEXT_PUBLIC_ALCHEMY_API_KEY}`, + `https://opt-mainnet.g.alchemy.com/v2/${CONFIG.alchemyAPIKey}`, ), [mainnet.id]: http( - `https://eth-mainnet.g.alchemy.com/v2/${process.env.NEXT_PUBLIC_ALCHEMY_API_KEY}`, + `https://eth-mainnet.g.alchemy.com/v2/${CONFIG.alchemyAPIKey}`, ), [polygon.id]: http( - `https://polygon-mainnet.g.alchemy.com/v2/${process.env.NEXT_PUBLIC_ALCHEMY_API_KEY}`, + `https://polygon-mainnet.g.alchemy.com/v2/${CONFIG.alchemyAPIKey}`, ), }, diff --git a/packages/web/utils/networks.ts b/packages/web/utils/networks.ts index 236f06dd..e0e151a3 100644 --- a/packages/web/utils/networks.ts +++ b/packages/web/utils/networks.ts @@ -25,7 +25,7 @@ export const NETWORK_INFO: NetworkInfo = { label: 'Ethereum', symbol: 'ETH', explorer: 'https://etherscan.io', - rpc: `https://eth-mainnet.g.alchemy.com/v2/${process.env.NEXT_PUBLIC_ALCHEMY_MAINNET}`, + rpc: `https://eth-mainnet.g.alchemy.com/v2/${CONFIG.alchemyAPIKey}`, }, [GOERLI]: { chainId: GOERLI, @@ -49,7 +49,7 @@ export const NETWORK_INFO: NetworkInfo = { label: 'Polygon', symbol: 'MATIC', explorer: 'https://polygonscan.com', - rpc: `https://eth-mainnet.g.alchemy.com/v2/${process.env.NEXT_PUBLIC_ALCHEMY_MATIC}`, + rpc: `https://polygon-mainnet.g.alchemy.com/v2/${CONFIG.alchemyAPIKey}`, }, [MUMBAI]: { chainId: MUMBAI, @@ -84,4 +84,4 @@ export function getHexChainId(chain?: string): string { } } -export const getNumberId = (chainId: string): number => parseInt(chainId, 16) \ No newline at end of file +export const getNumberId = (chainId: string): number => Number(chainId);