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

Compare the signer of the normal message and the signer of MsgExcute #1291

Merged
merged 4 commits into from
Mar 25, 2024
+89 −33
Merged

Compare the signer of the normal message and the signer of MsgExcute #1291

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
abce770
Compare the signer of the normal message and the signer of MsgExcute
Mdaiki0730 Mar 22, 2024
e06a40b
Add CHANGELOG
Mdaiki0730 Mar 22, 2024
5118e53
Modification of test
Mdaiki0730 Mar 22, 2024
760851a
Add invalid signer case to test
Mdaiki0730 Mar 25, 2024
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 @@ -49,6 +49,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
* (x/zkauth) [\#1280](https://github.com/Finschia/finschia-sdk/pull/1280) Fetch jwk considering goroutine exit

### Bug Fixes
* (x/zkauth) [\#1291](https://github.com/Finschia/finschia-sdk/pull/1291) Compare the signer of the normal message and the signer of MsgExcute

### Removed

Expand Down
5 changes: 4 additions & 1 deletion x/zkauth/keeper/keeper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,16 @@
return ctx.Logger().With("module", fmt.Sprintf("x/%s", types.ModuleName))
}

func (k Keeper) DispatchMsgs(ctx sdk.Context, msgs []sdk.Msg) ([][]byte, error) {
func (k Keeper) DispatchMsgs(ctx sdk.Context, msgs []sdk.Msg, author sdk.AccAddress) ([][]byte, error) {
results := make([][]byte, 0, len(msgs))
for i, msg := range msgs {
signers := msg.GetSigners()
if len(signers) != 1 {
return nil, sdkerrors.ErrInvalidRequest.Wrap("authorization can be given to msg with only one signer")
}
if !author.Equals(signers[0]) {
return nil, sdkerrors.ErrUnauthorized.Wrapf("bad signer; expected %s, got %s", author, signers[0])
}

Check warning on line 64 in x/zkauth/keeper/keeper.go

View check run for this annotation

Codecov / codecov/patch

x/zkauth/keeper/keeper.go#L63-L64 

Added lines #L63 - L64 were not covered by tests
if err := msg.ValidateBasic(); err != nil {
return nil, err
}
Expand Down
26 changes: 21 additions & 5 deletions x/zkauth/keeper/keeper_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package keeper_test

import (
"context"
"encoding/base64"
"encoding/json"
"net/http"
"net/http/httptest"
Expand Down Expand Up @@ -81,9 +82,10 @@ func TestDispatchMsgs(t *testing.T) {
testApp := testutil.ZkAuthKeeper(t)
app, k, ctx := testApp.Simapp, testApp.ZKAuthKeeper, testApp.Ctx

addrs := simapp.AddTestAddrs(app, ctx, 2, sdk.NewInt(100))
fromAddr := addrs[0]
toAddr := addrs[1]
addrs := simapp.AddTestAddrs(app, ctx, 1, sdk.NewInt(100))
fromAddr := sdk.MustAccAddressFromBech32("link1f7j46mgxr3d5tgn3qsnn9ep8j77yr8w4ks0f3lpzz9rhnwja9vcqej33ld")
toAddr := addrs[0]
err := simapp.FundAccount(app, ctx, fromAddr, sdk.NewCoins(sdk.NewCoin(app.StakingKeeper.BondDenom(ctx), sdk.NewInt(100))))

newCoins := sdk.NewCoins(sdk.NewInt64Coin("stake", 5))

Expand All @@ -93,13 +95,27 @@ func TestDispatchMsgs(t *testing.T) {
ToAddress: toAddr.String(),
}

zkAuthSig := types.ZKAuthSignature{}
testProofB64 := "eyJwaV9hIjpbIjM0MjM1MjQ3MjQzMDgyMDE5Mzc5NTQyMDUwMjA3MTMyNDg0MTg5OTQ5NjEzODk1OTcxODgxNjk1ODg4Njk5Mzg0MDgyMjI1NjE2MzAiLCI4OTQ1NzMxODIxOTg1NDU0MTcwNDA5MjQ2MjA4MDUxMzYwMzcxNzQ0NjUxOTYwNjg2MjQ5Njg1NjExMDI0NzQ4MjQ5MDk2NjUyNDAwIiwiMSJdLCJwaV9iIjpbWyIxNjE3NzgwNjczNzQ1MTg2MDY3NDk3NTAxNjI1MjExODM3NDU0NDU5NjE5NzcxMDAyNjYzMjAxMTg2MTg4OTM4NDkxMDc3MTU5ODUwIiwiMTAzODU2MDMyMjQzMDc2MDQxMjM5NjI2NzAyMzA3NDcxNDM2NDc2ODAxOTAwNTQzNzU3OTE5NjAxNjYwMTY2NzMyNTcwNjE5ODExNjgiXSxbIjYyMTE1NjA5NTUzMTE1NzgxNDcwMzEzMjAzMTE1MzAyODM5MzgwMDY5MTIyMjAwMTUwODM1MTIxODg2MDI5MzU0MjA4Mjk5MjY1NCIsIjEzODUwMDYzMTA5ODg2MTE3MDcwNzgzMzIxNDk1ODI4MzQ2MTg3ODQ3OTM3OTIyMDMyNTI2NzU3MTU2MDg0MjUzMTU4NTc0NjgyMTYyIl0sWyIxIiwiMCJdXSwicGlfYyI6WyIxMDE0MTM1NTQwNTE1MDg5MzQ1MjY3NTUwMTE4Mjk4MTY1MzY5NDI1MzM0MzMyMjAyNzM1OTgwNTU0NzYxODgyODE4NjU3NDU5MTA4IiwiNDkzMjY5MjI2OTcyOTIyNDQ4NjI1MDI0MDAyMjI4NTQ4NzE1MjYzNTkwNjAzMzA1ODYwNjgwMjI2Nzg4Nzg5NjE2MTU2NTM4MzYiLCIxIl19"
testProof, err := base64.StdEncoding.DecodeString(testProofB64)
require.NoError(t, err)

zkAuthSig := types.ZKAuthSignature{
ZkAuthInputs: &types.ZKAuthInputs{
ProofPoints: testProof,
IssBase64: "aHR0cHM6Ly9hY2NvdW50cy5nb29nbGUuY29t",
HeaderBase64: "eyJhbGciOiJSUzI1NiIsImtpZCI6ImFkZjVlNzEwZWRmZWJlY2JlZmE5YTYxNDk1NjU0ZDAzYzBiOGVkZjgiLCJ0eXAiOiJKV1QifQ",
AddressSeed: "16929294337693897740349056748881744503581363933815798702166939594477679063350",
},
MaxBlockHeight: 104,
}

msgs := types.NewMsgExecution([]sdk.Msg{&bankMsg}, zkAuthSig)

execMsgs, err := msgs.GetMessages()
require.NoError(t, err)
result, err := k.DispatchMsgs(ctx, execMsgs)
// zksigner is assumed to be one
zksigner := msgs.GetSigners()[0]
result, err := k.DispatchMsgs(ctx, execMsgs, zksigner)

require.NoError(t, err)
require.NotNil(t, result)
Expand Down
5 changes: 4 additions & 1 deletion x/zkauth/keeper/msg_server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,10 @@ func (k msgServer) Execution(goCtx context.Context, msg *types.MsgExecution) (*t
return nil, err
}

results, err := k.DispatchMsgs(ctx, msgs)
// zksigner is assumed to be one
zksigner := msg.GetSigners()[0]

results, err := k.DispatchMsgs(ctx, msgs, zksigner)
if err != nil {
return nil, err
}
Expand Down
20 changes: 17 additions & 3 deletions x/zkauth/keeper/msg_server_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package keeper_test

import (
"encoding/base64"
"testing"

"github.com/stretchr/testify/require"
Expand All @@ -23,16 +24,29 @@ func TestExecution(t *testing.T) {
msgServer, app, ctx := setupMsgServer(t)
newCoins := sdk.NewCoins(sdk.NewInt64Coin("stake", 5))
addrs := simapp.AddTestAddrs(app, ctx, 2, sdk.NewInt(100))
fromAddr := addrs[0]
toAddr := addrs[1]
fromAddr := sdk.MustAccAddressFromBech32("link1f7j46mgxr3d5tgn3qsnn9ep8j77yr8w4ks0f3lpzz9rhnwja9vcqej33ld")
toAddr := addrs[0]
err := simapp.FundAccount(app, ctx, fromAddr, sdk.NewCoins(sdk.NewCoin(app.StakingKeeper.BondDenom(ctx), sdk.NewInt(100))))

bankMsg := banktypes.MsgSend{
Amount: newCoins,
FromAddress: fromAddr.String(),
ToAddress: toAddr.String(),
}

zkAuthSig := types.ZKAuthSignature{}
testProofB64 := "eyJwaV9hIjpbIjM0MjM1MjQ3MjQzMDgyMDE5Mzc5NTQyMDUwMjA3MTMyNDg0MTg5OTQ5NjEzODk1OTcxODgxNjk1ODg4Njk5Mzg0MDgyMjI1NjE2MzAiLCI4OTQ1NzMxODIxOTg1NDU0MTcwNDA5MjQ2MjA4MDUxMzYwMzcxNzQ0NjUxOTYwNjg2MjQ5Njg1NjExMDI0NzQ4MjQ5MDk2NjUyNDAwIiwiMSJdLCJwaV9iIjpbWyIxNjE3NzgwNjczNzQ1MTg2MDY3NDk3NTAxNjI1MjExODM3NDU0NDU5NjE5NzcxMDAyNjYzMjAxMTg2MTg4OTM4NDkxMDc3MTU5ODUwIiwiMTAzODU2MDMyMjQzMDc2MDQxMjM5NjI2NzAyMzA3NDcxNDM2NDc2ODAxOTAwNTQzNzU3OTE5NjAxNjYwMTY2NzMyNTcwNjE5ODExNjgiXSxbIjYyMTE1NjA5NTUzMTE1NzgxNDcwMzEzMjAzMTE1MzAyODM5MzgwMDY5MTIyMjAwMTUwODM1MTIxODg2MDI5MzU0MjA4Mjk5MjY1NCIsIjEzODUwMDYzMTA5ODg2MTE3MDcwNzgzMzIxNDk1ODI4MzQ2MTg3ODQ3OTM3OTIyMDMyNTI2NzU3MTU2MDg0MjUzMTU4NTc0NjgyMTYyIl0sWyIxIiwiMCJdXSwicGlfYyI6WyIxMDE0MTM1NTQwNTE1MDg5MzQ1MjY3NTUwMTE4Mjk4MTY1MzY5NDI1MzM0MzMyMjAyNzM1OTgwNTU0NzYxODgyODE4NjU3NDU5MTA4IiwiNDkzMjY5MjI2OTcyOTIyNDQ4NjI1MDI0MDAyMjI4NTQ4NzE1MjYzNTkwNjAzMzA1ODYwNjgwMjI2Nzg4Nzg5NjE2MTU2NTM4MzYiLCIxIl19"
testProof, err := base64.StdEncoding.DecodeString(testProofB64)
require.NoError(t, err)

zkAuthSig := types.ZKAuthSignature{
ZkAuthInputs: &types.ZKAuthInputs{
ProofPoints: testProof,
IssBase64: "aHR0cHM6Ly9hY2NvdW50cy5nb29nbGUuY29t",
HeaderBase64: "eyJhbGciOiJSUzI1NiIsImtpZCI6ImFkZjVlNzEwZWRmZWJlY2JlZmE5YTYxNDk1NjU0ZDAzYzBiOGVkZjgiLCJ0eXAiOiJKV1QifQ",
AddressSeed: "16929294337693897740349056748881744503581363933815798702166939594477679063350",
},
MaxBlockHeight: 104,
}

msgs := types.NewMsgExecution([]sdk.Msg{&bankMsg}, zkAuthSig)

Expand Down
Loading