add version/issuer in Issuance event

TheRougeProject · Feb 16, 2020 · 1e0039e · 1e0039e
1 parent 9578cc3
commit 1e0039e
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/contracts/BridgeRGEToken.sol b/contracts/BridgeRGEToken.sol
@@ -8,7 +8,7 @@
 
 pragma solidity >=0.5.0 <0.7.0;
 
-import "../node_modules/@openzeppelin/contracts/token/ERC20/ERC20.sol";
+import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 
 contract BridgeRGEToken is ERC20 {
 

diff --git a/contracts/RGETokenInterface.sol b/contracts/RGETokenInterface.sol
@@ -6,7 +6,7 @@
 
 pragma solidity >=0.5.0 <0.7.0;
 
-import "../node_modules/@openzeppelin/contracts/token/ERC20/IERC20.sol";
+import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 
 contract RGETokenInterface is IERC20 {
 

diff --git a/contracts/RougeFactory.sol b/contracts/RougeFactory.sol
@@ -10,7 +10,7 @@ import "./SimpleRougeCampaign.sol";
 
 contract RougeFactory {
 
-    string public version = '0.20';
+    bytes2 public version = 0x0021;
 
     // The Rouge Token contract address
     RGETokenInterface public rge;

diff --git a/contracts/SimpleRougeCampaign.sol b/contracts/SimpleRougeCampaign.sol
@@ -10,7 +10,7 @@ import "./RGETokenInterface.sol";
 
 import "./RougeFactoryInterface.sol";
 
-import "../node_modules/@openzeppelin/contracts/token/ERC721/IERC721.sol";
+import "@openzeppelin/contracts/token/ERC721/IERC721.sol";
 
 library RougeCampaign {
 
@@ -34,7 +34,7 @@ library RougeCampaign {
 
 contract SimpleRougeCampaign {
 
-    string public version = '0.20';
+    bytes2 public version = 0x0021;
 
     // The Rouge Token contract address
     RGETokenInterface public rge;
@@ -166,7 +166,7 @@ contract SimpleRougeCampaign {
     bool public campaignIssued;
     uint public campaignExpiration;
 
-    event Issuance(bytes4 indexed scheme, string name, uint campaignExpiration);
+    event Issuance(bytes2 indexed version, address indexed issuer, bytes4 indexed scheme, string name, uint campaignExpiration);
 
     function issue(bytes4 _scheme, string memory _name, uint _campaignExpiration) isAttestor(Authorization.Issuance) public {
         require(!campaignIssued);
@@ -185,7 +185,7 @@ contract SimpleRougeCampaign {
         available = issuance;
         scheme = _scheme;
 
-        emit Issuance(_scheme, _name, _campaignExpiration);
+        emit Issuance(version, issuer, _scheme, _name, _campaignExpiration);
     }    
 
     // Authorization is handled by issue()

diff --git a/contracts/TestRGEToken.sol b/contracts/TestRGEToken.sol
@@ -8,7 +8,7 @@
 
 pragma solidity >=0.5.0 <0.7.0;
 
-import "../node_modules/@openzeppelin/contracts/token/ERC20/ERC20.sol";
+import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 
 contract TestRGEToken is ERC20 {
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "rouge-protocol-solidity",
-  "version": "0.20.0",
+  "version": "0.21.1",
   "description": "Solidity contracts for the Rouge protocol (voucher, coupon, ticket, note on Ethereum)",
   "main": "",
   "files": [