From ceb4594c2d2438a293b190da808c26d2a873346e Mon Sep 17 00:00:00 2001
From: Steph Samson <hello@stephsamson.com>
Date: Fri, 27 Jan 2023 15:57:34 +0800
Subject: [PATCH 1/2] add eventsroot to receipt; embed msg to vmmsg; add index
 to vmmsg; add sig to msg

---
 pkg/transform/gorm/models/chainmessage.go | 1 +
 pkg/transform/gorm/models/receipt.go      | 9 +++++----
 pkg/transform/gorm/models/vmmessages.go   | 9 +++------
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/pkg/transform/gorm/models/chainmessage.go b/pkg/transform/gorm/models/chainmessage.go
index bc39954dc..dde9a7ad4 100644
--- a/pkg/transform/gorm/models/chainmessage.go
+++ b/pkg/transform/gorm/models/chainmessage.go
@@ -16,6 +16,7 @@ type Message struct {
 	GasPremium types.DbToken
 	Method     uint64
 	Params     []byte
+	Signature  string `gorm:"jsonb"`
 }
 
 type ParsedMessageParams struct {
diff --git a/pkg/transform/gorm/models/receipt.go b/pkg/transform/gorm/models/receipt.go
index 827fa22dd..45f9aacc9 100644
--- a/pkg/transform/gorm/models/receipt.go
+++ b/pkg/transform/gorm/models/receipt.go
@@ -19,8 +19,9 @@ type MessageReceipt struct {
 }
 
 type Receipt struct {
-	Index    int64 `gorm:"primaryKey"`
-	ExitCode int64
-	GasUsed  int64
-	Return   []byte
+	Index      int64 `gorm:"primaryKey"`
+	ExitCode   int64
+	GasUsed    int64
+	Return     []byte
+	EventsRoot string
 }
diff --git a/pkg/transform/gorm/models/vmmessages.go b/pkg/transform/gorm/models/vmmessages.go
index 2b44f7edc..a7b3f3257 100644
--- a/pkg/transform/gorm/models/vmmessages.go
+++ b/pkg/transform/gorm/models/vmmessages.go
@@ -5,11 +5,8 @@ import "github.com/filecoin-project/lily/pkg/transform/gorm/types"
 type VmMessage struct {
 	Source  types.DbCID `gorm:"primaryKey"`
 	Cid     types.DbCID `gorm:"primaryKey"`
-	To      types.DbAddr
-	From    types.DbAddr
-	Value   types.DbToken
-	Method  uint64
-	Params  []byte
-	Receipt Receipt `gorm:"embedded"`
+	Message Message     `gorm:"embedded"`
+	Receipt Receipt     `gorm:"embedded"`
 	Error   string
+	Index   uint64
 }

From ed27d8cb0550f26fa968d2f3d079d5f1f5fe7a6a Mon Sep 17 00:00:00 2001
From: Steph Samson <hello@stephsamson.com>
Date: Mon, 30 Jan 2023 14:33:47 +0800
Subject: [PATCH 2/2] per @frrist's comments

---
 pkg/transform/gorm/models/chainmessage.go | 2 +-
 pkg/transform/gorm/models/receipt.go      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg/transform/gorm/models/chainmessage.go b/pkg/transform/gorm/models/chainmessage.go
index dde9a7ad4..446e8b8ca 100644
--- a/pkg/transform/gorm/models/chainmessage.go
+++ b/pkg/transform/gorm/models/chainmessage.go
@@ -16,7 +16,7 @@ type Message struct {
 	GasPremium types.DbToken
 	Method     uint64
 	Params     []byte
-	Signature  string `gorm:"jsonb"`
+	Signature  []byte
 }
 
 type ParsedMessageParams struct {
diff --git a/pkg/transform/gorm/models/receipt.go b/pkg/transform/gorm/models/receipt.go
index 45f9aacc9..a100891cd 100644
--- a/pkg/transform/gorm/models/receipt.go
+++ b/pkg/transform/gorm/models/receipt.go
@@ -23,5 +23,5 @@ type Receipt struct {
 	ExitCode   int64
 	GasUsed    int64
 	Return     []byte
-	EventsRoot string
+	EventsRoot types.DbCid
 }