eosswedenorg/thalos
1
0
Fork 0
mirror of https://github.com/eosswedenorg/thalos synced 2026-07-04 12:03:41 +02:00
Code Releases Activity

api/message/types.go: Adding Authorization field to ActionTrace

Browse source
This commit is contained in:
Henrik Hautakoski 2023-04-26 15:00:25 +02:00
parent ffb5a10788
commit c8944ea18b
2 changed files with 22 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

18
api/message/msgpack/codec_test.go
View file

@ -36,13 +36,16 @@ func TestMsgpack_EncodeActionTrace(t *testing.T) {
Receiver: "eosio", Receiver: "eosio",
Data: dataJson, Data: dataJson,
HexData: "d0fa1b2ab8a6fd0d1b0173df91aa9ffd277642d05780cf750", HexData: "d0fa1b2ab8a6fd0d1b0173df91aa9ffd277642d05780cf750",
Authorization: []message.PermissionLevel{
{Actor: "mygame", Permission: "active"},
},
} }
data, err := msgpack.Marshal(msg) data, err := msgpack.Marshal(msg)
assert.NoError(t, err) assert.NoError(t, err)
expected := []byte{ expected := []byte{
0x86, 0xa5, 0x74, 0x78, 0x5f, 0x69, 0x64, 0xd9, 0x87, 0xa5, 0x74, 0x78, 0x5f, 0x69, 0x64, 0xd9,
0x40, 0x65, 0x64, 0x63, 0x30, 0x36, 0x64, 0x63, 0x40, 0x65, 0x64, 0x63, 0x30, 0x36, 0x64, 0x63,
0x65, 0x36, 0x33, 0x32, 0x30, 0x34, 0x35, 0x39, 0x65, 0x36, 0x33, 0x32, 0x30, 0x34, 0x35, 0x39,
0x66, 0x64, 0x36, 0x34, 0x34, 0x37, 0x35, 0x36, 0x66, 0x64, 0x36, 0x34, 0x34, 0x37, 0x35, 0x36,
@ -84,7 +87,13 @@ func TestMsgpack_EncodeActionTrace(t *testing.T) {
0x33, 0x64, 0x66, 0x39, 0x31, 0x61, 0x61, 0x39, 0x33, 0x64, 0x66, 0x39, 0x31, 0x61, 0x61, 0x39,
0x66, 0x66, 0x64, 0x32, 0x37, 0x37, 0x36, 0x34, 0x66, 0x66, 0x64, 0x32, 0x37, 0x37, 0x36, 0x34,
0x32, 0x64, 0x30, 0x35, 0x37, 0x38, 0x30, 0x63, 0x32, 0x64, 0x30, 0x35, 0x37, 0x38, 0x30, 0x63,
0x66, 0x37, 0x35, 0x30, 0x66, 0x37, 0x35, 0x30, 0xad, 0x61, 0x75, 0x74,
0x68, 0x6f, 0x72, 0x69, 0x7a, 0x61, 0x74, 0x69,
0x6f, 0x6e, 0x91, 0x82, 0xa5, 0x61, 0x63, 0x74,
0x6f, 0x72, 0xa6, 0x6d, 0x79, 0x67, 0x61, 0x6d,
0x65, 0xaa, 0x70, 0x65, 0x72, 0x6d, 0x69, 0x73,
0x73, 0x69, 0x6f, 0x6e, 0xa6, 0x61, 0x63, 0x74,
0x69, 0x76, 0x65,
} }
assert.Equal(t, expected, data) assert.Equal(t, expected, data)
@ -93,7 +102,7 @@ func TestMsgpack_EncodeActionTrace(t *testing.T) {
func TestMsgpack_Decode(t *testing.T) { func TestMsgpack_Decode(t *testing.T) {
RegisterGeneratedResolver() RegisterGeneratedResolver()
data := []byte("\x86\xa5tx_id\xd9@edc06dce6320459fd644756972048da453b2816b0a434c37ddffde36778dcab3\xa4name\xa4drop\xa8contract\xa6mygame\xa8receiver\xa8account1\xa4dataċ{\"dropped_from_id\":674562,\"item\":{\"dur\":145,\"id\":49623,\"name\":\"Shadowmourne\",\"qual\":\"legendary\",\"sta\":198,\"str\":223},\"receiver\":\"account1\"}\xa8hex_data\xda\x01\x167b2264726f707065645f66726f6d5f6964223a3637343536322c226974656d223a7b22647572223a3134352c226964223a34393632332c226e616d65223a22536861646f776d6f75726e65222c227175616c223a226c6567656e64617279222c22737461223a3139382c22737472223a3232337d2c227265636569766572223a226163636f756e7431227d") data := []byte("\x87\xa5tx_id\xd9@edc06dce6320459fd644756972048da453b2816b0a434c37ddffde36778dcab3\xa4name\xa4drop\xa8contract\xa6mygame\xa8receiver\xa8account1\xa4dataċ{\"dropped_from_id\":674562,\"item\":{\"dur\":145,\"id\":49623,\"name\":\"Shadowmourne\",\"qual\":\"legendary\",\"sta\":198,\"str\":223},\"receiver\":\"account1\"}\xa8hex_data\xda\x01\x167b2264726f707065645f66726f6d5f6964223a3637343536322c226974656d223a7b22647572223a3134352c226964223a34393632332c226e616d65223a22536861646f776d6f75726e65222c227175616c223a226c6567656e64617279222c22737461223a3139382c22737472223a3232337d2c227265636569766572223a226163636f756e7431227d\xadauthorization\x91\x82\xa5actor\xa6mygame\xaapermission\xa6active")
dataJson, err := json.Marshal(map[string]interface{}{ dataJson, err := json.Marshal(map[string]interface{}{
"item": map[string]interface{}{ "item": map[string]interface{}{
@ -117,6 +126,9 @@ func TestMsgpack_Decode(t *testing.T) {
Receiver: "account1", Receiver: "account1",
Data: dataJson, Data: dataJson,
HexData: hex.EncodeToString(dataJson), HexData: hex.EncodeToString(dataJson),
Authorization: []message.PermissionLevel{
{Actor: "mygame", Permission: "active"},
},
} }
res := message.ActionTrace{} res := message.ActionTrace{}

7
api/message/types.go
View file

@ -8,6 +8,11 @@ type HeartBeat struct {
LastIrreversibleBlockNum uint32 `json:"last_irreversible_blocknum" msgpack:"last_irreversible_blocknum"` LastIrreversibleBlockNum uint32 `json:"last_irreversible_blocknum" msgpack:"last_irreversible_blocknum"`
} }
type PermissionLevel struct {
Actor string `json:"actor" msgpack:"actor"`
Permission string `json:"permission" msgpack:"permission"`
}
type ActionTrace struct { type ActionTrace struct {
TxID string `json:"tx_id" msgpack:"tx_id"` TxID string `json:"tx_id" msgpack:"tx_id"`
@ -20,6 +25,8 @@ type ActionTrace struct {
Receiver string `json:"receiver" msgpack:"receiver"` Receiver string `json:"receiver" msgpack:"receiver"`
Data []byte `json:"data" msgpack:"data"` Data []byte `json:"data" msgpack:"data"`
HexData string `json:"hex_data" msgpack:"hex_data"` HexData string `json:"hex_data" msgpack:"hex_data"`
Authorization []PermissionLevel `json:"authorization" msgpack:"authorization"`
} }
func (act ActionTrace) GetData() (map[string]interface{}, error) { func (act ActionTrace) GetData() (map[string]interface{}, error) {