Ppe/gcp

.dockerignore

@@ -2,3 +2,5 @@ node_modules
 dist
 .secrets/sw-gateway-ec2-key.cer
 gateway.lock
+dump*
+network-cache.json

.gitignore

@@ -3,8 +3,6 @@ node_modules
 .idea
 db*.sqlite
 .secrets
-.secrets/.env
-.secrets/local.env
 gateway.lock
 network-cache.json
 .DS_Store

Dockerfile

@@ -1,12 +1,12 @@
-FROM node:14.18.2-alpine
+FROM node:18
 
 RUN mkdir /app
 WORKDIR /app
 
 # Installing required npm packages
 COPY package.json package.json
 COPY yarn.lock yarn.lock
-RUN yarn
+RUN yarn && yarn global add pm2
 
 # Copying all files
 COPY . .
@@ -17,4 +17,4 @@ RUN yarn build
 EXPOSE 5666
 
 # Running the gateway
-CMD yarn start:prod --env_path .secrets/.env
+CMD [ "pm2-runtime", "start", "dist/gateway/init.js", "--name", "gateway", "-i", "max", "--", "--noSync" ]

docker-build.sh

@@ -1 +1 @@
-docker build -t redstone-sw-gateway .
+docker build -t warp-gateway .

docker-run.sh

@@ -1 +1 @@
-docker run -t -i -p 8080:5666 redstone-sw-gateway
+docker run -t -i -p 8080:5666 warp-gateway

k8s/deployment.yaml

@@ -0,0 +1,24 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: node
+  labels:
+    name: node
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: node
+  template:
+    metadata:
+      labels:
+        app: node
+    spec:
+      containers:
+        - name: node
+          image: gcr.io/warp-372209/docker-image:2
+          imagePullPolicy: Always
+          ports:
+            - containerPort: 5666
+              protocol: TCP
+      restartPolicy: Always

k8s/ingress.yaml

@@ -0,0 +1,18 @@
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: gke-warp-gw-ingress
+  annotations:
+    kubernetes.io/ingress.global-static-ip-name: "gke-warp-gw-ip"
+spec:
+  rules:
+    - host: "chart-example.local"
+      http:
+        paths:
+          - path: /
+            pathType: Prefix
+            backend:
+              service:
+                name: gke-warp-gw-deployment
+                port:
+                  number: 5666

k8s/podscaler.yaml

@@ -0,0 +1,21 @@
+apiVersion: autoscaling/v2
+kind: HorizontalPodAutoscaler
+metadata:
+  name: node
+  namespace: default
+  labels:
+    app: node
+spec:
+  scaleTargetRef:
+    kind: Deployment
+    name: node
+    apiVersion: apps/v1
+  minReplicas: 2
+  maxReplicas: 5
+  metrics:
+    - type: Resource
+      resource:
+        name: cpu
+        target:
+          averageValue: 70
+          type: Utilization

k8s/service.yaml

@@ -0,0 +1,12 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: node
+  labels:
+    service: node
+spec:
+  selector:
+    app: node
+  type: LoadBalancer
+  ports:
+    - port: 5666

package.json

@@ -4,10 +4,12 @@
     "dev:network:watch": "ts-node-dev --watch -- src/gateway/init.ts",
     "build": "tsc",
     "start:prod": "node dist/gateway/init.js",
+    "start:prod:noSync": "node dist/gateway/init.js --noSync",
     "start:prod:replica": "node dist/gateway/init.js --replica",
     "start:local": "node dist/gateway/init.js --env_path .secrets/local.env --local",
     "start:local:replica": "node dist/gateway/init.js --env_path .secrets/local.env --replica --local",
     "start:local:testnet": "node dist/gateway/init.js --env_path .secrets/local-testnet.env --local",
+    "start:local:noSync": "node dist/gateway/init.js --env_path .secrets/local.env --local --noSync",
     "start:prod:testnet": "node dist/gateway/init.js --env_path .secrets/prod-testnet.env",
     "format": "prettier --write .",
     "test": "jest",
@@ -19,31 +21,35 @@
   "license": "MIT",
   "author": "Redstone Team <[email protected]>",
   "dependencies": {
-    "@bundlr-network/client": "0.9.6",
+    "@irys/sdk": "0.1.1",
     "@idena/vrf-js": "^1.0.1",
     "@koa/cors": "3.2.0",
     "@koa/router": "10.1.1",
-    "@types/yargs": "17.0.7",
     "JSONStream": "^1.3.5",
-    "arbundles": "^0.7.0",
-    "arweave": "1.11.8",
+    "arbundles": "^0.9.6",
+    "arweave": "1.13.7",
     "axios": "^0.26.1",
     "dotenv": "16.0.3",
     "elliptic": "^6.5.4",
     "ethers": "^5.7.2",
     "exponential-backoff": "3.1.0",
     "ioredis": "^5.2.4",
-    "knex": "0.95.14",
-    "koa": "2.13.4",
-    "koa-bodyparser": "4.3.0",
+    "knex": "2.4.2",
+    "koa": "2.14.1",
+    "koa-bodyparser": "4.4.0",
     "koa-compress": "5.1.0",
     "nodemailer": "^6.9.1",
     "parse-json-stream": "^2.4.0",
-    "pg": "8.7.3",
+    "pg": "8.10.0",
     "pg-query-stream": "^4.2.3",
     "raw-body": "^2.5.1",
-    "undici": "5.14.0",
-    "warp-contracts": "1.2.48",
+    "undici": "5.21.0",
+    "uuid": "^9.0.0",
+    "warp-arbundles": "1.0.0",
+    "warp-contracts": "1.4.26-beta.0",
+    "warp-contracts-new": "npm:warp-contracts",
+    "warp-contracts-old": "npm:[email protected]",
+    "warp-contracts-plugin-signature": "^1.0.16",
     "warp-contracts-pubsub": "^1.0.3",
     "warp-contracts-subscription-plugin": "1.0.4",
     "warp-signature": "1.0.4",
@@ -56,6 +62,8 @@
     "@types/koa__router": "8.0.11",
     "@types/nodemailer": "^6.4.7",
     "@types/object-hash": "2.2.1",
+    "@types/uuid": "^9.0.1",
+    "@types/yargs": "17.0.7",
     "@typescript-eslint/eslint-plugin": "4.33.0",
     "@typescript-eslint/parser": "4.33.0",
     "autocannon": "^7.6.0",
@@ -68,6 +76,6 @@
     "ts-jest": "27.1.2",
     "ts-node": "^10.2.1",
     "tsconfig-paths": "^3.10.1",
-    "typescript": "4.5.2"
+    "typescript": "4.9.5"
   }
 }

src/bundlr/connect.ts

@@ -1,41 +1,46 @@
-import { WarpLogger } from 'warp-contracts';
-import Bundlr from '@bundlr-network/client';
-import fs from 'fs';
-import { TaskRunner } from '../gateway/tasks/TaskRunner';
-import { GatewayContext } from '../gateway/init';
-import { JWKInterface } from 'arweave/node/lib/wallet';
-import { BUNDLR_NODE1_URL } from '../constants';
+import { WarpLogger } from "warp-contracts";
+import fs from "fs";
+import { TaskRunner } from "../gateway/tasks/TaskRunner";
+import { GatewayContext } from "../gateway/init";
+import { JWKInterface } from "arweave/node/lib/wallet";
+import { BUNDLR_NODE1_URL } from "../constants";
+import Irys from "@irys/sdk";
 
 const BUNDLR_CHECK_INTERVAL = 3600000;
 
 export async function runBundlrCheck(context: GatewayContext) {
-  await TaskRunner.from('[bundlr balance check]', checkBalance, context).runSyncEvery(BUNDLR_CHECK_INTERVAL, true);
+  await TaskRunner.from("[bundlr balance check]", checkBalance, context).runSyncEvery(BUNDLR_CHECK_INTERVAL, true);
 }
 
-export function initBundlr(logger: WarpLogger): { bundlr: Bundlr; jwk: JWKInterface } {
-  const jwk = JSON.parse(fs.readFileSync('.secrets/warp-wallet-jwk.json').toString());
-  const bundlr = new Bundlr(BUNDLR_NODE1_URL, 'arweave', jwk, {
-    timeout: 5000,
+export function initBundlr(logger: WarpLogger): { bundlr: Irys; jwk: JWKInterface } {
+  const jwk = JSON.parse(fs.readFileSync(".secrets/warp-wallet-jwk.json").toString());
+  const bundlr = new Irys({
+    url: BUNDLR_NODE1_URL,
+    token: "arweave",
+    key: jwk,
+    config: {
+      timeout: 5000
+    }
   });
-  logger.info('Running bundlr on', {
+  logger.info("Running bundlr on", {
     address: bundlr.address,
-    currency: bundlr.currency,
+    currency: bundlr.token
   });
 
   return { bundlr, jwk };
 }
 
 async function checkBalance(context: GatewayContext) {
   const { bundlr, logger } = context;
-  logger.debug('Checking Bundlr balance');
+  logger.debug("Checking Bundlr balance");
 
   // Check your balance
   const balance = await bundlr.getLoadedBalance();
-  logger.debug('Current Bundlr balance', balance);
+  logger.debug("Current Bundlr balance", balance);
 
   // If balance is < 0.5 AR
   if (balance.isLessThan(5e11)) {
-    logger.debug('Funding Bundlr');
+    logger.debug("Funding Bundlr");
     // Fund your account with 0.5 AR
     //const fundResult = await bundlr.fund(5e11);
     //logger.debug("Fund result", fundResult);

src/db/databaseSource.ts

@@ -24,9 +24,10 @@ interface DbData {
 export class DatabaseSource {
   public db: Knex[] = [];
   public primaryDb: Knex | null = null;
+  public healthCheckConnection: Knex | null = null;
   private mailClient: Transporter<SMTPTransport.SentMessageInfo>;
 
-  constructor(dbData: DbData[]) {
+  constructor(dbData: DbData[], healthCheckConnection?: DbData) {
     for (let i = 0; i < dbData.length; i++) {
       this.db[i] = this.connectDb(dbData[i]);
       if (dbData[i].primaryDb) {
@@ -39,6 +40,9 @@ export class DatabaseSource {
     if (this.primaryDb == null) {
       throw new Error('Exactly one db must be set as primary');
     }
+    if (healthCheckConnection != null) {
+      this.healthCheckConnection = this.connectDb(healthCheckConnection);
+    }
     this.mailClient = client();
   }
 
@@ -251,6 +255,14 @@ export class DatabaseSource {
     return db.raw(query, bindings);
   }
 
+  public healthCheckEnabled(): boolean {
+    return this.healthCheckConnection != null;
+  }
+
+  public healthCheck(query: string, bindings?: any) {
+    return this.healthCheckConnection!!.raw(query, bindings);
+  }
+
   public async loopThroughDb(callback: any, recordName: string): Promise<any> {
     let result: any;
     try {
@@ -278,7 +290,7 @@ export class DatabaseSource {
       useNullAsDefault: true,
       pool: {
         min: 5,
-        max: 30,
+        max: 20,
         createTimeoutMillis: 3000,
         acquireTimeoutMillis: 30000,
         idleTimeoutMillis: 30000,

src/db/insertInterfaces.ts

@@ -1,5 +1,5 @@
 import { GQLTagInterface, Tags } from 'warp-contracts';
-import { WarpDeployment } from '../gateway/router/routes/deployContractRoute';
+import { WarpDeployment } from '../gateway/router/routes/deploy/deployContractRoute';
 
 export interface SequencerInsert {
   original_sig: string;
@@ -49,7 +49,7 @@ export interface ContractInsert {
   block_timestamp: number;
   content_type: string | undefined;
   contract_tx: {
-    tags: Tags;
+    tags: { name: string; value: string }[];
   };
   bundler_contract_tx_id: string;
   bundler_contract_node: string;