refactor: merge from develop and add test script

.github/workflows/interchaintest.yml

@@ -23,7 +23,7 @@ jobs:
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
+          password: ${{ secrets.GHCR_PAT }}
       - name: Build and push
         id: build_push_image
         uses: docker/build-push-action@v3

.gitignore

@@ -29,7 +29,8 @@ dist/
 
 # Test binary, built with `go test -c`
 *.test
-
+# Test data
+data/*
 # Output of the go coverage tool, specifically when used with LiteIDE
 *.out
 
@@ -48,8 +49,9 @@ vendor
 go.work
 go.work.sum
 
+_build/
 
-_build 
+mytestnet/
 
 screenlog.0
-mytestnet
+.idea

.goreleaser.yml

@@ -1,14 +1,14 @@
 # .goreleaser.yml
 
-project_name: centaurid
+project_name: picad
 
 env:
   - CGO_ENABLED=1
 
 builds:
   - id: linux
-    main: ./cmd/centaurid
-    binary: centaurid
+    main: ./cmd/picad
+    binary: picad
     hooks:
       pre:
         - cmd: bash scripts/release_pre_linux.sh
@@ -28,8 +28,8 @@ builds:
       - -mod=readonly
       - -trimpath
     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=pica
+      - -X github.com/cosmos/cosmos-sdk/version.AppName=picad
       - -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=netgo,ledger,muslc"

Dockerfile

@@ -18,7 +18,7 @@ RUN apk add --no-cache \
     linux-headers
 
 # Download go dependencies
-WORKDIR /centauri
+WORKDIR /pica
 COPY go.mod go.sum ./
 RUN --mount=type=cache,target=/root/.cache/go-build \
     --mount=type=cache,target=/root/go/pkg/mod \
@@ -36,30 +36,30 @@ RUN set -eux; \
 # Copy the remaining files
 COPY . .
 
-# Build centaurid binary
+# Build picad binary
 RUN --mount=type=cache,target=/root/.cache/go-build \
     --mount=type=cache,target=/root/go/pkg/mod \
     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="pica" \
+            -X github.com/cosmos/cosmos-sdk/version.AppName="picad" \
             -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
+        -o /pica/build/picad \
+        /pica/cmd/picad
 
 
 # --------------------------------------------------------
 # toolkit
 # --------------------------------------------------------
 
 FROM busybox:1.35.0-uclibc as busybox
-RUN addgroup --gid 1025 -S composable && adduser --uid 1025 -S composable -G composable
+RUN addgroup --gid 1025 -S pica && adduser --uid 1025 -S pica -G pica
 
 
 # --------------------------------------------------------
@@ -69,14 +69,14 @@ FROM ${RUNNER_IMAGE}
 
 COPY --from=busybox:1.35.0-uclibc /bin/sh /bin/sh
 
-COPY --from=builder /centauri/build/centaurid /bin/centaurid
+COPY --from=builder /pica/build/picad /bin/picad
 
 # Install composable user
 COPY --from=busybox /etc/passwd /etc/passwd
-COPY --from=busybox --chown=1025:1025 /home/composable /home/composable
+COPY --from=busybox --chown=1025:1025 /home/pica /home/pica
 
-WORKDIR /home/composable
-USER composable
+WORKDIR /home/pica
+USER pica
 
 # rest server
 EXPOSE 1317
@@ -87,4 +87,4 @@ EXPOSE 26657
 # grpc
 EXPOSE 9090
 
-ENTRYPOINT ["centaurid"]
+ENTRYPOINT ["picad"]

Dockerfile.dev

@@ -18,7 +18,7 @@ RUN apk add --no-cache \
     linux-headers
 
 # Download go dependencies
-WORKDIR /centauri
+WORKDIR /pica
 COPY go.mod go.sum ./
 
 # Cosmwasm - Download correct libwasmvm version
@@ -33,34 +33,34 @@ RUN set -eux; \
 # Copy the remaining files
 COPY . .
 
-# Build centaurid binary
+# Build picad binary
 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="pica" \
+            -X github.com/cosmos/cosmos-sdk/version.AppName="picad" \
             -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
+        -o /pica/build/picad \
+        /pica/cmd/picad
 
 # --------------------------------------------------------
 # Runner
 # --------------------------------------------------------
 
 FROM ${RUNNER_IMAGE}
 
-COPY --from=builder /centauri/build/centaurid /bin/centaurid
+COPY --from=builder /pica/build/picad /bin/picad
 
-ENV HOME /centauri
+ENV HOME /pica
 
 WORKDIR $HOME
 
-COPY scripts/* /centauri/
+COPY scripts/* /pica/
 # rest server
 EXPOSE 1317
 # tendermint p2p

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=centauri \
-		  -X github.com/cosmos/cosmos-sdk/version.AppName=centaurid \
+ldflags = -X github.com/cosmos/cosmos-sdk/version.Name=pica \
+		  -X github.com/cosmos/cosmos-sdk/version.AppName=picad \
 		  -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,18 +86,18 @@ endif
 all: install
 
 install: go.sum
-	go install -mod=readonly $(BUILD_FLAGS) ./cmd/centaurid
+	go install -mod=readonly $(BUILD_FLAGS) ./cmd/picad
 
 build:
-	go build $(BUILD_FLAGS) -o bin/centaurid ./cmd/centaurid
+	go build $(BUILD_FLAGS) -o bin/picad ./cmd/picad
 
 docker-build-debug:
-	@DOCKER_BUILDKIT=1 docker build -t centauri:local -f Dockerfile .
+	@DOCKER_BUILDKIT=1 docker build -t centauri: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 .
 	@find . -name '*.go' -type f -not -path "./vendor*" -not -path "*.git*" -not -name '*.pb.go' -not -name '*.gw.go' | xargs go run github.com/client9/misspell/cmd/misspell -w
-	@find . -name '*.go' -type f -not -path "./vendor*" -not -path "*.git*" -not -name '*.pb.go' -not -name '*.gw.go' | xargs go run golang.org/x/tools/cmd/goimports -w -local github.com/notional-labs/centauri
+	@find . -name '*.go' -type f -not -path "./vendor*" -not -path "*.git*" -not -name '*.pb.go' -not -name '*.gw.go' | xargs go run golang.org/x/tools/cmd/goimports -w -local github.com/notional-labs/pica
 .PHONY: lint
 
 ###############################################################################
@@ -156,6 +156,21 @@ ictest-all: ictest-start-cosmos ictest-start-polkadot ictest-ibc
 ictest-push-wasm:
 	cd tests/interchaintest && go test -race -v -run TestPushWasmClientCode .
 
+# Init 2 cosmos chains and setup ibc between them
+init-test-interchain: clean-testing-data install
+	./scripts/test-upgrade-cosmos-chains.sh
+
+###  Upgrade Test ###
+test-upgrade: clean-testing-data
+	@echo "Starting upgrade test"
+	./scripts/test-upgrade.sh
+
+clean-testing-data:
+	@echo "Killing binary and removing previous data"
+	-@pkill picad 2>/dev/null
+	-@pkill rly 2>/dev/null
+	-@rm -rf ./mytestnet
+
 .PHONY: ictest-start-cosmos ictest-start-polkadot ictest-ibc ictest-push-wasm ictest-all
 
 include contrib/make/release.mk
@@ -169,5 +184,28 @@ test-upgrade: clean-testing-data
 clean-testing-data:
 	@echo "Killing binary and removing previous data"
 	-@pkill centaurid 2>/dev/null
+	-@pkill picad 2>/dev/null
+	-@rm -rf ./screenlog.0
 	-@rm -rf ./mytestnet
 
+## Scripts for testing sdk 50
+init-deps:
+	@echo "Installing dependencies"
+	bash ./scripts/upgrade/init-deps.sh
+
+localnet-pica: clean-testing-data
+	@echo "Starting localnet"
+	bash ./scripts/upgrade/setup-old-picad-node.sh
+
+localnet-picasso:
+	@echo "Starting localnet"
+	bash ./scripts/upgrade/setup-polkadot-node.sh
+
+relayer-start:
+	@echo "Starting relayer"
+	bash ./scripts/upgrade/setup-relayer.sh
+
+pica-upgrade:
+	@echo "Starting upgrade"
+	bash ./scripts/upgrade/upgrade.sh
+

README.md

@@ -1,4 +1,4 @@
-# Centauri
+# Pica
 Cosmos blockchain with IBC-v7 and wasm client enable.
 
 ## Hardware Recommendation
@@ -13,7 +13,7 @@ Requires [Go 1.20](https://go.dev/doc/install) or higher.
 
 ```bash
 make install
-centaurid version
+picad version
 ```
 Then you can run a node with a single command.
 

app/app.go

@@ -4,9 +4,9 @@ import (
 	"cosmossdk.io/client/v2/autocli"
 	"cosmossdk.io/core/appmodule"
 	"fmt"
+	tmproto "github.com/cometbft/cometbft/proto/tendermint/types"
 	runtimeservices "github.com/cosmos/cosmos-sdk/runtime/services"
 	authcodec "github.com/cosmos/cosmos-sdk/x/auth/codec"
-	"github.com/notional-labs/composable/v6/app/upgrades/v6_5_1"
 	"io"
 	"os"
 	"path/filepath"
@@ -101,8 +101,8 @@ import (
 	customstaking "github.com/notional-labs/composable/v6/custom/staking"
 	"github.com/spf13/cast"
 
-	router "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v8/packetforward"
-	routertypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v8/packetforward/types"
+	pfm "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v8/packetforward"
+	pfmtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v8/packetforward/types"
 
 	custombankmodule "github.com/notional-labs/composable/v6/custom/bank"
 
@@ -138,7 +138,7 @@ import (
 )
 
 const (
-	Name       = "centauri"
+	Name       = "picasso"
 	dirName    = "banksy"
 	ForkHeight = 244008
 )
@@ -152,7 +152,7 @@ var (
 	// https://github.com/CosmWasm/wasmd/blob/02a54d33ff2c064f3539ae12d75d027d9c665f05/x/wasm/internal/types/proposal.go#L28-L34
 	EnableSpecificProposals = ""
 
-	Upgrades = []upgrades.Upgrade{v6_5_1.Upgrade, v7_0_1.Upgrade}
+	Upgrades = []upgrades.Upgrade{v7_0_1.Upgrade}
 	Forks    = []upgrades.Fork{}
 )
 
@@ -200,7 +200,7 @@ var (
 		tendermint.AppModuleBasic{},
 		mint.AppModuleBasic{},
 		wasm.AppModuleBasic{},
-		router.AppModuleBasic{},
+		pfm.AppModuleBasic{},
 		ica.AppModuleBasic{},
 		ibc_hooks.AppModuleBasic{},
 		transfermiddleware.AppModuleBasic{},
@@ -341,7 +341,7 @@ func NewComposableApp(
 
 	// transferModule := transfer.NewAppModule(app.TransferKeeper)
 	transferModule := customibctransfer.NewAppModule(appCodec, app.TransferKeeper, app.BankKeeper)
-	routerModule := router.NewAppModule(app.RouterKeeper, app.GetSubspace(routertypes.ModuleName))
+	pfmModule := pfm.NewAppModule(app.PfmKeeper, app.GetSubspace(pfmtypes.ModuleName))
 	transfermiddlewareModule := transfermiddleware.NewAppModule(&app.TransferMiddlewareKeeper)
 	txBoundaryModule := txBoundary.NewAppModule(appCodec, app.TxBoundaryKeepper)
 	ratelimitModule := ratelimitmodule.NewAppModule(&app.RatelimitKeeper)
@@ -388,7 +388,7 @@ func NewComposableApp(
 		consensus.NewAppModule(appCodec, app.ConsensusParamsKeeper),
 		wasm.NewAppModule(appCodec, &app.WasmKeeper, app.StakingKeeper, app.AccountKeeper, app.BankKeeper, app.MsgServiceRouter(), app.GetSubspace(wasmtypes.ModuleName)),
 		wasm08.NewAppModule(app.Wasm08Keeper),
-		routerModule,
+		pfmModule,
 		transfermiddlewareModule,
 		txBoundaryModule,
 		icaModule,
@@ -420,7 +420,7 @@ func NewComposableApp(
 		vestingtypes.ModuleName,
 		ibcexported.ModuleName,
 		ibctransfertypes.ModuleName,
-		routertypes.ModuleName,
+		pfmtypes.ModuleName,
 		transfermiddlewaretypes.ModuleName,
 		txBoundaryTypes.ModuleName,
 		ratelimitmoduletypes.ModuleName,
@@ -464,7 +464,7 @@ func NewComposableApp(
 		group.ModuleName,
 		paramstypes.ModuleName,
 		upgradetypes.ModuleName,
-		routertypes.ModuleName,
+		pfmtypes.ModuleName,
 		transfermiddlewaretypes.ModuleName,
 		txBoundaryTypes.ModuleName,
 		ratelimitmoduletypes.ModuleName,
@@ -504,7 +504,7 @@ func NewComposableApp(
 		upgradetypes.ModuleName,
 		ibctransfertypes.ModuleName,
 		icqtypes.ModuleName,
-		routertypes.ModuleName,
+		pfmtypes.ModuleName,
 		transfermiddlewaretypes.ModuleName,
 		txBoundaryTypes.ModuleName,
 		ratelimitmoduletypes.ModuleName,
@@ -596,6 +596,15 @@ func NewComposableApp(
 		if err := app.LoadLatestVersion(); err != nil {
 			tmos.Exit(err.Error())
 		}
+		ctx := app.BaseApp.NewUncachedContext(true, tmproto.Header{})
+		// Initialize pinned codes in wasmvm as they are not persisted there
+		if err := app.WasmKeeper.InitializePinnedCodes(ctx); err != nil {
+			tmos.Exit(fmt.Sprintf("failed initialize pinned codes %s", err))
+		}
+
+		//if err := wasm08keeper.InitializePinnedCodes(ctx); err != nil {
+		//	tmos.Exit(fmt.Sprintf("failed initialize pinned codes %s", err))
+		//}
 	}
 
 	return app