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

Prevent docker crashes #92

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
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
2 changes: 1 addition & 1 deletion .github/workflows/check-codebase.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- name: Setup Node.js environment
uses: actions/setup-node@v3
with:
node-version: 16
node-version: 20.11.1
cache: "yarn"
cache-dependency-path: yarn.lock

Expand Down
8 changes: 4 additions & 4 deletions apps/api/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Install Turbo and Prune
FROM amd64/node:16 AS builder
FROM node:20.11.1-buster AS builder

WORKDIR /app
RUN yarn global add turbo
Expand All @@ -9,14 +9,13 @@ RUN turbo prune --scope=@superlight-labs/api --docker


# Install Dependencies and Node Modules
FROM amd64/node:16 AS installer
FROM node:20.11.1-buster AS installer

RUN apt-get update
RUN apt-get --yes install python3 \
make \
g++


WORKDIR /app

COPY .gitignore .gitignore
Expand All @@ -30,7 +29,8 @@ COPY turbo.json turbo.json
RUN yarn turbo run build --filter=@superlight-labs/api...

# Setup Process and run command
FROM amd64/node:16 AS runner
FROM node:20.11.1-buster AS runner

WORKDIR /app

RUN addgroup --system --gid 1001 superlight-api
Expand Down
2 changes: 1 addition & 1 deletion apps/api/doctl.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ ingress:
match:
path:
prefix: /
name: monkfish-app
name: newfinance-api
region: fra
services:
- envs:
Expand Down
5 changes: 0 additions & 5 deletions apps/api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,6 @@
"lint": "eslint \"./src/**/*.ts\"",
"dev": "ts-node-dev --inspect --respawn -r tsconfig-paths/register --watch --exit-child --transpile-only ./index.ts | pino-pretty"
},
"volta": {
"node": "16.20.0",
"yarn": "1.22.19"
},
"keywords": [
"mpc",
"bitcoin",
Expand All @@ -37,7 +33,6 @@
"ffi-napi": "^4.0.3",
"neverthrow": "^6.0.0",
"ref-napi": "^3.0.3",
"rxjs": "^7.8.0",
"ts-node": "^10.9.1",
"tsconfig-paths": "^4.1.2"
},
Expand Down
Empty file modified apps/api/src/crypto-mpc-js/deps/MPCCrypto-arch64.dylib
100755 → 100644
Empty file.
3 changes: 3 additions & 0 deletions apps/api/src/crypto-mpc-js/lib/native.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import logger from '@superlight-labs/logger';
import { Library } from 'ffi-napi';
import { join } from 'path';
import { refType, types } from 'ref-napi';
Expand All @@ -17,6 +18,8 @@ const errorCodes = {

// Copy from mpc_crypto.h

logger.info({ arch: process.arch }, 'Loading native lib on architecture');

const name = process.arch.includes('arm64') ? 'MPCCrypto-arch64' : 'MPCCrypto';

const mpc = Library(join(__dirname, '..', 'deps', name), {
Expand Down
2 changes: 2 additions & 0 deletions apps/api/src/lib/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ interface Config {
logLevel: string;
host: string;
port: number;
db: string;
}

const initConfig = (): Config => {
Expand All @@ -15,6 +16,7 @@ const initConfig = (): Config => {
logLevel: process.env.LOG_LEVEL || 'debug',
host: process.env.API_HOST || '0.0.0.0',
port: parseInt(process.env.API_PORT || '3000', 10),
db: process.env.DB_URL || '',
};
};

Expand Down
18 changes: 0 additions & 18 deletions apps/api/src/service/mpc/ecdsa/generate-share.service.ts

This file was deleted.

8 changes: 5 additions & 3 deletions apps/mobile/ios/NewFinance.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = NewFinance/main.m; sourceTree = "<group>"; };
21D4CA8ACE174FDCA9598D1F /* Manrope-Regular.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Manrope-Regular.ttf"; path = "../assets/fonts/Manrope-Regular.ttf"; sourceTree = "<group>"; };
26D3E19221D74E8590752265 /* Inter-Regular.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Inter-Regular.ttf"; path = "../assets/fonts/Inter-Regular.ttf"; sourceTree = "<group>"; };
2C0EDA358C964F8F8B60C4C0 /* Manrope-SemiBold.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "Manrope-SemiBold.ttf"; path = "../assets/fonts/Manrope-SemiBold.ttf"; sourceTree = "<group>"; };
2C0EDA358C964F8F8B60C4C0 /* Manrope-SemiBold.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Manrope-SemiBold.ttf"; path = "../assets/fonts/Manrope-SemiBold.ttf"; sourceTree = "<group>"; };
2F1172DE3EDA4B9EBF915ABA /* IBMPlexSerif-Medium.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "IBMPlexSerif-Medium.ttf"; path = "../assets/fonts/IBMPlexSerif-Medium.ttf"; sourceTree = "<group>"; };
3068570324B4275A56AA8CE2 /* Pods-NewFinance.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NewFinance.debug.xcconfig"; path = "Target Support Files/Pods-NewFinance/Pods-NewFinance.debug.xcconfig"; sourceTree = "<group>"; };
3B4392A12AC88292D35C810B /* Pods-NewFinance.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NewFinance.debug.xcconfig"; path = "Target Support Files/Pods-NewFinance/Pods-NewFinance.debug.xcconfig"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -632,11 +632,12 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CURRENT_PROJECT_VERSION = 16;
DEVELOPMENT_TEAM = 33NTHR48GT;
DEVELOPMENT_TEAM = "BXB7RBS9FX";
ENABLE_BITCODE = NO;
INFOPLIST_FILE = NewFinance/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = NewFinance;
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.finance";
IPHONEOS_DEPLOYMENT_TARGET = 13.4;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down Expand Up @@ -668,10 +669,11 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CURRENT_PROJECT_VERSION = 16;
DEVELOPMENT_TEAM = 33NTHR48GT;
DEVELOPMENT_TEAM = "BXB7RBS9FX";
INFOPLIST_FILE = NewFinance/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = NewFinance;
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.finance";
IPHONEOS_DEPLOYMENT_TARGET = 13.4;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down
2 changes: 1 addition & 1 deletion apps/mobile/ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ require Pod::Executable.execute_command('node', ['-p',
pod 'OpenSSL-Universal', :modular_headers => true, :configurations => ['Release', 'Debug']


platform :ios, '13.0'
platform :ios, '13.4'
prepare_react_native_project!


Expand Down
Loading
Loading