fix validatePlaceLimitOrderV2 and rename trader to sender in validate…

…CancelLimitOrderV2 and validatePlaceLimitOrderV2
hubble-exchange · Aug 31, 2023 · e2c911b · e2c911b
1 parent c73dfcf
commit e2c911b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/precompile/contracts/bibliophile/client.go b/precompile/contracts/bibliophile/client.go
@@ -21,7 +21,7 @@ type BibliophileClient interface {
 	GetLongOpenOrdersAmount(trader common.Address, ammIndex *big.Int) *big.Int
 	GetShortOpenOrdersAmount(trader common.Address, ammIndex *big.Int) *big.Int
 	GetReduceOnlyAmount(trader common.Address, ammIndex *big.Int) *big.Int
-	IsTradingAuthority(senderOrSigner, trader common.Address) bool
+	IsTradingAuthority(trader, senderOrSigner common.Address) bool
 	// Limit Order
 	GetBlockPlaced(orderHash [32]byte) *big.Int
 	GetOrderFilledAmount(orderHash [32]byte) *big.Int

diff --git a/precompile/contracts/juror/logic.go b/precompile/contracts/juror/logic.go
@@ -508,9 +508,10 @@ func ValidateCancelLimitOrderV2(bibliophile b.BibliophileClient, inputStruct *Va
 	}
 }
 
-func validateCancelLimitOrderV2(bibliophile b.BibliophileClient, order ILimitOrderBookOrderV2, trader common.Address, assertLowMargin bool) (errorString string, orderHash [32]byte, ammAddress common.Address, unfilledAmount *big.Int) {
+func validateCancelLimitOrderV2(bibliophile b.BibliophileClient, order ILimitOrderBookOrderV2, sender common.Address, assertLowMargin bool) (errorString string, orderHash [32]byte, ammAddress common.Address, unfilledAmount *big.Int) {
 	unfilledAmount = big.NewInt(0)
-	if order.Trader != trader && !bibliophile.IsTradingAuthority(order.Trader, trader) {
+	trader := order.Trader
+	if trader != sender && !bibliophile.IsTradingAuthority(trader, sender) {
 		errorString = ErrNoTradingAuthority.Error()
 		return
 	}
@@ -552,14 +553,15 @@ func ValidatePlaceLimitOrderV2(bibliophile b.BibliophileClient, order ILimitOrde
 	}
 }
 
-func validatePlaceLimitOrderV2(bibliophile b.BibliophileClient, order ILimitOrderBookOrderV2, trader common.Address) (errorString string, orderHash [32]byte, ammAddress common.Address, reserveAmount *big.Int) {
+func validatePlaceLimitOrderV2(bibliophile b.BibliophileClient, order ILimitOrderBookOrderV2, sender common.Address) (errorString string, orderHash [32]byte, ammAddress common.Address, reserveAmount *big.Int) {
 	reserveAmount = big.NewInt(0)
 	orderHash, err := GetLimitOrderV2Hash(&order)
 	if err != nil {
 		errorString = err.Error()
 		return
 	}
-	if order.Trader != trader && !bibliophile.IsTradingAuthority(order.Trader, trader) {
+	trader := order.Trader
+	if trader != sender && !bibliophile.IsTradingAuthority(trader, sender) {
 		errorString = ErrNoTradingAuthority.Error()
 		return
 	}