Merge branch 'main' into chasefleming/update-evm-branch

onflow · Feb 20, 2024 · 4409076 · 4409076
2 parents 70b5e50 + 4ba3116
commit 4409076
Show file tree

Hide file tree

Showing 14 changed files with 1,329 additions and 3,733 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -8,7 +8,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [15.x]
+        node-version: [20.x]
 
     steps:
       - uses: actions/checkout@v2
@@ -39,7 +39,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [15.x]
+        node-version: [20.x]
 
     steps:
       - uses: actions/checkout@v2

diff --git a/.gitignore b/.gitignore
@@ -24,3 +24,5 @@
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
+
+.idea
diff --git a/cypress.json b/cypress.json
diff --git a/cypress/integration/create_account.spec.js b/cypress/integration/create_account.spec.js
diff --git a/cypress/integration/fund_account.spec.js b/cypress/integration/fund_account.spec.js
diff --git a/cypress/integration/header.spec.js b/cypress/integration/header.spec.js
diff --git a/cypress/plugins/index.js b/cypress/plugins/index.js
diff --git a/cypress/support/commands.js b/cypress/support/commands.js
diff --git a/cypress/support/index.js b/cypress/support/index.js
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -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

diff --git a/env.example b/env.example
@@ -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

diff --git a/lib/publicConfig.ts b/lib/publicConfig.ts
@@ -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,
 }