Skip to content

Commit

Permalink
refactor: rename project
Browse files Browse the repository at this point in the history
Signed-off-by: Artur Troian <[email protected]>
  • Loading branch information
troian committed Jan 11, 2023
1 parent 9c376e9 commit f5ca21b
Show file tree
Hide file tree
Showing 355 changed files with 2,519 additions and 2,466 deletions.
2 changes: 1 addition & 1 deletion .chglog/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ style: github
template: CHANGELOG.tpl.md
info:
title: CHANGELOG
repository_url: https://github.com/ovrclk/akash
repository_url: https://github.com/akash-network/node
options:
commits:
# filters:
Expand Down
4 changes: 2 additions & 2 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ assignees: '@boz @gosuri'
## Motivation and Context
<!--- Why is this change required? What problem does it solve? -->
<!--- If it fixes an open issue, please link to the issue here. -->
- [ ] I have raised an issue to propose this change ([required](https://github.com/ovrclk/akash/blob/master/CONTRIBUTING.md))
- [ ] I have raised an issue to propose this change ([required](https://github.com/akash-network/node/blob/master/CONTRIBUTING.md))
- [ ] My issue has received approval from the maintainers or lead with the `design/approved` label


Expand All @@ -38,7 +38,7 @@ assignees: '@boz @gosuri'
- [ ] My code follows the code style of this project.
- [ ] My change requires a change to the documentation.
- [ ] I have updated the documentation accordingly.
- [ ] I've read the [CONTRIBUTION](https://github.com/ovrclk/akash/blob/master/CONTRIBUTING.md) guide
- [ ] I've read the [CONTRIBUTION](https://github.com/akash-network/node/blob/master/CONTRIBUTING.md) guide
- [ ] I have signed-off my commits with `git commit -s`
- [ ] I have added tests to cover my changes.
- [ ] All new and existing tests passed.
5 changes: 3 additions & 2 deletions .goreleaser-docker.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
project_name: node
env:
- GO111MODULE=on
- CGO_ENABLED=1
Expand Down Expand Up @@ -55,7 +56,7 @@ dockers:
- --label=org.opencontainers.image.created={{ time "2006-01-02T15:04:05Z07:00" }}
- --label=org.opencontainers.image.revision={{ .FullCommit }}
image_templates:
- 'ghcr.io/ovrclk/{{ .ProjectName }}:latest-amd64'
- 'ghcr.io/akash-network/{{ .ProjectName }}:latest-amd64'
- dockerfile: _build/Dockerfile.akash
use: buildx
goarch: arm64
Expand All @@ -70,7 +71,7 @@ dockers:
- --label=org.opencontainers.image.created={{ time "2006-01-02T15:04:05Z07:00" }}
- --label=org.opencontainers.image.revision={{ .FullCommit }}
image_templates:
- 'ghcr.io/ovrclk/{{ .ProjectName }}:latest-arm64'
- 'ghcr.io/akash-network/{{ .ProjectName }}:latest-arm64'

archives:
- format: binary
53 changes: 30 additions & 23 deletions .goreleaser.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
project_name: node
env:
- GO111MODULE=on
- CGO_ENABLED=1
Expand Down Expand Up @@ -101,16 +102,16 @@ universal_binaries:
- akash-darwin-amd64
- akash-darwin-arm64
replace: true
name_template: "{{.ProjectName}}"
name_template: "akash"
archives:
- id: w/version
builds:
- akash-darwin-universal
- akash-linux-amd64
- akash-linux-arm64
- akash-windows-amd64
name_template: "{{ .ProjectName }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}"
wrap_in_directory: true
name_template: "akash_{{ .Version }}_{{ .Os }}_{{ .Arch }}"
wrap_in_directory: false
format: zip
files:
- none*
Expand All @@ -120,12 +121,17 @@ archives:
- akash-linux-amd64
- akash-linux-arm64
- akash-windows-amd64
name_template: "{{ .ProjectName }}_{{ .Os }}_{{ .Arch }}"
wrap_in_directory: true
name_template: "akash_{{ .Os }}_{{ .Arch }}"
wrap_in_directory: false
format: zip
files:
- none*

checksum:
# You can change the name of the checksums file.
# Default is `{{ .ProjectName }}_{{ .Version }}_checksums.txt`.
name_template: "akash_{{ .Version }}_checksums.txt"

dockers:
- dockerfile: _build/Dockerfile.akash
use: buildx
Expand All @@ -141,9 +147,9 @@ dockers:
- --label=org.opencontainers.image.created={{ time "2006-01-02T15:04:05Z07:00" }}
- --label=org.opencontainers.image.revision={{ .FullCommit }}
image_templates:
- 'ghcr.io/ovrclk/{{ .ProjectName }}:{{ .ShortCommit }}-amd64'
- 'ghcr.io/ovrclk/{{ .ProjectName }}:{{ .Version }}-amd64'
- 'ghcr.io/ovrclk/{{ .ProjectName }}:{{if eq .Env.STABLE "true"}}stable{{else}}latest{{end}}-amd64'
- 'ghcr.io/akash-network/{{ .ProjectName }}:{{ .ShortCommit }}-amd64'
- 'ghcr.io/akash-network/{{ .ProjectName }}:{{ .Version }}-amd64'
- 'ghcr.io/akash-network/{{ .ProjectName }}:{{if eq .Env.STABLE "true"}}stable{{else}}latest{{end}}-amd64'
- dockerfile: _build/Dockerfile.akash
use: buildx
goarch: arm64
Expand All @@ -158,28 +164,29 @@ dockers:
- --label=org.opencontainers.image.created={{ time "2006-01-02T15:04:05Z07:00" }}
- --label=org.opencontainers.image.revision={{ .FullCommit }}
image_templates:
- 'ghcr.io/ovrclk/{{ .ProjectName }}:{{ .ShortCommit }}-arm64'
- 'ghcr.io/ovrclk/{{ .ProjectName }}:{{ .Version }}-arm64'
- 'ghcr.io/ovrclk/{{ .ProjectName }}:{{if eq .Env.STABLE "true"}}stable{{else}}latest{{end}}-arm64'
- 'ghcr.io/akash-network/{{ .ProjectName }}:{{ .ShortCommit }}-arm64'
- 'ghcr.io/akash-network/{{ .ProjectName }}:{{ .Version }}-arm64'
- 'ghcr.io/akash-network/{{ .ProjectName }}:{{if eq .Env.STABLE "true"}}stable{{else}}latest{{end}}-arm64'
docker_manifests:
- name_template: ghcr.io/ovrclk/{{ .ProjectName }}:{{ .ShortCommit }}
- name_template: ghcr.io/akash-network/{{ .ProjectName }}:{{ .ShortCommit }}
image_templates:
- ghcr.io/ovrclk/{{ .ProjectName }}:{{ .ShortCommit }}-amd64
- ghcr.io/ovrclk/{{ .ProjectName }}:{{ .ShortCommit }}-arm64
- name_template: ghcr.io/ovrclk/{{ .ProjectName }}:{{ .Version }}
- ghcr.io/akash-network/{{ .ProjectName }}:{{ .ShortCommit }}-amd64
- ghcr.io/akash-network/{{ .ProjectName }}:{{ .ShortCommit }}-arm64
- name_template: ghcr.io/akash-network/{{ .ProjectName }}:{{ .Version }}
image_templates:
- ghcr.io/ovrclk/{{ .ProjectName }}:{{ .Version }}-amd64
- ghcr.io/ovrclk/{{ .ProjectName }}:{{ .Version }}-arm64
- name_template: ghcr.io/ovrclk/{{ .ProjectName }}:latest
- ghcr.io/akash-network/{{ .ProjectName }}:{{ .Version }}-amd64
- ghcr.io/akash-network/{{ .ProjectName }}:{{ .Version }}-arm64
- name_template: ghcr.io/akash-network/{{ .ProjectName }}:latest
image_templates:
- ghcr.io/ovrclk/{{ .ProjectName }}:latest-amd64
- ghcr.io/ovrclk/{{ .ProjectName }}:latest-arm64
- ghcr.io/akash-network/{{ .ProjectName }}:latest-amd64
- ghcr.io/akash-network/{{ .ProjectName }}:latest-arm64

nfpms:
- id: w/version
vendor: "Overclock Labs Inc."
homepage: "http://ovrclk.com"
maintainer: "Akash Network <[email protected]>"
file_name_template: "akash_{{ .Version }}_{{ .Os }}_{{ .Arch }}"
formats:
- deb
- rpm
Expand All @@ -188,16 +195,16 @@ nfpms:
vendor: "Overclock Labs Inc."
homepage: "https://ovrclk.com"
maintainer: "Overclock Labs Inc. <[email protected]>"
file_name_template: "{{ .ProjectName }}_{{ .Os }}_{{ .Arch }}"
file_name_template: "akash_{{ .Os }}_{{ .Arch }}"
formats:
- deb
- rpm
license: Apache 2.0

release:
github:
owner: ovrclk
name: akash
owner: akash-network
name: node
prerelease: auto
mode: replace
draft: false
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ This is just a short list of ideas, if you have other ideas for contributing ple

#### I've found a typo

* A Pull Request is not necessary. Raise an [Issue](https://github.com/ovrclk/akash/issues) and we'll fix it as soon as we can.
* A Pull Request is not necessary. Raise an [Issue](https://github.com/akash-network/node/issues) and we'll fix it as soon as we can.

#### I have a (great) idea

Expand Down Expand Up @@ -326,7 +326,7 @@ There is a forum which you are welcome to join to discuss Akash Network, Kuberne

### Roadmap

* Browse open issues in [overclock/akash](https://github.com/ovrclk/akash/issues)
* Browse open issues in [overclock/akash](https://github.com/akash-network/node/issues)

## License

Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# Akash - Decentralized Serverless Network

![tests](https://github.com/ovrclk/akash/workflows/tests/badge.svg)
![simulations](https://github.com/ovrclk/akash/workflows/simulation-tests/badge.svg)
![tests](https://github.com/akash-network/node/workflows/tests/badge.svg)
![simulations](https://github.com/akash-network/node/workflows/simulation-tests/badge.svg)
[![codecov](https://codecov.io/github/ovrclk/akash/coverage.svg?branch=master)](https://codecov.io/github/ovrclk/akash?branch=master)

[![Go Report Card](https://goreportcard.com/badge/github.com/ovrclk/akash)](https://goreportcard.com/report/github.com/ovrclk/akash)
[![Go Report Card](https://goreportcard.com/badge/github.com/akash-network/node)](https://goreportcard.com/report/github.com/akash-network/node)
[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)

[![Akash](_docs/img/logo-label-black.svg "Akash")](#overview)
Expand Down Expand Up @@ -56,7 +56,7 @@ Windows | amd64 | ⚠️ **Experimental**

# Installing

The [latest](https://github.com/ovrclk/akash/releases/latest) binary release can be installed with [Homebrew](https://brew.sh/):
The [latest](https://github.com/akash-network/node/releases/latest) binary release can be installed with [Homebrew](https://brew.sh/):

```sh
$ brew tap ovrclk/tap
Expand All @@ -82,7 +82,7 @@ Akash is written in Golang and is Apache 2.0 licensed - contributions are welcom
To become a contributor, please see the guide on [contributing](CONTRIBUTING.md)

## Development environment
[This doc](https://github.com/ovrclk/akash/blob/master/_docs/development-environment.md) guides through setting up local development environment
[This doc](https://github.com/akash-network/node/blob/master/_docs/development-environment.md) guides through setting up local development environment

Akash is developed and tested with [golang 1.16.0+](https://golang.org/).
Building requires a working [golang](https://golang.org/) installation, a properly set `GOPATH`, and `$GOPATH/bin` present in `$PATH`.
Expand Down
2 changes: 1 addition & 1 deletion _build/Dockerfile.akash
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM debian:bullseye
LABEL "org.opencontainers.image.source"="https://github.com/ovrclk/akash"
LABEL "org.opencontainers.image.source"="https://github.com/akash-network/node"

COPY ./akash /bin/

Expand Down
4 changes: 2 additions & 2 deletions _build/Dockerfile.test
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ FROM golang:alpine AS build-env
ENV PACKAGES curl make git libc-dev bash gcc linux-headers eudev-dev python2

# Set working directory for the build
WORKDIR /go/src/github.com/ovrclk/akash
WORKDIR /go/src/github.com/akash-network/node

# Add source files
COPY . .
Expand All @@ -32,4 +32,4 @@ COPY ./_build/single-node.sh .
EXPOSE 26657

ENTRYPOINT [ "./single-node.sh" ]
# NOTE: to run this image, docker run -d -p 26657:26657 ./single-node.sh {{chain_id}} {{genesis_account}}
# NOTE: to run this image, docker run -d -p 26657:26657 ./single-node.sh {{chain_id}} {{genesis_account}}
2 changes: 1 addition & 1 deletion _docs/development-environment.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ sudo apt install -y jq curl wget build-essentials ca-certificates npm direnv gcc
```

## Direnv
Both [akash](https://github.com/ovrclk/akash) [provider-services](https://github.com/ovrclk/provider-services) are extensively using `direnv` to setup and seamlessly update environment
Both [akash](https://github.com/akash-network/node) [provider-services](https://github.com/ovrclk/provider-services) are extensively using `direnv` to setup and seamlessly update environment
while traversing across various directories. It is especially handy for running `provider-services` examples.

You may enable auto allow by whitelisting specific directories in `direnv.toml`.
Expand Down
12 changes: 12 additions & 0 deletions _docs/version-control.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# Merging into `mainnet/main`

As new mainnet need to be released, quite often `mainnet/main` branch is far behind the `master`.
This is so far cleanest solution we have found to perform merge without conflicts as well as keeping history

```shell
git checkout master
git merge -s ours mainnet/main
git checkout mainnet/main
git merge master
git push origin mainnet/main
```
16 changes: 8 additions & 8 deletions app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,10 @@ import (
abci "github.com/tendermint/tendermint/abci/types"
tmos "github.com/tendermint/tendermint/libs/os"

"github.com/ovrclk/akash/x/audit"
"github.com/ovrclk/akash/x/cert"
escrowkeeper "github.com/ovrclk/akash/x/escrow/keeper"
"github.com/ovrclk/akash/x/inflation"
"github.com/akash-network/node/x/audit"
"github.com/akash-network/node/x/cert"
escrowkeeper "github.com/akash-network/node/x/escrow/keeper"
"github.com/akash-network/node/x/inflation"

servertypes "github.com/cosmos/cosmos-sdk/server/types"
"github.com/cosmos/cosmos-sdk/version"
Expand All @@ -100,12 +100,12 @@ import (
ibchost "github.com/cosmos/ibc-go/v3/modules/core/24-host"
ibckeeper "github.com/cosmos/ibc-go/v3/modules/core/keeper"

dkeeper "github.com/ovrclk/akash/x/deployment/keeper"
mkeeper "github.com/ovrclk/akash/x/market/keeper"
pkeeper "github.com/ovrclk/akash/x/provider/keeper"
dkeeper "github.com/akash-network/node/x/deployment/keeper"
mkeeper "github.com/akash-network/node/x/market/keeper"
pkeeper "github.com/akash-network/node/x/provider/keeper"

// unnamed import of statik for swagger UI support
_ "github.com/ovrclk/akash/client/docs/statik"
_ "github.com/akash-network/node/client/docs/statik"
)

const (
Expand Down
32 changes: 16 additions & 16 deletions app/app_configure.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,22 +22,22 @@ import (
transfertypes "github.com/cosmos/ibc-go/v3/modules/apps/transfer/types"
ibchost "github.com/cosmos/ibc-go/v3/modules/core/24-host"

"github.com/ovrclk/akash/x/audit"
audittypes "github.com/ovrclk/akash/x/audit/types/v1beta2"
"github.com/ovrclk/akash/x/cert"
certtypes "github.com/ovrclk/akash/x/cert/types/v1beta2"
"github.com/ovrclk/akash/x/deployment"
deploymenttypes "github.com/ovrclk/akash/x/deployment/types/v1beta2"
"github.com/ovrclk/akash/x/escrow"
ekeeper "github.com/ovrclk/akash/x/escrow/keeper"
escrowtypes "github.com/ovrclk/akash/x/escrow/types/v1beta2"
"github.com/ovrclk/akash/x/inflation"
inflationtypes "github.com/ovrclk/akash/x/inflation/types/v1beta2"
"github.com/ovrclk/akash/x/market"
mhooks "github.com/ovrclk/akash/x/market/hooks"
markettypes "github.com/ovrclk/akash/x/market/types/v1beta2"
"github.com/ovrclk/akash/x/provider"
providertypes "github.com/ovrclk/akash/x/provider/types/v1beta2"
"github.com/akash-network/node/x/audit"
audittypes "github.com/akash-network/node/x/audit/types/v1beta2"
"github.com/akash-network/node/x/cert"
certtypes "github.com/akash-network/node/x/cert/types/v1beta2"
"github.com/akash-network/node/x/deployment"
deploymenttypes "github.com/akash-network/node/x/deployment/types/v1beta2"
"github.com/akash-network/node/x/escrow"
ekeeper "github.com/akash-network/node/x/escrow/keeper"
escrowtypes "github.com/akash-network/node/x/escrow/types/v1beta2"
"github.com/akash-network/node/x/inflation"
inflationtypes "github.com/akash-network/node/x/inflation/types/v1beta2"
"github.com/akash-network/node/x/market"
mhooks "github.com/akash-network/node/x/market/hooks"
markettypes "github.com/akash-network/node/x/market/types/v1beta2"
"github.com/akash-network/node/x/provider"
providertypes "github.com/akash-network/node/x/provider/types/v1beta2"
)

func akashModuleBasics() []module.AppModuleBasic {
Expand Down
2 changes: 1 addition & 1 deletion app/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ import (
ibcclient "github.com/cosmos/ibc-go/v3/modules/core/02-client/client"
ibchost "github.com/cosmos/ibc-go/v3/modules/core/24-host"

appparams "github.com/ovrclk/akash/app/params"
appparams "github.com/akash-network/node/app/params"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion app/mac.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
ibctransfertypes "github.com/cosmos/ibc-go/v3/modules/apps/transfer/types"

escrowtypes "github.com/ovrclk/akash/x/escrow/types/v1beta2"
escrowtypes "github.com/akash-network/node/x/escrow/types/v1beta2"
)

func MacPerms() map[string][]string {
Expand Down
2 changes: 1 addition & 1 deletion client/broadcaster/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"errors"
"fmt"

"github.com/ovrclk/akash/sdkutil"
"github.com/akash-network/node/sdkutil"

sdkclient "github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/client/tx"
Expand Down
22 changes: 11 additions & 11 deletions client/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,17 @@ import (

tmrpc "github.com/tendermint/tendermint/rpc/core/types"

"github.com/ovrclk/akash/client/broadcaster"
amodule "github.com/ovrclk/akash/x/audit"
atypes "github.com/ovrclk/akash/x/audit/types/v1beta2"
cmodule "github.com/ovrclk/akash/x/cert"
ctypes "github.com/ovrclk/akash/x/cert/types/v1beta2"
dmodule "github.com/ovrclk/akash/x/deployment"
dtypes "github.com/ovrclk/akash/x/deployment/types/v1beta2"
mmodule "github.com/ovrclk/akash/x/market"
mtypes "github.com/ovrclk/akash/x/market/types/v1beta2"
pmodule "github.com/ovrclk/akash/x/provider"
ptypes "github.com/ovrclk/akash/x/provider/types/v1beta2"
"github.com/akash-network/node/client/broadcaster"
amodule "github.com/akash-network/node/x/audit"
atypes "github.com/akash-network/node/x/audit/types/v1beta2"
cmodule "github.com/akash-network/node/x/cert"
ctypes "github.com/akash-network/node/x/cert/types/v1beta2"
dmodule "github.com/akash-network/node/x/deployment"
dtypes "github.com/akash-network/node/x/deployment/types/v1beta2"
mmodule "github.com/akash-network/node/x/market"
mtypes "github.com/akash-network/node/x/market/types/v1beta2"
pmodule "github.com/akash-network/node/x/provider"
ptypes "github.com/akash-network/node/x/provider/types/v1beta2"
)

var (
Expand Down
Loading

0 comments on commit f5ca21b

Please sign in to comment.