Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: fix the order of events #599

Merged
merged 5 commits into from
Jul 26, 2022
Merged

fix: fix the order of events #599

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
40840e1
test: add tests on event.go
0Tech Jul 13, 2022
ed1fc35
fix: fix the order of events
0Tech Jul 13, 2022
c0050bd
docs: update CHANGELOG.md
0Tech Jul 18, 2022
4048634
style: use variable name other than 'name'
0Tech Jul 18, 2022
f5249a8
Merge branch 'main' into token
0Tech Jul 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
* (x/auth) [\#563](https://github.com/line/lbm-sdk/pull/563) fix unmarshal bug of `BaseAccountJSON`
* (client) [\#565](https://github.com/line/lbm-sdk/pull/565) fix the data race problem in `TestQueryABCIHeight`
* (x/token) [\#589](https://github.com/line/lbm-sdk/pull/589) fix naming collision in x/token enums
* (x/token) [\#599](https://github.com/line/lbm-sdk/pull/599) fix the order of events

### Breaking Changes
* (proto) [\#564](https://github.com/line/lbm-sdk/pull/564) change gRPC path to original cosmos path
Expand Down
192 changes: 112 additions & 80 deletions x/token/event.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,178 +32,210 @@ func AttributeKeyFromString(name string) AttributeKey {
return AttributeKey(AttributeKey_value[attributeKeyName])
}

func NewEventIssueToken(e EventIssue, grantee, to sdk.AccAddress, amount sdk.Int) sdk.Event {
func NewEventIssueToken(event EventIssue, grantee, to sdk.AccAddress, amount sdk.Int) sdk.Event {
eventType := EventTypeIssueToken.String()
attributes := map[AttributeKey]string{
AttributeKeyContractID: e.ContractId,
AttributeKeyName: e.Name,
AttributeKeySymbol: e.Symbol,
AttributeKeyImageURI: e.Uri,
AttributeKeyMeta: e.Meta,
AttributeKeyDecimals: fmt.Sprintf("%d", e.Decimals),
AttributeKeyMintable: fmt.Sprintf("%t", e.Mintable),
AttributeKeyContractID: event.ContractId,
AttributeKeyName: event.Name,
AttributeKeySymbol: event.Symbol,
AttributeKeyImageURI: event.Uri,
AttributeKeyMeta: event.Meta,
AttributeKeyDecimals: fmt.Sprintf("%d", event.Decimals),
AttributeKeyMintable: fmt.Sprintf("%t", event.Mintable),

AttributeKeyOwner: grantee.String(),
AttributeKeyTo: to.String(),
AttributeKeyAmount: amount.String(),
}

new := sdk.NewEvent(eventType)
res := sdk.NewEvent(eventType)
for key, value := range attributes {
attribute := sdk.NewAttribute(key.String(), value)
new.AppendAttributes(attribute)
res = res.AppendAttributes(attribute)
}
return new
return res
}

func NewEventMintToken(e EventMinted) sdk.Event {
func NewEventMintToken(event EventMinted) sdk.Event {
eventType := EventTypeMintToken.String()
attributes := map[AttributeKey]string{
AttributeKeyContractID: e.ContractId,
AttributeKeyFrom: e.Operator,
AttributeKeyTo: e.To,
AttributeKeyAmount: e.Amount.String(),
AttributeKeyContractID: event.ContractId,
AttributeKeyFrom: event.Operator,
AttributeKeyTo: event.To,
AttributeKeyAmount: event.Amount.String(),
}

new := sdk.NewEvent(eventType)
res := sdk.NewEvent(eventType)
for key, value := range attributes {
attribute := sdk.NewAttribute(key.String(), value)
new.AppendAttributes(attribute)
res = res.AppendAttributes(attribute)
}
return new
return res
}

func NewEventBurnToken(e EventBurned) sdk.Event {
func NewEventBurnToken(event EventBurned) sdk.Event {
eventType := EventTypeBurnToken.String()
attributes := map[AttributeKey]string{
AttributeKeyContractID: e.ContractId,
AttributeKeyFrom: e.From,
AttributeKeyAmount: e.Amount.String(),
AttributeKeyContractID: event.ContractId,
AttributeKeyFrom: event.From,
AttributeKeyAmount: event.Amount.String(),
}

new := sdk.NewEvent(eventType)
res := sdk.NewEvent(eventType)
for key, value := range attributes {
attribute := sdk.NewAttribute(key.String(), value)
new.AppendAttributes(attribute)
res = res.AppendAttributes(attribute)
}
return new
return res
}

func NewEventBurnTokenFrom(e EventBurned) sdk.Event {
func NewEventBurnTokenFrom(event EventBurned) sdk.Event {
eventType := EventTypeBurnTokenFrom.String()
attributes := map[AttributeKey]string{
AttributeKeyContractID: e.ContractId,
AttributeKeyProxy: e.Operator,
AttributeKeyFrom: e.From,
AttributeKeyAmount: e.Amount.String(),
AttributeKeyContractID: event.ContractId,
AttributeKeyProxy: event.Operator,
AttributeKeyFrom: event.From,
AttributeKeyAmount: event.Amount.String(),
}

new := sdk.NewEvent(eventType)
res := sdk.NewEvent(eventType)
for key, value := range attributes {
attribute := sdk.NewAttribute(key.String(), value)
new.AppendAttributes(attribute)
res = res.AppendAttributes(attribute)
}
return new
return res
}

func NewEventModifyToken(e EventModified) []sdk.Event {
func NewEventModifyToken(event EventModified) []sdk.Event {
eventType := EventTypeModifyToken.String()
new := []sdk.Event{
res := []sdk.Event{
sdk.NewEvent(eventType,
sdk.NewAttribute(AttributeKeyContractID.String(), e.ContractId),
sdk.NewAttribute(AttributeKeyContractID.String(), event.ContractId),
),
}

for _, pair := range e.Changes {
for _, pair := range event.Changes {
attribute := sdk.NewAttribute(pair.Field, pair.Value)
event := sdk.NewEvent(eventType, attribute)
new = append(new, event)
res = append(res, event)
}
return new
return res
}

func NewEventTransfer(e EventSent) sdk.Event {
func NewEventTransfer(event EventSent) sdk.Event {
eventType := EventTypeTransfer.String()
attributes := map[AttributeKey]string{
AttributeKeyContractID: e.ContractId,
AttributeKeyFrom: e.From,
AttributeKeyTo: e.To,
AttributeKeyAmount: e.Amount.String(),
AttributeKeyContractID: event.ContractId,
AttributeKeyFrom: event.From,
AttributeKeyTo: event.To,
AttributeKeyAmount: event.Amount.String(),
}

new := sdk.NewEvent(eventType)
res := sdk.NewEvent(eventType)
for key, value := range attributes {
attribute := sdk.NewAttribute(key.String(), value)
new.AppendAttributes(attribute)
res = res.AppendAttributes(attribute)
}
return new
return res
}

func NewEventTransferFrom(e EventSent) sdk.Event {
func NewEventTransferFrom(event EventSent) sdk.Event {
eventType := EventTypeTransferFrom.String()
attributes := map[AttributeKey]string{
AttributeKeyContractID: e.ContractId,
AttributeKeyProxy: e.Operator,
AttributeKeyFrom: e.From,
AttributeKeyTo: e.To,
AttributeKeyAmount: e.Amount.String(),
AttributeKeyContractID: event.ContractId,
AttributeKeyProxy: event.Operator,
AttributeKeyFrom: event.From,
AttributeKeyTo: event.To,
AttributeKeyAmount: event.Amount.String(),
}

new := sdk.NewEvent(eventType)
res := sdk.NewEvent(eventType)
for key, value := range attributes {
attribute := sdk.NewAttribute(key.String(), value)
new.AppendAttributes(attribute)
res = res.AppendAttributes(attribute)
}
return new
return res
}

func NewEventGrantPermToken(e EventGrant) sdk.Event {
func NewEventGrantPermToken(event EventGrant) sdk.Event {
eventType := EventTypeGrantPermToken.String()
attributes := map[AttributeKey]string{
AttributeKeyContractID: e.ContractId,
AttributeKeyTo: e.Grantee,
AttributeKeyPerm: LegacyPermission(e.Permission).String(),
AttributeKeyContractID: event.ContractId,
AttributeKeyTo: event.Grantee,
AttributeKeyPerm: LegacyPermission(event.Permission).String(),
}
if e.Granter != e.Grantee {
attributes[AttributeKeyFrom] = e.Granter
if len(event.Granter) != 0 {
attributes[AttributeKeyFrom] = event.Granter
}

new := sdk.NewEvent(eventType)
res := sdk.NewEvent(eventType)
for key, value := range attributes {
attribute := sdk.NewAttribute(key.String(), value)
new.AppendAttributes(attribute)
res = res.AppendAttributes(attribute)
}
return new
return res
}

func NewEventRevokePermToken(e EventAbandon) sdk.Event {
func NewEventGrantPermTokenHead(event EventGrant) sdk.Event {
eventType := EventTypeGrantPermToken.String()
attributes := map[AttributeKey]string{
AttributeKeyContractID: event.ContractId,
AttributeKeyTo: event.Grantee,
}
if len(event.Granter) != 0 {
attributes[AttributeKeyFrom] = event.Granter
}

res := sdk.NewEvent(eventType)
for key, value := range attributes {
attribute := sdk.NewAttribute(key.String(), value)
res = res.AppendAttributes(attribute)
}
return res
}

func NewEventGrantPermTokenBody(event EventGrant) sdk.Event {
eventType := EventTypeGrantPermToken.String()
attributes := map[AttributeKey]string{
AttributeKeyPerm: LegacyPermission(event.Permission).String(),
}

res := sdk.NewEvent(eventType)
for key, value := range attributes {
attribute := sdk.NewAttribute(key.String(), value)
res = res.AppendAttributes(attribute)
}
return res
}

func NewEventRevokePermToken(event EventAbandon) sdk.Event {
eventType := EventTypeRevokePermToken.String()
attributes := map[AttributeKey]string{
AttributeKeyContractID: e.ContractId,
AttributeKeyFrom: e.Grantee,
AttributeKeyPerm: LegacyPermission(e.Permission).String(),
AttributeKeyContractID: event.ContractId,
AttributeKeyFrom: event.Grantee,
AttributeKeyPerm: LegacyPermission(event.Permission).String(),
}

new := sdk.NewEvent(eventType)
res := sdk.NewEvent(eventType)
for key, value := range attributes {
attribute := sdk.NewAttribute(key.String(), value)
new.AppendAttributes(attribute)
res = res.AppendAttributes(attribute)
}
return new
return res
}

func NewEventApproveToken(e EventAuthorizedOperator) sdk.Event {
func NewEventApproveToken(event EventAuthorizedOperator) sdk.Event {
eventType := EventTypeApproveToken.String()
attributes := map[AttributeKey]string{
AttributeKeyContractID: e.ContractId,
AttributeKeyApprover: e.Holder,
AttributeKeyProxy: e.Operator,
AttributeKeyContractID: event.ContractId,
AttributeKeyApprover: event.Holder,
AttributeKeyProxy: event.Operator,
}

new := sdk.NewEvent(eventType)
res := sdk.NewEvent(eventType)
for key, value := range attributes {
attribute := sdk.NewAttribute(key.String(), value)
new.AppendAttributes(attribute)
res = res.AppendAttributes(attribute)
}
return new
return res
}
Loading