update

Author: liuxiaobleach

server/dal.go

@@ -228,7 +228,7 @@ func (d *DAL) GetAllTransfersWithLimit(limit uint64) ([]*Transfer, error) {
 
 func (d *DAL) GetAllStartTransferIn() ([]*Transfer, error) {
 	q := fmt.Sprintf("SELECT %s from transfer where status = $1 and timelock > $2 and transfertype = $3", transferAllColumns)
-	rows, err := d.Query(q, cbn.TransferStatus_TRANSFER_STATUS_TRANSFER_IN_START, time.Now().Add(1 * time.Hour), cbn.TransferType_TRANSFER_TYPE_IN)
+	rows, err := d.Query(q, cbn.TransferStatus_TRANSFER_STATUS_TRANSFER_IN_START, time.Now().Add(1*time.Hour), cbn.TransferType_TRANSFER_TYPE_IN)
 	if err != nil {
 		return nil, err
 	}

server/server.go

@@ -827,12 +827,12 @@ func (s *server) processTrySendTransferIn() {
 				continue
 			}
 
-			sendTransferInErr := bc.transferIn(tx.Receiver, tx.Token, newAmount, tx.HashLock, tx.TransferId, tx.RelatedTid, uint64(tx.TimeLock.Unix()), bc.chainId.Uint64())
+			sendTransferInErr := bc.transferIn(tx.Receiver, tx.Token, newAmount, tx.HashLock, tx.TransferId, tx.RelatedTid, uint64(tx.TimeLock.Unix()), tx.RelatedChainId)
 			if sendTransferInErr != nil {
 				log.Errorf("fail to transferIn, ev:%+v, err:%v", tx, sendTransferInErr)
 				// if fail, let try again one time
 				time.Sleep(6 * time.Second)
-				sendTransferInAgainErr := bc.transferIn(tx.Receiver, tx.Token, newAmount, tx.HashLock, tx.TransferId, tx.RelatedTid, uint64(tx.TimeLock.Unix()), bc.chainId.Uint64())
+				sendTransferInAgainErr := bc.transferIn(tx.Receiver, tx.Token, newAmount, tx.HashLock, tx.TransferId, tx.RelatedTid, uint64(tx.TimeLock.Unix()), tx.RelatedChainId)
 				if sendTransferInAgainErr != nil {
 					log.Errorf("fail to transferIn again, ev:%+v, err:%v", tx, sendTransferInAgainErr)
 				} else {