update flow contract abi (#118)

* update flow contract abi

* add submitter as args

* keep submit event unchanged

* set submitter

* update batch default handle

* update contract and fix test

Author: 0g-peterzhb

cmd/upload.go

@@ -40,8 +40,9 @@ func bindTransactionFlags(cmd *cobra.Command, args *transactionArgument) {
 type uploadArgument struct {
 	transactionArgument
 
-	file string
-	tags string
+	file      string
+	tags      string
+	submitter string
 
 	node    []string
 	indexer string
@@ -71,6 +72,7 @@ func bindUploadFlags(cmd *cobra.Command, args *uploadArgument) {
 	cmd.Flags().StringVar(&args.file, "file", "", "File name to upload")
 	cmd.MarkFlagRequired("file")
 	cmd.Flags().StringVar(&args.tags, "tags", "0x", "Tags of the file")
+	cmd.Flags().StringVar(&args.submitter, "submitter", "", "Address to submit transaction from (optional, defaults to key owner)")
 
 	cmd.Flags().StringSliceVar(&args.node, "node", []string{}, "ZeroGStorage storage node URL")
 	cmd.Flags().StringVar(&args.indexer, "indexer", "", "ZeroGStorage indexer URL")
@@ -127,6 +129,21 @@ func upload(*cobra.Command, []string) {
 	w3client := blockchain.MustNewWeb3(uploadArgs.url, uploadArgs.key, providerOption)
 	defer w3client.Close()
 
+	// Extract submitter address once from w3client, or use provided submitter if specified
+	var submitter common.Address
+	if uploadArgs.submitter != "" {
+		submitter = common.HexToAddress(uploadArgs.submitter)
+		if submitter == (common.Address{}) {
+			logrus.Fatal("Invalid submitter address provided")
+		}
+	} else {
+		sm, err := w3client.GetSignerManager()
+		if err != nil {
+			logrus.WithError(err).Fatal("Failed to get signer manager")
+		}
+		submitter = sm.List()[0].Address()
+	}
+
 	var fee *big.Int
 	if uploadArgs.fee > 0 {
 		feeInA0GI := big.NewFloat(uploadArgs.fee)
@@ -146,6 +163,7 @@ func upload(*cobra.Command, []string) {
 		maxGasPrice = big.NewInt(int64(uploadArgs.maxGasPrice))
 	}
 	opt := transfer.UploadOption{
+		Submitter:        submitter,
 		Tags:             hexutil.MustDecode(uploadArgs.tags),
 		FinalityRequired: finalityRequired,
 		TaskSize:         uploadArgs.taskSize,

cmd/upload_dir.go

@@ -6,6 +6,7 @@ import (
 	zg_common "github.com/0gfoundation/0g-storage-client/common"
 	"github.com/0gfoundation/0g-storage-client/common/blockchain"
 	"github.com/0gfoundation/0g-storage-client/transfer"
+	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
@@ -42,11 +43,27 @@ func uploadDir(*cobra.Command, []string) {
 	w3client := blockchain.MustNewWeb3(uploadDirArgs.url, uploadDirArgs.key, providerOption)
 	defer w3client.Close()
 
+	// Extract submitter address once from w3client, or use provided submitter if specified
+	var submitter common.Address
+	if uploadDirArgs.submitter != "" {
+		submitter = common.HexToAddress(uploadDirArgs.submitter)
+		if submitter == (common.Address{}) {
+			logrus.Fatal("Invalid submitter address provided")
+		}
+	} else {
+		sm, err := w3client.GetSignerManager()
+		if err != nil {
+			logrus.WithError(err).Fatal("Failed to get signer manager")
+		}
+		submitter = sm.List()[0].Address()
+	}
+
 	finalityRequired := transfer.TransactionPacked
 	if uploadDirArgs.finalityRequired {
 		finalityRequired = transfer.FileFinalized
 	}
 	opt := transfer.UploadOption{
+		Submitter:        submitter,
 		Tags:             hexutil.MustDecode(uploadDirArgs.tags),
 		FinalityRequired: finalityRequired,
 		TaskSize:         uploadDirArgs.taskSize,

contract/contract.go

@@ -55,6 +55,14 @@ func NewFlowContract(flowAddress common.Address, clientWithSigner *web3go.Client
 	return &FlowContract{contract, flow, clientWithSigner}, nil
 }
 
+func (f *FlowContract) GetSubmitterAddress() (common.Address, error) {
+	sm, err := f.clientWithSigner.GetSignerManager()
+	if err != nil {
+		return common.Address{}, err
+	}
+	return sm.List()[0].Address(), nil
+}
+
 func (f *FlowContract) GetNonce(ctx context.Context) (*big.Int, error) {
 	sm, err := f.clientWithSigner.GetSignerManager()
 	if err != nil {
@@ -99,25 +107,25 @@ func (f *FlowContract) GetMarketContract(ctx context.Context) (*Market, error) {
 
 func (submission Submission) String() string {
 	var heights []uint64
-	for _, v := range submission.Nodes {
+	for _, v := range submission.Data.Nodes {
 		heights = append(heights, v.Height.Uint64())
 	}
 
-	return fmt.Sprintf("{ Size: %v, Heights: %v }", submission.Length, heights)
+	return fmt.Sprintf("{ Size: %v, Heights: %v }", submission.Data.Length, heights)
 }
 
 func (submission Submission) Root() common.Hash {
-	numNodes := len(submission.Nodes)
+	numNodes := len(submission.Data.Nodes)
 
 	// should be never occur
 	if numNodes == 0 {
 		return common.Hash{}
 	}
 
 	// calculate root in reverse order
-	root := submission.Nodes[numNodes-1].Root
+	root := submission.Data.Nodes[numNodes-1].Root
 	for i := 1; i < numNodes; i++ {
-		left := submission.Nodes[numNodes-1-i]
+		left := submission.Data.Nodes[numNodes-1-i]
 		root = crypto.Keccak256Hash(left.Root[:], root[:])
 	}
 
@@ -368,7 +376,7 @@ func TransactWithGasAdjustmentNoReceipt(
 
 func (submission Submission) Fee(pricePerSector *big.Int) *big.Int {
 	var sectors int64
-	for _, node := range submission.Nodes {
+	for _, node := range submission.Data.Nodes {
 		sectors += 1 << node.Height.Int64()
 	}
 

contract/flow.go

@@ -9,6 +9,7 @@ import (
 	"github.com/0gfoundation/0g-storage-client/common/parallel"
 	"github.com/0gfoundation/0g-storage-client/contract"
 	"github.com/0gfoundation/0g-storage-client/core/merkle"
+	ethcommon "github.com/ethereum/go-ethereum/common"
 	"github.com/sirupsen/logrus"
 )
 
@@ -23,11 +24,15 @@ func NewFlow(data IterableData, tags []byte, opts ...common.LogOption) *Flow {
 	return &Flow{data: data, tags: tags, logger: common.NewLogger(opts...)}
 }
 
-func (flow *Flow) CreateSubmission() (*contract.Submission, error) {
+func (flow *Flow) CreateSubmission(submitter ethcommon.Address) (*contract.Submission, error) {
 	// TODO(kevin): limit file size, e.g., 2^31
 	submission := contract.Submission{
-		Length: big.NewInt(flow.data.Size()),
-		Tags:   flow.tags,
+		Data: contract.SubmissionData{
+			Length: big.NewInt(flow.data.Size()),
+			Tags:   flow.tags,
+			Nodes:  make([]contract.SubmissionNode, 0),
+		},
+		Submitter: submitter,
 	}
 
 	var offset int64
@@ -36,7 +41,7 @@ func (flow *Flow) CreateSubmission() (*contract.Submission, error) {
 		if err != nil {
 			return nil, err
 		}
-		submission.Nodes = append(submission.Nodes, *node)
+		submission.Data.Nodes = append(submission.Data.Nodes, *node)
 		offset += chunks * DefaultChunkSize
 	}
 

core/flow.go

@@ -1 +1 @@
-bea58429e436e4952ae69235d9079cfc4ac5f3b3
+745c176bd206a37072281ec11aaf4f8ef6d4f6d3