Merge pull request #701 from iotexproject/tx-hash

query task, return send router tx

Author: huangzhiran

cmd/apinode/api/http.go

@@ -47,6 +47,7 @@ type StateLog struct {
 	State    string    `json:"state"`
 	Time     time.Time `json:"time"`
 	Comment  string    `json:"comment,omitempty"`
+	Tx       string    `json:"transaction_hash,omitempty"`
 	ProverID string    `json:"prover_id,omitempty"`
 }
 
@@ -164,7 +165,7 @@ func (s *httpServer) queryTask(c *gin.Context) {
 	}
 	resp.States = append(resp.States, &StateLog{
 		State:    "assigned",
-		Time:     t.CreatedAt,
+		Time:     ta.CreatedAt,
 		ProverID: "did:io:" + strings.TrimPrefix(ta.Prover.String(), "0x"),
 	})
 
@@ -180,8 +181,9 @@ func (s *httpServer) queryTask(c *gin.Context) {
 	}
 	resp.States = append(resp.States, &StateLog{
 		State:   "settled",
-		Time:    t.CreatedAt,
+		Time:    ts.CreatedAt,
 		Comment: "The task has been completed. Please check the generated proof in the corresponding DApp contract.",
+		Tx:      ts.Tx.String(),
 	})
 	c.JSON(http.StatusOK, resp)
 }

cmd/apinode/persistence/postgres.go

@@ -50,6 +50,7 @@ type SettledTask struct {
 	gorm.Model
 	TaskID    common.Hash `gorm:"uniqueIndex:settled_task_uniq,not null"`
 	ProjectID uint64      `gorm:"uniqueIndex:settled_task_uniq,not null"`
+	Tx        common.Hash `gorm:"not null"`
 }
 
 type Persistence struct {
@@ -165,14 +166,15 @@ func (p *Persistence) UpsertAssignedTask(projectID uint64, taskID common.Hash, p
 	return errors.Wrap(err, "failed to upsert assigned task")
 }
 
-func (p *Persistence) UpsertSettledTask(projectID uint64, taskID common.Hash) error {
+func (p *Persistence) UpsertSettledTask(projectID uint64, taskID, tx common.Hash) error {
 	t := SettledTask{
 		ProjectID: projectID,
 		TaskID:    taskID,
+		Tx:        tx,
 	}
 	err := p.db.Clauses(clause.OnConflict{
 		Columns:   []clause.Column{{Name: "task_id"}, {Name: "project_id"}},
-		DoNothing: true,
+		DoUpdates: clause.AssignmentColumns([]string{"tx"}),
 	}).Create(&t).Error
 	return errors.Wrap(err, "failed to upsert settled task")
 }

cmd/prover/db/db.go

@@ -136,7 +136,7 @@ func (p *DB) ProcessTask(projectID uint64, taskID common.Hash) error {
 	return errors.Wrap(err, "failed to update task")
 }
 
-func (p *DB) DeleteTask(projectID uint64, taskID common.Hash) error {
+func (p *DB) DeleteTask(projectID uint64, taskID, tx common.Hash) error {
 	err := p.db.Where("task_id = ?", taskID).Where("project_id = ?", projectID).Delete(&task{}).Error
 	return errors.Wrap(err, "failed to delete task")
 }

cmd/prover/main.go

@@ -79,7 +79,7 @@ func main() {
 		log.Fatal(errors.Wrap(err, "failed to connect datasource"))
 	}
 
-	if err := processor.Run(vmHandler.Handle, projectManager.Project, db, datasource.Retrieve, prv, cfg.ChainEndpoint, common.HexToAddress(cfg.RouterContractAddr), common.HexToAddress(cfg.TaskManagerContractAddr)); err != nil {
+	if err := processor.Run(vmHandler.Handle, projectManager.Project, db, datasource.Retrieve, prv, cfg.ChainEndpoint, common.HexToAddress(cfg.RouterContractAddr)); err != nil {
 		log.Fatal(errors.Wrap(err, "failed to run task processor"))
 	}
 

cmd/sequencer/db/db.go

@@ -154,7 +154,7 @@ func (p *DB) AssignTask(projectID uint64, taskID common.Hash, prover common.Addr
 	return errors.Wrap(err, "failed to assign task")
 }
 
-func (p *DB) DeleteTask(projectID uint64, taskID common.Hash) error {
+func (p *DB) DeleteTask(projectID uint64, taskID, tx common.Hash) error {
 	err := p.db.Where("task_id = ?", taskID).Where("project_id = ?", projectID).Delete(&task{}).Error
 	return errors.Wrap(err, "failed to delete task")
 }

monitor/monitor.go

@@ -29,7 +29,7 @@ type (
 	UpsertNBits              func(uint32) error
 	UpsertBlockHead          func(uint64, common.Hash) error
 	AssignTask               func(uint64, common.Hash, common.Address) error
-	SettleTask               func(uint64, common.Hash) error
+	SettleTask               func(uint64, common.Hash, common.Hash) error
 	UpsertProject            func(uint64, string, common.Hash) error
 	UpsertProver             func(uint64, common.Address) error
 )
@@ -158,7 +158,7 @@ func (c *contract) processLogs(logs []types.Log) error {
 			if err != nil {
 				return errors.Wrap(err, "failed to parse task settled event")
 			}
-			if err := c.h.SettleTask(e.ProjectId.Uint64(), e.TaskId); err != nil {
+			if err := c.h.SettleTask(e.ProjectId.Uint64(), e.TaskId, l.TxHash); err != nil {
 				return err
 			}
 		case projectConfigUpdatedTopic:

smartcontracts/go/router/router.abi

@@ -195,13 +195,44 @@
           "internalType": "bytes",
           "name": "_data",
           "type": "bytes"
+        },
+        {
+          "internalType": "bytes32",
+          "name": "_taskId",
+          "type": "bytes32"
         }
       ],
       "name": "route",
       "outputs": [],
       "stateMutability": "nonpayable",
       "type": "function"
     },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "_add",
+          "type": "address"
+        }
+      ],
+      "name": "setTaskManager",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "inputs": [],
+      "name": "taskManager",
+      "outputs": [
+        {
+          "internalType": "address",
+          "name": "",
+          "type": "address"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
     {
       "inputs": [
         {