Merge pull request #2 from iorveth/main

Add support for x86_64 target arch, GHA

.github/workflows/test.yml

@@ -0,0 +1,30 @@
+# This workflow will build a golang project
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-go
+
+name: Test
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+
+jobs:
+
+  test:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        submodules: 
+          recursive
+
+    - name: Set up Go
+      uses: actions/setup-go@v4
+      with:
+        go-version: '1.22'
+
+    - name: Build contracts
+      run: sudo make build-contracts
+
+    - name: Test
+      run: go test -v ./...

.gitignore

@@ -0,0 +1 @@
+contracts_wasm

Makefile

@@ -2,13 +2,23 @@
 ###   Build contracts   ###
 ###########################
 
-build-contracts:
+#!/bin/bash
 
+UNAMEP := $(shell uname -p)
+build-contracts:
+	echo $(UNAMEP)
+	mkdir -p contracts_wasm
 	cd contracts; make build; cd ..
-	for file in ./contracts/artifacts/*.wasm; do \
-        echo "$$file"; \
-				mv "$$file" ./contracts_wasm/$$(basename "$$file" -aarch64.wasm).wasm; \
-  done
-	cp ./contracts/artifacts/** ./contracts_wasm/
+	for file in ./contracts/artifacts/*; do \
+		if [ $(UNAMEP) = arm ]; then \
+			echo "$$file"; \
+		    BASENAME=$$(basename $$file); \
+		    NEWNAME=$$(echo $$BASENAME | sed 's/-aarch64//'); \
+		    mv $$file ./contracts_wasm/$$NEWNAME; \
+		else \
+			echo "$$file"; \
+					mv "$$file" ./contracts_wasm; \
+		fi \
+	done
 
 .PHONY: build-contracts

avida_ibc_test.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"runtime"
 	"testing"
 
 	sdjwttypes "github.com/nymlab/cheqd-interchaintest/types"
@@ -22,12 +23,23 @@ import (
 func TestCheqdV2AvidaIbc(t *testing.T) {
 	t.Parallel()
 
+	var cheqd_version string
+	var repository string
+
+	if runtime.GOARCH == "arm64" {
+		cheqd_version = "v2.0.1-arm64"
+		repository = "ghcr.io/nymlab/cheqd-node"
+	} else {
+		cheqd_version = "sha-fdf3b2cb9bef2ee518f46e299eee97b4c4082ff2"
+		repository = "ghcr.io/cheqd/cheqd-node"
+	}
+
 	cf := interchaintest.NewBuiltinChainFactory(zaptest.NewLogger(t), []*interchaintest.ChainSpec{
 		{
 			Name:        "cheqd",
 			ChainName:   "cheqd",
-			Version:     "v2.0.1-arm64",
-			ChainConfig: GetCheqdConfig(),
+			Version:     cheqd_version,
+			ChainConfig: GetCheqdConfig(cheqd_version, repository),
 			NoHostMount: &[]bool{false}[0], // specify no mount
 		},
 		{

cheqd.go

@@ -42,6 +42,7 @@ func CreateAndUploadDid(
 ) []byte {
 
 	err := MustUploadPayload(ctx, "artifacts", didPayload, chain)
+
 	require.NoError(t, err, "upload file err")
 	err = MustUploadPayload(ctx, "artifacts", resourcePayload, chain)
 	require.NoError(t, err, "upload file err")

cheqd_test.go

@@ -2,6 +2,7 @@ package cheqd_interchaintest
 
 import (
 	"context"
+	"runtime"
 	"testing"
 
 	interchaintest "github.com/strangelove-ventures/interchaintest/v7"
@@ -22,11 +23,24 @@ func TestCheqdV2UploadResource(t *testing.T) {
 	// create a single chain instance with x validators
 	validatorsCount, fullnodeCount := 1, 1
 
+	var cheqd_version string
+	var repository string
+
+	if runtime.GOARCH == "arm64" {
+		cheqd_version = "v2.0.1-arm64"
+		repository = "ghcr.io/nymlab/cheqd-node"
+	} else {
+		cheqd_version = "sha-fdf3b2cb9bef2ee518f46e299eee97b4c4082ff2"
+		repository = "ghcr.io/cheqd/cheqd-node"
+	}
+
 	ic, cheqd, _, _ := CreateCheqdChain(
 		t,
 		ctx,
 		validatorsCount,
 		fullnodeCount,
+		cheqd_version,
+		repository,
 	)
 	require.NotNil(t, ic)
 	require.NotNil(t, cheqd)

setup.go

@@ -68,16 +68,16 @@ func GetJunoEncoding() *testutil.TestEncodingConfig {
 	return &cfg
 }
 
-func GetCheqdConfig() ibc.ChainConfig {
+func GetCheqdConfig(cheqd_version string, repository string) ibc.ChainConfig {
 	return ibc.ChainConfig{
 		Type:    "cosmos",
 		Name:    "cheqd",
 		ChainID: "cheqd-mainnet-1",
 		Images: []ibc.DockerImage{
 			{
-				Repository: "ghcr.io/nymlab/cheqd-node", // FOR LOCAL IMAGE USE: Docker Image Name
+				Repository: repository, // FOR LOCAL IMAGE USE: Docker Image Name
 				//Repository: "ghcr.io/strangelove-ventures/heighliner/cheqd", // FOR LOCAL IMAGE USE: Docker Image Name
-				Version: "v2.0.1-arm64", // FOR LOCAL IMAGE USE: Docker Image Tag
+				Version: cheqd_version, // FOR LOCAL IMAGE USE: Docker Image Tag
 				UidGid:  "1000:1000",
 			},
 		},
@@ -123,14 +123,16 @@ func CreateCheqdChain(
 	t *testing.T,
 	ctx context.Context,
 	numVals, numFull int,
+	cheqd_version string,
+	repository string,
 ) (*interchaintest.Interchain, *cosmos.CosmosChain, *client.Client, string) {
 
 	cf := interchaintest.NewBuiltinChainFactory(zaptest.NewLogger(t), []*interchaintest.ChainSpec{
 		{
 			Name:          "cheqd",
 			ChainName:     "cheqd",
-			Version:       "v2.0.1-arm64",
-			ChainConfig:   GetCheqdConfig(),
+			Version:       cheqd_version,
+			ChainConfig:   GetCheqdConfig(cheqd_version, repository),
 			NoHostMount:   &[]bool{false}[0], // specify no mount
 			NumValidators: &numVals,
 			NumFullNodes:  &numFull,