[types] LedgerInfoWithSigs, ValidatorSet, TxnPayloadScript update

Author: the729

client/query_ledger.go

@@ -39,11 +39,14 @@ func (c *Client) verifyLedgerInfoAndConsistency(
 ) (*types.ProvenLedgerInfo, error) {
 
 	li := &types.LedgerInfoWithSignatures{}
-	li.FromProto(resp.LedgerInfoWithSigs)
+	if err := li.FromProto(resp.LedgerInfoWithSigs); err != nil {
+		return nil, fmt.Errorf("unmarshal ledgerInfoWithSigs error: %v", err)
+	}
+	li0 := li.Value.(*types.LedgerInfoWithSignaturesV0)
 
 	verifier := c.verifier
 	lastWaypoint := ""
-	if verifier.EpochChangeVerificationRequired(li.Epoch) {
+	if verifier.EpochChangeVerificationRequired(li0.Epoch) {
 		vcp := &types.ValidatorChangeProof{}
 		if err := vcp.FromProto(resp.ValidatorChangeProof); err != nil {
 			return nil, fmt.Errorf("validator change proof invalid: %v", err)
@@ -70,7 +73,7 @@ func (c *Client) verifyLedgerInfoAndConsistency(
 		lastWaypointB, _ := (&types.Waypoint{}).FromProvenLedgerInfo(pli).MarshalText()
 		lastWaypoint = string(lastWaypointB)
 	}
-	pli, err := li.Verify(verifier)
+	pli, err := li0.Verify(verifier)
 	if err != nil {
 		return nil, fmt.Errorf("ledger info verification failed: %v", err)
 	}

client/state.go

@@ -30,11 +30,12 @@ func (h HashValue) MarshalText() (text []byte, err error) {
 
 // State represents the state of a client.
 type State struct {
-	Waypoint     string             `toml:"waypoint" json:"waypoint"`
-	ValidatorSet types.ValidatorSet `toml:"validator_set" json:"validator_set,omitempty"`
-	Epoch        uint64             `toml:"epoch" json:"epoch"`
-	KnownVersion uint64             `toml:"known_version" json:"known_version"`
-	Subtrees     []HashValue        `toml:"subtrees" json:"subtrees"`
+	Waypoint     string                 `toml:"waypoint" json:"waypoint"`
+	VSScheme     string                 `toml:"validator_set_scheme" json:"validator_set_scheme,omitempty"`
+	ValidatorSet []*types.ValidatorInfo `toml:"validator_set" json:"validator_set,omitempty"`
+	Epoch        uint64                 `toml:"epoch" json:"epoch"`
+	KnownVersion uint64                 `toml:"known_version" json:"known_version"`
+	Subtrees     []HashValue            `toml:"subtrees" json:"subtrees"`
 }
 
 // GetState returns the current state of a client.
@@ -45,7 +46,13 @@ func (c *Client) GetState() *State {
 	cs := &State{}
 	cs.Waypoint = c.lastWaypoint
 	if vv, ok := c.verifier.(*types.ValidatorVerifier); ok {
-		cs.ValidatorSet, cs.Epoch = vv.ToValidatorSet()
+		var vs *types.ValidatorSet
+		vs, cs.Epoch = vv.ToValidatorSet()
+		cs.ValidatorSet = vs.Payload
+		switch vs.Scheme.(type) {
+		case types.SchemeED25519:
+			cs.VSScheme = "ed25519"
+		}
 	}
 	cs.KnownVersion = c.acc.NumLeaves - 1
 	cs.Subtrees = cloneSubtrees2(c.acc.FrozenSubtreeRoots)
@@ -56,9 +63,16 @@ func (c *Client) GetState() *State {
 // SetState restores a client to a given state.
 func (c *Client) SetState(cs *State) error {
 	var verifier types.LedgerInfoVerifier
-	if len(cs.ValidatorSet) > 0 {
+	if cs.ValidatorSet != nil {
 		vv := &types.ValidatorVerifier{}
-		if err := vv.FromValidatorSet(cs.ValidatorSet, cs.Epoch); err != nil {
+		vs := &types.ValidatorSet{
+			Payload: cs.ValidatorSet,
+		}
+		switch cs.VSScheme {
+		case "ed25519":
+			vs.Scheme = types.SchemeED25519{}
+		}
+		if err := vv.FromValidatorSet(vs, cs.Epoch); err != nil {
 			return fmt.Errorf("restore validator set error: %v", err)
 		}
 		verifier = vv

client/transfer.go

@@ -25,7 +25,8 @@ func NewRawP2PTransaction(
 		Sender:         senderAddress,
 		SequenceNumber: senderSequenceNumber,
 		Payload: &types.TxnPayloadScript{
-			Code: stdscript.PeerToPeerTransfer,
+			Code:   stdscript.PeerToPeerTransfer,
+			TyArgs: []*types.TypeTag{types.LBRTypeTag()},
 			Args: []types.TransactionArgument{
 				types.TxnArgAddress(receiverAddress),
 				types.TxnArgBytes(receiverAuthKeyPrefix),

go.mod

@@ -6,7 +6,7 @@ require (
 	github.com/BurntSushi/toml v0.3.1
 	github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/golang/protobuf v1.3.2
+	github.com/golang/protobuf v1.3.5
 	github.com/gopherjs/gopherjs v0.0.0-20191106031601-ce3c9ade29de
 	github.com/johanbrandhorst/protobuf v0.7.1
 	github.com/kr/pretty v0.1.0 // indirect
@@ -18,10 +18,10 @@ require (
 	github.com/the729/lcs v0.1.4
 	github.com/urfave/cli v1.22.1
 	golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392
-	golang.org/x/net v0.0.0-20190923162816-aa69164e4478 // indirect
-	golang.org/x/sys v0.0.0-20190924135425-2f72d4f06240 // indirect
+	golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e // indirect
+	golang.org/x/sys v0.0.0-20200409092240-59c9f1ba88fa // indirect
 	golang.org/x/text v0.3.2 // indirect
-	google.golang.org/genproto v0.0.0-20190916214212-f660b8655731 // indirect
-	google.golang.org/grpc v1.23.1
+	google.golang.org/genproto v0.0.0-20200410110633-0848e9f44c36 // indirect
+	google.golang.org/grpc v1.28.1
 	gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
 )

go.sum

@@ -1,13 +1,19 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
+github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
 github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
 github.com/cpuguy83/go-md2man/v2 v2.0.0 h1:EoUDS0afbrsXAZ9YQ9jdu/mZ2sXgT1/2yyNng4PGlyM=
 github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
+github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
+github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
+github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58=
@@ -16,6 +22,10 @@ github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfb
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs=
 github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.3 h1:gyjaxf+svBWX08ZjK86iN9geUJF0H6gp2IRKX6Nf6/I=
+github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
+github.com/golang/protobuf v1.3.5 h1:F768QJ1E9tib+q5Sc8MkdJi1RxLTbRcTf8LJV56aRls=
+github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
 github.com/gopherjs/gopherjs v0.0.0-20191106031601-ce3c9ade29de h1:F7WD09S8QB4LrkEpka0dFPLSotH11HRpCsLIbIcJ7sU=
@@ -40,6 +50,7 @@ github.com/onsi/gomega v1.7.1 h1:K0jcRCwNQM3vFGh1ppMtDh/+7ApJrjldlX8fA0jDTLQ=
 github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q=
 github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo=
@@ -71,6 +82,8 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3 h1:0GoQqolDA55aaLxZyTzK/Y2eP
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190923162816-aa69164e4478 h1:l5EDrHhldLYb3ZRHDUhXF7Om7MvYXnkV9/iQNo1lX6g=
 golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e h1:3G+cUijn7XD+S4eJFddp53Pv7+slrESplyjG25HgL+k=
+golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -81,6 +94,9 @@ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5h
 golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190924135425-2f72d4f06240 h1:iLpJnvIAms/C7g3q9Gqq14Nuo4BOdygHa5TfyO3MzEE=
 golang.org/x/sys v0.0.0-20190924135425-2f72d4f06240/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200409092240-59c9f1ba88fa h1:mQTN3ECqfsViCNBgq+A40vdwhkGykrrQlYe3mPj6BoU=
+golang.org/x/sys v0.0.0-20200409092240-59c9f1ba88fa/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
@@ -95,11 +111,19 @@ google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9Ywl
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8 h1:Nw54tB0rB7hY/N0NQvRW8DG4Yk3Q6T9cu9RcFQDu1tc=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
+google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20190916214212-f660b8655731 h1:Phvl0+G5t5k/EUFUi0wPdUUeTL2HydMQUXHnunWgSb0=
 google.golang.org/genproto v0.0.0-20190916214212-f660b8655731/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8=
+google.golang.org/genproto v0.0.0-20200410110633-0848e9f44c36 h1:QGM8iDIfHwTRMruKa7+aKDNRMQcWKeS6LDhdMiucYCE=
+google.golang.org/genproto v0.0.0-20200410110633-0848e9f44c36/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
+google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.23.1 h1:q4XQuHFC6I28BKZpo6IYyb3mNO+l7lSOxRuYTCiDfXk=
 google.golang.org/grpc v1.23.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
+google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
+google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/grpc v1.28.1 h1:C1QC6KzgSiLyBabDi87BbjaGreoRgGUF5nOyvfrAZ1k=
+google.golang.org/grpc v1.28.1/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

types/ledger_info.go

@@ -1,7 +1,6 @@
 package types
 
 import (
-	"encoding/hex"
 	"errors"
 	"fmt"
 
@@ -19,17 +18,38 @@ type LedgerInfo struct {
 	TransactionAccumulatorHash []byte
 	Version                    uint64
 	TimestampUsec              uint64
-	NextValidatorSet           ValidatorSet `lcs:"optional"`
+	NextValidatorSet           *ValidatorSet `lcs:"optional"`
 	ConsensusDataHash          []byte
 }
 
-// LedgerInfoWithSignatures is a ledger info with signature from trusted
-// validators.
 type LedgerInfoWithSignatures struct {
+	Value isLedgerInfoWithSignatures `lcs:"enum=isLedgerInfoWithSignatures"`
+}
+
+type isLedgerInfoWithSignatures interface {
+	isLedgerInfoWithSignatures()
+}
+
+// LedgerInfoWithSignaturesV0 is a ledger info with signature from trusted
+// validators.
+type LedgerInfoWithSignaturesV0 struct {
 	*LedgerInfo
-	Sigs map[string]HashValue
+	Sigs map[AccountAddress]HashValue
+}
+
+func (*LedgerInfoWithSignaturesV0) isLedgerInfoWithSignatures() {}
+
+var ledgerInfoWSigsEnumDef = []lcs.EnumVariant{
+	{
+		Name:     "isLedgerInfoWithSignatures",
+		Value:    0,
+		Template: (*LedgerInfoWithSignaturesV0)(nil),
+	},
 }
 
+// EnumTypes defines enum variants for lcs
+func (*LedgerInfoWithSignatures) EnumTypes() []lcs.EnumVariant { return ledgerInfoWSigsEnumDef }
+
 // ProvenLedgerInfo is a ledger info proven to be history state of the ledger.
 type ProvenLedgerInfo struct {
 	proven     bool
@@ -73,30 +93,20 @@ func (l *LedgerInfo) Clone() *LedgerInfo {
 		TransactionAccumulatorHash: cloneBytes(l.TransactionAccumulatorHash),
 		Version:                    l.Version,
 		TimestampUsec:              l.TimestampUsec,
+		NextValidatorSet:           l.NextValidatorSet.Clone(),
 		ConsensusDataHash:          cloneBytes(l.ConsensusDataHash),
 	}
-	for _, v := range l.NextValidatorSet {
-		out.NextValidatorSet = append(out.NextValidatorSet, v.Clone())
-	}
 	return out
 }
 
 // FromProto parses a protobuf struct into this struct.
 func (l *LedgerInfoWithSignatures) FromProto(pb *pbtypes.LedgerInfoWithSignatures) error {
-	l.LedgerInfo = &LedgerInfo{}
-	l.LedgerInfo.FromProto(pb.LedgerInfo)
-
-	sigs := make(map[string]HashValue)
-	for _, s := range pb.Signatures {
-		sigs[hex.EncodeToString(s.ValidatorId)] = s.Signature
-	}
-	l.Sigs = sigs
-	return nil
+	return lcs.Unmarshal(pb.Bytes, l)
 }
 
 // Verify the ledger info with a consensus verifier and output a ProvenLedgerInfo.
-func (l *LedgerInfoWithSignatures) Verify(v LedgerInfoVerifier) (*ProvenLedgerInfo, error) {
-	if err := v.Verify(l); err != nil {
+func (l *LedgerInfoWithSignaturesV0) Verify(v LedgerInfoVerifier) (*ProvenLedgerInfo, error) {
+	if err := v.Verify(&LedgerInfoWithSignatures{l}); err != nil {
 		return nil, err
 	}
 	return &ProvenLedgerInfo{
@@ -143,7 +153,7 @@ func (pl *ProvenLedgerInfo) ToVerifier() (LedgerInfoVerifier, error) {
 	if !pl.proven {
 		panic("not valid proven ledger info")
 	}
-	if len(pl.ledgerInfo.NextValidatorSet) == 0 {
+	if pl.ledgerInfo.NextValidatorSet == nil {
 		return nil, errors.New("empty validator set")
 	}
 	vv := &ValidatorVerifier{}

types/raw_transaction.go

@@ -148,7 +148,6 @@ func (v *WriteOpWithPath) Clone() *WriteOpWithPath {
 
 // TransactionPayload is the enum type of transaction payload
 type TransactionPayload interface {
-	isTransactionPayload()
 	Clone() TransactionPayload
 }
 
@@ -173,8 +172,9 @@ func (v *TxnPayloadWriteSet) Clone() TransactionPayload {
 
 // TxnPayloadScript is variant of TransactionPayload
 type TxnPayloadScript struct {
-	Code []byte
-	Args []TransactionArgument `lcs:"enum=TransactionArgument"`
+	Code   []byte
+	TyArgs []*TypeTag
+	Args   []TransactionArgument `lcs:"enum=TransactionArgument"`
 }
 
 // EnumTypes defines enum variants for lcs
@@ -196,10 +196,6 @@ type TxnPayloadModule []byte
 // Clone the transaction payload
 func (v TxnPayloadModule) Clone() TransactionPayload { return TxnPayloadModule(cloneBytes(v)) }
 
-func (*TxnPayloadWriteSet) isTransactionPayload() {}
-func (*TxnPayloadScript) isTransactionPayload()   {}
-func (TxnPayloadModule) isTransactionPayload()    {}
-
 // EnumTypes defines enum variants for lcs
 func (*RawTransaction) EnumTypes() []lcs.EnumVariant {
 	return []lcs.EnumVariant{

types/txn_authenticator.go

@@ -3,7 +3,6 @@ package types
 import "github.com/the729/lcs"
 
 type TxnAuthenticator interface {
-	isTxnAuthenticator()
 	Clone() TxnAuthenticator
 }
 
@@ -19,8 +18,6 @@ type ED25519Authenticator struct {
 
 // }
 
-func (*ED25519Authenticator) isTxnAuthenticator() {}
-
 // Clone the TxnAuthenticator
 func (v *ED25519Authenticator) Clone() TxnAuthenticator {
 	out := &ED25519Authenticator{}

types/validator_change.go

@@ -43,24 +43,26 @@ func (vcp *ValidatorChangeProof) Verify(v LedgerInfoVerifier) (*ProvenValidatorC
 	}
 	var genesisHash []byte
 	for _, li := range vcp.LedgerInfoWithSigs {
+		li0 := li.Value.(*LedgerInfoWithSignaturesV0)
 		if err := v.Verify(li); err != nil {
 			return nil, fmt.Errorf("some ledger info failed to verify: %v", err)
 		}
-		if li.Version == 0 {
-			genesisHash = li.TransactionAccumulatorHash
+		if li0.Version == 0 {
+			genesisHash = li0.TransactionAccumulatorHash
 		}
-		if li.NextValidatorSet == nil {
+		if li0.NextValidatorSet == nil {
 			return nil, errors.New("ledger info doesn't carry validator set")
 		}
 		vv := &ValidatorVerifier{}
-		if err := vv.FromValidatorSet(li.NextValidatorSet, li.Epoch+1); err != nil {
+		if err := vv.FromValidatorSet(li0.NextValidatorSet, li0.Epoch+1); err != nil {
 			return nil, fmt.Errorf("init new validator error: %v", err)
 		}
 		v = vv
 	}
+	lastLedger0 := vcp.LedgerInfoWithSigs[len(vcp.LedgerInfoWithSigs)-1].Value.(*LedgerInfoWithSignaturesV0)
 	return &ProvenValidatorChange{
 		proven:         true,
-		lastLedgerInfo: vcp.LedgerInfoWithSigs[len(vcp.LedgerInfoWithSigs)-1].LedgerInfo.Clone(),
+		lastLedgerInfo: lastLedger0.LedgerInfo.Clone(),
 		genesisHash:    cloneBytes(genesisHash),
 	}, nil
 }