c-osmosis -> osmosis-labs (osmosis-labs#153)

catShaark · May 18, 2021 · 366023a · 366023a
1 parent 7868e01
commit 366023a
Show file tree

Hide file tree

Showing 206 changed files with 1,157 additions and 1,136 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -8,7 +8,7 @@ FROM golang:alpine AS build-env
 ENV PACKAGES curl make git libc-dev bash gcc linux-headers eudev-dev python3
 
 # Set working directory for the build
-WORKDIR /go/src/github.com/c-osmosis/osmosis
+WORKDIR /go/src/github.com/osmosis-labs/osmosis
 
 # Add source files
 COPY . .

diff --git a/Makefile b/Makefile
@@ -7,7 +7,7 @@ LEDGER_ENABLED ?= true
 SDK_PACK := $(shell go list -m github.com/cosmos/cosmos-sdk | sed  's/ /\@/g')
 DOCKER := $(shell which docker)
 BUILDDIR ?= $(CURDIR)/build
-TEST_DOCKER_REPO=c-osmosis/osmosisdnode
+TEST_DOCKER_REPO=osmosis-labs/osmosisdnode
 
 export GO111MODULE = on
 
@@ -239,7 +239,7 @@ build-docker-osmosisdnode:
 
 # Run a 4-node testnet locally
 localnet-start: build-linux localnet-stop
-	@if ! [ -f build/node0/osmosisd/config/genesis.json ]; then docker run --rm -v $(CURDIR)/build:/osmosisd:Z c-osmosis/osmosisdnode testnet --v 4 -o . --starting-ip-address 192.168.10.2 --keyring-backend=test ; fi
+	@if ! [ -f build/node0/osmosisd/config/genesis.json ]; then docker run --rm -v $(CURDIR)/build:/osmosisd:Z osmosis-labs/osmosisdnode testnet --v 4 -o . --starting-ip-address 192.168.10.2 --keyring-backend=test ; fi
 	docker-compose up -d
 
 # Stop testnet

diff --git a/app/app.go b/app/app.go
@@ -9,30 +9,6 @@ import (
 	ibcclient "github.com/cosmos/cosmos-sdk/x/ibc/core/02-client"
 	paramproposal "github.com/cosmos/cosmos-sdk/x/params/types/proposal"
 
-	appparams "github.com/c-osmosis/osmosis/app/params"
-	_ "github.com/c-osmosis/osmosis/client/docs/statik"
-	"github.com/c-osmosis/osmosis/x/claim"
-	claimkeeper "github.com/c-osmosis/osmosis/x/claim/keeper"
-	claimtypes "github.com/c-osmosis/osmosis/x/claim/types"
-	"github.com/c-osmosis/osmosis/x/epochs"
-	epochskeeper "github.com/c-osmosis/osmosis/x/epochs/keeper"
-	epochstypes "github.com/c-osmosis/osmosis/x/epochs/types"
-	"github.com/c-osmosis/osmosis/x/gamm"
-	gammkeeper "github.com/c-osmosis/osmosis/x/gamm/keeper"
-	gammtypes "github.com/c-osmosis/osmosis/x/gamm/types"
-	"github.com/c-osmosis/osmosis/x/incentives"
-	incentiveskeeper "github.com/c-osmosis/osmosis/x/incentives/keeper"
-	incentivestypes "github.com/c-osmosis/osmosis/x/incentives/types"
-	"github.com/c-osmosis/osmosis/x/lockup"
-	lockupkeeper "github.com/c-osmosis/osmosis/x/lockup/keeper"
-	lockuptypes "github.com/c-osmosis/osmosis/x/lockup/types"
-	"github.com/c-osmosis/osmosis/x/mint"
-	mintkeeper "github.com/c-osmosis/osmosis/x/mint/keeper"
-	minttypes "github.com/c-osmosis/osmosis/x/mint/types"
-	poolincentives "github.com/c-osmosis/osmosis/x/pool-incentives"
-	poolincentivesclient "github.com/c-osmosis/osmosis/x/pool-incentives/client"
-	poolincentiveskeeper "github.com/c-osmosis/osmosis/x/pool-incentives/keeper"
-	poolincentivestypes "github.com/c-osmosis/osmosis/x/pool-incentives/types"
 	"github.com/cosmos/cosmos-sdk/baseapp"
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/grpc/tmservice"
@@ -96,6 +72,30 @@ import (
 	upgradekeeper "github.com/cosmos/cosmos-sdk/x/upgrade/keeper"
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
 	"github.com/gorilla/mux"
+	appparams "github.com/osmosis-labs/osmosis/app/params"
+	_ "github.com/osmosis-labs/osmosis/client/docs/statik"
+	"github.com/osmosis-labs/osmosis/x/claim"
+	claimkeeper "github.com/osmosis-labs/osmosis/x/claim/keeper"
+	claimtypes "github.com/osmosis-labs/osmosis/x/claim/types"
+	"github.com/osmosis-labs/osmosis/x/epochs"
+	epochskeeper "github.com/osmosis-labs/osmosis/x/epochs/keeper"
+	epochstypes "github.com/osmosis-labs/osmosis/x/epochs/types"
+	"github.com/osmosis-labs/osmosis/x/gamm"
+	gammkeeper "github.com/osmosis-labs/osmosis/x/gamm/keeper"
+	gammtypes "github.com/osmosis-labs/osmosis/x/gamm/types"
+	"github.com/osmosis-labs/osmosis/x/incentives"
+	incentiveskeeper "github.com/osmosis-labs/osmosis/x/incentives/keeper"
+	incentivestypes "github.com/osmosis-labs/osmosis/x/incentives/types"
+	"github.com/osmosis-labs/osmosis/x/lockup"
+	lockupkeeper "github.com/osmosis-labs/osmosis/x/lockup/keeper"
+	lockuptypes "github.com/osmosis-labs/osmosis/x/lockup/types"
+	"github.com/osmosis-labs/osmosis/x/mint"
+	mintkeeper "github.com/osmosis-labs/osmosis/x/mint/keeper"
+	minttypes "github.com/osmosis-labs/osmosis/x/mint/types"
+	poolincentives "github.com/osmosis-labs/osmosis/x/pool-incentives"
+	poolincentivesclient "github.com/osmosis-labs/osmosis/x/pool-incentives/client"
+	poolincentiveskeeper "github.com/osmosis-labs/osmosis/x/pool-incentives/keeper"
+	poolincentivestypes "github.com/osmosis-labs/osmosis/x/pool-incentives/types"
 	"github.com/rakyll/statik/fs"
 	"github.com/spf13/cast"
 	abci "github.com/tendermint/tendermint/abci/types"

diff --git a/app/encoding.go b/app/encoding.go
@@ -1,8 +1,8 @@
 package app
 
 import (
-	"github.com/c-osmosis/osmosis/app/params"
 	"github.com/cosmos/cosmos-sdk/std"
+	"github.com/osmosis-labs/osmosis/app/params"
 )
 
 // MakeEncodingConfig creates an EncodingConfig for testing

diff --git a/app/params/config.go b/app/params/config.go
@@ -1,9 +1,9 @@
 package params
 
 import (
-	"github.com/c-osmosis/osmosis/v043_temp/address"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
+	"github.com/osmosis-labs/osmosis/v043_temp/address"
 )
 
 const (

diff --git a/app/params/genesis.go b/app/params/genesis.go
@@ -12,9 +12,9 @@ import (
 	slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 
-	epochstypes "github.com/c-osmosis/osmosis/x/epochs/types"
-	incentivestypes "github.com/c-osmosis/osmosis/x/incentives/types"
-	minttypes "github.com/c-osmosis/osmosis/x/mint/types"
+	epochstypes "github.com/osmosis-labs/osmosis/x/epochs/types"
+	incentivestypes "github.com/osmosis-labs/osmosis/x/incentives/types"
+	minttypes "github.com/osmosis-labs/osmosis/x/mint/types"
 )
 
 type NetworkParams struct {

diff --git a/cmd/osmosisd/cmd/genaccounts.go b/cmd/osmosisd/cmd/genaccounts.go
@@ -10,8 +10,6 @@ import (
 
 	"github.com/spf13/cobra"
 
-	appparams "github.com/c-osmosis/osmosis/app/params"
-	claimtypes "github.com/c-osmosis/osmosis/x/claim/types"
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/cosmos/cosmos-sdk/codec"
@@ -23,6 +21,8 @@ import (
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 	"github.com/cosmos/cosmos-sdk/x/genutil"
 	genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types"
+	appparams "github.com/osmosis-labs/osmosis/app/params"
+	claimtypes "github.com/osmosis-labs/osmosis/x/claim/types"
 )
 
 const (

diff --git a/cmd/osmosisd/cmd/genesis.go b/cmd/osmosisd/cmd/genesis.go
@@ -12,20 +12,20 @@ import (
 	"github.com/cosmos/cosmos-sdk/x/genutil"
 	"github.com/spf13/cobra"
 
-	appparams "github.com/c-osmosis/osmosis/app/params"
+	appparams "github.com/osmosis-labs/osmosis/app/params"
 
-	claimtypes "github.com/c-osmosis/osmosis/x/claim/types"
-	epochstypes "github.com/c-osmosis/osmosis/x/epochs/types"
-	incentivestypes "github.com/c-osmosis/osmosis/x/incentives/types"
-	minttypes "github.com/c-osmosis/osmosis/x/mint/types"
-	poolincentivestypes "github.com/c-osmosis/osmosis/x/pool-incentives/types"
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 	crisistypes "github.com/cosmos/cosmos-sdk/x/crisis/types"
 	distributiontypes "github.com/cosmos/cosmos-sdk/x/distribution/types"
 	genutiltypes "github.com/cosmos/cosmos-sdk/x/genutil/types"
 	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
 	slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
+	claimtypes "github.com/osmosis-labs/osmosis/x/claim/types"
+	epochstypes "github.com/osmosis-labs/osmosis/x/epochs/types"
+	incentivestypes "github.com/osmosis-labs/osmosis/x/incentives/types"
+	minttypes "github.com/osmosis-labs/osmosis/x/mint/types"
+	poolincentivestypes "github.com/osmosis-labs/osmosis/x/pool-incentives/types"
 )
 
 func PrepareGenesisCmd(defaultNodeHome string, mbm module.BasicManager) *cobra.Command {

diff --git a/cmd/osmosisd/cmd/root.go b/cmd/osmosisd/cmd/root.go
@@ -6,8 +6,8 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/c-osmosis/osmosis/app/params"
 	"github.com/cosmos/cosmos-sdk/x/crisis"
+	"github.com/osmosis-labs/osmosis/app/params"
 
 	"github.com/cosmos/cosmos-sdk/baseapp"
 	"github.com/cosmos/cosmos-sdk/client"
@@ -33,7 +33,7 @@ import (
 	"github.com/tendermint/tendermint/libs/log"
 	dbm "github.com/tendermint/tm-db"
 
-	osmosis "github.com/c-osmosis/osmosis/app"
+	osmosis "github.com/osmosis-labs/osmosis/app"
 )
 
 // NewRootCmd creates a new root command for simd. It is called once in the

diff --git a/cmd/osmosisd/main.go b/cmd/osmosisd/main.go
@@ -3,8 +3,8 @@ package main
 import (
 	"os"
 
-	"github.com/c-osmosis/osmosis/app/params"
-	"github.com/c-osmosis/osmosis/cmd/osmosisd/cmd"
+	"github.com/osmosis-labs/osmosis/app/params"
+	"github.com/osmosis-labs/osmosis/cmd/osmosisd/cmd"
 )
 
 func main() {

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -3,7 +3,7 @@ version: '3'
 services:
   osmosisdnode0:
     container_name: osmosisdnode0
-    image: "c-osmosis/osmosisdnode"
+    image: "osmosis-labs/osmosisdnode"
     ports:
       - "26656-26657:26656-26657"
     environment:
@@ -17,7 +17,7 @@ services:
 
   osmosisdnode1:
     container_name: osmosisdnode1
-    image: "c-osmosis/osmosisdnode"
+    image: "osmosis-labs/osmosisdnode"
     ports:
       - "26659-26660:26656-26657"
     environment:
@@ -31,7 +31,7 @@ services:
 
   osmosisdnode2:
     container_name: osmosisdnode2
-    image: "c-osmosis/osmosisdnode"
+    image: "osmosis-labs/osmosisdnode"
     environment:
       - ID=2
       - LOG=${LOG:-osmosisd.log}
@@ -45,7 +45,7 @@ services:
 
   osmosisdnode3:
     container_name: osmosisdnode3
-    image: "c-osmosis/osmosisdnode"
+    image: "osmosis-labs/osmosisdnode"
     environment:
       - ID=3
       - LOG=${LOG:-osmosisd.log}

diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module github.com/c-osmosis/osmosis
+module github.com/osmosis-labs/osmosis
 
 go 1.15
 

diff --git a/networks/local/Makefile b/networks/local/Makefile
@@ -1,6 +1,6 @@
 # Makefile for the "osmosisdnode" docker image.
 
 all:
-	docker build --tag c-osmosis/osmosisdnode osmosisdnode
+	docker build --tag osmosis-labs/osmosisdnode osmosisdnode
 
 .PHONY: all
diff --git a/proto/osmosis/claim/v1beta1/genesis.proto b/proto/osmosis/claim/v1beta1/genesis.proto
@@ -7,7 +7,7 @@ import "cosmos/bank/v1beta1/genesis.proto";
 import "google/protobuf/duration.proto";
 import "google/protobuf/timestamp.proto";
 
-option go_package = "github.com/c-osmosis/osmosis/x/claim/types";
+option go_package = "github.com/osmosis-labs/osmosis/x/claim/types";
 
 enum Action {
   option (gogoproto.goproto_enum_prefix) = false;

diff --git a/proto/osmosis/claim/v1beta1/params.proto b/proto/osmosis/claim/v1beta1/params.proto
@@ -5,7 +5,7 @@ import "gogoproto/gogo.proto";
 import "google/protobuf/duration.proto";
 import "google/protobuf/timestamp.proto";
 
-option go_package = "github.com/c-osmosis/osmosis/x/claim/types";
+option go_package = "github.com/osmosis-labs/osmosis/x/claim/types";
 
 // Params defines the claim module's parameters.
 message Params {

diff --git a/proto/osmosis/claim/v1beta1/query.proto b/proto/osmosis/claim/v1beta1/query.proto
@@ -5,7 +5,7 @@ import "gogoproto/gogo.proto";
 import "google/api/annotations.proto";
 import "cosmos/base/v1beta1/coin.proto";
 
-option go_package = "github.com/c-osmosis/osmosis/x/claim/types";
+option go_package = "github.com/osmosis-labs/osmosis/x/claim/types";
 
 // Query defines the gRPC querier service.
 service Query {

diff --git a/proto/osmosis/epochs/genesis.proto b/proto/osmosis/epochs/genesis.proto
@@ -5,7 +5,7 @@ import "gogoproto/gogo.proto";
 import "google/protobuf/duration.proto";
 import "google/protobuf/timestamp.proto";
 
-option go_package = "github.com/c-osmosis/osmosis/x/epochs/types";
+option go_package = "github.com/osmosis-labs/osmosis/x/epochs/types";
 
 message EpochInfo {
   string identifier = 1;

diff --git a/proto/osmosis/epochs/query.proto b/proto/osmosis/epochs/query.proto
@@ -6,7 +6,7 @@ import "google/api/annotations.proto";
 import "cosmos/base/query/v1beta1/pagination.proto";
 import "osmosis/epochs/genesis.proto";
 
-option go_package = "github.com/c-osmosis/osmosis/x/epochs/types";
+option go_package = "github.com/osmosis-labs/osmosis/x/epochs/types";
 
 // Query defines the gRPC querier service.
 service Query {

diff --git a/proto/osmosis/gamm/v1beta1/pool.proto b/proto/osmosis/gamm/v1beta1/pool.proto
@@ -10,7 +10,7 @@ import "google/protobuf/timestamp.proto";
 import "cosmos/auth/v1beta1/auth.proto";
 import "cosmos/base/v1beta1/coin.proto";
 
-option go_package = "github.com/c-osmosis/osmosis/x/gamm/types";
+option go_package = "github.com/osmosis-labs/osmosis/x/gamm/types";
 
 message PoolAsset {
   // Coins we are talking about,

diff --git a/proto/osmosis/gamm/v1beta1/query.proto b/proto/osmosis/gamm/v1beta1/query.proto
@@ -10,7 +10,7 @@ import "google/api/annotations.proto";
 import "google/protobuf/any.proto";
 import "cosmos_proto/cosmos.proto";
 
-option go_package = "github.com/c-osmosis/osmosis/x/gamm/types";
+option go_package = "github.com/osmosis-labs/osmosis/x/gamm/types";
 
 service Query {
   rpc Pool(QueryPoolRequest) returns (QueryPoolResponse) {

diff --git a/proto/osmosis/gamm/v1beta1/tx.proto b/proto/osmosis/gamm/v1beta1/tx.proto
@@ -5,7 +5,7 @@ import "gogoproto/gogo.proto";
 import "osmosis/gamm/v1beta1/pool.proto";
 import "cosmos/base/v1beta1/coin.proto";
 
-option go_package = "github.com/c-osmosis/osmosis/x/gamm/types";
+option go_package = "github.com/osmosis-labs/osmosis/x/gamm/types";
 
 service Msg {
   rpc CreatePool(MsgCreatePool) returns (MsgCreatePoolResponse);

diff --git a/proto/osmosis/incentives/genesis.proto b/proto/osmosis/incentives/genesis.proto
@@ -5,7 +5,7 @@ import "gogoproto/gogo.proto";
 import "osmosis/incentives/params.proto";
 import "osmosis/incentives/pot.proto";
 
-option go_package = "github.com/c-osmosis/osmosis/x/incentives/types";
+option go_package = "github.com/osmosis-labs/osmosis/x/incentives/types";
 
 // GenesisState defines the incentives module's genesis state.
 message GenesisState {

diff --git a/proto/osmosis/incentives/params.proto b/proto/osmosis/incentives/params.proto
@@ -3,7 +3,7 @@ package osmosis.incentives;
 
 import "gogoproto/gogo.proto";
 
-option go_package = "github.com/c-osmosis/osmosis/x/incentives/types";
+option go_package = "github.com/osmosis-labs/osmosis/x/incentives/types";
 
 // Params holds parameters for the incentives module
 message Params {

diff --git a/proto/osmosis/incentives/pot.proto b/proto/osmosis/incentives/pot.proto
@@ -7,7 +7,7 @@ import "google/protobuf/timestamp.proto";
 import "cosmos/base/v1beta1/coin.proto";
 import "osmosis/lockup/lock.proto";
 
-option go_package = "github.com/c-osmosis/osmosis/x/incentives/types";
+option go_package = "github.com/osmosis-labs/osmosis/x/incentives/types";
 
 message Pot {
   uint64 id = 1;         // unique ID of a Pot

diff --git a/proto/osmosis/incentives/query.proto b/proto/osmosis/incentives/query.proto
@@ -7,7 +7,7 @@ import "cosmos/base/query/v1beta1/pagination.proto";
 import "osmosis/incentives/pot.proto";
 import "osmosis/lockup/lock.proto";
 
-option go_package = "github.com/c-osmosis/osmosis/x/incentives/types";
+option go_package = "github.com/osmosis-labs/osmosis/x/incentives/types";
 
 // Query defines the gRPC querier service.
 service Query {

diff --git a/proto/osmosis/incentives/tx.proto b/proto/osmosis/incentives/tx.proto
@@ -7,7 +7,7 @@ import "cosmos/base/v1beta1/coin.proto";
 import "osmosis/incentives/pot.proto";
 import "osmosis/lockup/lock.proto";
 
-option go_package = "github.com/c-osmosis/osmosis/x/incentives/types";
+option go_package = "github.com/osmosis-labs/osmosis/x/incentives/types";
 
 service Msg {
   rpc CreatePot(MsgCreatePot) returns (MsgCreatePotResponse);

diff --git a/proto/osmosis/lockup/genesis.proto b/proto/osmosis/lockup/genesis.proto
@@ -3,7 +3,7 @@ package osmosis.lockup;
 
 import "osmosis/lockup/lock.proto";
 
-option go_package = "github.com/c-osmosis/osmosis/x/lockup/types";
+option go_package = "github.com/osmosis-labs/osmosis/x/lockup/types";
 
 // GenesisState defines the lockup module's genesis state.
 message GenesisState { repeated PeriodLock locks = 1; }
diff --git a/proto/osmosis/lockup/lock.proto b/proto/osmosis/lockup/lock.proto
@@ -6,7 +6,7 @@ import "google/protobuf/duration.proto";
 import "google/protobuf/timestamp.proto";
 import "cosmos/base/v1beta1/coin.proto";
 
-option go_package = "github.com/c-osmosis/osmosis/x/lockup/types";
+option go_package = "github.com/osmosis-labs/osmosis/x/lockup/types";
 
 // PeriodLock is a single unit of lock by period. It's a record of locked coin
 // at a specific time. It stores owner, duration, unlock time and the amount of

diff --git a/proto/osmosis/lockup/query.proto b/proto/osmosis/lockup/query.proto
@@ -7,7 +7,7 @@ import "google/protobuf/timestamp.proto";
 import "google/protobuf/duration.proto";
 import "osmosis/lockup/lock.proto";
 
-option go_package = "github.com/c-osmosis/osmosis/x/lockup/types";
+option go_package = "github.com/osmosis-labs/osmosis/x/lockup/types";
 
 // Query defines the gRPC querier service.
 service Query {