Skip to content

Commit

Permalink
Merge pull request #70 from borgvin/v4.1
Browse files Browse the repository at this point in the history
v4.1 (slippage support)
  • Loading branch information
kleinroy authored Oct 18, 2024
2 parents d604239 + 2e5f632 commit 5090e07
Show file tree
Hide file tree
Showing 33 changed files with 17,751 additions and 59,639 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/desktop.build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
system:
- os: "windows-latest"
path: "squirrel.windows/x64/"
- os: "macos-13"
- os: "macos-latest"
path: ""
- os: ubuntu-latest
path: "deb/x64/"
Expand All @@ -38,12 +38,12 @@ jobs:
with:
python-version: '3.10'

- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Use Node.js
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: '14'
node-version: '18'

- name: Install client dependencies
working-directory: client
Expand All @@ -54,7 +54,7 @@ jobs:
- name: Audit client dependencies
working-directory: client
run: |
npm audit fix --production
npm audit fix --audit-level moderate
- name: Client Build for Desktop
working-directory: client
Expand All @@ -81,7 +81,7 @@ jobs:
- name: Audit backend dependencies
working-directory: haven-desktop-app
run: |
npm audit fix --production
npm audit fix --audit-level moderate
- if: matrix.system.os == 'ubuntu-latest'
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker.build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
]
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
- name: Set up Docker Buildx
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/web.build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@ jobs:
url: "https://nodes-stagenet.havenprotocol.org:443"
name: "stagenet"
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Use Node.js
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: '14'
node-version: '18'

- name: Install client dependencies
working-directory: client
Expand All @@ -59,7 +59,7 @@ jobs:
- name: Audit client dependencies
working-directory: client
run: |
npm audit fix --production
npm audit fix --audit-level moderate
- name: Client Build for Web
working-directory: client
Expand Down
4 changes: 2 additions & 2 deletions client/.docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:14-buster as builder
FROM node:18-bookworm as builder

ARG REACT_APP_NET_TYPE_ID
ARG REACT_APP_HAVEN_DIRECT_HOST
Expand All @@ -12,7 +12,7 @@ RUN git config --global url."https://".insteadOf git://
RUN npm install
RUN npm install haven-wallet-core@latest --save
RUN npm run copy-haven-core
RUN npm audit fix --production
RUN npm audit fix --audit-level moderate
RUN npm run build:web:ci

FROM nginx:stable-alpine
Expand Down
14 changes: 14 additions & 0 deletions client/config-overrides.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
const webpack = require('webpack');
module.exports = function override(config, env) {
config.resolve.fallback = {
crypto: require.resolve('crypto-browserify'),
http: require.resolve('stream-http'),
https: require.resolve('https-browserify'),
path: require.resolve('path-browserify'),
fs: false,
child_process: false,
vm: false
};

return config;
}
Loading

0 comments on commit 5090e07

Please sign in to comment.