From 495774b3430182e9619b5914172c5f8bac990fa9 Mon Sep 17 00:00:00 2001
From: Jimmy Hu <jimmy.hu@dexon.org>
Date: Mon, 28 Jan 2019 13:43:05 +0800
Subject: core/vm: modify Withdrawn event and add NodeRemoved event (#179)

* core/vm: add delegatorAddr to withdrawn event
* core/vm: update gov abi
* core/vm: add NodeRemoved event
---
 core/vm/oracle_contract_abi.go | 17 +++++++++++++++++
 core/vm/oracle_contracts.go    | 18 ++++++++++++++----
 2 files changed, 31 insertions(+), 4 deletions(-)

(limited to 'core/vm')

diff --git a/core/vm/oracle_contract_abi.go b/core/vm/oracle_contract_abi.go
index 1c630c1c8..0f771a1a9 100644
--- a/core/vm/oracle_contract_abi.go
+++ b/core/vm/oracle_contract_abi.go
@@ -666,6 +666,18 @@ const GovernanceABIJSON = `
     "name": "Unstaked",
     "type": "event"
   },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": true,
+        "name": "NodeAddress",
+        "type": "address"
+      }
+    ],
+    "name": "NodeRemoved",
+    "type": "event"
+  },
   {
     "anonymous": false,
     "inputs": [
@@ -718,6 +730,11 @@ const GovernanceABIJSON = `
         "name": "NodeAddress",
         "type": "address"
       },
+      {
+        "indexed": true,
+        "name": "DelegatorAddress",
+        "type": "address"
+      },
       {
         "indexed": false,
         "name": "Amount",
diff --git a/core/vm/oracle_contracts.go b/core/vm/oracle_contracts.go
index 5f83ca68f..8e276f97c 100644
--- a/core/vm/oracle_contracts.go
+++ b/core/vm/oracle_contracts.go
@@ -967,6 +967,15 @@ func (s *GovernanceStateHelper) emitUnstaked(nodeAddr common.Address) {
 	})
 }
 
+// event NodeRemoved(address indexed NodeAddress);
+func (s *GovernanceStateHelper) emitNodeRemoved(nodeAddr common.Address) {
+	s.StateDB.AddLog(&types.Log{
+		Address: GovernanceContractAddress,
+		Topics:  []common.Hash{GovernanceABI.Events["NodeRemoved"].Id(), nodeAddr.Hash()},
+		Data:    []byte{},
+	})
+}
+
 // event Delegated(address indexed NodeAddress, address indexed DelegatorAddress, uint256 Amount);
 func (s *GovernanceStateHelper) emitDelegated(nodeAddr, delegatorAddr common.Address, amount *big.Int) {
 	s.StateDB.AddLog(&types.Log{
@@ -985,11 +994,11 @@ func (s *GovernanceStateHelper) emitUndelegated(nodeAddr, delegatorAddr common.A
 	})
 }
 
-// event Withdrawn(address indexed NodeAddress, uint256 Amount);
-func (s *GovernanceStateHelper) emitWithdrawn(nodeAddr common.Address, amount *big.Int) {
+// event Withdrawn(address indexed NodeAddress, address indexed DelegatorAddress, uint256 Amount);
+func (s *GovernanceStateHelper) emitWithdrawn(nodeAddr common.Address, delegatorAddr common.Address, amount *big.Int) {
 	s.StateDB.AddLog(&types.Log{
 		Address: GovernanceContractAddress,
-		Topics:  []common.Hash{GovernanceABI.Events["Withdrawn"].Id(), nodeAddr.Hash()},
+		Topics:  []common.Hash{GovernanceABI.Events["Withdrawn"].Id(), nodeAddr.Hash(), delegatorAddr.Hash()},
 		Data:    common.BigToHash(amount).Bytes(),
 	})
 }
@@ -1460,7 +1469,7 @@ func (g *GovernanceContract) withdraw(nodeAddr common.Address) ([]byte, error) {
 		return nil, errExecutionReverted
 	}
 
-	g.state.emitWithdrawn(nodeAddr, delegator.Value)
+	g.state.emitWithdrawn(nodeAddr, delegator.Owner, delegator.Value)
 
 	// We are the last delegator to withdraw the fund, remove the node info.
 	if g.state.LenDelegators(nodeAddr).Cmp(big.NewInt(0)) == 0 {
@@ -1477,6 +1486,7 @@ func (g *GovernanceContract) withdraw(nodeAddr common.Address) ([]byte, error) {
 		}
 		g.state.DeleteNodesOffsetByAddress(nodeAddr)
 		g.state.PopLastNode()
+		g.state.emitNodeRemoved(nodeAddr)
 	}
 
 	return g.useGas(100000)
-- 
cgit