IOTA GraphQL client integration

.github/workflows/build-test.yml

@@ -2,7 +2,7 @@ name: Test
 
 on:
   pull_request:
-    branches: [develop]
+    branches: [develop, ql-dev]
     paths-ignore:
       - "**/README.md"
 
@@ -11,19 +11,18 @@ jobs:
     name: Build only
     runs-on: ubuntu-latest
     steps:
+      - name: Check out code into the Go module directory
+        uses: actions/checkout@v4
+
       - name: Set up Go 1.x
         uses: actions/setup-go@v5
         with:
           go-version: "1.24"
+          cache-dependency-path: |
+            go.work.sum
+            **/go.sum
         id: go
 
-      - name: Check out code into the Go module directory
-        uses: actions/checkout@v4
-
-      - name: Get dependencies
-        run: |
-          go get -v -t -d ./...
-
       - name: Build
         run: make build
 
@@ -33,38 +32,44 @@ jobs:
 
   test-short:
     name: Test (short)
-    runs-on: ubuntu-latest
+    runs-on: [self-hosted, Linux, X64, wasp]
     steps:
+      - name: Check out code into the Go module directory
+        uses: actions/checkout@v4
+
       - name: Set up Go 1.x
         uses: actions/setup-go@v5
         with:
           go-version: "1.24"
+          cache-dependency-path: |
+            go.work.sum
+            **/go.sum
         id: go
 
-      - name: Check out code into the Go module directory
-        uses: actions/checkout@v4
-
-      - name: Get dependencies
-        run: |
-          go get -v -t -d ./...
-
       # Here used to be a make build step, but we separated it into another job
 
       - name: Test
-        run: make test-short
+        run: |
+          TEST_SHORT_PKGS="$(go list ./... \
+            | grep -v '/tools/cluster' \
+          )" make test-short
 
   golangci:
     name: Lint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/setup-go@v5
+      - name: Check out code into the Go module directory
+        uses: actions/checkout@v4
+
+      - name: Set up Go 1.x
+        uses: actions/setup-go@v5
         with:
           go-version: "1.24"
+          cache-dependency-path: |
+            go.work.sum
+            **/go.sum
         id: go
 
-      - name: Check out code into the Go module directory
-        uses: actions/checkout@v4
-
       - name: Run global scope golangci-lint
         uses: golangci/golangci-lint-action@v8
         with:

.github/workflows/cluster-tests-nightly.yml

@@ -24,10 +24,6 @@ jobs:
           fetch-depth: 0
           fetch-tags: true
 
-      - name: Get dependencies
-        run: |
-          go get -v -t -d ./...
-
       - name: Run cluster tests
         run: |
           make test-cluster

.github/workflows/iotago-test.yml

@@ -7,14 +7,15 @@ on:
 jobs:
 
   TestAndBuild:
-    runs-on: ubuntu-latest
+    runs-on: [self-hosted, Linux, X64, wasp]
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Set up Go 1.x
       uses: actions/setup-go@v5
       with:
         go-version: '1.24'
+        cache-dependency-path: clients/iota-go/go.sum
 
     - name: Test
       run: |

.github/workflows/simulator-test.yml

@@ -0,0 +1,31 @@
+name: Simulator Test
+
+on:
+  pull_request:
+    branches: [develop, ql-dev]
+    paths-ignore:
+      - "**/README.md"
+
+jobs:
+  test-short:
+    name: Test (short, simulator)
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out code into the Go module directory
+        uses: actions/checkout@v4
+
+      - name: Set up Go 1.x
+        uses: actions/setup-go@v5
+        with:
+          go-version: "1.24"
+          cache-dependency-path: |
+            go.work.sum
+            **/go.sum
+        id: go
+
+      - name: Configure simulator
+        run: echo '{"l1starter":{"IS_SIMULATOR":true}}' > .testconfig
+
+      - name: Test
+        run: |
+          make test-short-simulator

.golangci.yml

@@ -83,6 +83,7 @@ linters:
     staticcheck:
       checks:
         - all
+        - '-ST1020' # comment on exported method FooBar should be of the form "FooBar ..."
       initialisms:
         - ACL
         - API

Makefile

@@ -8,6 +8,7 @@ DOCKER_BUILD_ARGS = # E.g. make docker-build "DOCKER_BUILD_ARGS=--tag wasp:devel
 #
 TEST_PKG=./...
 TEST_ARG=
+TEST_SHORT_PKGS ?= $(shell go list ./... | tr '\n' ' ')
 
 BUILD_PKGS ?= ./
 BUILD_CMD=go build -o . -ldflags $(BUILD_LD_FLAGS)
@@ -38,14 +39,26 @@ build-lint: build lint
 gendoc:
 	./scripts/gendoc.sh
 
+genqlient:
+	cd clients/iotagraphql && GOTOOLCHAIN=go1.24.6 go run github.com/Khan/genqlient@v0.8.1
+
 test-full: install
 	go test -tags runheavy -race -ldflags $(BUILD_LD_FLAGS) ./... --timeout 60m --count 1 -failfast
 
 test: install
 	go test -race -ldflags $(BUILD_LD_FLAGS) $(TEST_PKG) --timeout 90m --count 1 -failfast  $(TEST_ARG)
 
 test-short:
-	go test -race -ldflags $(BUILD_LD_FLAGS) --short --count 1 -timeout 60m -failfast $(shell go list ./...)
+	go test -race -ldflags $(BUILD_LD_FLAGS) --short --count 1 -timeout 60m -failfast $(strip $(TEST_SHORT_PKGS))
+
+test-short-simulator:	
+	TEST_L1STARTER_IS_SIMULATOR=true go test --short --count 1 -parallel 1 -timeout 60m -failfast $(shell go list ./... \
+	| grep -v '/tools/cluster' \
+	| grep -v '/clients/apiclient' \
+	| grep -v '/clients/apiextensions' \
+	| grep -v '/clients/chainclient' \
+	| grep -v '/clients/multiclient' \
+	| grep -v '/clients/iotagraphql/iotaclienttest')
 
 test-cluster: install
 	go test -race -ldflags $(BUILD_LD_FLAGS) --count 1 -timeout 25m -failfast $(shell go list ./tools/cluster/tests/...)
@@ -99,4 +112,4 @@ deps-versions:
 		awk -F ":" '{ print $$1 }' | \
 		{ read from ; read to; awk -v s="$$from" -v e="$$to" 'NR>1*s&&NR<1*e' packages/testutil/privtangle/privtangle.go; }
 
-.PHONY: all compile-solidity build-cli build-full build build-lint test-full test test-short install-cli install-full install lint gofumpt-list docker-build deps-versions
+.PHONY: all compile-solidity build-cli build-full build build-lint test-full test test-short install-cli install-full install lint gofumpt-list docker-build deps-versions genqlient

clients/apiextensions/func.go

@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"github.com/iotaledger/wasp/v2/clients/apiclient"
-	"github.com/iotaledger/wasp/v2/clients/iota-go/iotajsonrpc"
+	"github.com/iotaledger/wasp/v2/clients/iotagraphql"
 	"github.com/iotaledger/wasp/v2/clients/iscmove"
 	"github.com/iotaledger/wasp/v2/packages/cryptolib"
 	"github.com/iotaledger/wasp/v2/packages/isc"
@@ -49,8 +49,8 @@ func APIResultToCallArgs(res []string) (isc.CallResults, error) {
 	return APIArgsToCallArgs(res)
 }
 
-func APIWaitUntilAllRequestsProcessed(ctx context.Context, client *apiclient.APIClient, tx *iotajsonrpc.IotaTransactionBlockResponse, waitForL1Confirmation bool, timeout time.Duration) ([]*apiclient.ReceiptResponse, error) {
-	req, err := tx.GetCreatedObjectByName(iscmove.RequestModuleName, iscmove.RequestObjectName)
+func APIWaitUntilAllRequestsProcessed(ctx context.Context, client *apiclient.APIClient, tx *iotagraphql.ExecuteTransactionBlockResponse, waitForL1Confirmation bool, timeout time.Duration) ([]*apiclient.ReceiptResponse, error) {
+	req, err := tx.ExecuteTransactionBlock.Effects.GetCreatedObjectByName(iscmove.RequestModuleName, iscmove.RequestObjectName)
 	if err != nil {
 		return nil, err
 	}

clients/chainclient/chainclient.go

@@ -6,13 +6,14 @@ import (
 	"math"
 	"sync"
 
+	"github.com/samber/lo"
+
 	"github.com/iotaledger/bcs-go"
 	"github.com/iotaledger/wasp/v2/clients"
 	"github.com/iotaledger/wasp/v2/clients/apiclient"
 	"github.com/iotaledger/wasp/v2/clients/apiextensions"
-	"github.com/iotaledger/wasp/v2/clients/iota-go/iotaclient"
 	"github.com/iotaledger/wasp/v2/clients/iota-go/iotago"
-	"github.com/iotaledger/wasp/v2/clients/iota-go/iotajsonrpc"
+	"github.com/iotaledger/wasp/v2/clients/iotagraphql"
 	"github.com/iotaledger/wasp/v2/clients/iscmove"
 	"github.com/iotaledger/wasp/v2/clients/iscmove/iscmoveclient"
 	"github.com/iotaledger/wasp/v2/packages/coin"
@@ -84,7 +85,7 @@ func (par *PostRequestParams) GetGasBudget() uint64 {
 
 func (par *PostRequestParams) GetGasPrice() uint64 {
 	if par.GasPrice == 0 {
-		return iotaclient.DefaultGasPrice
+		return iotagraphql.DefaultGasPrice
 	}
 	return par.GasPrice
 }
@@ -108,7 +109,7 @@ func (c *Client) PostRequest(
 	ctx context.Context,
 	msg isc.Message,
 	param PostRequestParams,
-) (*iotajsonrpc.IotaTransactionBlockResponse, error) {
+) (*iotagraphql.ExecuteTransactionBlockResponse, error) {
 	if param.GasBudget == 0 {
 		return nil, fmt.Errorf("GasBudget is empty")
 	}
@@ -121,9 +122,9 @@ func (c *Client) PostMultipleRequests(
 	msg isc.Message,
 	requestsCount int,
 	params ...PostRequestParams,
-) ([]*iotajsonrpc.IotaTransactionBlockResponse, error) {
+) ([]*iotagraphql.ExecuteTransactionBlockResponse, error) {
 	var err error
-	txRes := make([]*iotajsonrpc.IotaTransactionBlockResponse, requestsCount)
+	txRes := make([]*iotagraphql.ExecuteTransactionBlockResponse, requestsCount)
 	for i := range requestsCount {
 		txRes[i], err = c.postSingleRequest(ctx, msg, params[i])
 		if err != nil {
@@ -137,11 +138,11 @@ func (c *Client) postSingleRequest(
 	ctx context.Context,
 	iscmsg isc.Message,
 	params PostRequestParams,
-) (*iotajsonrpc.IotaTransactionBlockResponse, error) {
+) (*iotagraphql.ExecuteTransactionBlockResponse, error) {
 	transferAssets := iscmove.NewAssets(0)
 	if params.Transfer != nil {
 		for coinType, coinbal := range params.Transfer.Coins.Iterate() {
-			transferAssets.SetCoin(iotajsonrpc.MustCoinTypeFromString(coinType.String()), iotajsonrpc.CoinValue(coinbal.Uint64()))
+			transferAssets.SetCoin(iotagraphql.MustCoinTypeFromString(coinType.String()), iotagraphql.CoinValue(coinbal.Uint64()))
 		}
 	}
 	msg := &iscmove.Message{
@@ -168,7 +169,7 @@ func (c *Client) postSingleRequest(
 		&iscmoveclient.CreateAndSendRequestWithAssetsRequest{
 			Signer:           c.KeyPair,
 			PackageID:        *iscPackageID,
-			AnchorAddress:    c.ChainID.AsAddress().AsIotaAddress(),
+			AnchorAddress:    lo.ToPtr(c.ChainID.AsAddress().AsIotaAddress()),
 			Assets:           transferAssets,
 			Message:          msg,
 			AllowanceBCS:     allowanceBCS,
@@ -233,19 +234,19 @@ func (c *Client) PostOffLedgerRequest(
 	return signed, err
 }
 
-func (c *Client) DepositFunds(n coin.Value) (*iotajsonrpc.IotaTransactionBlockResponse, error) {
+func (c *Client) DepositFunds(n coin.Value) (*iotagraphql.ExecuteTransactionBlockResponse, error) {
 	return c.PostRequest(context.Background(), accounts.FuncDeposit.Message(), PostRequestParams{
 		Transfer:  isc.NewAssets(n),
 		Allowance: isc.NewAssets(n),
-		GasBudget: iotaclient.DefaultGasBudget,
+		GasBudget: iotagraphql.DefaultGasBudget,
 	})
 }
 
 func NewPostRequestParams() *PostRequestParams {
 	return &PostRequestParams{
 		Transfer:  isc.NewEmptyAssets(),
 		Allowance: isc.NewEmptyAssets(),
-		GasBudget: iotaclient.DefaultGasBudget,
+		GasBudget: iotagraphql.DefaultGasBudget,
 	}
 }