build(pyth): hyphenate wasm artifact names

Cargo emits underscore filenames for hyphenated contract crates. Normalize the final CosmWasm artifacts after optimization so the packaged wasm names match the pyth-vaa and pyth-pro directories.

Update local deployment and e2e artifact lookups to use the hyphenated names.

Signed-off-by: Joseph Chalabi <chalabi.joseph@gmail.com>

Author: chalabi2

_run/init.sh

@@ -22,8 +22,8 @@ if [[ -z "$CONTRACTS_DIR" ]]; then
 	exit 1
 fi
 
-PYTH_VAA_WASM="${CONTRACTS_DIR}/artifacts/pyth_vaa.wasm"
-PYTH_PRO_WASM="${CONTRACTS_DIR}/artifacts/pyth_pro.wasm"
+PYTH_VAA_WASM="${CONTRACTS_DIR}/artifacts/pyth-vaa.wasm"
+PYTH_PRO_WASM="${CONTRACTS_DIR}/artifacts/pyth-pro.wasm"
 
 HERMES_MNEMONIC="wire museum tragic inmate final lady illegal father whisper margin sea cool soul half moon nut tissue strategy ladder come glory opera device elbow"
 

make/cosmwasm.mk

@@ -8,6 +8,26 @@ build-contracts:
 	  -v "$(AKASH_DEVCACHE)/cosmwasm/artifacts":/code/artifacts \
 	  --mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
 	  $(COSMWASM_OPTIMIZER_IMAGE)
+	@# Cargo normalizes hyphenated crate names to underscores. Keep the
+	@# released artifact names aligned with the contract directories.
+	@artifacts="$(AKASH_DEVCACHE)/cosmwasm/artifacts"; \
+	for artifact in "pyth_vaa.wasm:pyth-vaa.wasm" "pyth_pro.wasm:pyth-pro.wasm"; do \
+		old="$${artifact%%:*}"; \
+		new="$${artifact##*:}"; \
+		if [ ! -f "$$artifacts/$$old" ]; then \
+			echo "error: expected $$artifacts/$$old from CosmWasm optimizer" >&2; \
+			exit 1; \
+		fi; \
+		mv -f "$$artifacts/$$old" "$$artifacts/$$new"; \
+	done; \
+	if [ -f "$$artifacts/checksums.txt" ]; then \
+		tmp="$$artifacts/checksums.txt.tmp"; \
+		sed \
+			-e 's/pyth_vaa\.wasm/pyth-vaa.wasm/g' \
+			-e 's/pyth_pro\.wasm/pyth-pro.wasm/g' \
+			"$$artifacts/checksums.txt" > "$$tmp"; \
+		mv "$$tmp" "$$artifacts/checksums.txt"; \
+	fi
 
 .PHONY: generate-contracts
 generate-contracts: build-contracts

tests/e2e/pyth_contract_test.go

@@ -198,9 +198,9 @@ func (s *priceOracleContractTestSuite) TestStoreContractViaGovernance() {
 	val := s.Network().Validators[0]
 
 	// Load the pyth-pro wasm contract.
-	wasmPath := findWasmPath("pyth-pro", "pyth_pro.wasm")
+	wasmPath := findWasmPath("pyth-pro", "pyth-pro.wasm")
 	if wasmPath == "" {
-		s.T().Skip("pyth_pro.wasm not found, skipping contract store test")
+		s.T().Skip("pyth-pro.wasm not found, skipping contract store test")
 		return
 	}
 
@@ -499,8 +499,8 @@ func (s *priceOracleContractTestSuite) TestAllContractsExist() {
 		dir      string
 		wasmFile string
 	}{
-		{"pyth-vaa", "pyth-vaa", "pyth_vaa.wasm"},
-		{"pyth-pro", "pyth-pro", "pyth_pro.wasm"},
+		{"pyth-vaa", "pyth-vaa", "pyth-vaa.wasm"},
+		{"pyth-pro", "pyth-pro", "pyth-pro.wasm"},
 	}
 
 	for _, c := range contracts {
@@ -568,11 +568,19 @@ func (s *priceOracleContractTestSuite) TestRouterSignedVAAStructure() {
 func findWasmPath(contractDir, wasmFile string) string {
 	// Try common paths relative to the test location
 	paths := []string{
+		filepath.Join("../../.cache/cosmwasm/artifacts", wasmFile),
+		filepath.Join("../.cache/cosmwasm/artifacts", wasmFile),
+		filepath.Join(".cache/cosmwasm/artifacts", wasmFile),
 		filepath.Join("../../contracts", contractDir, "artifacts", wasmFile),
 		filepath.Join("../contracts", contractDir, "artifacts", wasmFile),
 		filepath.Join("contracts", contractDir, "artifacts", wasmFile),
 	}
 
+	devcache := os.Getenv("AKASH_DEVCACHE")
+	if devcache != "" {
+		paths = append(paths, filepath.Join(devcache, "cosmwasm/artifacts", wasmFile))
+	}
+
 	// Also try using GOPATH
 	gopath := os.Getenv("GOPATH")
 	if gopath != "" {
@@ -912,9 +920,9 @@ func (s *priceOracleContractTestSuite) TestStoreContractCodeViaGovernance() {
 	s.Require().NoError(err)
 
 	// Step 1: Load contract WASM
-	wasmPath := findWasmPath("pyth-pro", "pyth_pro.wasm")
+	wasmPath := findWasmPath("pyth-pro", "pyth-pro.wasm")
 	if wasmPath == "" {
-		s.T().Skip("pyth_pro.wasm not found, skipping contract deployment test")
+		s.T().Skip("pyth-pro.wasm not found, skipping contract deployment test")
 		return
 	}
 	s.T().Logf("Found pyth-pro contract at: %s", wasmPath)