From 8e663c2237b9ecc910ace70d3d4a7967e9dff2d6 Mon Sep 17 00:00:00 2001
From: Pathorn <pathorn.teng@gmail.com>
Date: Wed, 14 Aug 2019 15:27:47 +0700
Subject: [PATCH 1/2] remove OriginalRequest from EventData

---
 plugin/vm.go                    | 11 +++++------
 receipts/handler/evm_handler.go |  7 +++----
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/plugin/vm.go b/plugin/vm.go
index 7043658c8e..6b0dfeb3ee 100644
--- a/plugin/vm.go
+++ b/plugin/vm.go
@@ -304,12 +304,11 @@ func (c *contractContext) EmitTopics(event []byte, topics ...string) {
 		return
 	}
 	data := types.EventData{
-		Topics:          topics,
-		Caller:          c.caller.MarshalPB(),
-		Address:         c.address.MarshalPB(),
-		PluginName:      c.pluginName,
-		EncodedBody:     event,
-		OriginalRequest: c.req.Body,
+		Topics:      topics,
+		Caller:      c.caller.MarshalPB(),
+		Address:     c.address.MarshalPB(),
+		PluginName:  c.pluginName,
+		EncodedBody: event,
 	}
 	height := uint64(c.State.Block().Height)
 	c.eventHandler.Post(height, &data)
diff --git a/receipts/handler/evm_handler.go b/receipts/handler/evm_handler.go
index aff759e1c0..da6c9e50ed 100644
--- a/receipts/handler/evm_handler.go
+++ b/receipts/handler/evm_handler.go
@@ -25,10 +25,9 @@ func (r *ReceiptHandler) GetEventsFromLogs(
 				ChainID: caller.ChainID,
 				Local:   log.Address.Bytes(),
 			}.MarshalPB(),
-			BlockHeight:     uint64(blockHeight),
-			PluginName:      contract.Local.String(),
-			EncodedBody:     log.Data,
-			OriginalRequest: input,
+			BlockHeight: uint64(blockHeight),
+			PluginName:  contract.Local.String(),
+			EncodedBody: log.Data,
 		}
 		events = append(events, eventData)
 	}

From e81c1ee969621d56110843e5e26df3f541678cd8 Mon Sep 17 00:00:00 2001
From: Pathorn <pathorn.teng@gmail.com>
Date: Wed, 14 Aug 2019 15:29:52 +0700
Subject: [PATCH 2/2] update Makefile

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 8bebfc0ec5..d60f65ecd7 100644
--- a/Makefile
+++ b/Makefile
@@ -28,7 +28,7 @@ BINANCE_TGORACLE_DIR=$(GOPATH)/src/$(PKG_BINANCE_TGORACLE)
 # NOTE: To build on Jenkins using a custom go-loom branch update the `deps` target below to checkout
 #       that branch, you only need to update GO_LOOM_GIT_REV if you wish to lock the build to a
 #       specific commit.
-GO_LOOM_GIT_REV = HEAD
+GO_LOOM_GIT_REV = change-event-data
 # Specifies the loomnetwork/transfer-gateway branch/revision to use.
 TG_GIT_REV = HEAD
 # loomnetwork/go-ethereum loomchain branch