bump v0.0.10

terpnetwork · Dec 28, 2024 · 4216714 · 4216714
1 parent 315707d
commit 4216714
Show file tree

Hide file tree

Showing 13 changed files with 93 additions and 86 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -154,7 +154,6 @@ ARG START_CMD
 ARG INIT_CMD
 ARG VERSION
 ARG REPOSITORY
-ARG NAMESPACE
 
 ENV PROJECT=$PROJECT
 ENV PROJECT_BIN=$PROJECT_BIN
@@ -164,7 +163,6 @@ ENV START_CMD=$START_CMD
 ENV INIT_CMD=$INIT_CMD
 ENV VERSION=$VERSION
 ENV REPOSITORY=$REPOSITORY
-ENV NAMESPACE=$NAMESPACE
 
 ENV MONIKER=my-omnibus-node
 

diff --git a/README.md b/README.md
@@ -24,12 +24,12 @@ O-line has a generic base image which can download the required binary at runtim
 
 This generic image provides the O-line scripts and configuration helpers, and nothing else. Set the `BINARY_URL` environment variable to a `.zip`, `.tar` or `.tar.gz` URL, and configure `PROJECT`, `PROJECT_DIR` and `PROJECT_BIN`. Alternatively provide a [Chain Registry](https://github.com/cosmos/chain-registry) `CHAIN_JSON` to configure everything automatically (where data is available).
 
-Image URL: `ghcr.io/terp-network/o-line:v0.0.9-generic`
+Image URL: `ghcr.io/terp-network/o-line:v0.0.10-generic`
 
 ```yaml
 services:
   node:
-    image: ghcr.io/terpnetwork/o-line:v0.0.9-generic
+    image: ghcr.io/terpnetwork/o-line:v0.0.10-generic
     env:
       - MONIKER=my-moniker-1
       - CHAIN_JSON=https://raw.githubusercontent.com/cosmos/chain-registry/refs/heads/master/terpnetwork/chain.json
@@ -45,7 +45,7 @@ tagged with the form `$COSMOS_OMNIBUS_VERSION-$PROJECT-$PROJECT_VERSION`.
 
 |Project|Version|Image| |
 |---|---|---|---|
-|[terp-network](https://github.com/terpnetwork/terp-core)|`v4.2.2`|`terpnetwork/o-line:v0.0.9`|[Example](./terpnetwork)|
+|[terp-network](https://github.com/terpnetwork/terp-core)|`v4.2.2`|`terpnetwork/o-line:v0.0.10`|[Example](./terpnetwork)|
 
 ## Example configurations
 
@@ -221,7 +221,7 @@ See [Cosmos docs](https://docs.tendermint.com/master/nodes/configuration.html) f
 
 ### Creating New ghcr.io image:
 ```sh
-git tag v0.0.8 && git push --tags
+git tag v0.0.10 && git push --tags
 ```
 
 <!-- Adding a new chain is easy:

diff --git a/_examples/load-balanced-rpc-nodes/node_deploy.yml b/_examples/load-balanced-rpc-nodes/node_deploy.yml
@@ -3,13 +3,14 @@ version: "2.0"
 
 services:
   node:
-    image: ghcr.io/terpnetwork/o-line:v0.0.9-terpnetwork-v4.2.2
+    image: ghcr.io/terpnetwork/o-line:v0.0.10-terpnetwork-v4.2.2
     env:
       - MONIKER=my-moniker-1
       - CHAIN_JSON=https://raw.githubusercontent.com/cosmos/chain-registry/refs/heads/master/terpnetwork/chain.json
       - MINIMUM_GAS_PRICES=0.05uthiol
       - FASTSYNC_VERSION=v0
-      - STATESYNC_RPC_SERVERS="<node1>,node2"
+      - ADDRBOOK_URL=https://server-3.itrocket.net/mainnet/terp/addrbook.json
+      - SNAPSHOT_URL=https://snapshots.nodejumper.io/terp/terp_latest.tar.lz4
     expose:
       - port: 26657
         to:

diff --git a/_examples/snapshot_backup/deploy.yml b/_examples/snapshot_backup/deploy.yml
@@ -3,18 +3,18 @@ version: "2.0"
 
 services:
   node:
-    image: ghcr.io/terpnetwork/o-line:v0.0.9-terpnetwork-v4.2.2
+    image: ghcr.io/terpnetwork/o-line:v0.0.10-terpnetwork-v4.2.2
     env:
       - MONIKER=my-moniker-1
       - CHAIN_JSON=https://raw.githubusercontent.com/cosmos/chain-registry/refs/heads/master/terpnetwork/chain.json
       - MINIMUM_GAS_PRICES=0.05uthiol
       - FASTSYNC_VERSION=v0
-      # - P2P_POLKACHU=1
-      - STATESYNC_RPC_SERVERS=<publicnode1:26657,publicnode2:26657>
       - SNAPSHOT_PATH=<bucket/path>
       - SNAPSHOT_TIME=00:00:00
       # - SNAPSHOT_DAY=* #(1-7)
       - SNAPSHOT_SIZE=214748364800 # 200GB in bytes
+      - ADDRBOOK_URL=https://server-3.itrocket.net/mainnet/terp/addrbook.json
+      - SNAPSHOT_URL=https://snapshots.nodejumper.io/terp/terp_latest.tar.lz4
     expose:
       - port: 26657
         to:

diff --git a/_examples/statesync/snapshot-deploy.yml b/_examples/statesync/snapshot-deploy.yml
@@ -3,16 +3,16 @@ version: "2.0"
 
 services:
   node1:
-    image: ghcr.io/terpnetwork/o-line:v0.0.9-terpnetwork-v4.2.2
+    image: ghcr.io/terpnetwork/o-line:v0.0.10-terpnetwork-v4.2.2
     env:
       - MONIKER=public-node-1
       - CHAIN_JSON=https://raw.githubusercontent.com/cosmos/chain-registry/refs/heads/master/terpnetwork/chain.json
       - MINIMUM_GAS_PRICES=0.05uthiol
       - FASTSYNC_VERSION=v0
-      - STATESYNC_RPC_SERVERS=<publicnode1:26657,publicnode2:26657>
-      # - P2P_POLKACHU=1
       - PRUNING=nothing
       - STATESYNC_SNAPSHOT_INTERVAL=500
+      - ADDRBOOK_URL=https://server-3.itrocket.net/mainnet/terp/addrbook.json
+      - SNAPSHOT_URL=https://snapshots.nodejumper.io/terp/terp_latest.tar.lz4
     expose:
       - port: 26657
         as: 80
@@ -26,16 +26,16 @@ services:
     #     data:
     #       mount: /root/.akash
   node2:
-    image: ghcr.io/terpnetwork/o-line:v0.0.9-terpnetwork-v4.2.2
+    image: ghcr.io/terpnetwork/o-line:v0.0.10-terpnetwork-v4.2.2
     env:
       - MONIKER=public-node-2
       - CHAIN_JSON=https://raw.githubusercontent.com/cosmos/chain-registry/refs/heads/master/terpnetwork/chain.json
       - MINIMUM_GAS_PRICES=0.05uthiol
       - FASTSYNC_VERSION=v0
-      - STATESYNC_RPC_SERVERS=<publicnode1:26657,publicnode2:26657>
-      # - P2P_POLKACHU=1
       - PRUNING=nothing
       - STATESYNC_SNAPSHOT_INTERVAL=500
+      - ADDRBOOK_URL=https://server-3.itrocket.net/mainnet/terp/addrbook.json
+      - SNAPSHOT_URL=https://snapshots.nodejumper.io/terp/terp_latest.tar.lz4
     expose:
       - port: 26657
         as: 80

diff --git a/_examples/statesync/statesync-deploy.yml b/_examples/statesync/statesync-deploy.yml
@@ -3,13 +3,14 @@ version: "2.0"
 
 services:
   node1:
-    image: ghcr.io/terpnetwork/o-line:v0.0.9-terpnetwork-v4.2.2
+    image: ghcr.io/terpnetwork/o-line:v0.0.10-terpnetwork-v4.2.2
     env:
       - MONIKER=private_node_1
       - CHAIN_JSON=https://raw.githubusercontent.com/cosmos/chain-registry/refs/heads/master/terpnetwork/chain.json
       - MINIMUM_GAS_PRICES=0.05uthiol
       - FASTSYNC_VERSION=v0
-      - STATESYNC_RPC_SERVERS=<publicnode1:26657,publicnode2:26657>
+      - ADDRBOOK_URL=https://server-3.itrocket.net/mainnet/terp/addrbook.json
+      - SNAPSHOT_URL=https://snapshots.nodejumper.io/terp/terp_latest.tar.lz4
     expose:
       - port: 26657
         as: 80

diff --git a/_examples/validator-and-private-sentries/deploy.yml b/_examples/validator-and-private-sentries/deploy.yml
@@ -2,50 +2,53 @@
 version: "2.0"
 
 services:
-  validator:
-    image: ghcr.io/terpnetwork/o-line:v0.0.9-terpnetwork-v4.2.2
-    env:
-      - MONIKER=validator
-      - CHAIN_JSON=https://raw.githubusercontent.com/cosmos/chain-registry/refs/heads/master/terpnetwork/chain.json
-      - MINIMUM_GAS_PRICES=0.05uthiol
-      - FASTSYNC_VERSION=v0
-      - TERPNETWORK_P2P_PEX=false
-      - TERPNETWORK_P2P_UNCONDITIONAL_PEER_IDS=<node-1-id>,<node-2-id>...
-      - TERPNETWORK_P2P_ADDR_BOOK_STRICT=false
-      - TERPNETWORK_CONSENSUS_DOUBLE_SIGN_CHECK_HEIGHT=10
-      - P2P_PERSISTENT_PEERS=<id@node1:port,id@node2:port>
-      - STATESYNC_RPC_SERVERS=<node1:80>,<node2:80>
-    depends_on:
-      - service: node1
-      - service: node2
-    expose:
-      - port: 26657
-        as: 80
-        to:
-          - service: node1
-          - service: node2
-          - global: true # debug
-      - port: 26656
-        to:
-          - service: node1
-          - service: node2
-    # params:
-    #   storage:
-    #     data:
-    #       mount: /root/.akash
+  # validator:
+  #   image: ghcr.io/terpnetwork/o-line:v0.0.10-terpnetwork-v4.2.2
+  #   env:
+  #     - MONIKER=validator
+  #     - CHAIN_JSON=https://raw.githubusercontent.com/cosmos/chain-registry/refs/heads/master/terpnetwork/chain.json
+  #     - MINIMUM_GAS_PRICES=0.05uthiol
+  #     - FASTSYNC_VERSION=v0
+  #     - TERP_P2P_PEX=false
+  #     - TERP_P2P_UNCONDITIONAL_PEER_IDS=<node-1-id>,<node-2-id>...
+  #     - TERP_P2P_ADDR_BOOK_STRICT=false
+  #     - TERP_CONSENSUS_DOUBLE_SIGN_CHECK_HEIGHT=10
+  #     - P2P_PERSISTENT_PEERS=<id@node1:port,id@node2:port>
+  #     - STATESYNC_RPC_SERVERS=<node1:80>,<node2:80>
+  #   depends_on:
+  #     - service: node1
+  #     - service: node2
+  #   expose:
+  #     - port: 26657
+  #       as: 80
+  #       to:
+  #         - service: node1
+  #         - service: node2
+  #         - global: true # debug
+  #     - port: 26656
+  #       to:
+  #         - service: node1
+  #         - service: node2
+  #   # params:
+  #   #   storage:
+  #   #     data:
+  #   #       mount: /root/.akash
   node1:
-    image: ghcr.io/terpnetwork/o-line:v0.0.9-terpnetwork-v4.2.2
+    image: ghcr.io/terpnetwork/o-line:v0.0.10-terpnetwork-v4.2.2
     env:
       - MONIKER=private_node_1
       - CHAIN_JSON=https://raw.githubusercontent.com/cosmos/chain-registry/refs/heads/master/terpnetwork/chain.json
       - MINIMUM_GAS_PRICES=0.05uthiol
       - FASTSYNC_VERSION=v0
-      - TERPNETWORK_P2P_PEX=true
-      - TERPNETWORK_P2P_PRIVATE_PEER_IDS=<validatorid>
-      - TERPNETWORK_P2P_UNCONDITIONAL_PEER_IDS=<validatorid>
-      - TERPNETWORK_P2P_ADDR_BOOK_STRICT=false
-      - STATESYNC_RPC_SERVERS=<publicnode1:26657,publicnode2:26657>
+      - TERP_P2P_PEX=true
+      - TERP_P2P_PRIVATE_PEER_IDS=562319f62773ecb4542450ceba80cb0db3303875@137.184.225.11:26656
+      - TERP_P2P_UNCONDITIONAL_PEER_IDS=562319f62773ecb4542450ceba80cb0db3303875@137.184.225.11:26656
+      - TERP_P2P_ADDR_BOOK_STRICT=false
+      - ADDRBOOK_URL=https://server-3.itrocket.net/mainnet/terp/addrbook.json
+      - SNAPSHOT_URL=https://snapshots.nodejumper.io/terp/terp_latest.tar.lz4
       - STATESYNC_SNAPSHOT_INTERVAL=500
+      - 
+
     expose:
       - port: 26657
         as: 80
@@ -60,16 +63,16 @@ services:
     #     data:
     #       mount: /root/.akash
   node2:
-    image: ghcr.io/terpnetwork/o-line:v0.0.9-terpnetwork-v4.2.2
+    image: ghcr.io/terpnetwork/o-line:v0.0.10-terpnetwork-v4.2.2
     env:
       - MONIKER=private_node_2
       - CHAIN_JSON=https://raw.githubusercontent.com/cosmos/chain-registry/refs/heads/master/terpnetwork/chain.json
       - MINIMUM_GAS_PRICES=0.05uthiol
       - FASTSYNC_VERSION=v0
-      - TERPNETWORK_P2P_PEX=true
-      - TERPNETWORK_P2P_PRIVATE_PEER_IDS=<validatorid>
-      - TERPNETWORK_P2P_UNCONDITIONAL_PEER_IDS=<validatorid>
-      - TERPNETWORK_P2P_ADDR_BOOK_STRICT=false
+      - TERP_P2P_PEX=true
+      - TERP_P2P_PRIVATE_PEER_IDS=<validatorid>
+      - TERP_P2P_UNCONDITIONAL_PEER_IDS=<validatorid>
+      - TERP_P2P_ADDR_BOOK_STRICT=false
       - STATESYNC_RPC_SERVERS=<publicnode1:26657,publicnode2:26657>
       - STATESYNC_SNAPSHOT_INTERVAL=500
     expose:

diff --git a/_examples/validator-and-public-sentries/sentries-deploy.yml b/_examples/validator-and-public-sentries/sentries-deploy.yml
@@ -3,17 +3,19 @@ version: "2.0"
 
 services:
   node1:
-    image: ghcr.io/terpnetwork/o-line:v0.0.9-terpnetwork-v4.2.2
+    image: ghcr.io/terpnetwork/o-line:v0.0.10-terpnetwork-v4.2.2
     env:
       - MONIKER=private_node_1
       - CHAIN_JSON=https://raw.githubusercontent.com/cosmos/chain-registry/refs/heads/master/terpnetwork/chain.json
       - MINIMUM_GAS_PRICES=0.05uthiol
+      - TERP_P2P_PEX=true
+      - TERP_P2P_SEED=true
+      - TERP_P2P_ADDR_BOOK_STRICT=false
+      - TERP_P2P_PRIVATE_PEER_IDS=<validator-id>
+      - TERP_P2P_UNCONDITIONAL_PEER_IDS=<validator-id>
+      - ADDRBOOK_URL=https://server-3.itrocket.net/mainnet/terp/addrbook.json
+      - SNAPSHOT_URL=https://snapshots.nodejumper.io/terp/terp_latest.tar.lz4
       - FASTSYNC_VERSION=v0
-      - TERPNETWORK_P2P_PEX=true
-      - TERPNETWORK_P2P_PRIVATE_PEER_IDS=<validatorid>
-      - TERPNETWORK_P2P_UNCONDITIONAL_PEER_IDS=<validatorid>
-      - TERPNETWORK_P2P_ADDR_BOOK_STRICT=false
-      - STATESYNC_RPC_SERVERS=<publicnode1:26657,publicnode2:26657>
       - STATESYNC_SNAPSHOT_INTERVAL=500
     expose:
       - port: 26657
@@ -28,17 +30,19 @@ services:
     #     data:
     #       mount: /root/.akash
   node2:
-    image: ghcr.io/terpnetwork/o-line:v0.0.9-terpnetwork-v4.2.2
+    image: ghcr.io/terpnetwork/o-line:v0.0.10-terpnetwork-v4.2.2
     env:
-      - MONIKER=private_node_2
+      - MONIKER=private_node_1
       - CHAIN_JSON=https://raw.githubusercontent.com/cosmos/chain-registry/refs/heads/master/terpnetwork/chain.json
       - MINIMUM_GAS_PRICES=0.05uthiol
+      - TERP_P2P_PEX=true
+      - TERP_P2P_SEED=true
+      - TERP_P2P_ADDR_BOOK_STRICT=false
+      - TERP_P2P_PRIVATE_PEER_IDS=<validator-id>
+      - TERP_P2P_UNCONDITIONAL_PEER_IDS=<validator-id>
+      - ADDRBOOK_URL=https://server-3.itrocket.net/mainnet/terp/addrbook.json
+      - SNAPSHOT_URL=https://snapshots.nodejumper.io/terp/terp_latest.tar.lz4
       - FASTSYNC_VERSION=v0
-      - TERPNETWORK_P2P_PEX=true
-      - TERPNETWORK_P2P_PRIVATE_PEER_IDS=<validatorid>
-      - TERPNETWORK_P2P_UNCONDITIONAL_PEER_IDS=<validatorid>
-      - TERPNETWORK_P2P_ADDR_BOOK_STRICT=false
-      - STATESYNC_RPC_SERVERS=<publicnode1:26657,publicnode2:26657>
       - STATESYNC_SNAPSHOT_INTERVAL=500
     expose:
       - port: 26657

diff --git a/_examples/validator-and-public-sentries/validator-deploy.yml b/_examples/validator-and-public-sentries/validator-deploy.yml
@@ -3,16 +3,16 @@ version: "2.0"
 
 services:
   validator:
-    image: ghcr.io/terpnetwork/o-line:v0.0.9-terpnetwork-v4.2.2
+    image: ghcr.io/terpnetwork/o-line:v0.0.10-terpnetwork-v4.2.2
     env:
       - MONIKER=validator
       - CHAIN_JSON=https://raw.githubusercontent.com/cosmos/chain-registry/refs/heads/master/terpnetwork/chain.json
       - MINIMUM_GAS_PRICES=0.05uthiol
       - FASTSYNC_VERSION=v0
-      - TERPNETWORK_P2P_PEX=false
-      - TERPNETWORK_P2P_UNCONDITIONAL_PEER_IDS=<node-1-id>,<node-2-id>...
-      - TERPNETWORK_P2P_ADDR_BOOK_STRICT=false
-      - TERPNETWORK_CONSENSUS_DOUBLE_SIGN_CHECK_HEIGHT=10
+      - TERP_P2P_PEX=false
+      - TERP_P2P_UNCONDITIONAL_PEER_IDS=<node-1-id>,<node-2-id>...
+      - TERP_P2P_ADDR_BOOK_STRICT=false
+      - TERP_CONSENSUS_DOUBLE_SIGN_CHECK_HEIGHT=10
       - P2P_PERSISTENT_PEERS=<id@node1:port,id@node2:port>
       - STATESYNC_RPC_SERVERS=<node1:80>,<node2:80>
       - S3_KEY=<s3-key>

diff --git a/_examples/validator-and-tmkms/deploy.yml b/_examples/validator-and-tmkms/deploy.yml
@@ -3,14 +3,14 @@ version: "2.0"
 
 services:
   node:
-    image: ghcr.io/terpnetwork/o-line:v0.0.9-terpnetwork-v4.2.2
+    image: ghcr.io/terpnetwork/o-line:v0.0.10-terpnetwork-v4.2.2
     env:
       - MONIKER=my-moniker-1
       - CHAIN_JSON=https://raw.githubusercontent.com/cosmos/chain-registry/refs/heads/master/terpnetwork/chain.json
       - MINIMUM_GAS_PRICES=0.05uthiol
-      # - P2P_POLKACHU=1
-      # - STATESYNC_POLKACHU=1
-      - TERPNETWORK_PRIV_VALIDATOR_LADDR=tcp://0.0.0.0:26658 # requires remote signer
+      - ADDRBOOK_URL=https://server-3.itrocket.net/mainnet/terp/addrbook.json
+      - SNAPSHOT_URL=https://snapshots.nodejumper.io/terp/terp_latest.tar.lz4
+      - TERP_PRIV_VALIDATOR_LADDR=tcp://0.0.0.0:26658 # requires remote signer
     expose:
       - port: 26657
         to:

diff --git a/run.sh b/run.sh
@@ -274,7 +274,7 @@ if [ -n "$STATESYNC_RPC_SERVERS" ]; then
   fi
 fi
 
-if [[ -z $DOWNLOAD_SNAPSHOT && ( -n $SNAPSHOT_URL || -n $SNAPSHOT_BASE_URL || -n $SNAPSHOT_JSON || -n $SNAPSHOT_QUICKSYNC ) && ! -f "$PROJECT_ROOT/data/priv_validator_state.json" ]]; then
+if [[ -z $DOWNLOAD_SNAPSHOT && ( -n $SNAPSHOT_URL || -n $SNAPSHOT_BASE_URL || -n $SNAPSHOT_JSON) && ! -f "$PROJECT_ROOT/data/priv_validator_state.json" ]]; then
   export DOWNLOAD_SNAPSHOT="1"
 fi
 

diff --git a/terpnetwork/deploy.yml b/terpnetwork/deploy.yml
@@ -3,7 +3,7 @@ version: "2.0"
 
 services:
   node:
-    image: ghcr.io/terpnetwork/o-line:v0.0.9-terpnetwork-v4.2.2
+    image: ghcr.io/terpnetwork/o-line:v0.0.10-terpnetwork-v4.2.2
     env:
       - MONIKER=my-moniker-1
       - CHAIN_ID=morocco-1

diff --git a/terpnetwork/docker-compose.yml b/terpnetwork/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3.4'
 
 services:
   node_1:
-    image: ghcr.io/terpnetwork/o-line:v0.0.9-terpnetwork-v4.2.2
+    image: ghcr.io/terpnetwork/o-line:v0.0.10-terpnetwork-v4.2.2
     ports:
       - '26656:26656' # peer
       - '26657:26657' # rpc
-Original file line number
+Diff line change
@@ Expand Up / @@ -274,7 +274,7 @@ if [ -n "$STATESYNC_RPC_SERVERS" ]; then @@
       fi
     fi
-    if [[ -z $DOWNLOAD_SNAPSHOT && ( -n $SNAPSHOT_URL || -n $SNAPSHOT_BASE_URL || -n $SNAPSHOT_JSON || -n $SNAPSHOT_QUICKSYNC ) && ! -f "$PROJECT_ROOT/data/priv_validator_state.json" ]]; then
+    if [[ -z $DOWNLOAD_SNAPSHOT && ( -n $SNAPSHOT_URL || -n $SNAPSHOT_BASE_URL || -n $SNAPSHOT_JSON) && ! -f "$PROJECT_ROOT/data/priv_validator_state.json" ]]; then
       export DOWNLOAD_SNAPSHOT="1"
     fi
@@ Expand Down @@