Merge branch 'main' into sepolia

cosmology-tech · Aug 8, 2023 · fd980b5 · fd980b5
2 parents 50043a4 + 056d085
commit fd980b5
Show file tree

Hide file tree

Showing 37 changed files with 486 additions and 806 deletions.
diff --git a/.github/workflows/pr-tests.yaml b/.github/workflows/pr-tests.yaml
@@ -41,7 +41,7 @@ jobs:
 
       - name: Setup Test infra
         id: starship-action
-        uses: cosmology-tech/starship-action@0.2.11
+        uses: cosmology-tech/starship-action@0.2.12
         with:
           values: ${{ env.CONFIG_FILE }}
           port-forward: true

diff --git a/Makefile b/Makefile
@@ -8,13 +8,6 @@ endif
 KEYS_CONFIG = charts/$(HELM_CHART)/configs/keys.json
 VALUES_FILE = charts/$(HELM_CHART)/values.yaml
 
-###############################################################################
-###                              Proto commands                             ###
-###############################################################################
-.PHONY: proto
-proto:
-	(cd proto/ && make build-proto)
-
 ###############################################################################
 ###                              Helm commands                              ###
 ###############################################################################

diff --git a/charts/devnet/Chart.yaml b/charts/devnet/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.40
+version: 0.1.42
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/charts/devnet/defaults.yaml b/charts/devnet/defaults.yaml
@@ -0,0 +1,263 @@
+# API for interacting with the charts for devnet
+# TODO: need a way to create state reaching jobs, those will run user bash scripts
+# after the chain has been initialized, get the chain to a state and then complete
+defaultChains:
+  osmosis:
+    image: ghcr.io/cosmology-tech/starship/osmosis:v15.1.2-wasmvm1.1.2
+    home: /root/.osmosisd
+    binary: osmosisd
+    prefix: osmo
+    denom: uosmo
+    coins: 100000000000000uosmo,100000000000000uion
+    hdPath: m/44'/118'/0'/0/0
+    coinType: 118
+    repo: https://github.com/osmosis-labs/osmosis
+  juno:
+    image: ghcr.io/cosmology-tech/starship/juno:v15.0.0
+    home: /root/.juno
+    binary: junod
+    prefix: juno
+    denom: ujuno
+    coins: 100000000000000ujuno
+    hdPath: m/44'/118'/0'/0/0
+    coinType: 118
+    repo: https://github.com/CosmosContracts/juno
+  wasmd:
+    image: anmol1696/wasmd:latest
+    home: /root/.wasmd
+    binary: wasmd
+    prefix: wasm
+    denom: stake
+    coins: 100000000000000ucosm,100000000000000stake
+    hdPath: m/44'/118'/0'/0/0
+    coinType: 118
+    repo: https://github.com/CosmWasm/wasmd
+  cosmos:
+    image: ghcr.io/cosmology-tech/starship/gaia:v9.1.1
+    home: /root/.gaia
+    binary: gaiad
+    prefix: cosmos
+    denom: uatom
+    coins: 100000000000000stake,100000000000000uatom
+    hdPath: m/44'/118'/0'/0/0
+    coinType: 118
+    repo: https://github.com/cosmos/gaia
+  simapp:
+    image: ghcr.io/cosmology-tech/starship/simapp:v0.47.3
+    home: /root/.simapp
+    binary: simd
+    prefix: cosmos
+    denom: stake
+    coins: 100000000000000stake
+    hdPath: m/44'/118'/0'/0/0
+    coinType: 118
+    repo: https://github.com/cosmos/cosmos-sdk/tree/main/simapp
+  persistencecore:
+    image: anmol1696/persistencecore:latest
+    home: /root/.persistenceCore
+    binary: persistenceCore
+    prefix: persistence
+    denom: uxprt
+    coins: 100000000000000uxprt
+    hdPath: m/44'/118'/0'/0/0
+    coinType: 118
+    repo: https://github.com/persistenceOne/persistenceCore
+  stride:
+    image: ghcr.io/cosmology-tech/starship/stride:v9.2.1
+    home: /root/.stride
+    binary: strided
+    prefix: stride
+    denom: ustrd
+    coins: 100000000000000ustrd
+    hdPath: m/44'/118'/0'/0/0
+    coinType: 118
+    repo: https://github.com/Stride-Labs/stride
+  injective:
+    image: ghcr.io/cosmology-tech/starship/injective:v1.11-1685225746
+    home: /root/.injectived
+    binary: injectived
+    prefix: inj
+    denom: inj
+    coins: 100000000000000inj
+    hdPath: m/44'/60'/0'/0/0
+    coinType: 60
+    repo: https://github.com/InjectiveLabs/injective-chain-releases
+  ics:
+    image: ghcr.io/cosmology-tech/starship/ics:v0.1.0
+    home: /root/.ics
+    binary: interchain-security-pd
+    prefix: cosmos
+    denom: uatom
+    coins: 100000000000000stake,100000000000000uatom
+    hdPath: m/44'/118'/0'/0/0
+    coinType: 118
+    repo: https://github.com/cosmos/interchain-security
+  cronos:
+    image: ghcr.io/cosmology-tech/starship/cronos:v1.0.4
+    home: /root/.cronos
+    binary: cronosd
+    prefix: crc
+    denom: basecro
+    coins: 100000000000000basecro
+    hdPath: m/44'/60'/0'/0/0
+    coinType: 60
+    repo: https://github.com/crypto-org-chain/cronos
+  cryptoorgchain:
+    image: ghcr.io/cosmology-tech/starship/cryptoorgchain:v4.1.2
+    home: /root/.cryptoorgchain
+    binary: chain-maind
+    prefix: cro
+    denom: basecro
+    coins: 100000000000000basecro
+    hdPath: m/44'/118'/0'/0/0
+    coinType: 118
+    repo: https://github.com/crypto-org-chain/chain-main
+  evmos:
+    image: ghcr.io/cosmology-tech/starship/evmos:v12.1.5
+    home: /root/.evmosd
+    binary: evmosd
+    prefix: evmos
+    denom: aevmos
+    coins: 100000000000000aevmos
+    hdPath: m/44'/60'/0'/0/0
+    coinType: 60
+    repo: https://github.com/evmos/evmos
+  regen:
+    image: ghcr.io/cosmology-tech/starship/regen:v5.0.0
+    home: /root/.regen
+    binary: regen
+    prefix: regen
+    denom: uregen
+    coins: 100000000000000uregen
+    hdPath: m/44'/118'/0'/0/0
+    coinType: 118
+    repo: https://github.com/regen-network/regen-ledger
+  quasar:
+    image: ghcr.io/cosmology-tech/starship/quasar:v0.1.1
+    home: /root/.quasarnode
+    binary: quasarnoded
+    prefix: quasar
+    denom: uqsr
+    coins: 100000000000000uqsr
+    hdPath: m/44'/118'/0'/0/0
+    coinType: 118
+    repo: https://github.com/quasar-finance/quasar-preview
+  quicksilver:
+    image: ghcr.io/cosmology-tech/starship/quicksilver:v0.6.6
+    home: /root/.quicksilverd
+    binary: quicksilverd
+    prefix: quick
+    denom: uqck
+    coins: 100000000000000uqck
+    hdPath: m/44'/118'/0'/0/0
+    coinType: 118
+    repo: https://github.com/ingenuity-build/quicksilver
+  sei:
+    image: ghcr.io/cosmology-tech/starship/sei:2.0.46beta
+    home: /root/.seid
+    binary: seid
+    prefix: sei
+    denom: usei
+    coins: 100000000000000usei
+    hdPath: m/44'/118'/0'/0/0
+    coinType: 118
+    repo: https://github.com/sei-protocol/sei-chain
+  sommelier:
+    image: ghcr.io/cosmology-tech/starship/sommelier:v6.0.0
+    home: /root/.sommelier
+    binary: sommelier
+    prefix: somm
+    denom: usomm
+    coins: 100000000000000usomm
+    hdPath: m/44'/118'/0'/0/0
+    coinType: 118
+    repo: https://github.com/PeggyJV/sommelier
+  stargaze:
+    image: ghcr.io/cosmology-tech/starship/stargaze:v10.0.1
+    home: /root/.starsd
+    binary: starsd
+    prefix: stars
+    denom: ustars
+    coins: 100000000000000ustars
+    hdPath: m/44'/118'/0'/0/0
+    coinType: 118
+    repo: https://github.com/public-awesome/stargaze
+  umee:
+    image: ghcr.io/cosmology-tech/starship/umee:v3.1.0
+    home: /root/.umee
+    binary: umeed
+    prefix: umee
+    denom: uumee
+    coins: 100000000000000uumee
+    hdPath: m/44'/118'/0'/0/0
+    coinType: 118
+    repo: https://github.com/umee-network/umee
+  eth:
+    prysmCtl:
+      image: gcr.io/prysmaticlabs/prysm/cmd/prysmctl
+      command: ["/app/cmd/prysmctl/prysmctl"]
+      args:
+        - testnet
+        - generate-genesis
+        - --num-validators=36
+        - --output-ssz=/ethereum/consensus/genesis.ssz
+        - --chain-config-file=/etc/config/config.yml
+    geth:
+      image: ethereum/client-go:v1.10.26
+      args:
+        - --nodiscover
+        - --http
+        - --http.api=eth,net,web3,debug
+        - --http.addr=0.0.0.0
+        - --http.vhosts=*
+        - --authrpc.addr=0.0.0.0
+        - --authrpc.jwtsecret=/etc/secrets/jwt.hex
+        - --datadir=/ethereum/execution
+        - --allow-insecure-unlock
+        - --unlock=0x123463a4B065722E99115D6c222f267d9cABb524
+        - --password=/dev/null
+        - --syncmode=full
+        - --mine
+        - --miner.etherbase=0x123463a4b065722e99115d6c222f267d9cabb524
+        - --networkid=32382
+    beaconChain:
+      image: gcr.io/prysmaticlabs/prysm/beacon-chain:v4.0.7
+      command: ["/app/cmd/beacon-chain/beacon-chain"]
+      args:
+        - --datadir=/ethereum/consensus/beacon
+        - --min-sync-peers=0
+        - --genesis-state=/ethereum/consensus/genesis.ssz
+        - --bootstrap-node=
+        - --chain-config-file=/etc/config/config.yml
+        - --config-file=/etc/config/config.yml
+        - --chain-id=32382
+        - --rpc-host=0.0.0.0
+        - --contract-deployment-block=0
+        - --grpc-gateway-host=0.0.0.0
+        - --execution-endpoint=http://localhost:8551
+        - --accept-terms-of-use
+        - --jwt-secret=/etc/secrets/jwt.hex
+        - --contract-deployment-block=0
+        - --suggested-fee-recipient=0x123463a4B065722E99115D6c222f267d9cABb524
+    validator:
+      image: gcr.io/prysmaticlabs/prysm/validator:v4.0.7
+      command: ["/app/cmd/validator/validator"]
+      args:
+        - --accept-terms-of-use
+        - --beacon-rpc-provider=localhost:4000
+        - --datadir=/ethereum/consensus/validator
+        - --interop-num-validators=36
+        - --interop-start-index=0
+        - --force-clear-db
+        - --chain-config-file=/etc/config/config.yml
+        - --config-file=/etc/config/config.yml
+        - --suggested-fee-recipient=0x0C46c2cAFE097b4f7e1BB868B89e5697eE65f934
+    contracts: []
+
+defaultRelayers:
+  ts-relayer:
+    image: ghcr.io/cosmology-tech/starship/ts-relayer:0.9.0
+  hermes:
+    image: ghcr.io/cosmology-tech/starship/hermes:1.5.1
+  go-relayer:
+    image: ghcr.io/polymerdao/relayer-ibcx:starship-integration
diff --git a/charts/devnet/scripts/create_validator.sh b/charts/devnet/scripts/create_validator.sh
@@ -17,20 +17,77 @@ do
   sleep 30
 done
 
-# Run create validator tx command
-echo "Running txn for create-validator"
-$CHAIN_BIN tx staking create-validator \
-  --pubkey=$($CHAIN_BIN tendermint show-validator) \
-  --moniker $VAL_NAME \
-  --amount 5000000000$DENOM \
-  --chain-id $CHAIN_ID \
-  --from $VAL_NAME \
-  --commission-rate="0.10" \
-  --commission-max-rate="0.20" \
-  --commission-max-change-rate="0.01" \
-  --min-self-delegation="1000000" \
-  --fees 100000$DENOM \
-  --gas="auto" \
-  --gas-adjustment 1.5 --yes > /validator.log
-
-cat /validator.log | jq
+# Function to compare version numbers
+version_compare() {
+    version1="$1"
+    version2="$2"
+    if [[ "$(printf '%s\n' "$version1" "$version2" | sort -V | head -n 1)" == "$version1" ]]; then
+        return 1 # version1 is greater
+    else
+        return 0 # version2 is greater or equal
+    fi
+}
+
+# Check if cosmos_sdk_version is greater than a specified version
+is_greater() {
+    version_compare "$1" "$2"
+    return $?
+}
+
+function cosmos-sdk-version-v50() {
+  # Content for the validator.json file
+  json_content='{
+    "pubkey": '$($CHAIN_BIN tendermint show-validator)',
+    "amount": "5000000000'$DENOM'",
+    "moniker": "'$VAL_NAME'",
+    "commission-rate": "0.1",
+    "commission-max-rate": "0.2",
+    "commission-max-change-rate": "0.01",
+    "min-self-delegation": "1000000"
+  }'
+  echo "$json_content" > /validator.json
+  cat /validator.json
+
+  # Run create validator tx command
+  echo "Running txn for create-validator"
+  $CHAIN_BIN tx staking create-validator /validator.json \
+    --chain-id $CHAIN_ID \
+    --from $VAL_NAME \
+    --fees 100000$DENOM \
+    --gas="auto" \
+    --gas-adjustment 1.5 --yes > /validator.log
+
+  cat /validator.log | jq
+}
+
+function cosmos-sdk-version-default() {
+  # Run create validator tx command
+  echo "Running txn for create-validator"
+  $CHAIN_BIN tx staking create-validator \
+    --pubkey=$($CHAIN_BIN tendermint show-validator) \
+    --moniker $VAL_NAME \
+    --amount 5000000000$DENOM \
+    --chain-id $CHAIN_ID \
+    --from $VAL_NAME \
+    --commission-rate="0.10" \
+    --commission-max-rate="0.20" \
+    --commission-max-change-rate="0.01" \
+    --min-self-delegation="1000000" \
+    --fees 100000$DENOM \
+    --gas="auto" \
+    --gas-adjustment 1.5 --yes > /validator.log
+
+  cat /validator.log | jq
+}
+
+# Fetch the cosmos-sdk version to be able to perform the create-validator tx
+cosmos_sdk_version=$($CHAIN_BIN version --long | sed -n 's/cosmos_sdk_version: \(.*\)/\1/p')
+echo "cosmos_sdk_version: $cosmos_sdk_version"
+
+if is_greater "$cosmos_sdk_version" "v0.50.0"; then
+  echo "cosmos_sdk_version is greater than v0.50.0, running create-validator tx with new format"
+  cosmos-sdk-version-v50
+else
+  echo "cosmos_sdk_version is less than v0.50.0, running create-validator tx with old format"
+  cosmos-sdk-version-default
+fi