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

Jump to bottom

Register missing amino codec of x/token, x/collection, x/wasm and x/foundation #745

Merged
merged 15 commits into from
Oct 25, 2022
Merged

Register missing amino codec of x/token, x/collection, x/wasm and x/foundation #745

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
d79fdfd
fix: implement Amino serialization for x/token
zemyblue Oct 19, 2022
b8ba54f
fix: implement Amino serialization for x/collection
zemyblue Oct 19, 2022
42b58a8
fix: implement Amino serialization for x/foundation, x/stakingplus
zemyblue Oct 20, 2022
4bac217
fix: conflict msgs
zemyblue Oct 20, 2022
0696821
fix: change x/wasm amino to using legacyCdc
zemyblue Oct 20, 2022
eeb032d
fix: change conflict amino msgName with x/token and x/collection.
zemyblue Oct 20, 2022
b27e4ea
chore: add more unittest
zemyblue Oct 20, 2022
d8fdde2
chore: update changelog
zemyblue Oct 20, 2022
63a85a3
Merge branch 'main' into missing_aminojson
zemyblue Oct 21, 2022
b098963
fix: apply the changes of `x/foundation`
zemyblue Oct 21, 2022
29c0ce1
chore: remove redundant code.
zemyblue Oct 21, 2022
1967603
fix: apply feedback.
zemyblue Oct 21, 2022
3d430ab
Merge branch 'main' into missing_aminojson
zemyblue Oct 24, 2022
65f4747
fix: remove unused amino codec type, `Change` of `x/collection`
zemyblue Oct 24, 2022
45071dd
fix: remove unused amino codec type, `MintNFTParam` of `x/collection`
zemyblue Oct 25, 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
Prev Previous commit
Next Next commit
fix: conflict msgs 
Signed-off-by: zemyblue <zemyblue@gmail.com>
  • Loading branch information
@zemyblue
zemyblue committed Oct 20, 2022
commit 4bac217b31bc4d0426b3bd361053620b5dec2e56
8 changes: 4 additions & 4 deletions x/collection/codec.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ func RegisterLegacyAminoCodec(cdc *codec.LegacyAmino) {
legacy.RegisterAminoMsg(cdc, &MsgTransferFTFrom{}, "lbm-sdk/MsgTransferFTFrom")
legacy.RegisterAminoMsg(cdc, &MsgTransferNFT{}, "lbm-sdk/MsgTransferNFT")
legacy.RegisterAminoMsg(cdc, &MsgTransferNFTFrom{}, "lbm-sdk/MsgTransferNFTFrom")
legacy.RegisterAminoMsg(cdc, &MsgApprove{}, "lbm-sdk/MsgApprove")
legacy.RegisterAminoMsg(cdc, &MsgApprove{}, "lbm-sdk/MsgCollectionApprove") // Changed msgName due to conflict with `x/token`
legacy.RegisterAminoMsg(cdc, &MsgDisapprove{}, "lbm-sdk/MsgDisapprove")
legacy.RegisterAminoMsg(cdc, &MsgCreateContract{}, "lbm-sdk/MsgCreateContract")
legacy.RegisterAminoMsg(cdc, &MsgIssueFT{}, "lbm-sdk/MsgIssueFT")
Expand All @@ -28,9 +28,9 @@ func RegisterLegacyAminoCodec(cdc *codec.LegacyAmino) {
legacy.RegisterAminoMsg(cdc, &MsgBurnFTFrom{}, "lbm-sdk/MsgBurnFTFrom")
legacy.RegisterAminoMsg(cdc, &MsgBurnNFT{}, "lbm-sdk/MsgBurnNFT")
legacy.RegisterAminoMsg(cdc, &MsgBurnNFTFrom{}, "lbm-sdk/MsgBurnNFTFrom")
legacy.RegisterAminoMsg(cdc, &MsgModify{}, "lbm-sdk/MsgModify")
legacy.RegisterAminoMsg(cdc, &MsgGrantPermission{}, "lbm-sdk/MsgGrantPermission")
legacy.RegisterAminoMsg(cdc, &MsgRevokePermission{}, "lbm-sdk/MsgRevokePermission")
legacy.RegisterAminoMsg(cdc, &MsgModify{}, "lbm-sdk/MsgCollectionModify") // Changed msgName due to conflict with `x/token`
legacy.RegisterAminoMsg(cdc, &MsgGrantPermission{}, "lbm-sdk/MsgCollectionGrantPermission") // Changed msgName due to conflict with `x/token`
legacy.RegisterAminoMsg(cdc, &MsgRevokePermission{}, "lbm-sdk/MsgCollectionRevokePermission") // Changed msgName due to conflict with `x/token`
legacy.RegisterAminoMsg(cdc, &MsgAttach{}, "lbm-sdk/MsgAttach")
legacy.RegisterAminoMsg(cdc, &MsgDetach{}, "lbm-sdk/MsgDetach")
legacy.RegisterAminoMsg(cdc, &MsgAttachFrom{}, "lbm-sdk/MsgAttachFrom")
Expand Down
17 changes: 10 additions & 7 deletions x/collection/msgs_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1644,7 +1644,7 @@ func TestAminoJSON(t *testing.T) {
Approver: addrs[0].String(),
Proxy: addrs[1].String(),
},
fmt.Sprintf("{\"account_number\":\"1\",\"chain_id\":\"foo\",\"fee\":{\"amount\":[],\"gas\":\"0\"},\"memo\":\"memo\",\"msgs\":[{\"type\":\"lbm-sdk/MsgApprove\",\"value\":{\"approver\":\"%s\",\"contract_id\":\"deadbeef\",\"proxy\":\"%s\"}}],\"sequence\":\"1\",\"timeout_height\":\"1\"}", addrs[0].String(), addrs[1].String()),
fmt.Sprintf("{\"account_number\":\"1\",\"chain_id\":\"foo\",\"fee\":{\"amount\":[],\"gas\":\"0\"},\"memo\":\"memo\",\"msgs\":[{\"type\":\"lbm-sdk/MsgCollectionApprove\",\"value\":{\"approver\":\"%s\",\"contract_id\":\"deadbeef\",\"proxy\":\"%s\"}}],\"sequence\":\"1\",\"timeout_height\":\"1\"}", addrs[0].String(), addrs[1].String()),
},
"MsgDisapprove": {
&collection.MsgDisapprove{
Expand Down Expand Up @@ -1745,7 +1745,7 @@ func TestAminoJSON(t *testing.T) {
TokenIndex: "deadbeef",
Changes: []collection.Change{{Field: "name", Value: "New test"}},
},
fmt.Sprintf("{\"account_number\":\"1\",\"chain_id\":\"foo\",\"fee\":{\"amount\":[],\"gas\":\"0\"},\"memo\":\"memo\",\"msgs\":[{\"type\":\"lbm-sdk/MsgModify\",\"value\":{\"changes\":[{\"field\":\"name\",\"value\":\"New test\"}],\"contract_id\":\"deadbeef\",\"owner\":\"%s\",\"token_index\":\"deadbeef\",\"token_type\":\"NewType\"}}],\"sequence\":\"1\",\"timeout_height\":\"1\"}", addrs[0].String()),
fmt.Sprintf("{\"account_number\":\"1\",\"chain_id\":\"foo\",\"fee\":{\"amount\":[],\"gas\":\"0\"},\"memo\":\"memo\",\"msgs\":[{\"type\":\"lbm-sdk/MsgCollectionModify\",\"value\":{\"changes\":[{\"field\":\"name\",\"value\":\"New test\"}],\"contract_id\":\"deadbeef\",\"owner\":\"%s\",\"token_index\":\"deadbeef\",\"token_type\":\"NewType\"}}],\"sequence\":\"1\",\"timeout_height\":\"1\"}", addrs[0].String()),
},
"MsgGrantPermission": {
&collection.MsgGrantPermission{
Expand All @@ -1754,15 +1754,15 @@ func TestAminoJSON(t *testing.T) {
To: addrs[1].String(),
Permission: collection.LegacyPermissionMint.String(),
},
fmt.Sprintf("{\"account_number\":\"1\",\"chain_id\":\"foo\",\"fee\":{\"amount\":[],\"gas\":\"0\"},\"memo\":\"memo\",\"msgs\":[{\"type\":\"lbm-sdk/MsgGrantPermission\",\"value\":{\"contract_id\":\"deadbeef\",\"from\":\"%s\",\"permission\":\"mint\",\"to\":\"%s\"}}],\"sequence\":\"1\",\"timeout_height\":\"1\"}", addrs[0].String(), addrs[1].String()),
fmt.Sprintf("{\"account_number\":\"1\",\"chain_id\":\"foo\",\"fee\":{\"amount\":[],\"gas\":\"0\"},\"memo\":\"memo\",\"msgs\":[{\"type\":\"lbm-sdk/MsgCollectionGrantPermission\",\"value\":{\"contract_id\":\"deadbeef\",\"from\":\"%s\",\"permission\":\"mint\",\"to\":\"%s\"}}],\"sequence\":\"1\",\"timeout_height\":\"1\"}", addrs[0].String(), addrs[1].String()),
},
"MsgRevokePermission": {
&collection.MsgRevokePermission{
ContractId: contractId,
From: addrs[0].String(),
Permission: collection.LegacyPermissionMint.String(),
},
fmt.Sprintf("{\"account_number\":\"1\",\"chain_id\":\"foo\",\"fee\":{\"amount\":[],\"gas\":\"0\"},\"memo\":\"memo\",\"msgs\":[{\"type\":\"lbm-sdk/MsgRevokePermission\",\"value\":{\"contract_id\":\"deadbeef\",\"from\":\"%s\",\"permission\":\"mint\"}}],\"sequence\":\"1\",\"timeout_height\":\"1\"}", addrs[0].String()),
fmt.Sprintf("{\"account_number\":\"1\",\"chain_id\":\"foo\",\"fee\":{\"amount\":[],\"gas\":\"0\"},\"memo\":\"memo\",\"msgs\":[{\"type\":\"lbm-sdk/MsgCollectionRevokePermission\",\"value\":{\"contract_id\":\"deadbeef\",\"from\":\"%s\",\"permission\":\"mint\"}}],\"sequence\":\"1\",\"timeout_height\":\"1\"}", addrs[0].String()),
},
"MsgAttach": {
&collection.MsgAttach{
Expand Down Expand Up @@ -1802,8 +1802,11 @@ func TestAminoJSON(t *testing.T) {
},
}

for _, tc := range testCase {
tx.Msgs = []sdk.Msg{tc.msg}
require.Equal(t, tc.expected, string(legacytx.StdSignBytes("foo", 1, 1, 1, legacytx.StdFee{}, []sdk.Msg{tc.msg}, "memo")))
for name, tc := range testCase {
tc := tc
t.Run(name, func(t *testing.T) {
tx.Msgs = []sdk.Msg{tc.msg}
require.Equal(t, tc.expected, string(legacytx.StdSignBytes("foo", 1, 1, 1, legacytx.StdFee{}, []sdk.Msg{tc.msg}, "memo")))
})
}
}
8 changes: 4 additions & 4 deletions x/token/codec.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@ func RegisterLegacyAminoCodec(cdc *codec.LegacyAmino) {
legacy.RegisterAminoMsg(cdc, &MsgSend{}, "lbm-sdk/MsgSend")
legacy.RegisterAminoMsg(cdc, &MsgTransferFrom{}, "lbm-sdk/MsgTransferFrom")
legacy.RegisterAminoMsg(cdc, &MsgRevokeOperator{}, "lbm-sdk/MsgRevokeOperator")
legacy.RegisterAminoMsg(cdc, &MsgApprove{}, "lbm-sdk/MsgApprove")
legacy.RegisterAminoMsg(cdc, &MsgApprove{}, "lbm-sdk/MsgTokenApprove") // Changed msgName due to conflict with `x/collection`
legacy.RegisterAminoMsg(cdc, &MsgIssue{}, "lbm-sdk/MsgIssue")
legacy.RegisterAminoMsg(cdc, &MsgGrantPermission{}, "lbm-sdk/MsgGrantPermission")
legacy.RegisterAminoMsg(cdc, &MsgRevokePermission{}, "lbm-sdk/MsgRevokePermission")
legacy.RegisterAminoMsg(cdc, &MsgGrantPermission{}, "lbm-sdk/MsgTokenGrantPermission") // Changed msgName due to conflict with `x/collection`
legacy.RegisterAminoMsg(cdc, &MsgRevokePermission{}, "lbm-sdk/MsgTokenRevokePermission") // Changed msgName due to conflict with `x/collection`
legacy.RegisterAminoMsg(cdc, &MsgMint{}, "lbm-sdk/MsgMint")
legacy.RegisterAminoMsg(cdc, &MsgBurn{}, "lbm-sdk/MsgBurn")
legacy.RegisterAminoMsg(cdc, &MsgBurnFrom{}, "lbm-sdk/MsgBurnFrom")
legacy.RegisterAminoMsg(cdc, &MsgModify{}, "lbm-sdk/MsgModify")
legacy.RegisterAminoMsg(cdc, &MsgModify{}, "lbm-sdk/MsgTokenModify") // Changed msgName due to conflict with `x/collection`

cdc.RegisterConcrete(&Pair{}, "lbm-sdk/Pair", nil)
}
Expand Down
20 changes: 12 additions & 8 deletions x/token/msgs_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -790,7 +790,7 @@ func TestAminoJSON(t *testing.T) {
Approver: addrs[0].String(),
Proxy: addrs[1].String(),
},
fmt.Sprintf("{\"account_number\":\"1\",\"chain_id\":\"foo\",\"fee\":{\"amount\":[],\"gas\":\"0\"},\"memo\":\"memo\",\"msgs\":[{\"type\":\"lbm-sdk/MsgApprove\",\"value\":{\"approver\":\"%s\",\"contract_id\":\"deadbeef\",\"proxy\":\"%s\"}}],\"sequence\":\"1\",\"timeout_height\":\"1\"}", addrs[0].String(), addrs[1].String()),
fmt.Sprintf("{\"account_number\":\"1\",\"chain_id\":\"foo\",\"fee\":{\"amount\":[],\"gas\":\"0\"},\"memo\":\"memo\",\"msgs\":[{\"type\":\"lbm-sdk/MsgTokenApprove\",\"value\":{\"approver\":\"%s\",\"contract_id\":\"deadbeef\",\"proxy\":\"%s\"}}],\"sequence\":\"1\",\"timeout_height\":\"1\"}", addrs[0].String(), addrs[1].String()),
},
"MsgIssue": {
&token.MsgIssue{
Expand All @@ -813,15 +813,15 @@ func TestAminoJSON(t *testing.T) {
To: addrs[1].String(),
Permission: token.LegacyPermissionMint.String(),
},
fmt.Sprintf("{\"account_number\":\"1\",\"chain_id\":\"foo\",\"fee\":{\"amount\":[],\"gas\":\"0\"},\"memo\":\"memo\",\"msgs\":[{\"type\":\"lbm-sdk/MsgGrantPermission\",\"value\":{\"contract_id\":\"deadbeef\",\"from\":\"%s\",\"permission\":\"mint\",\"to\":\"%s\"}}],\"sequence\":\"1\",\"timeout_height\":\"1\"}", addrs[0].String(), addrs[1].String()),
fmt.Sprintf("{\"account_number\":\"1\",\"chain_id\":\"foo\",\"fee\":{\"amount\":[],\"gas\":\"0\"},\"memo\":\"memo\",\"msgs\":[{\"type\":\"lbm-sdk/MsgTokenGrantPermission\",\"value\":{\"contract_id\":\"deadbeef\",\"from\":\"%s\",\"permission\":\"mint\",\"to\":\"%s\"}}],\"sequence\":\"1\",\"timeout_height\":\"1\"}", addrs[0].String(), addrs[1].String()),
},
"MsgRevokePermission": {
&token.MsgRevokePermission{
ContractId: contractId,
From: addrs[0].String(),
Permission: token.LegacyPermissionMint.String(),
},
fmt.Sprintf("{\"account_number\":\"1\",\"chain_id\":\"foo\",\"fee\":{\"amount\":[],\"gas\":\"0\"},\"memo\":\"memo\",\"msgs\":[{\"type\":\"lbm-sdk/MsgRevokePermission\",\"value\":{\"contract_id\":\"deadbeef\",\"from\":\"%s\",\"permission\":\"mint\"}}],\"sequence\":\"1\",\"timeout_height\":\"1\"}", addrs[0].String()),
fmt.Sprintf("{\"account_number\":\"1\",\"chain_id\":\"foo\",\"fee\":{\"amount\":[],\"gas\":\"0\"},\"memo\":\"memo\",\"msgs\":[{\"type\":\"lbm-sdk/MsgTokenRevokePermission\",\"value\":{\"contract_id\":\"deadbeef\",\"from\":\"%s\",\"permission\":\"mint\"}}],\"sequence\":\"1\",\"timeout_height\":\"1\"}", addrs[0].String()),
},
"MsgMint": {
&token.MsgMint{
Expand All @@ -847,20 +847,24 @@ func TestAminoJSON(t *testing.T) {
From: addrs[1].String(),
Amount: sdk.NewInt(1000000),
},
fmt.Sprintf("{\"account_number\":\"1\",\"chain_id\":\"foo\",\"fee\":{\"amount\":[],\"gas\":\"0\"},\"memo\":\"memo\",\"msgs\":[{\"type\":\"lbm-sdk/MsgBurnFrom\",\"value\":{\"amount\":\"1000000\",\"contract_id\":\"deadbeef\",\"from\":\"%s\",\"proxy\":\"%s\"}}],\"sequence\":\"1\",\"timeout_height\":\"1\"}", addrs[0].String(), addrs[1].String()),
fmt.Sprintf("{\"account_number\":\"1\",\"chain_id\":\"foo\",\"fee\":{\"amount\":[],\"gas\":\"0\"},\"memo\":\"memo\",\"msgs\":[{\"type\":\"lbm-sdk/MsgBurnFrom\",\"value\":{\"amount\":\"1000000\",\"contract_id\":\"deadbeef\",\"from\":\"%s\",\"proxy\":\"%s\"}}],\"sequence\":\"1\",\"timeout_height\":\"1\"}", addrs[1].String(), addrs[0].String()),
},
"MsgModify": {
&token.MsgModify{
ContractId: contractId,
Owner: addrs[0].String(),
Changes: []token.Pair{token.Pair{Field: token.AttributeKeyName.String(), Value: "New test"}},
ulbqb marked this conversation as resolved.
Show resolved Hide resolved
},
fmt.Sprintf("{\"account_number\":\"1\",\"chain_id\":\"foo\",\"fee\":{\"amount\":[],\"gas\":\"0\"},\"memo\":\"memo\",\"msgs\":[{\"type\":\"lbm-sdk/MsgModify\",\"value\":{\"changes\":[{\"field\":\"name\",\"value\":\"New test\"}],\"contract_id\":\"deadbeef\",\"owner\":\"%s\"}}],\"sequence\":\"1\",\"timeout_height\":\"1\"}", addrs[0].String()),
fmt.Sprintf("{\"account_number\":\"1\",\"chain_id\":\"foo\",\"fee\":{\"amount\":[],\"gas\":\"0\"},\"memo\":\"memo\",\"msgs\":[{\"type\":\"lbm-sdk/MsgTokenModify\",\"value\":{\"changes\":[{\"field\":\"name\",\"value\":\"New test\"}],\"contract_id\":\"deadbeef\",\"owner\":\"%s\"}}],\"sequence\":\"1\",\"timeout_height\":\"1\"}", addrs[0].String()),
},
}

for _, tc := range testCases {
tx.Msgs = []sdk.Msg{tc.msg}
require.Equal(t, tc.expected, string(legacytx.StdSignBytes("foo", 1, 1, 1, legacytx.StdFee{}, []sdk.Msg{tc.msg}, "memo")))
for name, tc := range testCases {
tc := tc

t.Run(name, func(t *testing.T) {
tx.Msgs = []sdk.Msg{tc.msg}
require.Equal(t, tc.expected, string(legacytx.StdSignBytes("foo", 1, 1, 1, legacytx.StdFee{}, []sdk.Msg{tc.msg}, "memo")))
})
}
}