api/command for encoding actor params

This commit is contained in:
Łukasz Magiera 2021-08-20 17:31:01 +02:00
parent 5bdc1862d9
commit 12875a9664
9 changed files with 188 additions and 1 deletions

View File

@ -434,6 +434,8 @@ type FullNode interface {
StateListMessages(ctx context.Context, match *MessageMatch, tsk types.TipSetKey, toht abi.ChainEpoch) ([]cid.Cid, error) //perm:read StateListMessages(ctx context.Context, match *MessageMatch, tsk types.TipSetKey, toht abi.ChainEpoch) ([]cid.Cid, error) //perm:read
// StateDecodeParams attempts to decode the provided params, based on the recipient actor address and method number. // StateDecodeParams attempts to decode the provided params, based on the recipient actor address and method number.
StateDecodeParams(ctx context.Context, toAddr address.Address, method abi.MethodNum, params []byte, tsk types.TipSetKey) (interface{}, error) //perm:read StateDecodeParams(ctx context.Context, toAddr address.Address, method abi.MethodNum, params []byte, tsk types.TipSetKey) (interface{}, error) //perm:read
// StateEncodeParams attempts to encode the provided json params to the binary from
StateEncodeParams(ctx context.Context, toActCode cid.Cid, method abi.MethodNum, params json.RawMessage) ([]byte, error) //perm:read
// StateNetworkName returns the name of the network the node is synced to // StateNetworkName returns the name of the network the node is synced to
StateNetworkName(context.Context) (dtypes.NetworkName, error) //perm:read StateNetworkName(context.Context) (dtypes.NetworkName, error) //perm:read

View File

@ -6,6 +6,7 @@ package mocks
import ( import (
context "context" context "context"
json "encoding/json"
reflect "reflect" reflect "reflect"
address "github.com/filecoin-project/go-address" address "github.com/filecoin-project/go-address"
@ -2244,6 +2245,21 @@ func (mr *MockFullNodeMockRecorder) StateDecodeParams(arg0, arg1, arg2, arg3, ar
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "StateDecodeParams", reflect.TypeOf((*MockFullNode)(nil).StateDecodeParams), arg0, arg1, arg2, arg3, arg4) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "StateDecodeParams", reflect.TypeOf((*MockFullNode)(nil).StateDecodeParams), arg0, arg1, arg2, arg3, arg4)
} }
// StateEncodeParams mocks base method.
func (m *MockFullNode) StateEncodeParams(arg0 context.Context, arg1 cid.Cid, arg2 abi.MethodNum, arg3 json.RawMessage) ([]byte, error) {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "StateEncodeParams", arg0, arg1, arg2, arg3)
ret0, _ := ret[0].([]byte)
ret1, _ := ret[1].(error)
return ret0, ret1
}
// StateEncodeParams indicates an expected call of StateEncodeParams.
func (mr *MockFullNodeMockRecorder) StateEncodeParams(arg0, arg1, arg2, arg3 interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "StateEncodeParams", reflect.TypeOf((*MockFullNode)(nil).StateEncodeParams), arg0, arg1, arg2, arg3)
}
// StateGetActor mocks base method. // StateGetActor mocks base method.
func (m *MockFullNode) StateGetActor(arg0 context.Context, arg1 address.Address, arg2 types.TipSetKey) (*types.Actor, error) { func (m *MockFullNode) StateGetActor(arg0 context.Context, arg1 address.Address, arg2 types.TipSetKey) (*types.Actor, error) {
m.ctrl.T.Helper() m.ctrl.T.Helper()

View File

@ -4,6 +4,7 @@ package api
import ( import (
"context" "context"
"encoding/json"
"time" "time"
"github.com/filecoin-project/go-address" "github.com/filecoin-project/go-address"
@ -342,6 +343,8 @@ type FullNodeStruct struct {
StateDecodeParams func(p0 context.Context, p1 address.Address, p2 abi.MethodNum, p3 []byte, p4 types.TipSetKey) (interface{}, error) `perm:"read"` StateDecodeParams func(p0 context.Context, p1 address.Address, p2 abi.MethodNum, p3 []byte, p4 types.TipSetKey) (interface{}, error) `perm:"read"`
StateEncodeParams func(p0 context.Context, p1 cid.Cid, p2 abi.MethodNum, p3 json.RawMessage) ([]byte, error) `perm:"read"`
StateGetActor func(p0 context.Context, p1 address.Address, p2 types.TipSetKey) (*types.Actor, error) `perm:"read"` StateGetActor func(p0 context.Context, p1 address.Address, p2 types.TipSetKey) (*types.Actor, error) `perm:"read"`
StateListActors func(p0 context.Context, p1 types.TipSetKey) ([]address.Address, error) `perm:"read"` StateListActors func(p0 context.Context, p1 types.TipSetKey) ([]address.Address, error) `perm:"read"`
@ -2340,6 +2343,17 @@ func (s *FullNodeStub) StateDecodeParams(p0 context.Context, p1 address.Address,
return nil, ErrNotSupported return nil, ErrNotSupported
} }
func (s *FullNodeStruct) StateEncodeParams(p0 context.Context, p1 cid.Cid, p2 abi.MethodNum, p3 json.RawMessage) ([]byte, error) {
if s.Internal.StateEncodeParams == nil {
return *new([]byte), ErrNotSupported
}
return s.Internal.StateEncodeParams(p0, p1, p2, p3)
}
func (s *FullNodeStub) StateEncodeParams(p0 context.Context, p1 cid.Cid, p2 abi.MethodNum, p3 json.RawMessage) ([]byte, error) {
return *new([]byte), ErrNotSupported
}
func (s *FullNodeStruct) StateGetActor(p0 context.Context, p1 address.Address, p2 types.TipSetKey) (*types.Actor, error) { func (s *FullNodeStruct) StateGetActor(p0 context.Context, p1 address.Address, p2 types.TipSetKey) (*types.Actor, error) {
if s.Internal.StateGetActor == nil { if s.Internal.StateGetActor == nil {
return nil, ErrNotSupported return nil, ErrNotSupported

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -14,6 +14,7 @@ import (
"golang.org/x/xerrors" "golang.org/x/xerrors"
"github.com/filecoin-project/go-address" "github.com/filecoin-project/go-address"
"github.com/filecoin-project/go-state-types/abi"
"github.com/filecoin-project/go-state-types/big" "github.com/filecoin-project/go-state-types/big"
"github.com/filecoin-project/lotus/chain/stmgr" "github.com/filecoin-project/lotus/chain/stmgr"
@ -23,7 +24,11 @@ import (
) )
var msgCmd = &cli.Command{ var msgCmd = &cli.Command{
Name: "msg", Name: "msg",
Subcommands: []*cli.Command{
msgParamsCmd,
msgActorParamsCmd,
},
Usage: "Translate message between various formats", Usage: "Translate message between various formats",
ArgsUsage: "Message in any form", ArgsUsage: "Message in any form",
Action: func(cctx *cli.Context) error { Action: func(cctx *cli.Context) error {
@ -278,3 +283,113 @@ func messageFromCID(cctx *cli.Context, c cid.Cid) (types.ChainMsg, error) {
return messageFromBytes(cctx, msgb) return messageFromBytes(cctx, msgb)
} }
var msgParamsCmd = &cli.Command{
Name: "encode-params",
Usage: "convert json params to binary (for given dest address)",
ArgsUsage: "[json params]",
Flags: []cli.Flag{
&cli.StringFlag{
Name: "to",
Usage: "dest address",
Required: true,
},
&cli.Int64Flag{
Name: "method",
Aliases: []string{"m"},
Usage: "method number",
Required: true,
},
&cli.StringFlag{
Name: "encoding",
Aliases: []string{"e"},
Usage: "out encoding (b64, hex)",
Value: "b64",
},
},
Action: func(cctx *cli.Context) error {
svc, err := lcli.GetFullNodeServices(cctx)
if err != nil {
return err
}
defer svc.Close() // nolint
ctx := lcli.ReqContext(cctx)
to, err := address.NewFromString(cctx.String("to"))
if err != nil {
return xerrors.Errorf("parsing to addr: %w", err)
}
p, err := svc.DecodeTypedParamsFromJSON(ctx, to, abi.MethodNum(cctx.Int64("method")), cctx.Args().First())
if err != nil {
return xerrors.Errorf("decoding json params: %w", err)
}
switch cctx.String("encoding") {
case "b64":
fmt.Println(base64.StdEncoding.EncodeToString(p))
case "hex":
fmt.Println(hex.EncodeToString(p))
default:
return xerrors.Errorf("unknown encoding")
}
return nil
},
}
var msgActorParamsCmd = &cli.Command{
Name: "encode-params-code",
Usage: "convert json params to binary (for given actor code)",
ArgsUsage: "[json params]",
Flags: []cli.Flag{
&cli.StringFlag{
Name: "to",
Usage: "dest actor code cid",
Required: true,
},
&cli.Int64Flag{
Name: "method",
Aliases: []string{"m"},
Usage: "method number",
Required: true,
},
&cli.StringFlag{
Name: "encoding",
Aliases: []string{"e"},
Usage: "out encoding (b64, hex)",
Value: "b64",
},
},
Action: func(cctx *cli.Context) error {
api, done, err := lcli.GetFullNodeAPIV1(cctx)
if err != nil {
return err
}
defer done()
ctx := lcli.ReqContext(cctx)
to, err := cid.Parse(cctx.String("to"))
if err != nil {
return xerrors.Errorf("parsing to addr: %w", err)
}
p, err := api.StateEncodeParams(ctx, to, abi.MethodNum(cctx.Int64("method")), json.RawMessage(cctx.Args().First()))
if err != nil {
return xerrors.Errorf("decoding json params: %w", err)
}
switch cctx.String("encoding") {
case "b64":
fmt.Println(base64.StdEncoding.EncodeToString(p))
case "hex":
fmt.Println(hex.EncodeToString(p))
default:
return xerrors.Errorf("unknown encoding")
}
return nil
},
}

View File

@ -164,6 +164,7 @@
* [StateCompute](#StateCompute) * [StateCompute](#StateCompute)
* [StateDealProviderCollateralBounds](#StateDealProviderCollateralBounds) * [StateDealProviderCollateralBounds](#StateDealProviderCollateralBounds)
* [StateDecodeParams](#StateDecodeParams) * [StateDecodeParams](#StateDecodeParams)
* [StateEncodeParams](#StateEncodeParams)
* [StateGetActor](#StateGetActor) * [StateGetActor](#StateGetActor)
* [StateListActors](#StateListActors) * [StateListActors](#StateListActors)
* [StateListMessages](#StateListMessages) * [StateListMessages](#StateListMessages)
@ -4184,6 +4185,25 @@ Inputs:
Response: `{}` Response: `{}`
### StateEncodeParams
StateEncodeParams attempts to encode the provided json params to the binary from
Perms: read
Inputs:
```json
[
{
"/": "bafy2bzacea3wsdh6y3a36tb3skempjoxqpuyompjbmfeyf34fi3uy6uue42v4"
},
1,
null
]
```
Response: `"Ynl0ZSBhcnJheQ=="`
### StateGetActor ### StateGetActor
StateGetActor returns the indicated actor's nonce and balance. StateGetActor returns the indicated actor's nonce and balance.

View File

@ -3,8 +3,10 @@ package full
import ( import (
"bytes" "bytes"
"context" "context"
"encoding/json"
"strconv" "strconv"
"github.com/filecoin-project/go-state-types/cbor"
cid "github.com/ipfs/go-cid" cid "github.com/ipfs/go-cid"
"go.uber.org/fx" "go.uber.org/fx"
"golang.org/x/xerrors" "golang.org/x/xerrors"
@ -497,6 +499,24 @@ func (a *StateAPI) StateDecodeParams(ctx context.Context, toAddr address.Address
return paramType, nil return paramType, nil
} }
func (a *StateAPI) StateEncodeParams(ctx context.Context, toActCode cid.Cid, method abi.MethodNum, params json.RawMessage) ([]byte, error) {
paramType, err := stmgr.GetParamType(toActCode, method)
if err != nil {
return nil, xerrors.Errorf("getting params type: %w", err)
}
if err := json.Unmarshal(params, &paramType); err != nil {
return nil, xerrors.Errorf("json unmarshal: %w", err)
}
var cbb bytes.Buffer
if err := paramType.(cbor.Marshaler).MarshalCBOR(&cbb); err != nil {
return nil, xerrors.Errorf("cbor marshal: %w", err)
}
return cbb.Bytes(), nil
}
// This is on StateAPI because miner.Miner requires this, and MinerAPI requires miner.Miner // This is on StateAPI because miner.Miner requires this, and MinerAPI requires miner.Miner
func (a *StateAPI) MinerGetBaseInfo(ctx context.Context, maddr address.Address, epoch abi.ChainEpoch, tsk types.TipSetKey) (*api.MiningBaseInfo, error) { func (a *StateAPI) MinerGetBaseInfo(ctx context.Context, maddr address.Address, epoch abi.ChainEpoch, tsk types.TipSetKey) (*api.MiningBaseInfo, error) {
// XXX: Gets the state by computing the tipset state, instead of looking at the parent. // XXX: Gets the state by computing the tipset state, instead of looking at the parent.