Bugfix/remove hardcoded ports

dev-compose.yml

@@ -3,7 +3,7 @@ services:
   sekai:
     depends_on:
       - syslog-ng
-    image: ghcr.io/kiracore/sekin/sekai:v0.3.45
+    image: ghcr.io/kiracore/sekin/sekai:v0.4.13
     restart: always
     logging:
       driver: syslog
@@ -12,40 +12,196 @@ services:
         syslog-facility: local0
         tag: "sekai"
     volumes:
-      - ./sekai:/sekai
       - ./tmp:/tmp
+      - ./sekai:/sekai
     ports:
       - "26658:26658"           # ABCI
       - "26657:26657"           # RPC
       - "26656:26656"           # P2P (gRPC)
       - "26660:26660"           # Prometheus
-      - "127.0.0.1:8080:8080"             # RPC scaller
+      - "8181:8080"             # RPC sCaller
+      - "1317:1317"             # REST API
+      - "9090:9090"             # gRPC
+
 
     networks:
       kiranet:
         ipv4_address: 10.1.0.3
     hostname: sekai.local
 
-  interx:
+  # Manager - P2P load balancer and HTTP server
+  manager:
     depends_on:
       - syslog-ng
-    image: ghcr.io/kiracore/sekin/interx:v0.4.48
+    image: ghcr.io/kiracore/interx/manager:v0.3.0
     restart: always
     logging:
       driver: syslog
       options:
         syslog-address: "udp://10.1.0.2:514"
         syslog-facility: local0
-        tag: "interx"
-    volumes:
-      - ./interx:/interx
+        tag: "manager"
     ports:
-      - "11000:11000"
-      - "127.0.0.1:8081:8081"
+      - "8080:8080"             # HTTP server
+      - "9000:9000/udp"         # P2P UDP
     networks:
       kiranet:
         ipv4_address: 10.1.0.4
-    hostname: interx.local
+    volumes:
+      - "./manager/config.yml:/srv/config.yml"
+      - "./manager/logs:/srv/logs"
+    hostname: manager.local
+
+  # Proxy - Legacy HTTP request converter
+  proxy:
+    depends_on:
+      - syslog-ng
+    image: ghcr.io/kiracore/interx/proxy:v0.3.0
+    restart: always
+    logging:
+      driver: syslog
+      options:
+        syslog-address: "udp://10.1.0.2:514"
+        syslog-facility: local0
+        tag: "proxy"
+    ports:
+      - "80:8080"               # HTTP proxy
+    networks:
+      kiranet:
+        ipv4_address: 10.1.0.10
+    volumes:
+      - "./proxy/config.yml:/srv/config.yml"
+      - "./proxy/logs:/srv/logs"
+    hostname: proxy.local
+
+  # Storage - MongoDB storage service
+  storage:
+    depends_on:
+      - syslog-ng
+      - mongo
+    image: ghcr.io/kiracore/interx/storage:v0.3.0
+    restart: always
+    logging:
+      driver: syslog
+      options:
+        syslog-address: "udp://10.1.0.2:514"
+        syslog-facility: local0
+        tag: "storage"
+    expose:
+      - "8880"
+    volumes:
+      - "./worker/sai-storage-mongo/config.yml:/srv/config.yml"
+    networks:
+      kiranet:
+        ipv4_address: 10.1.0.11
+    hostname: storage.local
+
+  # Cosmos Indexer - Indexes Cosmos blockchain data
+  cosmos-indexer:
+    depends_on:
+      - syslog-ng
+    image: ghcr.io/kiracore/interx/cosmos-indexer:v0.3.0
+    restart: always
+    logging:
+      driver: syslog
+      options:
+        syslog-address: "udp://10.1.0.2:514"
+        syslog-facility: local0
+        tag: "cosmos-indexer"
+    expose:
+      - "8883"
+    volumes:
+      - "./worker/cosmos/sai-cosmos-indexer/config.yml:/srv/config.yml"
+    networks:
+      kiranet:
+        ipv4_address: 10.1.0.12
+    hostname: cosmos-indexer.local
+
+  # Cosmos Interaction - Creates and publishes Cosmos transactions
+  cosmos-interaction:
+    depends_on:
+      - syslog-ng
+    image: ghcr.io/kiracore/interx/cosmos-interaction:v0.3.0
+    restart: always
+    logging:
+      driver: syslog
+      options:
+        syslog-address: "udp://10.1.0.2:514"
+        syslog-facility: local0
+        tag: "cosmos-interaction"
+    expose:
+      - "8884"
+    volumes:
+      - "./worker/cosmos/sai-cosmos-interaction/config.yml:/srv/config.yml"
+      - "./worker/cosmos/sai-cosmos-interaction/kira19g3ueqj45wv0pqngeu0hcysjksns76r2nrz63u:/srv/kira19g3ueqj45wv0pqngeu0hcysjksns76r2nrz63u"
+    networks:
+      kiranet:
+        ipv4_address: 10.1.0.13
+    hostname: cosmos-interaction.local
+
+  # Ethereum Indexer - Indexes Ethereum blockchain data
+  ethereum-indexer:
+    depends_on:
+      - syslog-ng
+    image: ghcr.io/kiracore/interx/ethereum-indexer:v0.3.0
+    restart: always
+    logging:
+      driver: syslog
+      options:
+        syslog-address: "udp://10.1.0.2:514"
+        syslog-facility: local0
+        tag: "ethereum-indexer"
+    expose:
+      - "8881"
+    volumes:
+      - "./worker/ethereum/sai-ethereum-indexer/block.data:/srv/block.data"
+      - "./worker/ethereum/sai-ethereum-indexer/config.json:/srv/config.json"
+      - "./worker/ethereum/sai-ethereum-indexer/contracts.json:/srv/contracts.json"
+    networks:
+      kiranet:
+        ipv4_address: 10.1.0.14
+    hostname: ethereum-indexer.local
+
+  # Ethereum Interaction - Creates and publishes Ethereum transactions
+  ethereum-interaction:
+    depends_on:
+      - syslog-ng
+    image: ghcr.io/kiracore/interx/ethereum-interaction:v0.3.0
+    restart: always
+    logging:
+      driver: syslog
+      options:
+        syslog-address: "udp://10.1.0.2:514"
+        syslog-facility: local0
+        tag: "ethereum-interaction"
+    expose:
+      - "8882"
+    volumes:
+      - "./worker/ethereum/sai-ethereum-contract-interaction/config.yml:/srv/config.yml"
+      - "./worker/ethereum/sai-ethereum-contract-interaction/contracts.json:/srv/contracts.json"
+    networks:
+      kiranet:
+        ipv4_address: 10.1.0.15
+    hostname: ethereum-interaction.local
+
+  # MongoDB - Database for storage service
+  mongo:
+    depends_on:
+      - syslog-ng
+    image: mongo:7.0
+    restart: always
+    logging:
+      driver: syslog
+      options:
+        syslog-address: "udp://10.1.0.2:514"
+        syslog-facility: local0
+        tag: "mongo"
+    volumes:
+      - mongo_data:/data/db
+    networks:
+      kiranet:
+        ipv4_address: 10.1.0.16
+    hostname: mongo.local
 
   shidai:
     depends_on:
@@ -92,6 +248,9 @@ services:
 
     hostname: syslog-ng.local
 
+volumes:
+  mongo_data:
+
 networks:
   kiranet:
     name: kiranet

scripts/00-sekaid-join.sh

@@ -0,0 +1,16 @@
+#!/bin/env bash
+curl -X POST "http://localhost:8282/api/execute" \
+     -H "Content-Type: application/json" \
+     -d '{
+            "command": "join",
+            "args": {
+                "ip": "'"$1"'",
+                "interx_port": 80,
+                "rpc_port": 26657,
+                "p2p_port": 26656,
+                "sekaidAddress": "sekai.local",
+                "interxAddress": "interx.local",
+                "mnemonic": "burden size near tragic fitness couch search suffer fluid output expire swap poem utility sing genuine replace dune tenant monkey sauce soccer twin sentence",
+                "local": false
+            }
+         }'

scripts/00-sekaid-version.sh

@@ -1,2 +1,2 @@
- curl -X POST http://127.0.0.1:8080/api/execute -H "Content-Type: application/json" -d '{"command":"version"}'
+ curl -X POST http://127.0.0.1:8181/api/execute -H "Content-Type: application/json" -d '{"command":"version"}'
 

scripts/01-sekaid-init.sh

@@ -1,5 +1,5 @@
 #!/bin/env bash
-curl -X POST http://localhost:8080/api/execute -H "Content-Type: application/json" \
+curl -X POST http://localhost:8181/api/execute -H "Content-Type: application/json" \
 -d '{
     "command": "init",
     "args": {

scripts/02-sekaid-keys-add.sh

@@ -1,5 +1,5 @@
 #!/bin/env bash
-curl -X POST http://localhost:8080/api/execute -H "Content-Type: application/json" \
+curl -X POST http://localhost:8181/api/execute -H "Content-Type: application/json" \
 -d '{
     "command": "keys-add",
     "args": {

scripts/03-sekaid-add-genesis-account.sh

@@ -1,6 +1,6 @@
 #!/bin/env bash
 
-curl -X POST http://localhost:8080/api/execute -H "Content-Type: application/json" \
+curl -X POST http://localhost:8181/api/execute -H "Content-Type: application/json" \
 -d '{
     "command": "add-genesis-account",
     "args": {

scripts/04-sekaid-gentx-claim.sh

@@ -1,5 +1,5 @@
 #!/bin/env bash
-curl -X POST http://localhost:8080/api/execute \
+curl -X POST http://localhost:8181/api/execute \
 -H "Content-Type: application/json" \
 -d '{
     "command": "gentx-claim",

scripts/05-sekaid-start.sh

@@ -1,5 +1,5 @@
 #!/bin/env bash
-curl -X POST http://localhost:8080/api/execute \
+curl -X POST http://localhost:8181/api/execute \
 -H "Content-Type: application/json" \
 -d '{
     "command": "start",

scripts/docker-sekaid-run.sh

@@ -1,4 +1,4 @@
 #!/bin/env bash
 
 VERSION=$1
-docker run --name sekai_rpc --rm -d -p 8080:8080 -p 9090:9090 -p 26657:26657 -p 26656:26656 -v $(pwd)/sekai:/sekai sekai_rpc:$VERSION
+docker run --name sekai_rpc --rm -d -p 8181:8080 -p 9090:9090 -p 26657:26657 -p 26656:26656 -v $(pwd)/sekai:/sekai sekai_rpc:$VERSION