feature/refactor ui

.github/workflows/checks.yml

@@ -2,7 +2,6 @@ name: Run All Checks
 
 on:
   pull_request:
-     types: [opened, edited]
   merge_group:
 
 jobs:
@@ -132,21 +131,3 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-  bump-version:
-    if: github.event_name == 'merge_group'
-    runs-on: ubuntu-latest
-    name: Bump Current Version
-    needs: [validate-release, test-cover, test-race]
-    outputs:
-      new_tag: ${{ steps.bump.outputs.new_tag }}
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          fetch-depth: 0
-      - name: Create bump and changelog
-        id: bump
-        uses: commitizen-tools/commitizen-action@master
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          increment: "PATCH"

.github/workflows/publish.yml

@@ -1,9 +1,8 @@
 name: Publish Versioned Assets
 on:
   push:
-    branches:
-      - develop
-      - main
+    tags:
+      - v*
     paths:
       - "docs/**"
       - "proto/**"

.github/workflows/release.yml

@@ -1,6 +1,8 @@
 name: Versioned Release
 
 on:
+  pull_request:
+    types: [closed]
   push:
     tags:
       - v*
@@ -9,6 +11,25 @@ permissions:
   contents: write
 
 jobs:
+  bump-version:
+    if: github.event.pull_request.merged == true && github.event.pull_request.base.ref == 'develop'
+    runs-on: ubuntu-latest
+    name: Bump Current Version
+    needs: [validate-release, test-cover, test-race]
+    outputs:
+      new_tag: ${{ steps.bump.outputs.new_tag }}
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          fetch-depth: 0
+      - name: Create bump and changelog
+        id: bump
+        uses: commitizen-tools/commitizen-action@master
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          increment: "PATCH"
+
   new-release:
     name: Run GoReleaser on New Tag
     if: startsWith(github.ref, 'refs/tags/')

.gitignore

@@ -61,7 +61,7 @@ override.tf.json
 
 .terraformrc
 terraform.rc
-
+flake.lock
 
 # Misc
 .DS_Store
@@ -100,6 +100,7 @@ mprocs.yaml
 mprocs.log
 tools-stamp
 sonr.log
+deploy/conf
 
 interchaintest-downloader
 .haptic

.taskfiles/Hway.yml

@@ -0,0 +1,25 @@
+version: "3"
+
+vars:
+  GOPATH:
+    sh: go env GOPATH
+  BIN_DIR: "{{.GOPATH}}/bin"
+  BINARY: "{{.BIN_DIR}}/hway"
+  OS:
+    sh: uname -s
+  ARCH:
+    sh: uname -m
+
+tasks:
+  build:
+    desc: Build the hway binary
+    silent: true
+    cmds: 
+      - gum spin --spinner dot --title "Build Hway Single Target ({{.OS}}/{{.ARCH}})..." -- goreleaser build --snapshot --clean --single-target --id hway -o {{.BIN_DIR}}/hway
+
+  start:
+    desc: Start the hway daemon
+    silent: true
+    deps: [build]
+    cmds:
+      - "{{.BINARY}}"

.taskfiles/IPFS.yml

@@ -0,0 +1,37 @@
+version: "3"
+
+vars:
+  ROOT:
+    sh: git rev-parse --show-toplevel
+tasks:
+  init:
+    desc: Setup ipfs with Cloudflare
+    silent: true
+    vars:
+      PEERS: |
+        '[
+          {"ID": "QmcFf2FH3CEgTNHeMRGhN7HNHU1EXAxoEk6EFuSyXCsvRE", "Addrs": ["/dnsaddr/node-1.ingress.cloudflare-ipfs.com"]},
+          {"ID": "QmcFmLd5ySfk2WZuJ1mfSWLDjdmHZq7rSAua4GoeSQfs1z", "Addrs": ["/dnsaddr/node-2.ingress.cloudflare-ipfs.com"]},
+          {"ID": "QmcfFmzSDVbwexQ9Au2pt5YEXHK5xajwgaU6PpkbLWerMa", "Addrs": ["/dnsaddr/node-3.ingress.cloudflare-ipfs.com"]},
+          {"ID": "QmcfJeB3Js1FG7T8YaZATEiaHqNKVdQfybYYkbT1knUswx", "Addrs": ["/dnsaddr/node-4.ingress.cloudflare-ipfs.com"]},
+          {"ID": "QmcfVvzK4tMdFmpJjEKDUoqRgP4W9FnmJoziYX5GXJJ8eZ", "Addrs": ["/dnsaddr/node-5.ingress.cloudflare-ipfs.com"]},
+          {"ID": "QmcfZD3VKrUxyP9BbyUnZDpbqDnT7cQ4WjPP8TRLXaoE7G", "Addrs": ["/dnsaddr/node-6.ingress.cloudflare-ipfs.com"]},
+          {"ID": "QmcfZP2LuW4jxviTeG8fi28qjnZScACb8PEgHAc17ZEri3", "Addrs": ["/dnsaddr/node-7.ingress.cloudflare-ipfs.com"]},
+          {"ID": "QmcfgsJsMtx6qJb74akCw1M24X1zFwgGo11h1cuhwQjtJP", "Addrs": ["/dnsaddr/node-8.ingress.cloudflare-ipfs.com"]},
+          {"ID": "Qmcfr2FC7pFzJbTSDfYaSy1J8Uuy8ccGLeLyqJCKJvTHMi", "Addrs": ["/dnsaddr/node-9.ingress.cloudflare-ipfs.com"]},
+          {"ID": "QmcfR3V5YAtHBzxVACWCzXTt26SyEkxdwhGJ6875A8BuWx", "Addrs": ["/dnsaddr/node-10.ingress.cloudflare-ipfs.com"]},
+          {"ID": "Qmcfuo1TM9uUiJp6dTbm915Rf1aTqm3a3dnmCdDQLHgvL5", "Addrs": ["/dnsaddr/node-11.ingress.cloudflare-ipfs.com"]},
+          {"ID": "QmcfV2sg9zaq7UUHVCGuSvT2M2rnLBAPsiE79vVyK3Cuev", "Addrs": ["/dnsaddr/node-12.ingress.cloudflare-ipfs.com"]}
+        ]'
+    cmds:
+      - rm -rf ~/.ipfs
+      - ipfs init
+      - ipfs config --json Peering.Peers {{.PEERS}}
+      - ipfs config --json API.HTTPHeaders.Access-Control-Allow-Origin '["*"]'
+
+start:
+  desc: Start the ipfs daemon
+  silent: true
+  deps: [init]
+  cmds:
+    - ipfs daemon

.taskfiles/Postgres.yml

@@ -0,0 +1,23 @@
+version: "3"
+
+vars:
+  GOPATH:
+    sh: go env GOPATH
+  BIN_DIR: "{{.GOPATH}}/bin"
+  OS:
+    sh: uname -s
+  ARCH:
+    sh: uname -m
+
+tasks:
+  init:
+    desc: Initialize postgresql
+    silent: true
+    dir: deploy
+    cmds:
+      - cmd: sudo -u postgres psql -f deploy/apps/chainindex/seed.sql
+        platforms:
+          - linux
+      - cmd: sudo -u postgres psql -d chainindex -f deploy/apps/chainindex/schema.sql
+        platforms:
+          - linux

.taskfiles/Sonrd.yml

@@ -0,0 +1,48 @@
+version: "3"
+
+vars:
+  BINARY: sonrd
+  BUILD_FLAGS: -mod=readonly -trimpath
+  BUILD_TAGS: netgo,ledger
+  COMMIT: 
+    sh: git rev-parse HEAD
+  VERSION:
+    sh: git describe --tags --always
+  DOPPLER_TOKEN:
+    sh: skate get DOPPLER_NETWORK
+
+tasks:
+  build:
+    desc: Build the sonrd binary
+    cmds:
+      - >
+        go build 
+        {{.BUILD_FLAGS}}
+        -tags "{{.BUILD_TAGS}}"
+        -ldflags "
+        -X github.com/cosmos/cosmos-sdk/version.Name=sonr
+        -X github.com/cosmos/cosmos-sdk/version.AppName=sonrd
+        -X github.com/cosmos/cosmos-sdk/version.Version={{.VERSION}}
+        -X github.com/cosmos/cosmos-sdk/version.Commit={{.COMMIT}}
+        -X github.com/cosmos/cosmos-sdk/version.BuildTags={{.BUILD_TAGS}}
+        "
+        -o ./build/{{.BINARY}}
+        ./cmd/sonrd
+    env:
+      CGO_ENABLED: 1
+      GOARCH: 
+        sh: go env GOARCH
+      GOOS:
+        sh: go env GOOS
+
+  install:
+    desc: Install sonrd
+    silent: true
+    cmds:
+      - gum spin --spinner dot --title "Installing sonr daemon..." -- make install
+
+  start:
+    desc: Start the sonr node
+    cmds:
+      - sh scripts/test_dop_node.sh
+

.taskfiles/Synapse.yml

@@ -0,0 +1,23 @@
+version: "3"
+
+vars:
+  ROOT:
+    sh: git rev-parse --show-toplevel
+
+tasks:
+  init:
+    desc: Configure synapse homeserver with PKL
+    silent: true
+    cmds: 
+      - pkl eval pkl/matrix.net/Homeserver.pkl -f yaml -o deploy/conf/synapse/homeserver.yaml
+    env:
+      MATRIX_CLIENT_NAME: sonr.id
+      MATRIX_SERVER_NAME: sonr.id
+      MATRIX_SERVER_URL: http://localhost:8008
+      MATRIX_SLIDING_SYNC_PROXY: http://localhost:8008
+      MATRIX_PSQL_CONN: postgresql://matrixhs_user:matrixhs_password123@localhost:5432/sonr
+      MATRIX_REGISTRATION_SHARED_SECRET: secret
+      MATRIX_ENABLE_RECATCHA: false
+      MATRIX_RECATCHA_PUBLIC_KEY: ""
+      MATRIX_RECATCHA_PRIVATE_KEY: ""
+      MATRIX_RECATCHA_BYPASS_SECRET: ""

.taskfiles/TigerBeetle.yml

@@ -0,0 +1,12 @@
+version: "3"
+
+vars:
+  ROOT:
+    sh: git rev-parse --show-toplevel
+
+tasks:
+  init:
+    desc: Configure tigerbeetle database
+    silent: true
+    cmds: 
+      - pkl eval pkl/matrix.net/Homeserver.pkl -f yaml -o deploy/conf/synapse/homeserver.yaml

Dockerfile

@@ -1,40 +1,3 @@
-FROM jetpackio/devbox:latest AS sonrvm
-
-# Installing your devbox project
-WORKDIR /code
-USER root:root
-
-RUN mkdir -p /code && chown ${DEVBOX_USER}:${DEVBOX_USER} /code
-
-USER ${DEVBOX_USER}:${DEVBOX_USER}
-
-COPY --chown=${DEVBOX_USER}:${DEVBOX_USER} devbox.json devbox.json
-COPY --chown=${DEVBOX_USER}:${DEVBOX_USER} process-compose.yaml process-compose.yaml
-
-RUN devbox run -- echo "Installed Packages."
-
-ENTRYPOINT ["devbox", "run"]
-
-# --------------------------------------------------------
-FROM jetpackio/devbox:latest AS sonr-runner
-
-WORKDIR /code
-USER root:root
-
-RUN mkdir -p /code && chown ${DEVBOX_USER}:${DEVBOX_USER} /code
-
-USER ${DEVBOX_USER}:${DEVBOX_USER}
-
-COPY --chown=${DEVBOX_USER}:${DEVBOX_USER} devbox.json devbox.json
-COPY --chown=${DEVBOX_USER}:${DEVBOX_USER} process-compose.yaml process-compose.yaml
-COPY --chown=${DEVBOX_USER}:${DEVBOX_USER} . .
-
-RUN devbox run -- echo "Installed Packages."
-
-RUN git config --global --add safe.directory /code
-ENTRYPOINT ["devbox", "run", "testnet"]
-
-# --------------------------------------------------------
 FROM golang:1.22-alpine AS go-builder
 
 SHELL ["/bin/sh", "-ecuxo", "pipefail"]