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

Update EVM Branch with Main #73

Merged
merged 11 commits into from
Feb 20, 2024
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
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:

strategy:
matrix:
node-version: [15.x]
node-version: [20.x]

steps:
- uses: actions/checkout@v2
Expand Down Expand Up @@ -39,7 +39,7 @@ jobs:

strategy:
matrix:
node-version: [15.x]
node-version: [20.x]

steps:
- uses: actions/checkout@v2
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,5 @@
npm-debug.log*
yarn-debug.log*
yarn-error.log*

.idea
12 changes: 0 additions & 12 deletions cypress.json

This file was deleted.

94 changes: 0 additions & 94 deletions cypress/integration/create_account.spec.js

This file was deleted.

113 changes: 0 additions & 113 deletions cypress/integration/fund_account.spec.js

This file was deleted.

21 changes: 0 additions & 21 deletions cypress/integration/header.spec.js

This file was deleted.

22 changes: 0 additions & 22 deletions cypress/plugins/index.js

This file was deleted.

15 changes: 0 additions & 15 deletions cypress/support/commands.js

This file was deleted.

20 changes: 0 additions & 20 deletions cypress/support/index.js

This file was deleted.

4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ services:
- POSTGRES_USER=faucet
- POSTGRES_PASSWORD=faucet
emulator:
image: gcr.io/flow-container-registry/emulator:0.23.0
image: gcr.io/flow-container-registry/emulator:0.59.0
ports:
- "8080:8080"
- "8888:8888"
- "3569:3569"
environment:
- FLOW_SERVICEPRIVATEKEY=91a22fbd87392b019fbe332c32695c14cf2ba5b6521476a8540228bdf1987068
Expand Down
2 changes: 1 addition & 1 deletion env.example
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ NEXT_PUBLIC_MIXPANEL_TOKEN="dev"
NEXT_PUBLIC_TOKEN_AMOUNT_FLOW=1000.0
NEXT_PUBLIC_TOKEN_AMOUNT_FUSD=10.0
NEXT_PUBLIC_SIGNER_ADDRESS=0xf8d6e0586b0a20c7
NEXT_PUBLIC_ACCESS_API_HOST=http://localhost:8080
NEXT_PUBLIC_ACCESS_API_HOST=http://localhost:8888
NEXT_PUBLIC_HCAPTCHA_SITE_KEY=10000000-ffff-ffff-ffff-000000000001
NEXT_PUBLIC_IS_LOCAL=true
NEXT_PUBLIC_CONTRACT_FUNGIBLE_TOKEN=0xee82856bf20e2aa6
Expand Down
2 changes: 1 addition & 1 deletion lib/publicConfig.ts
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ const publicConfig: PublicConfig = {
contractFUSD,
contractEVM,
accessAPIHost:
process.env.NEXT_PUBLIC_ACCESS_API_HOST || "http://localhost:8080",
process.env.NEXT_PUBLIC_ACCESS_API_HOST || "http://localhost:8888",
isLocal: process.env.NEXT_PUBLIC_IS_LOCAL === "true" || false,
walletDiscovery,
}
Expand Down
Loading
Loading