From f7b6cac7fbdd6ab5b8963f23b436829267f78776 Mon Sep 17 00:00:00 2001 From: GnaD13 Date: Fri, 13 Oct 2023 12:07:38 +0700 Subject: [PATCH 1/5] composable to layer --- cmd/{composabled => layerd}/cmd/bech32_convert.go | 4 ++-- cmd/{composabled => layerd}/cmd/genaccounts.go | 2 +- cmd/{composabled => layerd}/cmd/root.go | 0 cmd/{composabled => layerd}/config/config.go | 6 +++--- cmd/{composabled => layerd}/main.go | 0 tests/interchaintest/ibc_transfer_test.go | 4 ++-- tests/interchaintest/push_wasm_client_code_test.go | 4 ++-- tests/interchaintest/setup.go | 6 +++--- tests/interchaintest/upgrade_chain_test.go | 6 +++--- 9 files changed, 16 insertions(+), 16 deletions(-) rename cmd/{composabled => layerd}/cmd/bech32_convert.go (87%) rename cmd/{composabled => layerd}/cmd/genaccounts.go (99%) rename cmd/{composabled => layerd}/cmd/root.go (100%) rename cmd/{composabled => layerd}/config/config.go (97%) rename cmd/{composabled => layerd}/main.go (100%) diff --git a/cmd/composabled/cmd/bech32_convert.go b/cmd/layerd/cmd/bech32_convert.go similarity index 87% rename from cmd/composabled/cmd/bech32_convert.go rename to cmd/layerd/cmd/bech32_convert.go index 04c918916..766609098 100644 --- a/cmd/composabled/cmd/bech32_convert.go +++ b/cmd/layerd/cmd/bech32_convert.go @@ -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 { diff --git a/cmd/composabled/cmd/genaccounts.go b/cmd/layerd/cmd/genaccounts.go similarity index 99% rename from cmd/composabled/cmd/genaccounts.go rename to cmd/layerd/cmd/genaccounts.go index 02ccb6f6f..ca5a8a0e5 100644 --- a/cmd/composabled/cmd/genaccounts.go +++ b/cmd/layerd/cmd/genaccounts.go @@ -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]) diff --git a/cmd/composabled/cmd/root.go b/cmd/layerd/cmd/root.go similarity index 100% rename from cmd/composabled/cmd/root.go rename to cmd/layerd/cmd/root.go diff --git a/cmd/composabled/config/config.go b/cmd/layerd/config/config.go similarity index 97% rename from cmd/composabled/config/config.go rename to cmd/layerd/config/config.go index 64a26cc06..d32dc0510 100644 --- a/cmd/composabled/config/config.go +++ b/cmd/layerd/config/config.go @@ -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 @@ -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. diff --git a/cmd/composabled/main.go b/cmd/layerd/main.go similarity index 100% rename from cmd/composabled/main.go rename to cmd/layerd/main.go diff --git a/tests/interchaintest/ibc_transfer_test.go b/tests/interchaintest/ibc_transfer_test.go index 8e56f2fb3..22fbccadc 100644 --- a/tests/interchaintest/ibc_transfer_test.go +++ b/tests/interchaintest/ibc_transfer_test.go @@ -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, diff --git a/tests/interchaintest/push_wasm_client_code_test.go b/tests/interchaintest/push_wasm_client_code_test.go index 1d1cfbd0c..41dbacee1 100644 --- a/tests/interchaintest/push_wasm_client_code_test.go +++ b/tests/interchaintest/push_wasm_client_code_test.go @@ -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, diff --git a/tests/interchaintest/setup.go b/tests/interchaintest/setup.go index cf70a985c..e2e5102be 100644 --- a/tests/interchaintest/setup.go +++ b/tests/interchaintest/setup.go @@ -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", @@ -45,7 +45,7 @@ func GetDockerImageInfo() (repo, version string) { repo = CentauriICTestRepo if !found { // make local-image - repo = "composable" + repo = "layer" branchVersion = "debug" } diff --git a/tests/interchaintest/upgrade_chain_test.go b/tests/interchaintest/upgrade_chain_test.go index 874fff5a6..e9d4f540c 100644 --- a/tests/interchaintest/upgrade_chain_test.go +++ b/tests/interchaintest/upgrade_chain_test.go @@ -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) { @@ -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, From 13bff499b0c6f9ffde932c22db5ef9b0fffb0615 Mon Sep 17 00:00:00 2001 From: GnaD13 Date: Fri, 13 Oct 2023 12:09:23 +0700 Subject: [PATCH 2/5] make layer' --- Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 84be7f8d3..662724651 100644 --- a/Makefile +++ b/Makefile @@ -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)" @@ -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 . From 711a89f62fc610927699f04afff47531d3cab414 Mon Sep 17 00:00:00 2001 From: GnaD13 Date: Fri, 13 Oct 2023 12:10:36 +0700 Subject: [PATCH 3/5] layer --- cmd/layerd/main.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/layerd/main.go b/cmd/layerd/main.go index c453eaf19..814033ca0 100644 --- a/cmd/layerd/main.go +++ b/cmd/layerd/main.go @@ -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() { From 092eedf09d390168b869727de5cf722d586c7d83 Mon Sep 17 00:00:00 2001 From: GnaD13 Date: Fri, 13 Oct 2023 12:12:33 +0700 Subject: [PATCH 4/5] gov address --- app/keepers/keepers.go | 2 +- x/transfermiddleware/ibc_ante_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/keepers/keepers.go b/app/keepers/keepers.go index e6f37df98..e394688d8 100644 --- a/app/keepers/keepers.go +++ b/app/keepers/keepers.go @@ -107,7 +107,7 @@ import ( const ( AccountAddressPrefix = "composable" - authorityAddress = "composable10556m38z4x6pqalr9rl5ytf3cff8q46nnngqs2" // convert from: centauri10556m38z4x6pqalr9rl5ytf3cff8q46nk85k9m + authorityAddress = "layer10556m38z4x6pqalr9rl5ytf3cff8q46nz002d6" // convert from: centauri10556m38z4x6pqalr9rl5ytf3cff8q46nk85k9m ) type AppKeepers struct { diff --git a/x/transfermiddleware/ibc_ante_test.go b/x/transfermiddleware/ibc_ante_test.go index 67fac835f..85b644739 100644 --- a/x/transfermiddleware/ibc_ante_test.go +++ b/x/transfermiddleware/ibc_ante_test.go @@ -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 From feb4093eac2482b5d67abca4aac8ae9381fd65ac Mon Sep 17 00:00:00 2001 From: GnaD13 Date: Fri, 13 Oct 2023 12:20:00 +0700 Subject: [PATCH 5/5] update setup.go --- tests/interchaintest/setup.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/interchaintest/setup.go b/tests/interchaintest/setup.go index e2e5102be..5b2279431 100644 --- a/tests/interchaintest/setup.go +++ b/tests/interchaintest/setup.go @@ -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()