Merge pull request #66 from KyberNetwork/feat/update-expiry-and-parse…

…r-interface feat: support parse expiry of bebop, oneinchv6, uniswapx and update p…
KyberNetwork · Aug 28, 2024 · 5b30ccb · 5b30ccb
2 parents 31e8a90 + 7d5efda
commit 5b30ccb
Show file tree

Hide file tree

Showing 27 changed files with 321 additions and 171 deletions.
diff --git a/pkg/decoder/decoder.go b/pkg/decoder/decoder.go
@@ -31,7 +31,9 @@ func Decode(ABI *abi.ABI, input string) (*tradingTypes.ContractCall, error) {
 	if err != nil {
 		return nil, err
 	}
-
+	if len(input) < 10 {
+		return nil, fmt.Errorf("input data is too short")
+	}
 	bytes, err := hex.DecodeString(input[10:])
 	if err != nil {
 		return nil, err

diff --git a/pkg/parser/bebop/parser.go b/pkg/parser/bebop/parser.go
@@ -267,15 +267,12 @@ func (p *Parser) buildOrderByLog(log ethereumTypes.Log, blockTime uint64) (stora
 	return order, nil
 }
 
-func (p *Parser) ParseWithCallFrame(callFrame *tradingTypes.CallFrame, log ethereumTypes.Log, blockTime uint64) (storage.TradeLog, error) {
-	if callFrame == nil {
-		return storage.TradeLog{}, errors.New("missing call frame")
-	}
+func (p *Parser) ParseWithCallFrame(callFrame types.CallFrame, log ethereumTypes.Log, blockTime uint64) (storage.TradeLog, error) {
 	order, err := p.buildOrderByLog(log, blockTime)
 	if err != nil {
 		return storage.TradeLog{}, err
 	}
-	return p.searchTradeLog(order, types.ConvertCallFrame(callFrame))
+	return p.searchTradeLog(order, callFrame)
 }
 
 func (p *Parser) LogFromExchange(log ethereumTypes.Log) bool {

diff --git a/pkg/parser/hashflow/hashflow_test.go b/pkg/parser/hashflow/hashflow_test.go
@@ -3,7 +3,6 @@ package hashflow
 import (
 	"context"
 	"encoding/json"
-	tradingTypes "github.com/KyberNetwork/tradinglib/pkg/types"
 	"math/big"
 	"strings"
 	"testing"
@@ -14,6 +13,9 @@ import (
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/ethclient"
 	"github.com/stretchr/testify/require"
+
+	tradelogstype "github.com/KyberNetwork/tradelogs/pkg/types"
+	tradingTypes "github.com/KyberNetwork/tradinglib/pkg/types"
 )
 
 const rpcURL = ""
@@ -84,7 +86,7 @@ func TestParseWithCallFrame(t *testing.T) {
 			continue
 		}
 
-		parse, err := p.ParseWithCallFrame(&callFrame, *eventLog, uint64(time.Now().Unix()))
+		parse, err := p.ParseWithCallFrame(tradelogstype.ConvertCallFrame(&callFrame), *eventLog, uint64(time.Now().Unix()))
 		require.NoError(t, err)
 		t.Log(parse)
 	}

diff --git a/pkg/parser/hashflow/parser.go b/pkg/parser/hashflow/parser.go
@@ -4,11 +4,9 @@ import (
 	"encoding/json"
 	"errors"
 	"github.com/KyberNetwork/tradelogs/pkg/decoder"
-	"github.com/ethereum/go-ethereum/common/hexutil"
-
 	"github.com/KyberNetwork/tradelogs/pkg/parser"
 	"github.com/KyberNetwork/tradelogs/pkg/storage"
-	tradingTypes "github.com/KyberNetwork/tradinglib/pkg/types"
+	"github.com/KyberNetwork/tradelogs/pkg/types"
 	"github.com/ethereum/go-ethereum/accounts/abi"
 	"github.com/ethereum/go-ethereum/common"
 	ethereumTypes "github.com/ethereum/go-ethereum/core/types"
@@ -79,10 +77,7 @@ func (p *Parser) Parse(log ethereumTypes.Log, blockTime uint64) (storage.TradeLo
 	return res, nil
 }
 
-func (p *Parser) ParseWithCallFrame(callFrame *tradingTypes.CallFrame, log ethereumTypes.Log, blockTime uint64) (storage.TradeLog, error) {
-	if callFrame == nil {
-		return storage.TradeLog{}, errors.New("missing call frame")
-	}
+func (p *Parser) ParseWithCallFrame(callFrame types.CallFrame, log ethereumTypes.Log, blockTime uint64) (storage.TradeLog, error) {
 	tradeLog, err := p.Parse(log, blockTime)
 	if err != nil {
 		return storage.TradeLog{}, err
@@ -103,19 +98,13 @@ func (p *Parser) UseTraceCall() bool {
 	return false
 }
 
-func (p *Parser) getRFQOrderParams(callFrame *tradingTypes.CallFrame) (*OrderRFQ, error) {
-	var (
-		err error
-	)
-	contractCall := callFrame.ContractCall
+func (p *Parser) getRFQOrderParams(callFrame types.CallFrame) (*OrderRFQ, error) {
+	contractCall, err := decoder.Decode(p.abi, callFrame.Input)
+	if err != nil {
+		return nil, err
+	}
 	if contractCall == nil {
-		contractCall, err = decoder.Decode(p.abi, hexutil.Encode(callFrame.Input))
-		if err != nil {
-			return nil, err
-		}
-		if contractCall == nil {
-			return nil, errors.New("missing contract_call")
-		}
+		return nil, errors.New("missing contract_call")
 	}
 	for _, param := range contractCall.Params {
 		if param.Name != paramName {

diff --git a/pkg/parser/hashflow_v3/hashflowv3_test.go b/pkg/parser/hashflow_v3/hashflowv3_test.go
@@ -9,6 +9,7 @@ import (
 	"testing"
 	"time"
 
+	tradelogstypes "github.com/KyberNetwork/tradelogs/pkg/types"
 	"github.com/ethereum/go-ethereum"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/types"
@@ -84,7 +85,7 @@ func TestParseWithCallFrame(t *testing.T) {
 			continue
 		}
 
-		parse, err := p.ParseWithCallFrame(&callFrame, *eventLog, uint64(time.Now().Unix()))
+		parse, err := p.ParseWithCallFrame(tradelogstypes.ConvertCallFrame(&callFrame), *eventLog, uint64(time.Now().Unix()))
 		require.NoError(t, err)
 		t.Log(parse)
 	}

diff --git a/pkg/parser/hashflow_v3/parser.go b/pkg/parser/hashflow_v3/parser.go
@@ -6,11 +6,9 @@ import (
 	"strings"
 
 	"github.com/KyberNetwork/tradelogs/pkg/decoder"
-	tradingTypes "github.com/KyberNetwork/tradinglib/pkg/types"
-	"github.com/ethereum/go-ethereum/common/hexutil"
-
 	"github.com/KyberNetwork/tradelogs/pkg/parser"
 	"github.com/KyberNetwork/tradelogs/pkg/storage"
+	"github.com/KyberNetwork/tradelogs/pkg/types"
 	"github.com/ethereum/go-ethereum/accounts/abi"
 	"github.com/ethereum/go-ethereum/common"
 	ethereumTypes "github.com/ethereum/go-ethereum/core/types"
@@ -87,10 +85,7 @@ func (p *Parser) UseTraceCall() bool {
 	return false
 }
 
-func (p *Parser) ParseWithCallFrame(callFrame *tradingTypes.CallFrame, log ethereumTypes.Log, blockTime uint64) (storage.TradeLog, error) {
-	if callFrame == nil {
-		return storage.TradeLog{}, errors.New("missing call frame")
-	}
+func (p *Parser) ParseWithCallFrame(callFrame types.CallFrame, log ethereumTypes.Log, blockTime uint64) (storage.TradeLog, error) {
 	tradeLog, err := p.Parse(log, blockTime)
 	if err != nil {
 		return storage.TradeLog{}, err
@@ -103,20 +98,15 @@ func (p *Parser) ParseWithCallFrame(callFrame *tradingTypes.CallFrame, log ether
 	return tradeLog, nil
 }
 
-func (p *Parser) getRFQOrderParams(callFrame *tradingTypes.CallFrame) (*OrderRFQ, error) {
-	var (
-		err error
-	)
-	contractCall := callFrame.ContractCall
+func (p *Parser) getRFQOrderParams(callFrame types.CallFrame) (*OrderRFQ, error) {
+	contractCall, err := decoder.Decode(p.abi, callFrame.Input)
+	if err != nil {
+		return nil, err
+	}
 	if contractCall == nil {
-		contractCall, err = decoder.Decode(p.abi, hexutil.Encode(callFrame.Input))
-		if err != nil {
-			return nil, err
-		}
-		if contractCall == nil {
-			return nil, errors.New("missing contract_call")
-		}
+		return nil, errors.New("missing contract_call")
 	}
+
 	for _, param := range contractCall.Params {
 		if param.Name != paramName {
 			continue

diff --git a/pkg/parser/kyberswap/parser.go b/pkg/parser/kyberswap/parser.go
@@ -3,12 +3,11 @@ package kyberswap
 import (
 	"strings"
 
-	tradingTypes "github.com/KyberNetwork/tradinglib/pkg/types"
-
 	ethereumTypes "github.com/ethereum/go-ethereum/core/types"
 
 	"github.com/KyberNetwork/tradelogs/pkg/parser"
 	"github.com/KyberNetwork/tradelogs/pkg/storage"
+	"github.com/KyberNetwork/tradelogs/pkg/types"
 	"github.com/ethereum/go-ethereum/accounts/abi"
 	"github.com/ethereum/go-ethereum/common"
 )
@@ -81,7 +80,7 @@ func (p *Parser) UseTraceCall() bool {
 	return false
 }
 
-func (p *Parser) ParseWithCallFrame(_ *tradingTypes.CallFrame, log ethereumTypes.Log, blockTime uint64) (storage.TradeLog, error) {
+func (p *Parser) ParseWithCallFrame(_ types.CallFrame, log ethereumTypes.Log, blockTime uint64) (storage.TradeLog, error) {
 	return p.Parse(log, blockTime)
 }
 

diff --git a/pkg/parser/kyberswap_rfq/kyberswap_rfq_test.go b/pkg/parser/kyberswap_rfq/kyberswap_rfq_test.go
@@ -3,13 +3,16 @@ package kyberswaprfq
 import (
 	"context"
 	"encoding/json"
+	"strings"
+	"testing"
+
 	"github.com/KyberNetwork/tradelogs/pkg/storage"
-	tradingTypes "github.com/KyberNetwork/tradinglib/pkg/types"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/ethclient"
 	"github.com/stretchr/testify/require"
-	"strings"
-	"testing"
+
+	tradelogstype "github.com/KyberNetwork/tradelogs/pkg/types"
+	tradingTypes "github.com/KyberNetwork/tradinglib/pkg/types"
 )
 
 const rpcURL = ""
@@ -55,7 +58,7 @@ func TestParseWithCallFrame(t *testing.T) {
 			continue
 		}
 
-		parse, err := p.ParseWithCallFrame(&callFrame, *eventLog, 0)
+		parse, err := p.ParseWithCallFrame(tradelogstype.ConvertCallFrame(&callFrame), *eventLog, 0)
 		require.NoError(t, err)
 		t.Log(parse)
 		require.Equal(t, expectedTradelog, parse)

diff --git a/pkg/parser/kyberswap_rfq/parser.go b/pkg/parser/kyberswap_rfq/parser.go
@@ -7,11 +7,9 @@ import (
 	"strings"
 
 	"github.com/KyberNetwork/tradelogs/pkg/decoder"
-	tradingTypes "github.com/KyberNetwork/tradinglib/pkg/types"
-	"github.com/ethereum/go-ethereum/common/hexutil"
-
 	"github.com/KyberNetwork/tradelogs/pkg/parser"
 	"github.com/KyberNetwork/tradelogs/pkg/storage"
+	"github.com/KyberNetwork/tradelogs/pkg/types"
 	"github.com/ethereum/go-ethereum/accounts/abi"
 	"github.com/ethereum/go-ethereum/common"
 
@@ -89,10 +87,7 @@ func (p *Parser) UseTraceCall() bool {
 	return false
 }
 
-func (p *Parser) ParseWithCallFrame(callFrame *tradingTypes.CallFrame, log ethereumTypes.Log, blockTime uint64) (storage.TradeLog, error) {
-	if callFrame == nil {
-		return storage.TradeLog{}, errors.New("missing call frame")
-	}
+func (p *Parser) ParseWithCallFrame(callFrame types.CallFrame, log ethereumTypes.Log, blockTime uint64) (storage.TradeLog, error) {
 	tradeLog, err := p.Parse(log, blockTime)
 	if err != nil {
 		return storage.TradeLog{}, err
@@ -105,20 +100,15 @@ func (p *Parser) ParseWithCallFrame(callFrame *tradingTypes.CallFrame, log ether
 	return tradeLog, nil
 }
 
-func (p *Parser) getRFQOrderParams(callFrame *tradingTypes.CallFrame) (*OrderRFQ, error) {
-	var (
-		err error
-	)
-	contractCall := callFrame.ContractCall
+func (p *Parser) getRFQOrderParams(callFrame types.CallFrame) (*OrderRFQ, error) {
+	contractCall, err := decoder.Decode(p.abi, callFrame.Input)
+	if err != nil {
+		return nil, err
+	}
 	if contractCall == nil {
-		contractCall, err = decoder.Decode(p.abi, hexutil.Encode(callFrame.Input))
-		if err != nil {
-			return nil, err
-		}
-		if contractCall == nil {
-			return nil, errors.New("missing contract_call")
-		}
+		return nil, errors.New("missing contract_call")
 	}
+
 	for _, param := range contractCall.Params {
 		if param.Name != paramName {
 			continue

diff --git a/pkg/parser/native/parser.go b/pkg/parser/native/parser.go
@@ -2,10 +2,9 @@ package native
 
 import (
 	"errors"
-	tradingTypes "github.com/KyberNetwork/tradinglib/pkg/types"
-
 	"github.com/KyberNetwork/tradelogs/pkg/parser"
 	"github.com/KyberNetwork/tradelogs/pkg/storage"
+	"github.com/KyberNetwork/tradelogs/pkg/types"
 	"github.com/ethereum/go-ethereum/accounts/abi"
 	"github.com/ethereum/go-ethereum/common"
 
@@ -84,6 +83,6 @@ func (p *Parser) UseTraceCall() bool {
 	return false
 }
 
-func (p *Parser) ParseWithCallFrame(_ *tradingTypes.CallFrame, log ethereumTypes.Log, blockTime uint64) (storage.TradeLog, error) {
+func (p *Parser) ParseWithCallFrame(_ types.CallFrame, log ethereumTypes.Log, blockTime uint64) (storage.TradeLog, error) {
 	return p.Parse(log, blockTime)
 }
diff --git a/pkg/parser/okx/parser.go b/pkg/parser/okx/parser.go
@@ -4,7 +4,7 @@ import (
 	"errors"
 	"fmt"
 	"github.com/KyberNetwork/tradelogs/pkg/storage"
-	tradingTypes "github.com/KyberNetwork/tradinglib/pkg/types"
+	"github.com/KyberNetwork/tradelogs/pkg/types"
 	"github.com/ethereum/go-ethereum/accounts/abi"
 	"github.com/ethereum/go-ethereum/common"
 	ethereumTypes "github.com/ethereum/go-ethereum/core/types"
@@ -69,6 +69,6 @@ func (p *Parser) Parse(log ethereumTypes.Log, blockTime uint64) (storage.TradeLo
 	return res, nil
 }
 
-func (p *Parser) ParseWithCallFrame(_ *tradingTypes.CallFrame, log ethereumTypes.Log, blockTime uint64) (storage.TradeLog, error) {
+func (p *Parser) ParseWithCallFrame(_ types.CallFrame, log ethereumTypes.Log, blockTime uint64) (storage.TradeLog, error) {
 	return p.Parse(log, blockTime)
 }
diff --git a/pkg/parser/oneinch/oneinch_test.go b/pkg/parser/oneinch/oneinch_test.go
@@ -8,16 +8,17 @@ import (
 	"testing"
 	"time"
 
-	"github.com/KyberNetwork/tradelogs/pkg/storage"
-	tradingTypes "github.com/KyberNetwork/tradinglib/pkg/types"
-
-	"github.com/KyberNetwork/tradelogs/pkg/rpcnode"
-	"github.com/KyberNetwork/tradelogs/pkg/tracecall"
 	"github.com/ethereum/go-ethereum"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/ethclient"
 	"github.com/stretchr/testify/require"
+
+	"github.com/KyberNetwork/tradelogs/pkg/rpcnode"
+	"github.com/KyberNetwork/tradelogs/pkg/storage"
+	"github.com/KyberNetwork/tradelogs/pkg/tracecall"
+	tradelogstype "github.com/KyberNetwork/tradelogs/pkg/types"
+	tradingTypes "github.com/KyberNetwork/tradinglib/pkg/types"
 )
 
 const rpcURL = ""
@@ -155,7 +156,7 @@ func TestParseWithCallFrame(t *testing.T) {
 			continue
 		}
 
-		parse, err := p.ParseWithCallFrame(&callFrame, *eventLog, 0)
+		parse, err := p.ParseWithCallFrame(tradelogstype.ConvertCallFrame(&callFrame), *eventLog, 0)
 		require.NoError(t, err)
 		require.Equal(t, expectedTradeLog, parse)
 	}

diff --git a/pkg/parser/oneinch/parser.go b/pkg/parser/oneinch/parser.go
@@ -4,8 +4,6 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"github.com/KyberNetwork/tradelogs/pkg/types"
-	tradingTypes "github.com/KyberNetwork/tradinglib/pkg/types"
 	"math/big"
 	"strings"
 
@@ -14,6 +12,7 @@ import (
 	"github.com/KyberNetwork/tradelogs/pkg/parser"
 	"github.com/KyberNetwork/tradelogs/pkg/storage"
 	"github.com/KyberNetwork/tradelogs/pkg/tracecall"
+	"github.com/KyberNetwork/tradelogs/pkg/types"
 	"github.com/ethereum/go-ethereum/accounts/abi"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/hexutil"
@@ -233,15 +232,12 @@ func (p *Parser) buildOrderByLog(log ethereumTypes.Log, blockTime uint64) (stora
 	return order, nil
 }
 
-func (p *Parser) ParseWithCallFrame(callFrame *tradingTypes.CallFrame, log ethereumTypes.Log, blockTime uint64) (storage.TradeLog, error) {
-	if callFrame == nil {
-		return storage.TradeLog{}, errors.New("missing call frame")
-	}
+func (p *Parser) ParseWithCallFrame(callFrame types.CallFrame, log ethereumTypes.Log, blockTime uint64) (storage.TradeLog, error) {
 	tradeLog, err := p.buildOrderByLog(log, blockTime)
 	if err != nil {
 		return storage.TradeLog{}, err
 	}
-	tradeLog, err = p.recursiveDetectOneInchRFQTrades(tradeLog, types.ConvertCallFrame(callFrame))
+	tradeLog, err = p.recursiveDetectOneInchRFQTrades(tradeLog, callFrame)
 	if err != nil {
 		return tradeLog, err
 	}