Merge pull request #10 from 0KnowledgeNetwork/misc

feat: tx handler with queue and improved logging, use qry package

Author: xendarboh

bin/network-init.sh

@@ -40,15 +40,18 @@ while [ ! -S ${socket} ]; do sleep 1; done
 
 appchain () {
   echo "$@" | tee >(cat >&2) | nc -U -q 0 ${socket}
-  sleep 1s
 }
 
 appchain admin setAdmin
 appchain nodes setRegistrationStake 0
 appchain nodes openRegistration
 appchain networks register ${network_id} ${network_build}
+sleep 2s # prev command takes longer for IPFS
 appchain networks setActive ${network_id}
 
+# this ensures we don't kill prematurely
+sleep 10
+
 kill ${PID}
 
 rm -f ${socket}

docker/Dockerfile

@@ -19,9 +19,9 @@ RUN --mount=type=cache,id=npm,target=/root/.npm \
 
 COPY --from=context-appchain / /app/appchain
 RUN --mount=type=cache,id=pnpm,target=${PNPM_HOME}/store \
-  cd /app/appchain/packages/chain \
+  cd /app/appchain \
   && pnpm install --frozen-lockfile \
-  && pnpm build
+  && pnpm build --filter chain --filter qry
 
 COPY package.json pnpm-lock.yaml /app/appchain-agent/
 RUN --mount=type=cache,id=pnpm,target=${PNPM_HOME}/store \
@@ -44,6 +44,8 @@ RUN apk add --no-cache \
 
 COPY --from=builder /app/appchain/packages/chain/dist /app/appchain/packages/chain/dist
 COPY --from=builder /app/appchain/packages/chain/package.json /app/appchain/packages/chain/
+COPY --from=builder /app/appchain/packages/qry/dist /app/appchain/packages/qry/dist
+COPY --from=builder /app/appchain/packages/qry/package.json /app/appchain/packages/qry/
 COPY --from=builder /app/appchain/package.json /app/appchain/pnpm-lock.yaml /app/appchain/
 COPY --from=builder /app/appchain-agent/dist ./dist
 COPY --from=builder /app/appchain-agent/package.json /app/appchain-agent/pnpm-lock.yaml ./

docker/entry.sh

@@ -1,6 +1,15 @@
 #!/bin/sh
 
-# map env var name to the one used internally
+# map env var names to the one used internally
+
+test ! -z "${URL_APPCHAIN_INDEXER}" \
+  && echo "URL_APPCHAIN_INDEXER=${URL_APPCHAIN_INDEXER}" \
+  && export NEXT_PUBLIC_PROTOKIT_INDEXER_GRAPHQL_URL="${URL_APPCHAIN_INDEXER}"
+
+test ! -z "${URL_APPCHAIN_PROCESSOR}" \
+  && echo "URL_APPCHAIN_PROCESSOR=${URL_APPCHAIN_PROCESSOR}" \
+  && export NEXT_PUBLIC_PROTOKIT_PROCESSOR_GRAPHQL_URL="${URL_APPCHAIN_PROCESSOR}"
+
 test ! -z "${URL_APPCHAIN_SEQUENCER}" \
   && echo "URL_APPCHAIN_SEQUENCER=${URL_APPCHAIN_SEQUENCER}" \
   && export NEXT_PUBLIC_PROTOKIT_GRAPHQL_URL="${URL_APPCHAIN_SEQUENCER}"

package.json

@@ -27,22 +27,25 @@
     "blockstore-core": "4.4.1",
     "blockstore-fs": "1.1.11",
     "cbor": "^9.0.2",
-    "chain": "file:../appchain/packages/chain",
     "commander": "^12.1.0",
     "datastore-core": "9.2.9",
     "datastore-fs": "9.1.9",
     "helia": "4.2.5",
     "libp2p": "1.8.3",
     "multiformats": "13.2.2",
-    "o1js": "1.6.0"
+    "o1js": "1.6.0",
+    "@zkn/chain": "file:../appchain/packages/chain",
+    "@zkn/qry": "file:../appchain/packages/qry"
   },
   "resolutions": {
     "@proto-kit/api": "*",
     "@proto-kit/common": "*",
     "@proto-kit/deployment": "*",
+    "@proto-kit/indexer": "*",
     "@proto-kit/library": "*",
     "@proto-kit/module": "*",
     "@proto-kit/persistance": "*",
+    "@proto-kit/processor": "*",
     "@proto-kit/protocol": "*",
     "@proto-kit/sdk": "*",
     "@proto-kit/sequencer": "*"
@@ -52,5 +55,5 @@
       "react-native": "never"
     }
   },
-  "packageManager": "pnpm@9.7.0+sha512.dc09430156b427f5ecfc79888899e1c39d2d690f004be70e05230b72cb173d96839587545d09429b55ac3c429c801b4dc3c0e002f653830a420fa2dd4e3cf9cf"
+  "packageManager": "pnpm@9.8.0+sha256.56a9e76b51796ca7f73b85e44cf83712862091f4d498c0ce4d5b7ecdc6ba18f7"
 }