revert dockerfile, create custom for testing

Author: darrenvechain

.dockerignore

@@ -0,0 +1,4 @@
+node_modules
+dist
+.idea
+

Dockerfile

@@ -1,51 +1,32 @@
-ARG THOR_VERSION=v2.1.5
+# Build thor in a stock Go builder container
+ARG THOR_VERSION=v2.1.6
 
-FROM vechain/thor:${THOR_VERSION} AS thor-builder
+FROM golang:1.22 AS builder
 
-FROM alpine:3.20 AS node-buider
+WORKDIR  /go/thor
+RUN git clone https://github.com/vechain/thor.git /go/thor
+RUN git checkout ${THOR_VERSION}
+RUN make all
 
-# Install necessary packages
-RUN apk add --no-cache ca-certificates bash nodejs npm
+FROM ubuntu:24.04
 
-# Copy and build rosetta
-WORKDIR /usr/src/app/rosetta
-COPY package.json package-lock.json tsconfig.json ./
-RUN npm ci --ignore-scripts \
-    && cd node_modules/@pzzh/solc \
-    && npm run postinstall
-COPY src src
-RUN npm run build
-
-FROM alpine:3.20
-
-RUN apk add --no-cache ca-certificates nodejs npm
+WORKDIR /data
+WORKDIR /usr/src/app
+RUN apt-get update
+RUN apt-get install -y git
+RUN apt-get install -y curl
 
-# Install pm2 globally
-RUN npm install -g pm2
+RUN curl -sL https://deb.nodesource.com/setup_18.x | bash
+RUN apt-get install -y nodejs
 
+RUN git clone https://github.com/vechain/rosetta.git
 WORKDIR /usr/src/app/rosetta
+RUN git checkout master
+RUN npm ci && npm run build
 
-COPY --from=thor-builder /usr/local/bin/thor /usr/src/app
-COPY --from=node-buider /usr/src/app/rosetta/dist/index.js /usr/src/app/rosetta/dist/index.js
-
-COPY process_online.json process_offline.json start.sh ./
-COPY rosetta-cli-conf rosetta-cli-conf
-COPY config config
-
-# Create a non-root user
-RUN adduser -D -s /bin/ash thor
-
-# Create /data/logs directory and set permissions for the thor user
-RUN mkdir -p /data/logs && chown -R thor:thor /data/logs
-
-# Prepare PM2 directories with correct permissions
-RUN mkdir -p /home/thor/.pm2/logs /home/thor/.pm2/pids && \
-    chown -R thor:thor /home/thor/.pm2
-
-ENV PM2_HOME=/home/thor/.pm2
-
-USER thor
+RUN npm install -g pm2
 
+COPY --from=builder /go/thor/bin/thor /usr/src/app/
 EXPOSE 8080 8669 11235 11235/udp
 
-ENTRYPOINT ["sh", "./start.sh"]
+ENTRYPOINT ["sh","./start.sh"]

src/common/checkSchema.ts

@@ -28,7 +28,7 @@ export class CheckSchema {
         const schema = Joi.object({
             index:Joi.number().min(0),
             hash:Joi.string().length(66).regex(/^(-0x|0x)?[0-9a-f]*$/)
-        }).or('index','hash');
+        });
         const verify = schema.validate(blockIdentifier,{allowUnknown:true});
         return {result:verify.error == undefined,error:verify.error};
     }
@@ -52,4 +52,4 @@ export class CheckSchema {
         const verify = schema.validate(addr);
         return verify.error == undefined ? true : false;
     }
-}
+}

src/controllers/block.ts

@@ -40,11 +40,6 @@ export class Block extends Router {
             revision = ctx.request.body.block_identifier.hash;
         }
 
-        if(revision == undefined){
-            ConvertJSONResponeMiddleware.KnowErrorJSONResponce(ctx,getError(24,undefined));
-            return;
-        }
-
         try {
             const block = await this.connex.thor.block(revision).get();
             if(block != null){
@@ -146,4 +141,4 @@ export class Block extends Router {
     private connex:ConnexPro;
     private verifyMiddleware:RequestInfoVerifyMiddleware;
     private transConverter:TransactionConverter;
-}
+}