From 038a55863ad193cace5a8781f68fbfab80208f28 Mon Sep 17 00:00:00 2001
From: Alex Coseru <alex.coseru@gmail.com>
Date: Thu, 1 Oct 2020 16:29:02 +0300
Subject: [PATCH 1/2] Update DataTokenTemplate.sol

---
 contracts/templates/DataTokenTemplate.sol | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/contracts/templates/DataTokenTemplate.sol b/contracts/templates/DataTokenTemplate.sol
index 0dccc1631..361def77c 100644
--- a/contracts/templates/DataTokenTemplate.sol
+++ b/contracts/templates/DataTokenTemplate.sol
@@ -44,7 +44,8 @@ contract DataTokenTemplate is IERC20Template, ERC20 {
             address indexed consumer, 
             uint256 amount, 
             uint256 serviceId, 
-            address indexed provider
+            address indexed provider,
+            uint256 stoppedAt
     );
 
     event MinterProposed(
@@ -241,7 +242,7 @@ contract DataTokenTemplate is IERC20Template, ERC20 {
             msg.sender,
             amount,
             serviceId,
-            block.number,
+            block.timestamp,
             mrktFeeCollector,
             marketFee
         );
@@ -276,7 +277,8 @@ contract DataTokenTemplate is IERC20Template, ERC20 {
             consumer, 
             amount, 
             serviceId, 
-            msg.sender
+            msg.sender,
+            block.timestamp
         );
     }
 

From 7c52c8b4d85d97409de12574648613aad73fd30c Mon Sep 17 00:00:00 2001
From: Alex Coseru <alex.coseru@gmail.com>
Date: Thu, 1 Oct 2020 16:39:57 +0300
Subject: [PATCH 2/2] Update DataTokenTemplate.sol

---
 contracts/templates/DataTokenTemplate.sol | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/contracts/templates/DataTokenTemplate.sol b/contracts/templates/DataTokenTemplate.sol
index 361def77c..80020abd0 100644
--- a/contracts/templates/DataTokenTemplate.sol
+++ b/contracts/templates/DataTokenTemplate.sol
@@ -34,7 +34,7 @@ contract DataTokenTemplate is IERC20Template, ERC20 {
             address indexed consumer, 
             uint256 amount, 
             uint256 serviceId, 
-            uint256 startedAt,
+            uint256 timestamp,
             address indexed mrktFeeCollector,
             uint256 marketFee
     );
@@ -45,7 +45,7 @@ contract DataTokenTemplate is IERC20Template, ERC20 {
             uint256 amount, 
             uint256 serviceId, 
             address indexed provider,
-            uint256 stoppedAt
+            uint256 timestamp
     );
 
     event MinterProposed(