add parser for uniswapx v1

cmd/tradelogs/main.go

@@ -14,6 +14,7 @@ import (
 	"github.com/KyberNetwork/tradelogs/pkg/parser/bebop"
 	"github.com/KyberNetwork/tradelogs/pkg/parser/oneinchv6"
 	"github.com/KyberNetwork/tradelogs/pkg/parser/uniswapx"
+	uniswapxv1 "github.com/KyberNetwork/tradelogs/pkg/parser/uniswapx_v1"
 	"github.com/KyberNetwork/tradelogs/pkg/parser/zxrfqv3"
 	"github.com/KyberNetwork/tradelogs/pkg/pricefiller"
 	"github.com/KyberNetwork/tradelogs/pkg/rpcnode"
@@ -103,6 +104,7 @@ func run(c *cli.Context) error {
 		kyberswaprfq.MustNewParser(),
 		hashflowv3.MustNewParser(),
 		oneinchv6.MustNewParser(traceCalls),
+		uniswapxv1.MustNewParser(traceCalls),
 		uniswapx.MustNewParser(traceCalls),
 		bebop.MustNewParser(traceCalls),
 		zxrfqv3.MustNewParserWithDeployer(traceCalls, ethClient, common.HexToAddress(parser.Deployer0xV3)),

pkg/parser/bebop/parser.go

@@ -25,11 +25,6 @@ const (
 	OrderParam = "order"
 )
 
-var (
-	ErrTradeTopic  = errors.New("invalid trade topic")
-	ErrNotFoundLog = errors.New("not found log")
-)
-
 type SingleOrder struct {
 	Expiry         *big.Int `json:"expiry"`
 	TakerAddress   string   `json:"taker_address"`
@@ -146,7 +141,7 @@ func (p *Parser) searchTradeLog(order storage.TradeLog, traceCall types.CallFram
 		}
 	}
 	traceData, _ := json.Marshal(traceCall)
-	return order, fmt.Errorf("%w %s", ErrNotFoundLog, string(traceData))
+	return order, fmt.Errorf("%w %s", parser.ErrNotFoundTrade, string(traceData))
 }
 
 func (p *Parser) checkBebopTrade(traceCall types.CallFrame, orderHash string) bool {
@@ -253,7 +248,7 @@ func (p *Parser) UseTraceCall() bool {
 
 func (p *Parser) buildOrderByLog(log ethereumTypes.Log, blockTime uint64) (storage.TradeLog, error) {
 	if len(log.Topics) > 0 && log.Topics[0].Hex() != p.eventHash {
-		return storage.TradeLog{}, ErrTradeTopic
+		return storage.TradeLog{}, parser.ErrInvalidTopic
 	}
 	o, err := p.ps.ParseBebopOrder(log)
 	if err != nil {

pkg/parser/hashflow_v3/parser.go

@@ -21,8 +21,6 @@ const (
 	paramName  = "quote"
 )
 
-var ErrTradeTopic = errors.New("invalid Trade topic")
-
 type Parser struct {
 	abi       *abi.ABI
 	ps        *Hashflowv3Filterer
@@ -57,7 +55,7 @@ func (p *Parser) Topics() []string {
 
 func (p *Parser) Parse(log ethereumTypes.Log, blockTime uint64) (storage.TradeLog, error) {
 	if len(log.Topics) > 0 && log.Topics[0].Hex() != p.eventHash {
-		return storage.TradeLog{}, ErrTradeTopic
+		return storage.TradeLog{}, parser.ErrInvalidTopic
 	}
 	o, err := p.ps.ParseTrade(log)
 	if err != nil {

pkg/parser/kyberswap/parser.go

@@ -1,7 +1,6 @@
 package kyberswap
 
 import (
-	"errors"
 	"strings"
 
 	tradingTypes "github.com/KyberNetwork/tradinglib/pkg/types"
@@ -18,8 +17,6 @@ const (
 	SwappedEvent = "Swapped"
 )
 
-var ErrInvalidKSSwappedTopic = errors.New("invalid KS Swapped topic")
-
 type Parser struct {
 	abi       *abi.ABI
 	ps        *SwappedFilterer
@@ -54,7 +51,7 @@ func (p *Parser) Topics() []string {
 
 func (p *Parser) Parse(log ethereumTypes.Log, blockTime uint64) (storage.TradeLog, error) {
 	if len(log.Topics) > 0 && log.Topics[0].Hex() != p.eventHash {
-		return storage.TradeLog{}, ErrInvalidKSSwappedTopic
+		return storage.TradeLog{}, parser.ErrInvalidTopic
 	}
 	e, err := p.ps.ParseSwapped(log)
 	if err != nil {

pkg/parser/kyberswap_rfq/parser.go

@@ -23,8 +23,6 @@ const (
 	paramName   = "order"
 )
 
-var ErrInvalidKSFilledTopic = errors.New("invalid KS order filled topic")
-
 type Parser struct {
 	abi       *abi.ABI
 	ps        *KyberswaprfqFilterer
@@ -59,7 +57,7 @@ func (p *Parser) Topics() []string {
 
 func (p *Parser) Parse(log ethereumTypes.Log, blockTime uint64) (storage.TradeLog, error) {
 	if len(log.Topics) > 0 && log.Topics[0].Hex() != p.eventHash {
-		return storage.TradeLog{}, ErrInvalidKSFilledTopic
+		return storage.TradeLog{}, parser.ErrInvalidTopic
 	}
 	e, err := p.ps.ParseOrderFilledRFQ(log)
 	if err != nil {

pkg/parser/oneinchv6/parser.go

@@ -27,9 +27,7 @@ const (
 )
 
 var (
-	ErrInvalidOneInchFilledTopic = errors.New("invalid oneinch order filled topic")
-	ErrNotFoundLog               = errors.New("not found log")
-	RFQOrderOutputArgument       abi.Arguments
+	RFQOrderOutputArgument abi.Arguments
 )
 
 func init() {
@@ -93,7 +91,7 @@ func (p *Parser) Parse(log ethereumTypes.Log, blockTime uint64) (storage.TradeLo
 
 func (p *Parser) buildOrderByLog(log ethereumTypes.Log) (storage.TradeLog, error) {
 	if len(log.Topics) > 0 && log.Topics[0].Hex() != p.eventHash {
-		return storage.TradeLog{}, ErrInvalidOneInchFilledTopic
+		return storage.TradeLog{}, parser.ErrInvalidTopic
 	}
 	e, err := p.ps.ParseOrderFilled(log)
 	if err != nil {
@@ -175,7 +173,7 @@ func (p *Parser) recursiveDetectOneInchRFQTrades(tradeLog storage.TradeLog, trac
 	}
 
 	traceData, _ := json.Marshal(traceCall)
-	return tradeLog, fmt.Errorf("%w %s", ErrNotFoundLog, string(traceData))
+	return tradeLog, fmt.Errorf("%w %s", parser.ErrNotFoundTrade, string(traceData))
 }
 
 func (p *Parser) isOneInchRFQTrades(txHash, orderHash string, traceCall types.CallFrame, count *int) bool {

pkg/parser/paraswap/parser.go

@@ -21,8 +21,6 @@ const (
 	paramName        = "order"
 )
 
-var ErrInvalidRFQTopic = errors.New("invalid RfqFilled topic")
-
 type Parser struct {
 	abi       *abi.ABI
 	ps        *OrderFilledFilterer
@@ -57,7 +55,7 @@ func (p *Parser) Topics() []string {
 
 func (p *Parser) Parse(log ethereumTypes.Log, blockTime uint64) (storage.TradeLog, error) {
 	if len(log.Topics) > 0 && log.Topics[0].Hex() != p.eventHash {
-		return storage.TradeLog{}, ErrInvalidRFQTopic
+		return storage.TradeLog{}, parser.ErrInvalidTopic
 	}
 	o, err := p.ps.ParseOrderFilled(log)
 	if err != nil {

pkg/parser/parser.go

@@ -1,6 +1,8 @@
 package parser
 
 import (
+	"errors"
+
 	"github.com/KyberNetwork/tradelogs/pkg/storage"
 	tradingTypes "github.com/KyberNetwork/tradinglib/pkg/types"
 	ethereumTypes "github.com/ethereum/go-ethereum/core/types"
@@ -22,6 +24,7 @@ const (
 	ExUniswapX      = "uniswapx"
 	ExNative        = "native"
 	ExBebop         = "bebop"
+	ExUniswapXV1    = "uniswapxV1"
 
 	Addr1InchV6      = "0x111111125421cA6dc452d289314280a0f8842A65"
 	AddrBebop        = "0xbbbbbBB520d69a9775E85b458C58c648259FAD5F"
@@ -30,10 +33,16 @@ const (
 	AddrKyberswapRFQ = "0x7A819Fa46734a49D0112796f9377E024c350FB26"
 	AddrParaswap     = "0xe92b586627ccA7a83dC919cc7127196d70f55a06"
 	AddrUniswapX     = "0x00000011F84B9aa48e5f8aA8B9897600006289Be"
+	AddrUniswapXV1   = "0x6000da47483062A0D734Ba3dc7576Ce6A0B645C4"
 	Addr0x           = "0xDef1C0ded9bec7F1a1670819833240f027b25EfF"
 	Deployer0xV3     = "0x00000000000004533Fe15556B1E086BB1A72cEae"
 )
 
+var (
+	ErrInvalidTopic  = errors.New("invalid order topic")
+	ErrNotFoundTrade = errors.New("not found log")
+)
+
 type Parser interface {
 	Parse(log ethereumTypes.Log, blockTime uint64) (storage.TradeLog, error)
 	Topics() []string

pkg/parser/uniswapx/parser.go

@@ -20,8 +20,7 @@ import (
 )
 
 const (
-	FilledEvent   = "Fill"
-	TransferEvent = "Transfer"
+	FilledEvent = "Fill"
 )
 
 type ResolvedOrder struct {
@@ -58,11 +57,6 @@ type ResolvedOrder struct {
 	Cosignature []uint8 "json:\"cosignature\""
 }
 
-var (
-	ErrInvalidOneInchFilledTopic = errors.New("invalid uniswapx order filled topic")
-	ErrNotFoundLog               = errors.New("not found log")
-)
-
 type Parser struct {
 	abi            *abi.ABI
 	ps             *UniswapxFilterer
@@ -151,7 +145,7 @@ func (p *Parser) Parse(log ethereumTypes.Log, blockTime uint64) (storage.TradeLo
 
 func (p *Parser) buildOrderByLog(log ethereumTypes.Log, blockTime uint64) (storage.TradeLog, error) {
 	if len(log.Topics) > 0 && log.Topics[0].Hex() != p.eventHash {
-		return storage.TradeLog{}, ErrInvalidOneInchFilledTopic
+		return storage.TradeLog{}, parser.ErrInvalidTopic
 	}
 	e, err := p.ps.ParseFill(log)
 	if err != nil {
@@ -232,7 +226,7 @@ func (p *Parser) recursiveDetectRFQTrades(order storage.TradeLog, call types.Cal
 		}
 	}
 	traceData, _ := json.Marshal(call)
-	return order, fmt.Errorf("%w %s", ErrNotFoundLog, string(traceData))
+	return order, fmt.Errorf("%w %s", parser.ErrNotFoundTrade, string(traceData))
 }
 
 func (p *Parser) updateOrder(internal storage.TradeLog, parsed []interface{}) (storage.TradeLog, error) {
@@ -280,7 +274,9 @@ func (p *Parser) updateOrder(internal storage.TradeLog, parsed []interface{}) (s
 func decay(startAmount, endAmount, decayStartTime, decayEndTime, blockTime *big.Int) (decayedAmount *big.Int) {
 	decayedAmount = new(big.Int)
 
-	if decayEndTime.Cmp(blockTime) <= 0 {
+	if startAmount.Cmp(endAmount) == 0 {
+		return startAmount
+	} else if decayEndTime.Cmp(blockTime) <= 0 {
 		decayedAmount.Set(endAmount)
 	} else if decayStartTime.Cmp(blockTime) >= 0 {
 		decayedAmount.Set(startAmount)
@@ -293,7 +289,7 @@ func decay(startAmount, endAmount, decayStartTime, decayEndTime, blockTime *big.
 			decayedAmount = new(big.Int).Sub(startAmount, mulDiv(diff, elapsed, duration))
 		} else {
 			diff := new(big.Int).Sub(endAmount, startAmount)
-			decayedAmount = new(big.Int).Add(startAmount, mulDiv(diff, elapsed, duration))
+			decayedAmount = new(big.Int).Add(startAmount, mulDivUp(diff, elapsed, duration))
 		}
 	}
 	return
@@ -307,6 +303,16 @@ func mulDiv(a, b, c *big.Int) *big.Int {
 	return new(big.Int).Div(new(big.Int).Mul(a, b), c)
 }
 
+func mulDivUp(x, y, denominator *big.Int) *big.Int {
+	product := new(big.Int).Mul(x, y)
+	remainder := new(big.Int).Mod(product, denominator)
+	result := new(big.Int).Div(product, denominator)
+	if remainder.Cmp(big.NewInt(0)) > 0 {
+		result.Add(result, big.NewInt(1))
+	}
+	return result
+}
+
 // func checkExclusivity(exclusive, sender common.Address, exclusivityEndTime, ts uint64) bool {
 // 	return exclusive == common.Address{} || ts > exclusivityEndTime || exclusive == sender
 // }

pkg/parser/uniswapx/uniswap_test.go

@@ -27,9 +27,7 @@ func TestFetchEvent(t *testing.T) {
 	traceCalls := tracecall.NewCache(rpcnode.NewClient(ethClient))
 	p := MustNewParser(traceCalls)
 	require.Equal(t, p.abi.Events[FilledEvent].ID, common.HexToHash("0x78ad7ec0e9f89e74012afa58738b6b661c024cb0fd185ee2f616c0a28924bd66"))
-	client, err := ethclient.Dial("https://ethereum.kyberengineering.io")
-	require.NoError(t, err)
-	logs, err := client.FilterLogs(context.Background(), ethereum.FilterQuery{
+	logs, err := ethClient.FilterLogs(context.Background(), ethereum.FilterQuery{
 		BlockHash: nil,
 		FromBlock: big.NewInt(19719300),
 		ToBlock:   big.NewInt(19719300),

pkg/parser/uniswapx_v1/gen.sh

@@ -0,0 +1 @@
+abigen --abi=abi.json --pkg=uniswapxv1 --out=uniswapx.go