Merge branch 'main' into joaquim/gas

Author: farhanW3

.env.test

@@ -0,0 +1,5 @@
+THIRDWEB_API_SECRET_KEY="test"
+POSTGRES_CONNECTION_URL="postgresql://postgres:postgres@localhost:5432/postgres?sslmode=disable"
+ADMIN_WALLET_ADDRESS="test"
+ENCRYPTION_PASSWORD="test"
+ENABLE_KEYPAIR_AUTH="true"

.github/workflows/tagBasedImageBuild.yml

@@ -1,12 +1,15 @@
 name: Tag Based Image Build
 
 on:
-  create: # This listens to create events, which includes tag creations
+  release:
+    types: [created] # This listens to release creation events
 
 jobs:
   buildImageForNewTag:
-    if: startsWith(github.ref, 'refs/tags/') # Only run this job when a tag is created
     runs-on: ubuntu-latest
+    # Set environment variables
+    env:
+      LATEST_TAG: ${{ (github.event.release.target_commitish == 'main') && 'thirdweb/engine:latest' || '' }}
 
     steps:
       - name: Check Disk Space Before Build
@@ -17,6 +20,9 @@ jobs:
 
       - name: Checkout code
         uses: actions/checkout@v2
+        with:
+          # Fetches the branch at which the release was made
+          ref: ${{ github.event.release.target_commitish }}
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
@@ -35,10 +41,10 @@ jobs:
           platforms: linux/amd64,linux/arm64
           push: true
           tags: |
-            thirdweb/engine:${{ github.ref_name }}
-            thirdweb/engine:latest
+            thirdweb/engine:${{ github.event.release.tag_name }}
+            ${{ env.LATEST_TAG }}
           build-args: |
-            ENGINE_VERSION=${{ github.ref_name }}
+            ENGINE_VERSION=${{ github.event.release.tag_name }}
 
       - name: Check Disk Space After Build
         run: df -h

README.md

@@ -46,7 +46,7 @@ Host Engine on your own instructure for free. [View self-host instructions](http
 
 Other deployment options:
 
-- [Deploy on Railway](https://railway.app/template/EASlyJ)
+[![Deploy on Railway](https://railway.app/button.svg)](https://railway.app/template/fcEVay)
 
 ### Cloud-host
 

package.json

@@ -39,11 +39,11 @@
     "@prisma/client": "5.2.0",
     "@sinclair/typebox": "^0.31.28",
     "@t3-oss/env-core": "^0.6.0",
-    "@thirdweb-dev/auth": "^4.1.47",
+    "@thirdweb-dev/auth": "^4.1.55",
     "@thirdweb-dev/chains": "^0.1.77",
-    "@thirdweb-dev/sdk": "^4.0.49",
+    "@thirdweb-dev/sdk": "^4.0.59",
     "@thirdweb-dev/service-utils": "0.4.17",
-    "@thirdweb-dev/wallets": "2.4.17",
+    "@thirdweb-dev/wallets": "^2.4.36-nightly-6961e09a4cec4c276b233285e721dc0505792be5-20240408215531",
     "@types/base-64": "^1.0.2",
     "base-64": "^1.0.0",
     "body-parser": "^1.20.2",
@@ -59,6 +59,7 @@
     "fastify": "^4.15.0",
     "fastify-plugin": "^4.5.0",
     "http-status-codes": "^2.2.0",
+    "jsonwebtoken": "^9.0.2",
     "knex": "^3.1.0",
     "mnemonist": "^0.39.8",
     "node-cron": "^3.0.2",
@@ -77,6 +78,7 @@
     "@types/crypto-js": "^4.2.2",
     "@types/express": "^4.17.17",
     "@types/jest": "^29.5.11",
+    "@types/jsonwebtoken": "^9.0.6",
     "@types/node": "^18.15.4",
     "@types/node-cron": "^3.0.8",
     "@types/pg": "^8.6.6",

src/db/keypair/delete.ts

@@ -0,0 +1,12 @@
+import { Keypairs } from "@prisma/client";
+import { prisma } from "../client";
+
+export const deleteKeypair = async ({
+  hash,
+}: {
+  hash: string;
+}): Promise<Keypairs> => {
+  return prisma.keypairs.delete({
+    where: { hash },
+  });
+};

src/db/keypair/get.ts

@@ -0,0 +1,15 @@
+import { Keypairs } from "@prisma/client";
+import { createHash } from "crypto";
+import { prisma } from "../client";
+
+export const getKeypairByPublicKey = async ({
+  publicKey,
+}: {
+  publicKey: string;
+}): Promise<Keypairs | null> => {
+  const hash = createHash("sha256").update(publicKey).digest("hex");
+
+  return prisma.keypairs.findUnique({
+    where: { hash },
+  });
+};

src/db/keypair/insert.ts

@@ -0,0 +1,25 @@
+import { Keypairs } from "@prisma/client";
+import { createHash } from "crypto";
+import { KeypairAlgorithm } from "../../server/schemas/keypairs";
+import { prisma } from "../client";
+
+export const insertKeypair = async ({
+  publicKey,
+  algorithm,
+  label,
+}: {
+  publicKey: string;
+  algorithm: KeypairAlgorithm;
+  label?: string;
+}): Promise<Keypairs> => {
+  const hash = createHash("sha256").update(publicKey).digest("hex");
+
+  return prisma.keypairs.create({
+    data: {
+      hash,
+      publicKey,
+      algorithm,
+      label,
+    },
+  });
+};

src/db/keypair/list.ts

@@ -0,0 +1,6 @@
+import { Keypairs } from "@prisma/client";
+import { prisma } from "../client";
+
+export const listKeypairs = async (): Promise<Keypairs[]> => {
+  return prisma.keypairs.findMany();
+};

src/db/tokens/getToken.ts

@@ -1,15 +1,14 @@
 import { parseJWT } from "@thirdweb-dev/auth";
 import { prisma } from "../client";
 
-interface GetTokenParams {
-  jwt: string;
-}
-
-export const getToken = async ({ jwt }: GetTokenParams) => {
+export const getToken = async (jwt: string) => {
   const { payload } = parseJWT(jwt);
-  return prisma.tokens.findUnique({
-    where: {
-      id: payload.jti,
-    },
-  });
+  if (payload.jti) {
+    return prisma.tokens.findUnique({
+      where: {
+        id: payload.jti,
+      },
+    });
+  }
+  return null;
 };

src/db/transactions/cleanTxs.ts

@@ -15,16 +15,14 @@ export const cleanTxs = (
       sentAt: tx.sentAt?.toISOString() || null,
       minedAt: tx.minedAt?.toISOString() || null,
       cancelledAt: tx.cancelledAt?.toISOString() || null,
-      status: !!tx.errorMessage
+      status: tx.errorMessage
         ? "errored"
-        : !!tx.minedAt
+        : tx.minedAt
         ? "mined"
-        : !!tx.cancelledAt
+        : tx.cancelledAt
         ? "cancelled"
-        : !!tx.sentAt && tx.retryCount === 0
+        : tx.sentAt
         ? "sent"
-        : !!tx.sentAt && tx.retryCount > 0
-        ? "retried"
         : "queued",
     };
   });

src/db/transactions/queueTx.ts

@@ -60,7 +60,12 @@ export const queueTx = async ({
     return queueId;
   } else {
     const fromAddress = await tx.getSignerAddress();
-    const toAddress = tx.getTarget();
+    const toAddress =
+      tx.getTarget() === "0x0000000000000000000000000000000000000000" &&
+      txData.functionName === "deploy" &&
+      extension === "deploy-published"
+        ? null
+        : tx.getTarget();
 
     const { id: queueId } = await queueTxRaw({
       pgtx,

src/db/transactions/updateTx.ts

@@ -24,6 +24,7 @@ type UpdateTxData =
       res: ethers.providers.TransactionRequest;
       sentAtBlockNumber: number;
       retryCount?: number;
+      deployedContractAddress?: string;
     }
   | {
       status: TransactionStatus.UserOpSent;
@@ -84,6 +85,7 @@ export const updateTx = async ({ pgtx, queueId, data }: UpdateTxParams) => {
           maxFeePerGas: data.res?.maxFeePerGas?.toString(),
           maxPriorityFeePerGas: data.res?.maxPriorityFeePerGas?.toString(),
           value: data.res?.value?.toString(),
+          deployedContractAddress: data.deployedContractAddress,
         },
       });
       break;

src/prisma/migrations/20240327202800_add_keypairs/migration.sql

@@ -0,0 +1,8 @@
+-- CreateTable
+CREATE TABLE "keypairs" (
+    "hash" TEXT NOT NULL,
+    "publicKey" TEXT NOT NULL,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+
+    CONSTRAINT "keypairs_pkey" PRIMARY KEY ("hash")
+);

src/prisma/migrations/20240410015450_add_keypair_algorithm/migration.sql

@@ -0,0 +1,8 @@
+/*
+  Warnings:
+
+  - Added the required column `algorithm` to the `keypairs` table without a default value. This is not possible if the table is not empty.
+
+*/
+-- AlterTable
+ALTER TABLE "keypairs" ADD COLUMN     "algorithm" TEXT NOT NULL;

src/prisma/migrations/20240411235927_add_keypair_label/migration.sql

@@ -0,0 +1,3 @@
+-- AlterTable
+ALTER TABLE "keypairs" ADD COLUMN     "label" TEXT,
+ADD COLUMN     "updatedAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP;

src/prisma/schema.prisma

@@ -265,3 +265,14 @@ model ChainIndexers {
 
   @@map("chain_indexers")
 }
+
+model Keypairs {
+  hash      String   @id
+  publicKey String
+  algorithm String
+  label     String?
+  createdAt DateTime @default(now())
+  updatedAt DateTime @default(now())
+
+  @@map("keypairs")
+}