Skip to content

Commit

Permalink
Merge pull request ComposableFi#242 from notional-labs/dang/change-pr…
Browse files Browse the repository at this point in the history
…efix

Change prefix to from Centauri to Composable
  • Loading branch information
vuong177 authored Oct 9, 2023
2 parents d54339e + 756c562 commit f1c4cd7
Show file tree
Hide file tree
Showing 166 changed files with 1,524 additions and 1,386 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/interchaintest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
push: true
platforms: linux/amd64
tags: |
ghcr.io/notional-labs/centauri-ictest:latest
ghcr.io/notional-labs/composable-ictest:latest
test-start-cosmos-chain:
runs-on: ubuntu-latest
needs: build-and-push-image
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/push_docker_images.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# This workflow pushes new centauri docker images on every new tag.
# This workflow pushes new composable docker images on every new tag.
#
# On every new `vX.Y.Z` tag the following images are pushed:
#
# notional-labs/centauri:X.Y.Z # is pushed
# notional-labs/centauri:X.Y # is updated to X.Y.Z
# notional-labs/centauri:X # is updated to X.Y.Z
# notional-labs/centauri:latest # is updated to X.Y.Z
# notional-labs/composable:X.Y.Z # is pushed
# notional-labs/composable:X.Y # is updated to X.Y.Z
# notional-labs/composable:X # is updated to X.Y.Z
# notional-labs/composable:latest # is updated to X.Y.Z
#
# All the images above have support for linux/amd64 and linux/arm64.
#
Expand Down Expand Up @@ -66,6 +66,6 @@ jobs:
push: true
platforms: linux/amd64,linux/arm64
tags: |
ghcr.io/notional-labs/centauri:${{ env.MAJOR_VERSION }}
ghcr.io/notional-labs/centauri:${{ env.MAJOR_VERSION }}.${{ env.MINOR_VERSION }}
ghcr.io/notional-labs/centauri:${{ env.MAJOR_VERSION }}.${{ env.MINOR_VERSION }}.${{ env.PATCH_VERSION }}
ghcr.io/notional-labs/composable:${{ env.MAJOR_VERSION }}
ghcr.io/notional-labs/composable:${{ env.MAJOR_VERSION }}.${{ env.MINOR_VERSION }}
ghcr.io/notional-labs/composable:${{ env.MAJOR_VERSION }}.${{ env.MINOR_VERSION }}.${{ env.PATCH_VERSION }}
16 changes: 8 additions & 8 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ RUN apk add --no-cache \
linux-headers

# Download go dependencies
WORKDIR /centauri
WORKDIR /composable
COPY go.mod go.sum ./
RUN --mount=type=cache,target=/root/.cache/go-build \
--mount=type=cache,target=/root/go/pkg/mod \
Expand All @@ -43,25 +43,25 @@ RUN --mount=type=cache,target=/root/.cache/go-build \
-mod=readonly \
-tags "netgo,ledger,muslc" \
-ldflags \
"-X github.com/cosmos/cosmos-sdk/version.Name="centauri" \
-X github.com/cosmos/cosmos-sdk/version.AppName="centaurid" \
"-X github.com/cosmos/cosmos-sdk/version.Name="composable" \
-X github.com/cosmos/cosmos-sdk/version.AppName="composabled" \
-X github.com/cosmos/cosmos-sdk/version.Version=${GIT_VERSION} \
-X github.com/cosmos/cosmos-sdk/version.Commit=${GIT_COMMIT} \
-X github.com/cosmos/cosmos-sdk/version.BuildTags=netgo,ledger,muslc \
-w -s -linkmode=external -extldflags '-Wl,-z,muldefs -static'" \
-trimpath \
-o /centauri/build/centaurid \
/centauri/cmd/centaurid/main.go
-o /composable/build/composabled \
/composable/cmd/composabled

# --------------------------------------------------------
# Runner
# --------------------------------------------------------

FROM ${RUNNER_IMAGE}

COPY --from=builder /centauri/build/centaurid /bin/centaurid
COPY --from=builder /composable/build/composabled /bin/composabled

ENV HOME /centauri
ENV HOME /composable
WORKDIR $HOME

# rest server
Expand All @@ -72,4 +72,4 @@ EXPOSE 26656
EXPOSE 26657
# grpc
EXPOSE 9090
ENTRYPOINT ["centaurid"]
ENTRYPOINT ["composabled"]
16 changes: 8 additions & 8 deletions Dockerfile.dev
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ RUN apk add --no-cache \
linux-headers

# Download go dependencies
WORKDIR /centauri
WORKDIR /composable
COPY go.mod go.sum ./

# Cosmwasm - Download correct libwasmvm version
Expand All @@ -38,29 +38,29 @@ RUN GOWORK=off go build \
-mod=readonly \
-tags "netgo,ledger,muslc" \
-ldflags \
"-X github.com/cosmos/cosmos-sdk/version.Name="centauri" \
-X github.com/cosmos/cosmos-sdk/version.AppName="centaurid" \
"-X github.com/cosmos/cosmos-sdk/version.Name="composable" \
-X github.com/cosmos/cosmos-sdk/version.AppName="composabled" \
-X github.com/cosmos/cosmos-sdk/version.Version=${GIT_VERSION} \
-X github.com/cosmos/cosmos-sdk/version.Commit=${GIT_COMMIT} \
-X github.com/cosmos/cosmos-sdk/version.BuildTags=netgo,ledger,muslc \
-w -s -linkmode=external -extldflags '-Wl,-z,muldefs -static'" \
-trimpath \
-o /centauri/build/centaurid \
/centauri/cmd/centaurid/main.go
-o /composable/build/composabled \
/composable/cmd/composabled

# --------------------------------------------------------
# Runner
# --------------------------------------------------------

FROM ${RUNNER_IMAGE}

COPY --from=builder /centauri/build/centaurid /bin/centaurid
COPY --from=builder /composable/build/composabled /bin/composabled

ENV HOME /centauri
ENV HOME /composable

WORKDIR $HOME

COPY scripts/* /centauri/
COPY scripts/* /composable/
# rest server
EXPOSE 1317
# tendermint p2p
Expand Down
16 changes: 8 additions & 8 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=centauri \
-X github.com/cosmos/cosmos-sdk/version.AppName=centaurid \
ldflags = -X github.com/cosmos/cosmos-sdk/version.Name=composable \
-X github.com/cosmos/cosmos-sdk/version.AppName=composabled \
-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/centaurid
go install -mod=readonly $(BUILD_FLAGS) ./cmd/composabled

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

docker-build-debug:
@DOCKER_BUILDKIT=1 docker build -t centauri:debug -f Dockerfile .
@DOCKER_BUILDKIT=1 docker build -t composable: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 Expand Up @@ -133,7 +133,7 @@ proto-check-breaking:

# Executes start chain tests via interchaintest
ictest-start-cosmos:
cd tests/interchaintest && go test -race -v -run TestStartCentauri .
cd tests/interchaintest && go test -race -v -run TestStartComposable .

ictest-validator:
cd tests/interchaintest && go test -race -v -run TestValidator .
Expand All @@ -144,11 +144,11 @@ ictest-start-polkadot:

# Executes IBC tests via interchaintest
ictest-ibc:
cd tests/interchaintest && go test -timeout=25m -race -v -run TestCentauriPicassoIBCTransfer .
cd tests/interchaintest && go test -timeout=25m -race -v -run TestComposablePicassoIBCTransfer .

# Executes Basic Upgrade Chain tests via interchaintest
ictest-upgrade:
cd tests/interchaintest && go test -timeout=25m -race -v -run TestCentauriUpgrade .
cd tests/interchaintest && go test -timeout=25m -race -v -run TestComposableUpgrade .

# Executes all tests via interchaintest after compling a local image as juno:local
ictest-all: ictest-start-cosmos ictest-start-polkadot ictest-ibc
Expand Down
6 changes: 3 additions & 3 deletions app/ante/ante.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import (
ante "github.com/cosmos/cosmos-sdk/x/auth/ante"
"github.com/cosmos/cosmos-sdk/x/auth/signing"

tfmwKeeper "github.com/notional-labs/centauri/v5/x/transfermiddleware/keeper"
txBoundaryAnte "github.com/notional-labs/centauri/v5/x/tx-boundary/ante"
txBoundaryKeeper "github.com/notional-labs/centauri/v5/x/tx-boundary/keeper"
tfmwKeeper "github.com/notional-labs/composable/v5/x/transfermiddleware/keeper"
txBoundaryAnte "github.com/notional-labs/composable/v5/x/tx-boundary/ante"
txBoundaryKeeper "github.com/notional-labs/composable/v5/x/tx-boundary/keeper"
)

// Link to default ante handler used by cosmos sdk:
Expand Down
2 changes: 1 addition & 1 deletion app/ante/ibc_ante.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/cosmos/cosmos-sdk/x/authz"
clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types"

tfmwKeeper "github.com/notional-labs/centauri/v5/x/transfermiddleware/keeper"
tfmwKeeper "github.com/notional-labs/composable/v5/x/transfermiddleware/keeper"
)

type IBCPermissionDecorator struct {
Expand Down
Loading

0 comments on commit f1c4cd7

Please sign in to comment.