Merge remote-tracking branch 'origin/main' into consensus-params-fix

.github/workflows/integration.yml

@@ -0,0 +1,36 @@
+name: Integration
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+
+jobs:
+  test:
+    # teritorid hangs on ubuntu runner
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Checkout teritori-dapp repo
+        uses: actions/checkout@v4
+        with:
+          repository: TERITORI/teritori-dapp
+          path: teritori-dapp
+          ref: 66134e9580135a07aba64e00b68af9f30f8fdb93
+
+      - uses: actions/setup-go@v3
+        with:
+          go-version: "1.20"
+
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 18
+          cache: "yarn"
+          cache-dependency-path: "teritori-dapp/yarn.lock"
+
+      - name: Run integration tests
+        run: make integration-tests
+        env:
+          TERITORI_DAPP_REPO: teritori-dapp

.gitignore

@@ -4,4 +4,7 @@
 testnetv2
 data
 *.txt
-.idea
+.idea
+
+/teritori-dapp/
+/build/

Makefile

@@ -213,3 +213,7 @@ proto-check-breaking:
 docker.publish:
 	docker build . --platform linux/amd64 -t $(IMAGE_TAG)
 	docker push $(IMAGE_TAG)
+
+.PHONY: integration-tests
+integration-tests:
+	./integration-test/run.sh

README.md

@@ -22,3 +22,11 @@ Teritori is a Cosmos SDK based blockchain here to enhance Web3 individuals, comm
 
 ## All the mainnet chains:
 [__ACTIVE__] - [teritori-1](https://github.com/TERITORI/teritori-chain/tree/main/mainnet/teritori-1)    
+
+# Dev
+
+## Run custom integration test
+
+```shell
+TERITORI_DAPP_REPO=/path/to/teritori-dapp ./integration-test/run.sh
+```

integration-test/run.sh

@@ -0,0 +1,21 @@
+#!/bin/bash
+set -euo pipefail
+IFS=$'\n\t'
+set -x
+
+commit=66134e9580135a07aba64e00b68af9f30f8fdb93
+
+if [[ -z "${TERITORI_DAPP_REPO:-}" ]]; then
+    rm -fr teritori-dapp
+    git clone https://github.com/TERITORI/teritori-dapp.git
+    cd teritori-dapp
+    git checkout $commit
+else
+    cd $TERITORI_DAPP_REPO
+fi
+
+yarn
+
+npx tsx packages/scripts/integration-testing/simpleTest ..
+npx tsx packages/scripts/integration-testing/upgradeTest142toDir ..
+npx tsx packages/scripts/integration-testing/upgradeTest120toDir ..

testnet/teritori-test-5/README.md

@@ -30,9 +30,9 @@ Install few packages:
 apt install build-essential git curl gcc make jq -y
 ```
 
-Install Go 1.18+:  
+Install Go 1.19+:  
 ```shell
-wget -c https://go.dev/dl/go1.18.3.linux-amd64.tar.gz && rm -rf /usr/local/go && tar -C /usr/local -xzf go1.18.3.linux-amd64.tar.gz && rm -rf go1.18.3.linux-amd64.tar.gz
+wget -c https://go.dev/dl/go1.19.13.linux-amd64.tar.gz && rm -rf /usr/local/go && tar -C /usr/local -xzf go1.19.13.linux-amd64.tar.gz && rm -rf go1.19.13.linux-amd64.tar.gz
 ``` 
 
 Setup your environnement (you can skip this part if you already had go installed before):  
@@ -46,12 +46,12 @@ echo 'export PATH=$PATH:/usr/local/go/bin:$HOME/go/bin' >> $HOME/.bash_profile &
 Verify the installation:  
 ```shell
 go version
-#Should return go version go1.18.3 linux/amd64
+#Should return go version go1.19.13 linux/amd64
 ``` 
 
 ## Setup the chain  
 
-Clone the Teritori repository and install the v2 of testnet:  
+Clone the Teritori repository and install teritorid:  
 ```shell
 git clone https://github.com/TERITORI/teritori-chain && cd teritori-chain && git checkout v1.4.2 && make install
 ```