Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change prefix to layer #254

Merged
merged 5 commits into from
Oct 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ comma := ,
build_tags_comma_sep := $(subst $(whitespace),$(comma),$(build_tags))

# process linker flags
ldflags = -X github.com/cosmos/cosmos-sdk/version.Name=composable \
-X github.com/cosmos/cosmos-sdk/version.AppName=composabled \
ldflags = -X github.com/cosmos/cosmos-sdk/version.Name=layer \
-X github.com/cosmos/cosmos-sdk/version.AppName=layerd \
-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_comma_sep)"
Expand All @@ -86,13 +86,13 @@ endif
all: install

install: go.sum
go install -mod=readonly $(BUILD_FLAGS) ./cmd/composabled
go install -mod=readonly $(BUILD_FLAGS) ./cmd/layerd

build:
go build $(BUILD_FLAGS) -o bin/composabled ./cmd/composabled
go build $(BUILD_FLAGS) -o bin/layerd ./cmd/layerd

docker-build-debug:
@DOCKER_BUILDKIT=1 docker build -t composable:debug -f Dockerfile .
@DOCKER_BUILDKIT=1 docker build -t layer:debug -f Dockerfile .

lint:
@find . -name '*.go' -type f -not -path "./vendor*" -not -path "*.git*" -not -name '*.pb.go' -not -name '*.gw.go' | xargs go run mvdan.cc/gofumpt -w .
Expand Down
2 changes: 1 addition & 1 deletion app/keepers/keepers.go
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ import (

const (
AccountAddressPrefix = "composable"
authorityAddress = "composable10556m38z4x6pqalr9rl5ytf3cff8q46nnngqs2" // convert from: centauri10556m38z4x6pqalr9rl5ytf3cff8q46nk85k9m
authorityAddress = "layer10556m38z4x6pqalr9rl5ytf3cff8q46nz002d6" // convert from: centauri10556m38z4x6pqalr9rl5ytf3cff8q46nk85k9m
)

type AppKeepers struct {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ func AddBech32ConvertCommand() *cobra.Command {
Long: `Convert any bech32 string to the composable prefix

Example:
composabled debug bech32-convert akash1a6zlyvpnksx8wr6wz8wemur2xe8zyh0ytz6d88
layerd debug bech32-convert akash1a6zlyvpnksx8wr6wz8wemur2xe8zyh0ytz6d88

composabled debug bech32-convert stride1673f0t8p893rqyqe420mgwwz92ac4qv6synvx2 --prefix osmo
layerd debug bech32-convert stride1673f0t8p893rqyqe420mgwwz92ac4qv6synvx2 --prefix osmo
`,
Args: cobra.ExactArgs(1),
RunE: func(cmd *cobra.Command, args []string) error {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ contain valid denominations. Accounts may optionally be supplied with vesting pa
func CovertPrefixAddr() *cobra.Command {
cmd := &cobra.Command{
Use: "convert [address]",
Short: "Convert prefix from centauri to composable",
Short: "Convert prefix from centauri to layer",
Args: cobra.ExactArgs(1),
RunE: func(cmd *cobra.Command, args []string) error {
newAddr := utils.ConvertAccAddr(args[0])
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (

const (
// Bech32Prefix defines the Bech32 prefix used for EthAccounts
Bech32Prefix = "composable"
Bech32Prefix = "layer"

// Bech32PrefixAccAddr defines the Bech32 prefix of an account's address
Bech32PrefixAccAddr = Bech32Prefix
Expand Down Expand Up @@ -40,8 +40,8 @@ func SetupConfig() {
SetAddressPrefixes(config)
config.Seal()

version.AppName = "composable"
version.Name = "composabled"
version.AppName = "layer"
version.Name = "layerd"
}

// SetBech32Prefixes sets the global prefixes to be used when serializing addresses and public keys to Bech32 strings.
Expand Down
4 changes: 2 additions & 2 deletions cmd/composabled/main.go → cmd/layerd/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
svrcmd "github.com/cosmos/cosmos-sdk/server/cmd"

"github.com/notional-labs/composable/v6/app"
cmd "github.com/notional-labs/composable/v6/cmd/composabled/cmd"
cmdcfg "github.com/notional-labs/composable/v6/cmd/composabled/config"
cmd "github.com/notional-labs/composable/v6/cmd/layerd/cmd"
cmdcfg "github.com/notional-labs/composable/v6/cmd/layerd/config"
)

func main() {
Expand Down
4 changes: 2 additions & 2 deletions tests/interchaintest/ibc_transfer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,8 @@ func TestCentauriPicassoIBCTransfer(t *testing.T) {
Name: "centauri",
ChainID: "centaurid",
Images: []ibc.DockerImage{CentauriImage},
Bin: "centaurid",
Bech32Prefix: "centauri",
Bin: "layerd",
Bech32Prefix: "layer",
Denom: "stake",
GasPrices: "0.00stake",
GasAdjustment: 1.3,
Expand Down
4 changes: 2 additions & 2 deletions tests/interchaintest/push_wasm_client_code_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@ func TestPushWasmClientCode(t *testing.T) {
Name: "composable",
ChainID: "centaurid",
Images: []ibc.DockerImage{CentauriImage},
Bin: "composabled",
Bech32Prefix: "composable",
Bin: "layerd",
Bech32Prefix: "layer",
Denom: "stake",
GasPrices: "0.00stake",
GasAdjustment: 1.3,
Expand Down
10 changes: 5 additions & 5 deletions tests/interchaintest/setup.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
)

var (
CentauriMainRepo = "ghcr.io/notional-labs/composable"
CentauriICTestRepo = "ghcr.io/notional-labs/composable-ictest"
CentauriMainRepo = "ghcr.io/notional-labs/layer"
CentauriICTestRepo = "ghcr.io/notional-labs/layer-ictest"

repo, version = GetDockerImageInfo()

Expand All @@ -24,8 +24,8 @@ var (
Name: "composable",
ChainID: "composable-2",
Images: []ibc.DockerImage{CentauriImage},
Bin: "composabled",
Bech32Prefix: "composable",
Bin: "layerd",
Bech32Prefix: "layer",
Denom: "stake",
CoinType: "118",
GasPrices: "0.0stake",
Expand All @@ -45,7 +45,7 @@ func GetDockerImageInfo() (repo, version string) {
repo = CentauriICTestRepo
if !found {
// make local-image
repo = "composable"
repo = "layer"
branchVersion = "debug"
}

Expand Down
6 changes: 3 additions & 3 deletions tests/interchaintest/upgrade_chain_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ const (

func TestComposableUpgrade(t *testing.T) {
repo, version := GetDockerImageInfo()
CosmosChainUpgradeTest(t, repo, version, "composable")
CosmosChainUpgradeTest(t, repo, version, "v6")
}

func CosmosChainUpgradeTest(t *testing.T, upgradeContainerRepo, upgradeVersion, upgradeName string) {
Expand All @@ -43,8 +43,8 @@ func CosmosChainUpgradeTest(t *testing.T, upgradeContainerRepo, upgradeVersion,
UidGid: "1025:1025",
},
},
Bin: "centaurid",
Bech32Prefix: "centauri",
Bin: "layerd",
Bech32Prefix: "layer",
Denom: "ppica",
GasPrices: "0.00ppica",
GasAdjustment: 1.3,
Expand Down
2 changes: 1 addition & 1 deletion x/transfermiddleware/ibc_ante_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
customibctesting "github.com/notional-labs/composable/v6/app/ibctesting"
)

var govAuthorityAddress = "composable10556m38z4x6pqalr9rl5ytf3cff8q46nnngqs2" // convert from: centauri10556m38z4x6pqalr9rl5ytf3cff8q46nk85k9m
var govAuthorityAddress = "layer10556m38z4x6pqalr9rl5ytf3cff8q46nz002d6" // convert from: centauri10556m38z4x6pqalr9rl5ytf3cff8q46nk85k9m

type TransferTestSuite struct {
suite.Suite
Expand Down
Loading