From d2b1ff68f99b4de93d7cf832899ea69dc8ddb45a Mon Sep 17 00:00:00 2001 From: conache Date: Wed, 7 Aug 2024 19:27:04 +0300 Subject: [PATCH] Remove b7s and add support for offchain-node --- .env.offchain-node.example | 37 +++++++++++++ .gitignore | 8 +-- Dockerfile_b7s | 7 --- Dockerfile => Dockerfile_inference | 0 docker-compose.yml | 88 ++++-------------------------- main.py | 31 ----------- 6 files changed, 53 insertions(+), 118 deletions(-) create mode 100644 .env.offchain-node.example delete mode 100644 Dockerfile_b7s rename Dockerfile => Dockerfile_inference (100%) delete mode 100644 main.py diff --git a/.env.offchain-node.example b/.env.offchain-node.example new file mode 100644 index 0000000..7425362 --- /dev/null +++ b/.env.offchain-node.example @@ -0,0 +1,37 @@ +ALLORA_OFFCHAIN_NODE_CONFIG_JSON='{ + "wallet": { + "addressKeyName": "test", + "addressRestoreMnemonic": "", + "addressAccountPassphrase": "", + "alloraHomeDir": "", + "gas": "1000000", + "gasAdjustment": 1.0, + "nodeRpc": "http://localhost:26657", + "maxRetries": 1, + "delay": 1, + "submitTx": false + }, + "worker": [ + { + "topicId": 1, + "inferenceEntrypointName": "api-worker-reputer", + "loopSeconds": 5, + "parameters": { + "InferenceEndpoint": "http://source:8000/inference/{Token}", + "Token": "ETH" + } + } + ], + "reputer": [ + { + "topicId": 1, + "reputerEntrypointName": "api-worker-reputer", + "loopSeconds": 30, + "minStake": 100000, + "parameters": { + "SourceOfTruthEndpoint": "http://source:8888/truth/{Token}/{BlockHeight}", + "Token": "ethereum" + } + } + ] +}' \ No newline at end of file diff --git a/.gitignore b/.gitignore index 0bb4c44..4a971f2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,12 +1,12 @@ .DS_Store __pycache__ *.pyc -.lake_cache/* logs/* .env -keys -data inference-data worker-data head-data -lib \ No newline at end of file +offchain-node-data + +.env.* +!.env.*.example diff --git a/Dockerfile_b7s b/Dockerfile_b7s deleted file mode 100644 index 3cfab5a..0000000 --- a/Dockerfile_b7s +++ /dev/null @@ -1,7 +0,0 @@ -FROM alloranetwork/allora-inference-base:latest - -USER root -RUN pip install requests - -USER appuser -COPY main.py /app/ diff --git a/Dockerfile b/Dockerfile_inference similarity index 100% rename from Dockerfile rename to Dockerfile_inference diff --git a/docker-compose.yml b/docker-compose.yml index a96f9be..2e6f837 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,14 +3,10 @@ services: container_name: inference-basic-eth-pred build: context: . + dockerfile: Dockerfile_inference command: python -u /app/app.py ports: - "8000:8000" - networks: - eth-model-local: - aliases: - - inference - ipv4_address: 172.22.0.4 healthcheck: test: ["CMD", "curl", "-f", "http://localhost:8000/inference/ETH"] interval: 10s @@ -21,7 +17,9 @@ services: updater: container_name: updater-basic-eth-pred - build: . + build: + context: . + dockerfile: Dockerfile_inference environment: - INFERENCE_API_ADDRESS=http://inference:8000 command: > @@ -34,78 +32,17 @@ services: depends_on: inference: condition: service_healthy - networks: - eth-model-local: - aliases: - - updater - ipv4_address: 172.22.0.5 - - head: - container_name: head-basic-eth-pred - image: alloranetwork/allora-inference-base-head:latest - environment: - - HOME=/data - entrypoint: - - "/bin/bash" - - "-c" - - | - if [ ! -f /data/keys/priv.bin ]; then - echo "Generating new private keys..." - mkdir -p /data/keys - cd /data/keys - allora-keys - fi - allora-node --role=head --peer-db=/data/peerdb --function-db=/data/function-db \ - --runtime-path=/app/runtime --runtime-cli=bls-runtime --workspace=/data/workspace \ - --private-key=/data/keys/priv.bin --log-level=debug --port=9010 --rest-api=:6000 - ports: - - "6000:6000" - volumes: - - ./head-data:/data - working_dir: /data - networks: - eth-model-local: - aliases: - - head - ipv4_address: 172.22.0.100 - worker: - container_name: worker-basic-eth-pred - environment: - - INFERENCE_API_ADDRESS=http://inference:8000 - - HOME=/data - build: - context: . - dockerfile: Dockerfile_b7s - entrypoint: - - "/bin/bash" - - "-c" - - | - if [ ! -f /data/keys/priv.bin ]; then - echo "Generating new private keys..." - mkdir -p /data/keys - cd /data/keys - allora-keys - fi - # Change boot-nodes below to the key advertised by your head - allora-node --role=worker --peer-db=/data/peerdb --function-db=/data/function-db \ - --runtime-path=/app/runtime --runtime-cli=bls-runtime --workspace=/data/workspace \ - --private-key=/data/keys/priv.bin --log-level=debug --port=9011 \ - --boot-nodes=/ip4/172.22.0.100/tcp/9010/p2p/{HEAD-ID} \ - --topic=allora-topic-1-worker + node: + container_name: offchain_node_test + image: allora-offchain-node:latest volumes: - - ./worker-data:/data - working_dir: /data + - ./offchain-node-data:/data depends_on: - - inference - - head - networks: - eth-model-local: - aliases: - - worker - ipv4_address: 172.22.0.10 - - + inference: + condition: service_healthy + env_file: + - ./env.offchain-node networks: eth-model-local: @@ -117,4 +54,3 @@ networks: volumes: inference-data: worker-data: - head-data: diff --git a/main.py b/main.py deleted file mode 100644 index 85b6611..0000000 --- a/main.py +++ /dev/null @@ -1,31 +0,0 @@ -import os -import requests -import sys -import json - -INFERENCE_ADDRESS = os.environ["INFERENCE_API_ADDRESS"] - - -def process(token_name): - response = requests.get(f"{INFERENCE_ADDRESS}/inference/{token_name}") - content = response.text - return content - - -if __name__ == "__main__": - # Your code logic with the parsed argument goes here - try: - if len(sys.argv) < 5: - value = json.dumps({"error": f"Not enough arguments provided: {len(sys.argv)}, expected 4 arguments: topic_id, blockHeight, blockHeightEval, default_arg"}) - else: - topic_id = sys.argv[1] - blockHeight = sys.argv[2] - blockHeightEval = sys.argv[3] - default_arg = sys.argv[4] - - response_inference = process(token_name=default_arg) - response_dict = {"infererValue": response_inference} - value = json.dumps(response_dict) - except Exception as e: - value = json.dumps({"error": {str(e)}}) - print(value)