feat: add additional information into EventXXXChanged (#621)

* Add additional fields to events * Update CHANGELOG.md * Use more specific word in the comment
Finschia · Aug 6, 2022 · b9242f3 · b9242f3
1 parent 9ba6ea3
commit b9242f3
Show file tree

Hide file tree

Showing 8 changed files with 353 additions and 109 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -60,6 +60,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 * (x/collection) [\#604](https://github.com/line/lbm-sdk/pull/604) add EventOwnerChanged and EventRootChanged
 * (x/collection) [\#608](https://github.com/line/lbm-sdk/pull/608) remove new APIs on x/collection
 * (x/token) [\#609](https://github.com/line/lbm-sdk/pull/609) remove new APIs on x/token
+* (x/collection) [\#621](https://github.com/line/lbm-sdk/pull/621) add additional information into EventXXXChanged
 
 ### Bug Fixes
 * (x/wasm) [\#453](https://github.com/line/lbm-sdk/pull/453) modify wasm grpc query api path

diff --git a/client/docs/statik/statik.go b/client/docs/statik/statik.go
diff --git a/client/docs/swagger-ui/swagger.yaml b/client/docs/swagger-ui/swagger.yaml
@@ -58279,6 +58279,10 @@ definitions:
                         timestamp:
                           type: string
                           format: date-time
+                        voting_weight:
+                          type: string
+                          format: int64
+                          title: '*** Ostracon Extended Fields ***'
                       description: >-
                         DuplicateVoteEvidence contains evidence of a validator
                         signed two conflicting votes.
@@ -58459,6 +58463,10 @@ definitions:
                                       proposer_priority:
                                         type: string
                                         format: int64
+                                      voting_weight:
+                                        type: string
+                                        format: int64
+                                        title: '*** Ostracon Extended Fields ***'
                                 proposer:
                                   type: object
                                   properties:
@@ -58483,6 +58491,10 @@ definitions:
                                     proposer_priority:
                                       type: string
                                       format: int64
+                                    voting_weight:
+                                      type: string
+                                      format: int64
+                                      title: '*** Ostracon Extended Fields ***'
                                 total_voting_power:
                                   type: string
                                   format: int64
@@ -58515,6 +58527,10 @@ definitions:
                               proposer_priority:
                                 type: string
                                 format: int64
+                              voting_weight:
+                                type: string
+                                format: int64
+                                title: '*** Ostracon Extended Fields ***'
                         total_voting_power:
                           type: string
                           format: int64

diff --git a/docs/core/proto-docs.md b/docs/core/proto-docs.md
@@ -14120,6 +14120,8 @@ Since: 0.46.0 (finschia)
 | ----- | ---- | ----- | ----------- |
 | `contract_id` | [string](#string) |  | contract id associated with the contract. |
 | `token_id` | [string](#string) |  | token id associated with the token. |
+| `from` | [string](#string) |  | address of the previous owner before the change. |
+| `to` | [string](#string) |  | address of the new owner. |
 
 
 
@@ -14157,6 +14159,8 @@ Since: 0.46.0 (finschia)
 | ----- | ---- | ----- | ----------- |
 | `contract_id` | [string](#string) |  | contract id associated with the contract. |
 | `token_id` | [string](#string) |  | token id associated with the token. |
+| `from` | [string](#string) |  | token id of the previous root before the change. |
+| `to` | [string](#string) |  | token id of the new root. |
 
 
 

diff --git a/proto/lbm/collection/v1/event.proto b/proto/lbm/collection/v1/event.proto
@@ -308,6 +308,10 @@ message EventOwnerChanged {
   string contract_id = 1;
   // token id associated with the token.
   string token_id = 2;
+  // address of the previous owner before the change.
+  string from = 3;
+  // address of the new owner.
+  string to = 4;
 }
 
 // EventRootChanged is emitted when the root of token is changed by operation applied to its ancestor.
@@ -318,4 +322,8 @@ message EventRootChanged {
   string contract_id = 1;
   // token id associated with the token.
   string token_id = 2;
+  // token id of the previous root before the change.
+  string from = 3;
+  // token id of the new root.
+  string to = 4;
 }
diff --git a/x/collection/event.pb.go b/x/collection/event.pb.go
diff --git a/x/collection/keeper/nft.go b/x/collection/keeper/nft.go
@@ -98,6 +98,8 @@ func (k Keeper) Attach(ctx sdk.Context, contractID string, owner sdk.AccAddress,
 		event := collection.EventRootChanged{
 			ContractId: contractID,
 			TokenId:    descendantID,
+			From:       subject,
+			To:         root,
 		}
 		ctx.EventManager().EmitEvent(collection.NewEventOperationRootChanged(event))
 		if err := ctx.EventManager().EmitTypedEvent(&event); err != nil {
@@ -131,10 +133,13 @@ func (k Keeper) Detach(ctx sdk.Context, contractID string, owner sdk.AccAddress,
 	k.deleteChild(ctx, contractID, *parent, subject)
 
 	// legacy
+	root := k.GetRoot(ctx, contractID, *parent)
 	k.iterateDescendants(ctx, contractID, subject, func(descendantID string, _ int) (stop bool) {
 		event := collection.EventRootChanged{
 			ContractId: contractID,
 			TokenId:    descendantID,
+			From:       root,
+			To:         subject,
 		}
 		ctx.EventManager().EmitEvent(collection.NewEventOperationRootChanged(event))
 		if err := ctx.EventManager().EmitTypedEvent(&event); err != nil {

diff --git a/x/collection/keeper/send.go b/x/collection/keeper/send.go
@@ -21,6 +21,8 @@ func (k Keeper) SendCoins(ctx sdk.Context, contractID string, from, to sdk.AccAd
 				event := collection.EventOwnerChanged{
 					ContractId: contractID,
 					TokenId:    descendantID,
+					From:       from.String(),
+					To:         to.String(),
 				}
 				ctx.EventManager().EmitEvent(collection.NewEventOperationTransferNFT(event))
 				if err := ctx.EventManager().EmitTypedEvent(&event); err != nil {