Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/go_modules/google.golang.org/gr…
Browse files Browse the repository at this point in the history
…pc-1.57.1

Signed-off-by: Prad Nukala <[email protected]>
  • Loading branch information
prnk28 authored Oct 30, 2023
2 parents 73fe98d + 079be65 commit 95dd523
Show file tree
Hide file tree
Showing 256 changed files with 1,977 additions and 1,119 deletions.
2 changes: 1 addition & 1 deletion .github/contribution/CLIENT_GUIDELINES.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ You will need to install and configure the following dependencies on your machin
You can setup your macOS or Linux machine to be ready for local development with these steps:

```sh
git clone https://github.com/sonr-io/core.git # Clone the repository
git clone https://github.com/sonrhq/core.git # Clone the repository
sh scripts/install.sh # Install dependencies
task # Display the available commands
```
Expand Down
2 changes: 1 addition & 1 deletion .github/contribution/DEVELOPERS.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ You will need to install and configure the following dependencies on your machin
You can setup your macOS or Linux machine to be ready for local development with these steps:

```sh
git clone https://github.com/sonr-io/core.git # Clone the repository
git clone https://github.com/sonrhq/core.git # Clone the repository
sh scripts/install.sh # Install dependencies
task # Display the available commands
```
Expand Down
4 changes: 2 additions & 2 deletions .github/contribution/TESTNET.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ You will need to install and configure the following dependencies on your machin
You can setup your macOS or Linux machine to be ready for local development with these steps:

```sh
git clone https://github.com/sonr-io/core.git # Clone the repository
git clone https://github.com/sonrhq/core.git # Clone the repository
sh scripts/install.sh # Install dependencies
task # Display the available commands
```
Expand All @@ -45,7 +45,7 @@ You will need to install and configure the following dependencies on your machin
You can setup your macOS or Linux machine to be ready for local development with these steps:

```sh
git clone https://github.com/sonr-io/core.git # Clone the repository
git clone https://github.com/sonrhq/core.git # Clone the repository
sh scripts/install.sh # Install dependencies
task # Display the available commands
```
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/proto.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ permissions:

jobs:
lint:
runs-on: self-hosted
runs-on: ubuntu-latest
timeout-minutes: 5
steps:
- uses: actions/checkout@v4
Expand All @@ -21,7 +21,7 @@ jobs:
input: "proto"

break-check:
runs-on: self-hosted
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: bufbuild/[email protected]
Expand Down
24 changes: 12 additions & 12 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,15 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

publish-buf:
name: Publish buf.build proto
runs-on: self-hosted
needs: release
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0
- uses: bufbuild/buf-setup-action@v1
with:
buf_token: ${{ secrets.BUF_TOKEN }}
input: "proto"
# publish-buf:
# name: Publish buf.build proto
# runs-on: self-hosted
# needs: release
# steps:
# - uses: actions/checkout@v3
# with:
# fetch-depth: 0
# - uses: bufbuild/buf-setup-action@v1
# with:
# buf_token: ${{ secrets.BUF_TOKEN }}
# input: "proto"
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
continue-on-error: true
with:
input: "proto"
against: "https://github.com/sonr-io/sonr.git#branch=master"
against: "https://github.com/sonrhq/core.git#branch=master"
- uses: bufbuild/buf-lint-action@v1
with:
input: "proto"
54 changes: 7 additions & 47 deletions .goreleaser.yaml
Original file line number Diff line number Diff line change
@@ -1,18 +1,8 @@
# Project information.
project_name: sonrd

env:
- CGO_ENABLED=1
- WASMVM_URL=https://github.com/CosmWasm/wasmvm/releases/download
- COSMWASM_VERSION=v1.2.4
builds:
# Build - Linux (amd64)
- id: sonrd-linux-amd64
env:
- CC=x86_64-linux-gnu-gcc
hooks:
pre:
- wget {{ .Env.WASMVM_URL }}/v1.3.0/libwasmvm_muslc.x86_64.a -O /usr/lib/x86_64-linux-gnu/libwasmvm_muslc.a
main: ./cmd/sonrd
binary: sonrd
goos:
Expand All @@ -27,22 +17,13 @@ builds:
- -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=netgo,muslc,osusergo
- -X github.com/cosmos/cosmos-sdk/version.BuildTags=netgo
- -w -s
- -linkmode=external
- -extldflags '-Wl,-z,muldefs -static -lm'
tags:
- netgo
- muslc
- osusergo

# Build - Linux (arm64)
- id: sonrd-linux-arm64
env:
- CC=aarch64-linux-gnu-gcc
hooks:
pre:
- wget {{ .Env.WASMVM_URL }}/v1.3.0/libwasmvm_muslc.aarch64.a -O /opt/homebrew/lib/aarch64-linux-gnu/libwasmvm_muslc.a
main: ./cmd/sonrd
binary: sonrd
goos:
Expand All @@ -57,24 +38,15 @@ builds:
- -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=netgo,muslc,osusergo
- -X github.com/cosmos/cosmos-sdk/version.BuildTags=netgo
- -w -s
- -linkmode=external
- -extldflags '-Wl,-z,muldefs -static -lm'
tags:
- netgo
- muslc
- ousergo

# Build - Darwin (amd64)
- id: sonrd-darwin-amd64
main: ./cmd/sonrd/main.go
binary: sonrd
hooks:
pre:
- wget {{ .Env.WASMVM_URL }}/v1.3.0/libwasmvmstatic_darwin.a -O /lib/libwasmvmstatic_darwin.a
env:
- CC=o64-clang
- CGO_LDFLAGS=-L/lib
goos:
- darwin
goarch:
Expand All @@ -87,24 +59,15 @@ builds:
- -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=netgo,ledger,static_wasm
- -X github.com/cosmos/cosmos-sdk/version.BuildTags=netgo
- -w -s
- -linkmode=external
tags:
- netgo
- static_wasm
- ledger

# Build - Darwin (arm64)
- id: sonrd-darwin-arm64
main: ./cmd/sonrd/main.go
binary: sonrd
hooks:
pre:
- wget {{ .Env.WASMVM_URL }}/v1.3.0/libwasmvmstatic_darwin.a -O /lib/libwasmvmstatic_darwin.a
env:
- CC=oa64-clang
- CGO_LDFLAGS=-L/lib
goos:
- darwin
goarch:
Expand All @@ -117,13 +80,10 @@ builds:
- -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=netgo,ledger,static_wasm
- -X github.com/cosmos/cosmos-sdk/version.BuildTags=netgo
- -w -s
- -linkmode=external
tags:
- netgo
- static_wasm
- ledger

# ! ||--------------------------------------------------------------------------------||
# ! || Tarball Archives ||
Expand Down Expand Up @@ -169,7 +129,7 @@ release:
Run the following command to install sonrd:
```bash
curl -L https://github.com/sonr-io/sonr/releases/latest/download/install.sh | sh
curl -L https://github.com/sonrhq/core/releases/latest/download/install.sh | sh
```
### ⚡️ Binaries
Expand All @@ -182,7 +142,7 @@ release:
If you prefer to build from source, you can use the following commands:
````bash
git clone https://github.com/sonr-io/core
git clone https://github.com/sonrhq/core
cd core && git checkout v{{ .Version }}
make install
# Then run sonrd
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ SDK_PACK := $(shell go list -m github.com/cosmos/cosmos-sdk | sed 's/ /\@/g')
DOCKER := $(shell which docker)
DOCKER_BUF := $(DOCKER) run --rm -v $(CURDIR):/workspace --workdir /workspace bufbuild/buf:1.0.0-rc8
BUILDDIR ?= $(CURDIR)/build
HTTPS_GIT := https://github.com/sonr-io/sonr.git
HTTPS_GIT := https://github.com/sonrhq/core.git

export GO111MODULE = on

Expand Down
30 changes: 15 additions & 15 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
</div>
<div style="text-align: left;">

[![Go Reference](https://pkg.go.dev/badge/github.com/sonr-io/sonr.svg)](https://pkg.go.dev/github.com/sonr-io/sonr)
[![Test sonrd](https://github.com/sonr-io/sonr/actions/workflows/tests.yml/badge.svg)](https://github.com/sonr-io/sonr/actions/workflows/tests.yml)
[![GitHub all releases](https://img.shields.io/github/downloads/sonr-io/sonr/total)](https://github.com/sonr-io/sonr/releases/latest)
[![Go Report Card](https://goreportcard.com/badge/github.com/sonr-io/sonr)](https://goreportcard.com/report/github.com/sonr-io/sonr)
[![Go Reference](https://pkg.go.dev/badge/github.com/sonrhq/core.svg)](https://pkg.go.dev/github.com/sonrhq/core)
[![Test sonrd](https://github.com/sonrhq/core/actions/workflows/tests.yml/badge.svg)](https://github.com/sonrhq/core/actions/workflows/tests.yml)
[![GitHub all releases](https://img.shields.io/github/downloads/sonr-io/sonr/total)](https://github.com/sonrhq/core/releases/latest)
[![Go Report Card](https://goreportcard.com/badge/github.com/sonrhq/core)](https://goreportcard.com/report/github.com/sonrhq/core)
[![Vulnerabilities](https://sonarcloud.io/api/project_badges/measure?project=sonr-io_sonr&metric=vulnerabilities)](https://sonarcloud.io/summary/new_code?id=sonr-io_sonr)
[![Security Rating](https://sonarcloud.io/api/project_badges/measure?project=sonr-io_sonr&metric=security_rating)](https://sonarcloud.io/summary/new_code?id=sonr-io_sonr)
[![Twitter](https://img.shields.io/twitter/follow/sonr_io?style=social)](https://sonr.io/twitter)
Expand All @@ -26,13 +26,13 @@ Sonr is an ibc-enabled blockchain for decentralized identity.
- [x] IPFS Database and Storage. [__Docs__](https://sonr.io/docs/guides/storage)
- [x] Redis. [__Docs__](https://sonr.io/docs/guides/api#rest-api-overview)
- [x] MySQL. [__Docs__](https://sonr.io/docs/guides/api#graphql-api-overview)
- [ ] User mailboxes. [Status](https://github.com/sonr-io/sonr/issues/781)
- [ ] database subscriptions. [Status](https://github.com/sonr-io/sonr/issues/782)
- [ ] Matrix chat. [Status](https://github.com/sonr-io/sonr/issues/783)
- [ ] User mailboxes. [Status](https://github.com/sonrhq/core/issues/781)
- [ ] database subscriptions. [Status](https://github.com/sonrhq/core/issues/782)
- [ ] Matrix chat. [Status](https://github.com/sonrhq/core/issues/783)
- [x] IBC Integrations.
- [ ] Nomic. [Status](https://github.com/sonr-io/sonr/issues/784)
- [ ] Evmos. [Status](https://github.com/sonr-io/sonr/issues/785)
- [ ] Osmosis. [Status](https://github.com/sonr-io/sonr/issues/786)
- [ ] Nomic. [Status](https://github.com/sonrhq/core/issues/784)
- [ ] Evmos. [Status](https://github.com/sonrhq/core/issues/785)
- [ ] Osmosis. [Status](https://github.com/sonrhq/core/issues/786)
- [x] Smart Contracts. [__Docs__](https://sonr.io/docs/guides/storage)
- [ ] Typescript Client SDKs. [Status](https://github.com/sonr-io/front/milestone/2)
- [ ] Dashboard. [Status](https://github.com/sonr-io/front/milestone/1)
Expand All @@ -45,8 +45,8 @@ To see how to Contribute, visit [Getting Started](./docs/contribution/DEVELOPERS

## Community & Support

- [Forum](https://github.com/sonr-io/sonr/discussions)
- [Issues](https://github.com/sonr-io/sonr/issues)
- [Forum](https://github.com/sonrhq/core/discussions)
- [Issues](https://github.com/sonrhq/core/issues)
- [Twitter](https://sonr.io/twitter)
- [Dev Chat](https://sonr.io/discord)

Expand All @@ -57,7 +57,7 @@ To see how to Contribute, visit [Getting Started](./docs/contribution/DEVELOPERS
- [ ] __Public Testnet__: Stable for non-enterprise use. [Join it](https://sonr.io/dashboard).
- [ ] __Mainnet__: Coming soon. [Watch status](https://sonr.io/docs/guides/getting-started/features#feature-status).

We are currently in transitioning to Public Testnet. Watch [releases](https://github.com/sonr-io/sonr/releases) of this repo to get notified of major updates.
We are currently in transitioning to Public Testnet. Watch [releases](https://github.com/sonrhq/core/releases) of this repo to get notified of major updates.

## How it works

Expand Down Expand Up @@ -119,15 +119,15 @@ Our approach for client libraries is uniform. Abstract away any blockchain speci
<!-- notranslate -->
<tr>
<td>JavaScript (TypeScript)</td>
<td><a href="https://github.com/sonr-io/core-js" target="_blank" rel="noopener noreferrer">sonr-js</a></td>
<td><a href="https://github.com/sonrhq/core-js" target="_blank" rel="noopener noreferrer">sonr-js</a></td>
<td><a href="https://github.com/sonr-io/auth-js" target="_blank" rel="noopener noreferrer">auth-js</a></td>
<td><a href="https://github.com/sonr-io/database-js" target="_blank" rel="noopener noreferrer">database-js</a></td>
<td><a href="https://github.com/sonr-io/storage-js" target="_blank" rel="noopener noreferrer">storage-js</a></td>
<td><a href="https://github.com/sonr-io/wallet-js" target="_blank" rel="noopener noreferrer">wallet-js</a></td>
</tr>
<tr>
<td>Flutter</td>
<td><a href="https://github.com/sonr-io/core-flutter" target="_blank" rel="noopener noreferrer">sonr-flutter</a></td>
<td><a href="https://github.com/sonrhq/core-flutter" target="_blank" rel="noopener noreferrer">sonr-flutter</a></td>
<td><a href="https://github.com/sonr-io/auth-dart" target="_blank" rel="noopener noreferrer">auth-dart</a></td>
<td><a href="https://github.com/sonr-io/database-dart" target="_blank" rel="noopener noreferrer">database-dart</a></td>
<td><a href="https://github.com/sonr-io/storage-dart" target="_blank" rel="noopener noreferrer">storage-dart</a></td>
Expand Down
1 change: 0 additions & 1 deletion Taskfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,4 +61,3 @@ tasks:
cmds:
- |
make proto-all
cd proto && buf generate --template buf.gen.pulsar.yaml
24 changes: 12 additions & 12 deletions app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -112,18 +112,18 @@ import (
solomachine "github.com/cosmos/ibc-go/v7/modules/light-clients/06-solomachine"
ibctm "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint"

appparams "github.com/sonr-io/core/app/params"
"github.com/sonr-io/core/docs"
"github.com/sonr-io/core/internal/highway"
domainmodule "github.com/sonr-io/core/x/domain"
domainmodulekeeper "github.com/sonr-io/core/x/domain/keeper"
domainmoduletypes "github.com/sonr-io/core/x/domain/types"
identitymodule "github.com/sonr-io/core/x/identity"
identitymodulekeeper "github.com/sonr-io/core/x/identity/keeper"
identitymoduletypes "github.com/sonr-io/core/x/identity/types"
servicemodule "github.com/sonr-io/core/x/service"
servicemodulekeeper "github.com/sonr-io/core/x/service/keeper"
servicemoduletypes "github.com/sonr-io/core/x/service/types"
appparams "github.com/sonrhq/core/app/params"
"github.com/sonrhq/core/docs"
"github.com/sonrhq/core/internal/highway"
domainmodule "github.com/sonrhq/core/x/domain"
domainmodulekeeper "github.com/sonrhq/core/x/domain/keeper"
domainmoduletypes "github.com/sonrhq/core/x/domain/types"
identitymodule "github.com/sonrhq/core/x/identity"
identitymodulekeeper "github.com/sonrhq/core/x/identity/keeper"
identitymoduletypes "github.com/sonrhq/core/x/identity/types"
servicemodule "github.com/sonrhq/core/x/service"
servicemodulekeeper "github.com/sonrhq/core/x/service/keeper"
servicemoduletypes "github.com/sonrhq/core/x/service/types"
"github.com/spf13/cast"
)

Expand Down
2 changes: 1 addition & 1 deletion app/encoding.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"github.com/cosmos/cosmos-sdk/std"
"github.com/cosmos/cosmos-sdk/x/auth/tx"

"github.com/sonr-io/core/app/params"
"github.com/sonrhq/core/app/params"
)

// makeEncodingConfig creates an EncodingConfig for an amino based test configuration.
Expand Down
2 changes: 1 addition & 1 deletion cmd/sonrd/cmd/genaccounts.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package cmd
package sonrcmd

import (
"bufio"
Expand Down
4 changes: 2 additions & 2 deletions cmd/sonrd/cmd/geninit.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package cmd
package sonrcmd

import (
"bufio"
Expand All @@ -20,7 +20,7 @@ import (
"github.com/cosmos/cosmos-sdk/x/genutil"
"github.com/cosmos/go-bip39"
"github.com/pkg/errors"
"github.com/sonr-io/core/config"
"github.com/sonrhq/core/config"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/sonrd/cmd/gentx.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package cmd
package sonrcmd

import (
"bufio"
Expand Down
Loading

0 comments on commit 95dd523

Please sign in to comment.