@@ -15,7 +15,7 @@ import (
1515 ethcommon "github.com/ethereum/go-ethereum/common"
1616 "github.com/ethereum/go-ethereum/crypto"
1717 "github.com/livepeer/node/eth"
18- "github.com/livepeer/node/signercompat "
18+ "github.com/livepeer/node/pm/wire "
1919)
2020
2121type ChainSnapshot = eth.ChainSnapshot
@@ -94,10 +94,10 @@ func (e *Engine) MakeChallenge(ctx context.Context, runner, manifest string, sen
9494 return Challenge {}, err
9595 }
9696 randHash := crypto .Keccak256Hash (random )
97- info := signercompat .OrchestratorInfo {Transcoder : service , Address : e .recipient .Bytes (), Price : signercompat .PriceInfo {PricePerUnit : price , UnitsPerPrice : 1 },
98- TicketParams : signercompat .TicketParams {Recipient : e .recipient .Bytes (), FaceValue : e .faceValue .Bytes (), WinProb : e .winProb .Bytes (), RecipientRandHash : randHash .Bytes (), Seed : seed , ExpirationBlock : new (big.Int ).Add (snapshot .Block , big .NewInt (40 )).Bytes (), Expiration : signercompat .ExpirationParams {CreationRound : snapshot .Round .Int64 (), CreationRoundBlockHash : snapshot .RoundHash .Bytes ()}},
99- Auth : signercompat .AuthToken {Token : token , SessionID : manifest , Expiration : time .Now ().Add (time .Hour ).Unix ()}}
100- encoded := signercompat .EncodeOrchestratorInfo (info )
97+ info := wire .OrchestratorInfo {Transcoder : service , Address : e .recipient .Bytes (), Price : wire .PriceInfo {PricePerUnit : price , UnitsPerPrice : 1 },
98+ TicketParams : wire .TicketParams {Recipient : e .recipient .Bytes (), FaceValue : e .faceValue .Bytes (), WinProb : e .winProb .Bytes (), RecipientRandHash : randHash .Bytes (), Seed : seed , ExpirationBlock : new (big.Int ).Add (snapshot .Block , big .NewInt (40 )).Bytes (), Expiration : wire .ExpirationParams {CreationRound : snapshot .Round .Int64 (), CreationRoundBlockHash : snapshot .RoundHash .Bytes ()}},
99+ Auth : wire .AuthToken {Token : token , SessionID : manifest , Expiration : time .Now ().Add (time .Hour ).Unix ()}}
100+ encoded := wire .EncodeOrchestratorInfo (info )
101101 e .mu .Lock ()
102102 defer e .mu .Unlock ()
103103 tx , err := e .store .db .BeginTx (ctx , nil )
@@ -125,20 +125,20 @@ func (e *Engine) MakeChallenge(ctx context.Context, runner, manifest string, sen
125125 return Challenge {PaymentParams : base64 .StdEncoding .EncodeToString (encoded ), Orchestrator : service , ManifestID : manifest , PaymentURL : service + "/apps/" + runner + "/session/" + manifest + "/payment" }, nil
126126}
127127
128- func (e * Engine ) ChallengeInfo (manifest string ) (signercompat .OrchestratorInfo , error ) {
128+ func (e * Engine ) ChallengeInfo (manifest string ) (wire .OrchestratorInfo , error ) {
129129 var encoded []byte
130130 if err := e .store .db .QueryRow ("SELECT info FROM payment_challenges WHERE manifest=?" , manifest ).Scan (& encoded ); err != nil {
131- return signercompat .OrchestratorInfo {}, err
131+ return wire .OrchestratorInfo {}, err
132132 }
133- return signercompat .DecodeOrchestratorInfo (encoded )
133+ return wire .DecodeOrchestratorInfo (encoded )
134134}
135135
136136func (e * Engine ) ChallengeForManifest (runner , manifest , service string ) (Challenge , error ) {
137137 info , err := e .ChallengeInfo (manifest )
138138 if err != nil {
139139 return Challenge {}, err
140140 }
141- return Challenge {PaymentParams : base64 .StdEncoding .EncodeToString (signercompat .EncodeOrchestratorInfo (info )), Orchestrator : service , ManifestID : manifest , PaymentURL : service + "/apps/" + runner + "/session/" + manifest + "/payment" }, nil
141+ return Challenge {PaymentParams : base64 .StdEncoding .EncodeToString (wire .EncodeOrchestratorInfo (info )), Orchestrator : service , ManifestID : manifest , PaymentURL : service + "/apps/" + runner + "/session/" + manifest + "/payment" }, nil
142142}
143143
144144func (e * Engine ) RefreshChallenge (ctx context.Context , manifest string , sender ethcommon.Address , service string ) (Challenge , error ) {
@@ -150,7 +150,7 @@ func (e *Engine) RefreshChallenge(ctx context.Context, manifest string, sender e
150150 if sender .Hex () != senderString {
151151 return Challenge {}, ErrInvalidPayment
152152 }
153- info , err := signercompat .DecodeOrchestratorInfo (encoded )
153+ info , err := wire .DecodeOrchestratorInfo (encoded )
154154 if err != nil {
155155 return Challenge {}, err
156156 }
@@ -162,7 +162,7 @@ func ManifestFromSegment(header string) (string, error) {
162162 if err != nil {
163163 return "" , ErrInvalidPayment
164164 }
165- segment , err := signercompat .DecodeSegData (data )
165+ segment , err := wire .DecodeSegData (data )
166166 if err != nil || segment .Auth .SessionID == "" || string (segment .ManifestID ) != segment .Auth .SessionID {
167167 return "" , ErrInvalidPayment
168168 }
@@ -174,22 +174,22 @@ var ErrInsufficientBalance = errors.New("insufficient payment balance")
174174var ErrMissingChallenge = errors .New ("payment challenge not found" )
175175var ErrFixedAlreadyCharged = errors .New ("fixed-price session already charged" )
176176
177- func decodeHeaders (paymentHeader , segmentHeader string ) (signercompat .Payment , signercompat .SegData , error ) {
177+ func decodeHeaders (paymentHeader , segmentHeader string ) (wire .Payment , wire .SegData , error ) {
178178 paymentBytes , err := base64 .StdEncoding .DecodeString (paymentHeader )
179179 if err != nil {
180- return signercompat .Payment {}, signercompat .SegData {}, ErrInvalidPayment
180+ return wire .Payment {}, wire .SegData {}, ErrInvalidPayment
181181 }
182182 segmentBytes , err := base64 .StdEncoding .DecodeString (segmentHeader )
183183 if err != nil {
184- return signercompat .Payment {}, signercompat .SegData {}, ErrInvalidPayment
184+ return wire .Payment {}, wire .SegData {}, ErrInvalidPayment
185185 }
186- payment , err := signercompat .DecodePayment (paymentBytes )
186+ payment , err := wire .DecodePayment (paymentBytes )
187187 if err != nil {
188- return signercompat .Payment {}, signercompat .SegData {}, ErrInvalidPayment
188+ return wire .Payment {}, wire .SegData {}, ErrInvalidPayment
189189 }
190- segment , err := signercompat .DecodeSegData (segmentBytes )
190+ segment , err := wire .DecodeSegData (segmentBytes )
191191 if err != nil {
192- return signercompat .Payment {}, signercompat .SegData {}, ErrInvalidPayment
192+ return wire .Payment {}, wire .SegData {}, ErrInvalidPayment
193193 }
194194 return payment , segment , nil
195195}
@@ -211,13 +211,13 @@ func (e *Engine) Receive(ctx context.Context, runner, manifest, paymentHeader, s
211211 if err != nil {
212212 return ethcommon.Address {}, nil , err
213213 }
214- info , err := signercompat .DecodeOrchestratorInfo (encoded )
214+ info , err := wire .DecodeOrchestratorInfo (encoded )
215215 if err != nil {
216216 return ethcommon.Address {}, nil , err
217217 }
218218 sender := ethcommon .BytesToAddress (payment .Sender )
219219 if storedRunner != runner || sender .Hex () != senderString || ! bytes .Equal (segment .Auth .Token , info .Auth .Token ) || segment .Auth .Expiration != info .Auth .Expiration || time .Now ().Unix () > info .Auth .Expiration ||
220- ! bytes .Equal (signercompat .EncodeTicketParams (payment .TicketParams ), signercompat .EncodeTicketParams (info .TicketParams )) ||
220+ ! bytes .Equal (wire .EncodeTicketParams (payment .TicketParams ), wire .EncodeTicketParams (info .TicketParams )) ||
221221 payment .Expiration .CreationRound != info .TicketParams .Expiration .CreationRound || ! bytes .Equal (payment .Expiration .CreationRoundBlockHash , info .TicketParams .Expiration .CreationRoundBlockHash ) ||
222222 payment .ExpectedPrice != info .Price || len (payment .SenderParams ) == 0 || len (payment .SenderParams ) > 100 {
223223 return ethcommon.Address {}, nil , ErrInvalidPayment
@@ -357,7 +357,7 @@ func (e *Engine) Charge(ctx context.Context, manifest string, now time.Time) err
357357 }
358358 return err
359359 }
360- info , err := signercompat .DecodeOrchestratorInfo (encoded )
360+ info , err := wire .DecodeOrchestratorInfo (encoded )
361361 if err != nil {
362362 return err
363363 }
@@ -428,6 +428,6 @@ func (e *Engine) ChallengePrice(runner, manifest string) (int64, string, error)
428428 if err := e .store .db .QueryRow ("SELECT info,unit FROM payment_challenges WHERE runner=? AND manifest=?" , runner , manifest ).Scan (& raw , & unit ); err != nil {
429429 return 0 , "" , err
430430 }
431- info , err := signercompat .DecodeOrchestratorInfo (raw )
431+ info , err := wire .DecodeOrchestratorInfo (raw )
432432 return info .Price .PricePerUnit , unit , err
433433}
0 commit comments