Skip to content

Commit

Permalink
fix: types and pkg
Browse files Browse the repository at this point in the history
  • Loading branch information
prnk28 committed Oct 31, 2023
1 parent fe3ac33 commit 6796b5f
Show file tree
Hide file tree
Showing 194 changed files with 828 additions and 825 deletions.
2 changes: 1 addition & 1 deletion .github/contribution/CLIENT_GUIDELINES.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,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/sonrhq/core.git # Clone the repository
git clone https://github.com/sonrhq/sonr.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 @@ -41,7 +41,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/sonrhq/core.git # Clone the repository
git clone https://github.com/sonrhq/sonr.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 @@ -31,7 +31,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/sonrhq/core.git # Clone the repository
git clone https://github.com/sonrhq/sonr.git # Clone the repository
sh scripts/install.sh # Install dependencies
task # Display the available commands
```
Expand All @@ -47,7 +47,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/sonrhq/core.git # Clone the repository
git clone https://github.com/sonrhq/sonr.git # Clone the repository
sh scripts/install.sh # Install dependencies
task # Display the available commands
```
Expand Down
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/sonrhq/core.git#branch=master"
against: "https://github.com/sonrhq/sonr.git#branch=master"
- uses: bufbuild/buf-lint-action@v1
with:
input: "proto"
4 changes: 2 additions & 2 deletions .goreleaser.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ release:
Run the following command to install sonrd:
```bash
curl -L https://github.com/sonrhq/core/releases/latest/download/install.sh | sh
curl -L https://github.com/sonrhq/sonr/releases/latest/download/install.sh | sh
```
### ⚡️ Binaries
Expand All @@ -142,7 +142,7 @@ release:
If you prefer to build from source, you can use the following commands:
````bash
git clone https://github.com/sonrhq/core
git clone https://github.com/sonrhq/sonr
cd core && git checkout v{{ .Version }}
make install
# Then run sonrd
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ GO_VERSION := $(shell cat go.mod | grep -E 'go [0-9].[0-9]+' | cut -d ' ' -f 2)
GO_MODULE := $(shell cat go.mod | grep "module " | cut -d ' ' -f 2)
GO_MAJOR_VERSION = $(shell go version | cut -c 14- | cut -d' ' -f1 | cut -d'.' -f1)
GO_MINOR_VERSION = $(shell go version | cut -c 14- | cut -d' ' -f1 | cut -d'.' -f2)
protoVer=0.14.0
protoVer=0.11.2
protoImageName=ghcr.io/cosmos/proto-builder:$(protoVer)
protoImage=$(DOCKER) run --rm -v $(CURDIR):/workspace --workdir /workspace $(protoImageName)

Expand All @@ -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/sonrhq/core.git
HTTPS_GIT := https://github.com/sonrhq/sonr.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/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)
[![Go Reference](https://pkg.go.dev/badge/github.com/sonrhq/sonr.svg)](https://pkg.go.dev/github.com/sonrhq/sonr)
[![Test sonrd](https://github.com/sonrhq/sonr/actions/workflows/tests.yml/badge.svg)](https://github.com/sonrhq/sonr/actions/workflows/tests.yml)
[![GitHub all releases](https://img.shields.io/github/downloads/sonr-io/sonr/total)](https://github.com/sonrhq/sonr/releases/latest)
[![Go Report Card](https://goreportcard.com/badge/github.com/sonrhq/sonr)](https://goreportcard.com/report/github.com/sonrhq/sonr)
[![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/sonrhq/core/issues/781)
- [ ] database subscriptions. [Status](https://github.com/sonrhq/core/issues/782)
- [ ] Matrix chat. [Status](https://github.com/sonrhq/core/issues/783)
- [ ] User mailboxes. [Status](https://github.com/sonrhq/sonr/issues/781)
- [ ] database subscriptions. [Status](https://github.com/sonrhq/sonr/issues/782)
- [ ] Matrix chat. [Status](https://github.com/sonrhq/sonr/issues/783)
- [x] IBC Integrations.
- [ ] 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)
- [ ] Nomic. [Status](https://github.com/sonrhq/sonr/issues/784)
- [ ] Evmos. [Status](https://github.com/sonrhq/sonr/issues/785)
- [ ] Osmosis. [Status](https://github.com/sonrhq/sonr/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/sonrhq/core/discussions)
- [Issues](https://github.com/sonrhq/core/issues)
- [Forum](https://github.com/sonrhq/sonr/discussions)
- [Issues](https://github.com/sonrhq/sonr/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/sonrhq/core/releases) of this repo to get notified of major updates.
We are currently in transitioning to Public Testnet. Watch [releases](https://github.com/sonrhq/sonr/releases) of this repo to get notified of major updates.

## How it works

Expand Down Expand Up @@ -120,15 +120,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/sonrhq/core-js" target="_blank" rel="noopener noreferrer">sonr-js</a></td>
<td><a href="https://github.com/sonrhq/sonr-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/sonrhq/core-flutter" target="_blank" rel="noopener noreferrer">sonr-flutter</a></td>
<td><a href="https://github.com/sonrhq/sonr-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
24 changes: 12 additions & 12 deletions app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -111,18 +111,18 @@ import (
ibctm "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint"
"github.com/spf13/cast"

appparams "github.com/sonrhq/core/app/params"
"github.com/sonrhq/core/docs"
"github.com/sonrhq/core/services/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"
appparams "github.com/sonrhq/sonr/app/params"
"github.com/sonrhq/sonr/docs"
"github.com/sonrhq/sonr/services/highway"
domainmodule "github.com/sonrhq/sonr/x/domain"
domainmodulekeeper "github.com/sonrhq/sonr/x/domain/keeper"
domainmoduletypes "github.com/sonrhq/sonr/x/domain/types"
identitymodule "github.com/sonrhq/sonr/x/identity"
identitymodulekeeper "github.com/sonrhq/sonr/x/identity/keeper"
identitymoduletypes "github.com/sonrhq/sonr/x/identity/types"
servicemodule "github.com/sonrhq/sonr/x/service"
servicemodulekeeper "github.com/sonrhq/sonr/x/service/keeper"
servicemoduletypes "github.com/sonrhq/sonr/x/service/types"
)

const (
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/sonrhq/core/app/params"
"github.com/sonrhq/sonr/app/params"
)

// makeEncodingConfig creates an EncodingConfig for an amino based test configuration.
Expand Down
2 changes: 1 addition & 1 deletion cmd/sonrd/cmd/geninit.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"github.com/cosmos/cosmos-sdk/x/genutil"
"github.com/cosmos/go-bip39"
"github.com/pkg/errors"
"github.com/sonrhq/core/config"
"github.com/sonrhq/sonr/config"
"github.com/spf13/cobra"
)

Expand Down
4 changes: 2 additions & 2 deletions cmd/sonrd/cmd/plugin.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import (
"github.com/sonrhq/cli-utils/clictx"
"github.com/sonrhq/cli-utils/cliui"
"github.com/sonrhq/cli-utils/cliui/icons"
pluginsconfig "github.com/sonrhq/core/config/plugins"
"github.com/sonrhq/core/services/plugin"
pluginsconfig "github.com/sonrhq/sonr/config/plugins"
"github.com/sonrhq/sonr/services/plugin"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions cmd/sonrd/cmd/plugin_default.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"github.com/spf13/cobra"

"github.com/sonrhq/cli-utils/cliui"
pluginsconfig "github.com/sonrhq/core/config/plugins"
"github.com/sonrhq/core/services/plugin"
pluginsconfig "github.com/sonrhq/sonr/config/plugins"
"github.com/sonrhq/sonr/services/plugin"
)

type defaultPlugin struct {
Expand Down
8 changes: 4 additions & 4 deletions cmd/sonrd/cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@ import (
"github.com/spf13/pflag"
"github.com/spf13/viper"

"github.com/sonrhq/core/app"
appparams "github.com/sonrhq/core/app/params"
sonrdconfig "github.com/sonrhq/core/config"
"github.com/sonrhq/core/services/highway"
"github.com/sonrhq/sonr/app"
appparams "github.com/sonrhq/sonr/app/params"
sonrdconfig "github.com/sonrhq/sonr/config"
"github.com/sonrhq/sonr/services/highway"
)

var (
Expand Down
4 changes: 2 additions & 2 deletions cmd/sonrd/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"github.com/cosmos/cosmos-sdk/server"
svrcmd "github.com/cosmos/cosmos-sdk/server/cmd"

"github.com/sonrhq/core/app"
sonrcmd "github.com/sonrhq/core/cmd/sonrd/cmd"
"github.com/sonrhq/sonr/app"
sonrcmd "github.com/sonrhq/sonr/cmd/sonrd/cmd"
)

func main() {
Expand Down
4 changes: 2 additions & 2 deletions config/defaults.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/spf13/viper"

"github.com/sonrhq/core/app"
"github.com/sonrhq/sonr/app"
)

// Masthead is the masthead of the application.
Expand Down Expand Up @@ -32,7 +32,7 @@ MMMMMMMMMMMMMMWX0OkkO0XWMMMMMMMMMMMMMMMM
Sonr Node
> Sonr is an Encrypted & Private by default Identity Verification System for the IBC Protocol.
🌐 - https://sonr.io
🚀 - https://github.com/sonrhq/core
🚀 - https://github.com/sonrhq/sonr
`

const bip44_purpose = 44
Expand Down
2 changes: 1 addition & 1 deletion config/plugins/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

pluginsconfig "github.com/sonrhq/core/config/plugins"
pluginsconfig "github.com/sonrhq/sonr/config/plugins"
)

func TestPluginIsGlobal(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion docker/deploy/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ ARG RUNNER_IMAGE="debian:bullseye-slim"
# ! ||-----------------------------------------------------------------------------||
FROM ${RUNNER_IMAGE}

LABEL org.opencontainers.image.source https://github.com/sonrhq/core
LABEL org.opencontainers.image.source https://github.com/sonrhq/sonr
LABEL org.opencontainers.image.description "Sonr Validator node container"
# Copy sonrd binary and config
COPY ../bin/sonrd /usr/local/bin/sonrd
Expand Down
2 changes: 1 addition & 1 deletion docker/start/Dockerfile.dev
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ ARG RUNNER_IMAGE="alpine:3.16"
# ! ||----------------------------------------------------------------------------------||
FROM --platform=linux alpine

LABEL org.opencontainers.image.source https://github.com/sonrhq/core
LABEL org.opencontainers.image.source https://github.com/sonrhq/sonr
LABEL org.opencontainers.image.description "Base sonr daemon image"
# Copy sonrd binary and config
COPY ../bin/sonrd /usr/local/bin/sonrd
Expand Down
Loading

0 comments on commit 6796b5f

Please sign in to comment.