small improvements

Author: Tanz0rz

internal/times/time.go

@@ -0,0 +1,16 @@
+package times
+
+import "time"
+
+var timeNow func() int64 = GetCurrentTime
+
+func GetCurrentTime() int64 {
+	return time.Now().Unix()
+}
+
+var CalcAuctionStartTimeFunc func(uint32, uint32) uint32 = CalcAuctionStartTime
+
+func CalcAuctionStartTime(startAuctionIn uint32, additionalWaitPeriod uint32) uint32 {
+	currentTime := time.Now().Unix()
+	return uint32(currentTime) + additionalWaitPeriod + startAuctionIn
+}

internal/validate/integration_check_cleanup_test.go

@@ -10,6 +10,7 @@ import (
 	"github.com/1inch/1inch-sdk-go/internal/bigint"
 	"github.com/1inch/1inch-sdk-go/internal/bytesbuilder"
 	"github.com/1inch/1inch-sdk-go/internal/hexadecimal"
+	"github.com/1inch/1inch-sdk-go/internal/times"
 	geth_common "github.com/ethereum/go-ethereum/common"
 	"golang.org/x/crypto/sha3"
 
@@ -27,7 +28,7 @@ type Extension struct {
 	PostInteractionDataEncoded string
 	Asset                      string
 	Permit                     string
-	Fees                       *FeesIntegratorResolver
+	Fees                       *FeesIntegratorAndResolver
 	Surplus                    *SurplusParams
 	ResolvingStartTime         *big.Int
 
@@ -84,10 +85,17 @@ func NewExtension(params ExtensionParams) (*Extension, error) {
 		return nil, errors.New("CustomData is not currently supported")
 	}
 
+	var resolvingStartTime *big.Int
+	if params.ResolvingStartTime == nil {
+		resolvingStartTime = big.NewInt(times.GetCurrentTime())
+	} else {
+		resolvingStartTime = params.ResolvingStartTime
+	}
+
 	bagdParams := &BuildAmountGetterDataParams{
 		AuctionDetails:      params.AuctionDetails,
 		PostInteractionData: params.PostInteractionData,
-		ResolvingStartTime:  params.ResolvingStartTime,
+		ResolvingStartTime:  resolvingStartTime,
 	}
 
 	amountData, err := BuildAmountGetterData(bagdParams, true)
@@ -105,7 +113,7 @@ func NewExtension(params ExtensionParams) (*Extension, error) {
 		Asset:               params.Asset,
 		Permit:              params.Permit,
 		Surplus:             params.Surplus,
-		ResolvingStartTime:  params.ResolvingStartTime,
+		ResolvingStartTime:  resolvingStartTime,
 
 		MakerAssetSuffix: prefix0x(params.MakerAssetSuffix),
 		TakerAssetSuffix: prefix0x(params.TakerAssetSuffix),

sdk-clients/fusion/Bps.go renamed to sdk-clients/fusion/bps.go

@@ -91,9 +91,9 @@ func TestNewExtension(t *testing.T) {
 				},
 				PostInteractionData: &SettlementPostInteractionData{
 					Whitelist: []WhitelistItem{},
-					AuctionFees: &FeesIntegratorResolver{
+					AuctionFees: &FeesIntegratorAndResolver{
 						Resolver:   ResolverFee{},
-						Integrator: IntegratorFeeNew{},
+						Integrator: IntegratorFee{},
 					},
 					ResolvingStartTime: big.NewInt(0),
 					CustomReceiver:     common.Address{},
@@ -139,9 +139,9 @@ func TestNewExtension(t *testing.T) {
 				},
 				PostInteractionData: &SettlementPostInteractionData{
 					Whitelist: []WhitelistItem{},
-					AuctionFees: &FeesIntegratorResolver{
+					AuctionFees: &FeesIntegratorAndResolver{
 						Resolver:   ResolverFee{},
-						Integrator: IntegratorFeeNew{},
+						Integrator: IntegratorFee{},
 					},
 					ResolvingStartTime: big.NewInt(0),
 					CustomReceiver:     common.Address{},
@@ -414,8 +414,8 @@ func TestBuildAmountGetterData(t *testing.T) {
 					InitialRateBump: 50000,
 					Points:          []AuctionPointClassFixed{{Coefficient: 20000, Delay: 12}},
 				},
-				FeesNew: &FeesIntegratorResolver{
-					Integrator: IntegratorFeeNew{
+				FeesIntAndRes: &FeesIntegratorAndResolver{
+					Integrator: IntegratorFee{
 						Integrator: "0x0000000000000000000000000000000000000001",
 						Protocol:   "0x0000000000000000000000000000000000000002",
 						Fee:        FromPercent(1, GetDefaultBase()),
@@ -447,7 +447,7 @@ func TestBuildAmountGetterData(t *testing.T) {
 					Whitelist:          tt.whitelist,
 					ResolvingStartTime: tt.detailsFull.ResolvingStartTime,
 					CustomReceiver:     common.Address{},
-					AuctionFees:        tt.detailsFull.FeesNew,
+					AuctionFees:        tt.detailsFull.FeesIntAndRes,
 				},
 			}
 

sdk-clients/fusion/extension.go

@@ -146,17 +146,12 @@ type Details struct {
 	Auction            *AuctionDetails `json:"auction"`
 	Whitelist          []AuctionWhitelistItem
 	ResolvingStartTime *big.Int
-	FeesNew            *FeesIntegratorResolver
+	FeesIntAndRes      *FeesIntegratorAndResolver
 }
 
-type FeesIntegratorResolver struct {
+type FeesIntegratorAndResolver struct {
 	Resolver   ResolverFee
-	Integrator IntegratorFeeNew
-}
-
-type IntegratorFee struct {
-	Ratio    *big.Int
-	Receiver common.Address
+	Integrator IntegratorFee
 }
 
 type AuctionWhitelistItem struct {
@@ -178,15 +173,6 @@ type ExtraParams struct {
 	unwrapWeth           bool
 }
 
-type SettlementSuffixData struct {
-	Whitelist          []AuctionWhitelistItem
-	IntegratorFee      *IntegratorFee
-	BankFee            *big.Int
-	ResolvingStartTime *big.Int
-	CustomReceiver     common.Address
-	Fees               FeesIntegratorResolver
-}
-
 type WhitelistItem struct {
 	/**
 	 * last 10 bytes of address, no 0x prefix

sdk-clients/fusion/extension_test.go

@@ -7,23 +7,23 @@ import (
 	"github.com/1inch/1inch-sdk-go/internal/addresses"
 )
 
-type IntegratorFeeNew struct {
+type IntegratorFee struct {
 	Integrator string
 	Protocol   string
 	Fee        *Bps
 	Share      *Bps
 }
 
 // IntegratorFeeZero is a safe default with all zero values
-var IntegratorFeeZero = &IntegratorFeeNew{
+var IntegratorFeeZero = &IntegratorFee{
 	Integrator: addresses.ZeroAddress,
 	Protocol:   addresses.ZeroAddress,
 	Fee:        BpsZero,
 	Share:      BpsZero,
 }
 
-// NewIntegratorFee constructs a validated IntegratorFeeNew or returns an error
-func NewIntegratorFee(integrator, protocol string, fee, share *Bps) (*IntegratorFeeNew, error) {
+// NewIntegratorFee constructs a validated IntegratorFee or returns an error
+func NewIntegratorFee(integrator, protocol string, fee, share *Bps) (*IntegratorFee, error) {
 	if fee.IsZero() {
 		if !share.IsZero() {
 			return nil, errors.New("integrator share must be zero if fee is zero")
@@ -40,15 +40,15 @@ func NewIntegratorFee(integrator, protocol string, fee, share *Bps) (*Integrator
 		return nil, errors.New("fee must be zero if integrator or protocol is zero address")
 	}
 
-	return &IntegratorFeeNew{
+	return &IntegratorFee{
 		Integrator: integrator,
 		Protocol:   protocol,
 		Fee:        fee,
 		Share:      share,
 	}, nil
 }
 
-func (f *IntegratorFeeNew) String() string {
-	return fmt.Sprintf("IntegratorFeeNew{Integrator: %s, Protocol: %s, Fee: %s, Share: %s}",
+func (f *IntegratorFee) String() string {
+	return fmt.Sprintf("IntegratorFee{Integrator: %s, Protocol: %s, Fee: %s, Share: %s}",
 		f.Integrator, f.Protocol, f.Fee.String(), f.Share.String())
 }

sdk-clients/fusion/fusion_types_extended.go

@@ -8,6 +8,7 @@ import (
 	"time"
 
 	"github.com/1inch/1inch-sdk-go/common"
+	"github.com/1inch/1inch-sdk-go/internal/times"
 	geth_common "github.com/ethereum/go-ethereum/common"
 
 	random_number_generation "github.com/1inch/1inch-sdk-go/internal/random-number-generation"
@@ -63,9 +64,9 @@ func CreateFusionOrderData(quote GetQuoteOutputFixed, orderParams OrderParams, w
 
 	details := Details{
 		Auction: auctionDetails,
-		FeesNew: &FeesIntegratorResolver{
+		FeesIntAndRes: &FeesIntegratorAndResolver{
 			Resolver:   ResolverFee{},
-			Integrator: IntegratorFeeNew{},
+			Integrator: IntegratorFee{},
 		},
 		Whitelist:          whitelistAddresses,
 		ResolvingStartTime: big.NewInt(int64(auctionDetails.StartTime)),
@@ -227,21 +228,15 @@ func CreateAuctionDetails(preset *PresetClassFixed, additionalWaitPeriod float32
 	}, nil
 }
 
-var timeNow func() int64 = GetCurrentTime
-
-func GetCurrentTime() int64 {
-	return time.Now().Unix()
-}
-
 func CreateSettlementPostInteractionData(details Details, whitelist []WhitelistItem, orderInfo FusionOrderV4) (*SettlementPostInteractionData, error) {
 	resolverStartTime := details.ResolvingStartTime
 	if details.ResolvingStartTime == nil || details.ResolvingStartTime.Cmp(big.NewInt(0)) == 0 {
-		resolverStartTime = big.NewInt(timeNow())
+		resolverStartTime = big.NewInt(times.GetCurrentTime())
 	}
 
 	return &SettlementPostInteractionData{
 		Whitelist:          whitelist,
-		AuctionFees:        details.FeesNew,
+		AuctionFees:        details.FeesIntAndRes,
 		ResolvingStartTime: resolverStartTime,
 		CustomReceiver:     geth_common.HexToAddress(orderInfo.Receiver),
 	}, nil
@@ -287,15 +282,15 @@ type CreateOrderDataParams struct {
 	MakerTraits         *orderbook.MakerTraits
 }
 
-func getReceiver(fees *FeesIntegratorResolver, settlementAddress string, receiver string) string {
+func getReceiver(fees *FeesIntegratorAndResolver, settlementAddress string, receiver string) string {
 	if fees != nil {
 		return settlementAddress
 	}
 	return receiver
 }
 
 func CreateOrder(params CreateOrderDataParams) (*Order, error) {
-	receiver := getReceiver(params.Details.FeesNew, params.SettlementAddress, params.orderInfo.Receiver)
+	receiver := getReceiver(params.Details.FeesIntAndRes, params.SettlementAddress, params.orderInfo.Receiver)
 
 	salt, err := params.Extension.GenerateSalt()
 	if err != nil {

sdk-clients/fusion/IntegratorFeeNew.go renamed to sdk-clients/fusion/integrator_fee.go

@@ -606,8 +606,8 @@ func TestCreateFusionOrderTdd(t *testing.T) {
 					InitialRateBump: 50000,
 					Points:          []AuctionPointClassFixed{{Coefficient: 20000, Delay: 12}},
 				},
-				FeesNew: &FeesIntegratorResolver{
-					Integrator: IntegratorFeeNew{
+				FeesIntAndRes: &FeesIntegratorAndResolver{
+					Integrator: IntegratorFee{
 						Integrator: "0x0000000000000000000000000000000000000001",
 						Protocol:   "0x0000000000000000000000000000000000000002",
 						Fee:        FromPercent(1, GetDefaultBase()),
@@ -635,11 +635,6 @@ func TestCreateFusionOrderTdd(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			postInteractionSufixDataNew := &SettlementSuffixData{
-				Whitelist:          tt.details.Whitelist,
-				ResolvingStartTime: tt.details.ResolvingStartTime,
-			}
-
 			var whitelistStrings []string
 			for _, whitelistItem := range tt.details.Whitelist {
 				whitelistStrings = append(whitelistStrings, whitelistItem.Address.Hex())
@@ -663,17 +658,16 @@ func TestCreateFusionOrderTdd(t *testing.T) {
 				Whitelist:          whitelist,
 				ResolvingStartTime: tt.details.ResolvingStartTime,
 				CustomReceiver:     common.Address{},
-				AuctionFees:        tt.details.FeesNew,
+				AuctionFees:        tt.details.FeesIntAndRes,
 			}
 
 			extension, err := NewExtension(ExtensionParams{
 				SettlementContract:  extensionContract,
 				AuctionDetails:      tt.details.Auction,
 				PostInteractionData: postInteractionData,
-				//PostInteractionDataEncoded: encodedPostInteractionData,
-				Asset:              "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
-				Surplus:            SurplusParamsNoFee,
-				ResolvingStartTime: tt.details.ResolvingStartTime,
+				Asset:               "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
+				Surplus:             SurplusParamsNoFee,
+				ResolvingStartTime:  tt.details.ResolvingStartTime,
 			})
 			require.NoError(t, err)
 
@@ -697,7 +691,7 @@ func TestCreateFusionOrderTdd(t *testing.T) {
 				TakingAmount: tt.expected.TakingAmount,
 				Salt:         salt.String(),
 				Maker:        tt.expected.Maker,
-				Receiver:     getReceiver(tt.details.FeesNew, extensionContract, postInteractionSufixDataNew.CustomReceiver.Hex()),
+				Receiver:     getReceiver(tt.details.FeesIntAndRes, extensionContract, tt.expected.Receiver),
 				MakerTraits:  makerTraits.Encode(),
 				Extension:    extensionEncoded,
 			}