nft: Batch NFT mint extrinsics (#1576)

centrifuge · Feb 14, 2023 · e09cce1 · e09cce1
1 parent 9bc98a3
commit e09cce1
Show file tree

Hide file tree

Showing 11 changed files with 638 additions and 133 deletions.
diff --git a/centchain/api.go b/centchain/api.go
@@ -43,6 +43,8 @@ func init() {
 
 var log = logging.Logger("centchain-client")
 
+type CallProviderFn func(metadata *types.Metadata) (*types.Call, error)
+
 // ExtrinsicInfo holds details of a successful extrinsic
 type ExtrinsicInfo struct {
 	Hash      types.Hash

diff --git a/centchain/test_client.go b/centchain/test_client.go
@@ -13,8 +13,6 @@ import (
 	"github.com/centrifuge/go-substrate-rpc-client/v4/types"
 )
 
-type CallProviderFn func(metadata *types.Metadata) (*types.Call, error)
-
 type TestClient struct {
 	api         *gsrpc.SubstrateAPI
 	meta        *types.Metadata

diff --git a/documents/anchor_job.go b/documents/anchor_job.go
@@ -90,8 +90,10 @@ func (a *AnchorJob) loadTasks() {
 			next:       "pre_commit",
 		},
 		"pre_commit": {
-			runnerFunc: func(args []interface{}, overrides map[string]interface{}) (interface{},
-				error) {
+			runnerFunc: func(
+				args []interface{},
+				overrides map[string]interface{},
+			) (interface{}, error) {
 				preCommit := args[2].(bool)
 				if !preCommit {
 					return nil, nil

diff --git a/identity/v2/test_utils.go b/identity/v2/test_utils.go
@@ -10,6 +10,8 @@ import (
 	"math/big"
 	"time"
 
+	"github.com/centrifuge/go-centrifuge/pallets/utility"
+
 	keystoreTypes "github.com/centrifuge/chain-custom-types/pkg/keystore"
 	proxyType "github.com/centrifuge/chain-custom-types/pkg/proxy"
 	"github.com/centrifuge/go-centrifuge/centchain"
@@ -215,7 +217,7 @@ func ExecutePostAccountBootstrap(
 
 	defer testClient.Close()
 
-	if _, err = testClient.SubmitAndWait(ctx, originKrp, batchCalls(callCreationFns...)); err != nil {
+	if _, err = testClient.SubmitAndWait(ctx, originKrp, utility.BatchCalls(callCreationFns...)); err != nil {
 		return fmt.Errorf("couldn't submit post account bootstrap batch call: %w", err)
 	}
 
@@ -466,27 +468,3 @@ func GetAddKeysCall(
 		return &proxyCall, nil
 	}, nil
 }
-
-func batchCalls(callCreationFns ...centchain.CallProviderFn) centchain.CallProviderFn {
-	return func(meta *types.Metadata) (*types.Call, error) {
-		var calls []*types.Call
-
-		for _, callCreationFn := range callCreationFns {
-			call, err := callCreationFn(meta)
-
-			if err != nil {
-				return nil, fmt.Errorf("couldn't create call: %w", err)
-			}
-
-			calls = append(calls, call)
-		}
-
-		batchCall, err := types.NewCall(meta, "Utility.batch_all", calls)
-
-		if err != nil {
-			return nil, err
-		}
-
-		return &batchCall, nil
-	}
-}
diff --git a/nft/v3/bootstrapper.go b/nft/v3/bootstrapper.go
@@ -8,6 +8,7 @@ import (
 	"github.com/centrifuge/go-centrifuge/jobs"
 	"github.com/centrifuge/go-centrifuge/pallets"
 	"github.com/centrifuge/go-centrifuge/pallets/uniques"
+	"github.com/centrifuge/go-centrifuge/pallets/utility"
 	"github.com/centrifuge/go-centrifuge/pending"
 )
 
@@ -54,20 +55,26 @@ func (*Bootstrapper) Bootstrap(ctx map[string]interface{}) error {
 		return errors.New("proxy API not initialised")
 	}
 
+	utilityAPI, ok := ctx[pallets.BootstrappedUtilityAPI].(utility.API)
+
+	if !ok {
+		return errors.New("utility API not initialised")
+	}
+
 	go dispatcher.RegisterRunner(commitAndMintNFTV3Job, &CommitAndMintNFTJobRunner{
 		accountsSrv:    accountsSrv,
 		pendingDocsSrv: pendingDocsSrv,
 		docSrv:         docSrv,
 		dispatcher:     dispatcher,
-		api:            uniquesAPI,
+		utilityAPI:     utilityAPI,
 		ipfsPinningSrv: ipfsPinningSrv,
 	})
 
 	go dispatcher.RegisterRunner(mintNFTV3Job, &MintNFTJobRunner{
 		accountsSrv:    accountsSrv,
 		docSrv:         docSrv,
 		dispatcher:     dispatcher,
-		api:            uniquesAPI,
+		utilityAPI:     utilityAPI,
 		ipfsPinningSrv: ipfsPinningSrv,
 	})