Added event fields needed for subgraph

Author: davekay100

contracts/GNS.sol

@@ -114,7 +114,8 @@ contract GNS is Governed, BancorFormula {
         uint256 subgraphNumber,
         address nameCurator,
         uint256 nSignalCreated,
-        uint256 vSignalCreated
+        uint256 vSignalCreated,
+        uint256 tokensDeposited
     );
 
     /**
@@ -139,7 +140,7 @@ contract GNS is Governed, BancorFormula {
         address graphAccount,
         uint256 subgraphNumber,
         uint256 newVSignalCreated,
-        uint256 tokensExchanged,
+        uint256 tokensSignalled,
         bytes32 subgraphDeploymentID
     );
 
@@ -514,7 +515,7 @@ contract GNS is Governed, BancorFormula {
         namePool.vSignal = namePool.vSignal.add(vSignal);
         namePool.nSignal = namePool.nSignal.add(nSignal);
         namePool.curatorNSignal[msg.sender] = namePool.curatorNSignal[msg.sender].add(nSignal);
-        emit NSignalMinted(_graphAccount, _subgraphNumber, msg.sender, nSignal, vSignal);
+        emit NSignalMinted(_graphAccount, _subgraphNumber, msg.sender, nSignal, vSignal, _tokens);
         return (vSignal, nSignal);
     }
 

contracts/staking/Staking.sol

@@ -110,7 +110,8 @@ contract Staking is StakingV1Storage, GraphUpgradeable, IStaking, Governed {
         uint256 tokens,
         address channelID,
         bytes channelPubKey,
-        uint256 price
+        uint256 price,
+        address proxy
     );
 
     /**
@@ -140,7 +141,8 @@ contract Staking is StakingV1Storage, GraphUpgradeable, IStaking, Governed {
         uint256 epoch,
         uint256 tokens,
         address channelID,
-        uint256 effectiveAllocation
+        uint256 effectiveAllocation,
+        address sender
     );
 
     /**
@@ -152,6 +154,7 @@ contract Staking is StakingV1Storage, GraphUpgradeable, IStaking, Governed {
     event RebateClaimed(
         address indexed indexer,
         bytes32 indexed subgraphDeploymentID,
+        address channelID,
         uint256 epoch,
         uint256 forEpoch,
         uint256 tokens,
@@ -795,7 +798,8 @@ contract Staking is StakingV1Storage, GraphUpgradeable, IStaking, Governed {
             alloc.settledAtEpoch,
             alloc.tokens,
             _channelID,
-            alloc.effectiveAllocation
+            alloc.effectiveAllocation,
+            msg.sender
         );
     }
 
@@ -889,6 +893,7 @@ contract Staking is StakingV1Storage, GraphUpgradeable, IStaking, Governed {
         emit RebateClaimed(
             alloc.indexer,
             alloc.subgraphDeploymentID,
+            _channelID,
             epochManager.currentEpoch(),
             settledAtEpoch,
             tokensToClaim,
@@ -989,7 +994,8 @@ contract Staking is StakingV1Storage, GraphUpgradeable, IStaking, Governed {
             allocations[channelID].tokens,
             channelID,
             _channelPubKey,
-            _price
+            _price,
+            _channelProxy
         );
     }
 

test/gns.test.ts

@@ -319,7 +319,14 @@ describe('GNS', () => {
     const tx = gns.connect(account.signer).mintNSignal(graphAccount, subgraphNumber0, graphTokens)
     await expect(tx)
       .emit(gns, 'NSignalMinted')
-      .withArgs(graphAccount, subgraphNumber0, account.address, nSigEstimate, vSigEstimate)
+      .withArgs(
+        graphAccount,
+        subgraphNumber0,
+        account.address,
+        nSigEstimate,
+        vSigEstimate,
+        graphTokens,
+      )
 
     const tokensVSig = await getTokensAndVSig(subgraph0.subgraphDeploymentID)
     const tokensAfter = tokensVSig[0]

test/staking/allocation.test.ts

@@ -150,6 +150,7 @@ describe('Staking:Allocation', () => {
           channelID,
           channelPubKey,
           price,
+          channelProxy.address,
         )
 
       // After state
@@ -469,6 +470,7 @@ describe('Staking:Allocation', () => {
           beforeAlloc.tokens,
           channelID,
           effectiveAllocation,
+          indexer.address,
         )
 
       // After state
@@ -526,6 +528,7 @@ describe('Staking:Allocation', () => {
         .withArgs(
           indexer.address,
           subgraphDeploymentID,
+          channelID,
           currentEpoch,
           beforeAlloc.settledAtEpoch,
           tokensToClaim,

test/staking/delegation.test.ts

@@ -498,6 +498,7 @@ describe('Staking::Delegation', () => {
         .withArgs(
           indexer.address,
           subgraphDeploymentID,
+          channelID,
           currentEpoch,
           beforeAlloc.settledAtEpoch,
           tokensToClaim,