Merge pull request #607 from bcnmy/revert-606-refactor/tw-merge

Revert "TrustWallet <-> Shared Production merge"

.env-example

@@ -1,16 +1 @@
-BUNDLER_CONFIG_PASSPHRASE=
-BUNDLER_NODE_PATH_INDEX=0
-BUNDLER_CHAIN_ID=80001
-BUNDLER_MIN_RELAYER_COUNT=5
-BUNDLER_MAX_RELAYER_COUNT=10
-BUNDLER_FUNDING_BALANCE_THRESHOLD=0.1
-BUNDLER_FUNDING_RELAYER_AMOUNT=0.2
-BUNDLER_SIMULATION_DATA_JSON='{"tenderlyData": {}}'
-BUNDLER_TOKEN_PRICE_JSON='{"coinMarketCapApi": ""}'
-BUNDLER_SLACK_JSON='{"token": "","channel": ""}'
-BUNDLER_PROVIDER_JSON='{"137": "", "42161": "", "56": "", "10": "", "43114": "", "8453": "", "80001": ""}'
-BUNDLER_DATASOURCES_JSON= '{"mongoUrl": "", "redisUrl": ""}'
-BUNDLER_SOCKET_SERVICE_JSON='{"wssUrl": "","httpUrl": "","token": "","apiKey": ""}'
-BUNDLER_QUEUE_URL=""
-BUNDLER_IS_TRUSTWALLET_SETUP=true
-BUNDLER_FALLBACK_PROVIDER_JSON='{"137": ["", ""], "42161": ["", ""], "56": ["", ""], "10": ["", ""], "43114": ["", ""], "8453": ["", ""], "80001": ["", ""]}'
+CONFIG_PASSPHRASE=

.github/workflows/main.yml

@@ -11,7 +11,7 @@ jobs:
 
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v2
 
       - name: Check if Master is Ahead of Staging
         run: |

.gitignore

@@ -1,27 +1,14 @@
 node_modules
 .env
 yarn-error.log
+centrifugo_config.json
 relayer/dist
 server/dist
 coverage
+config.json
 config.json.enc
 *heapsnapshot
-refundAddresses.ts
-*.enc
-# Ignore all JSON files
-*.json
-*json.enc
-# But not these specific files
-!static-config.json
-!config-example.json
-!centrifugo_config.json
-
-# If index.ts is not a .json file, you don't need to explicitly exclude it.
-# However, if it's actually index.json, include it like so:
-#!index.json
-
-!example.cfg
+.vscode
 dist/
 *.code-workspace
 config/development.json
-config/production.json

Dockerfile

@@ -1,36 +1,25 @@
-FROM node:21.6-bookworm as builder
+FROM node:18.17.1-bookworm
 
-# Install dependencies
+# install dependencies
+RUN apt update
+
+# Tini allows us to avoid several Docker edge cases, see https://github.com/krallin/tini.
+# NOTE: See https://github.com/hexops/dockerfile#is-tini-still-required-in-2020-i-thought-docker-added-it-natively
+RUN apt-get install tini
 
 # arguments
 ARG PORT=3000
 
-# Set up the directory
-WORKDIR /bundler
+RUN mkdir -p /relayer-node
+WORKDIR /relayer-node
 
-# Copy package files
 COPY package.json yarn.lock  ./
 
 # install packages
 RUN yarn install
+COPY . /relayer-node
 
-# Copy the rest of the files
-COPY . /bundler
-
-# Build the application
 RUN yarn run build
-
-# Second stage
-FROM node:21.6-bookworm
-
-# Tini allows us to avoid several Docker edge cases, see https://github.com/krallin/tini.
-# NOTE: See https://github.com/hexops/dockerfile#is-tini-still-required-in-2020-i-thought-docker-added-it-natively
-
-RUN apt-get update && apt-get install -y \
-    tini \
-    && rm -rf /var/lib/apt/lists/*
-
-# Expose the port
 EXPOSE 3000
 
 # Non-root user for security purposes.
@@ -43,15 +32,11 @@ EXPOSE 3000
 # such a user does not exist.
 RUN addgroup --gid 10001 --system nonroot \
   && adduser  --uid 10000 --system --ingroup nonroot --home /home/nonroot nonroot
-
-WORKDIR /home/nonroot/bundler
-COPY --from=builder --chown=10000:10001 /bundler /home/nonroot/bundler
-
+EXPOSE 3000
 
 # Use the non-root user to run our application
 USER nonroot
 
 ENTRYPOINT ["/usr/bin/tini", "--", "yarn"]
 
-# Default arguments for your app (remove if you have none):
 CMD ["run", "start"]