Fixing the exclusive resolver type

1inch · Dec 19, 2024 · 0145bfc · 0145bfc
1 parent ab94614
commit 0145bfc
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 21 deletions.
diff --git a/sdk-clients/fusion/fusion_types_extended.go b/sdk-clients/fusion/fusion_types_extended.go
@@ -10,10 +10,10 @@ import (
 
 type GetQuoteOutputFixed struct {
 	// FeeToken Destination token address
-	FeeToken        string            `json:"feeToken"`
-	FromTokenAmount string            `json:"fromTokenAmount"`
-	Presets         QuotePresetsClass `json:"presets"`
-	Prices          TokenPairValue    `json:"prices"`
+	FeeToken        string                 `json:"feeToken"`
+	FromTokenAmount string                 `json:"fromTokenAmount"`
+	Presets         QuotePresetsClassFixed `json:"presets"`
+	Prices          TokenPairValue         `json:"prices"`
 
 	// QuoteId Current generated quote id, should be passed with order
 	QuoteId string `json:"quoteId"` // TODO This field is marked as "object" instead of "string" in the swagger file. This is an easy fix from the Fusion team
@@ -232,3 +232,28 @@ type QuoterControllerGetQuoteParamsFixed struct {
 	// Permit permit, user approval sign
 	Permit string `url:"permit,omitempty" json:"permit,omitempty"`
 }
+
+// PresetClassFixed defines model for PresetClass.
+type PresetClassFixed struct {
+	AllowMultipleFills bool                `json:"allowMultipleFills"`
+	AllowPartialFills  bool                `json:"allowPartialFills"`
+	AuctionDuration    float32             `json:"auctionDuration"`
+	AuctionEndAmount   string              `json:"auctionEndAmount"`
+	AuctionStartAmount string              `json:"auctionStartAmount"`
+	BankFee            string              `json:"bankFee"`
+	EstP               float32             `json:"estP"`
+	ExclusiveResolver  string              `json:"exclusiveResolver"` // This was changed to a string from a map[string]interface{}
+	GasCost            GasCostConfigClass  `json:"gasCost"`
+	InitialRateBump    float32             `json:"initialRateBump"`
+	Points             []AuctionPointClass `json:"points"`
+	StartAuctionIn     float32             `json:"startAuctionIn"`
+	TokenFee           string              `json:"tokenFee"`
+}
+
+// QuotePresetsClassFixed defines model for QuotePresetsClass.
+type QuotePresetsClassFixed struct {
+	Custom *PresetClassFixed `json:"custom,omitempty"`
+	Fast   PresetClassFixed  `json:"fast"`
+	Medium PresetClassFixed  `json:"medium"`
+	Slow   PresetClassFixed  `json:"slow"`
+}
diff --git a/sdk-clients/fusion/order.go b/sdk-clients/fusion/order.go
@@ -160,7 +160,7 @@ func BigIntFromString(s string) (*big.Int, error) {
 	return bigInt, nil
 }
 
-func getPreset(presets QuotePresetsClass, presetType GetQuoteOutputRecommendedPreset) (*PresetClass, error) {
+func getPreset(presets QuotePresetsClassFixed, presetType GetQuoteOutputRecommendedPreset) (*PresetClassFixed, error) {
 	switch presetType {
 	case Custom:
 		if presets.Custom == nil {
@@ -184,7 +184,7 @@ func CalcAuctionStartTime(startAuctionIn uint32, additionalWaitPeriod uint32) ui
 	return uint32(currentTime) + additionalWaitPeriod + startAuctionIn
 }
 
-func CreateAuctionDetails(preset *PresetClass, additionalWaitPeriod float32) (*AuctionDetails, error) {
+func CreateAuctionDetails(preset *PresetClassFixed, additionalWaitPeriod float32) (*AuctionDetails, error) {
 	pointsFixed := make([]AuctionPointClassFixed, 0)
 	for _, point := range preset.Points {
 		pointsFixed = append(pointsFixed, AuctionPointClassFixed{

diff --git a/sdk-clients/fusion/order_test.go b/sdk-clients/fusion/order_test.go
@@ -129,15 +129,15 @@ func TestCreateFusionOrderData(t *testing.T) {
 }
 
 func TestGetPreset(t *testing.T) {
-	customPreset := &PresetClass{
+	customPreset := &PresetClassFixed{
 		AllowMultipleFills: true,
 		AllowPartialFills:  true,
 		AuctionDuration:    10.0,
 		AuctionEndAmount:   "1000",
 		AuctionStartAmount: "500",
 		BankFee:            "5",
 		EstP:               0.1,
-		ExclusiveResolver:  map[string]interface{}{"resolver": "value"},
+		ExclusiveResolver:  "resolver",
 		GasCost: GasCostConfigClass{
 			GasBumpEstimate:  1.0,
 			GasPriceEstimate: "100",
@@ -150,15 +150,15 @@ func TestGetPreset(t *testing.T) {
 		TokenFee:       "1",
 	}
 
-	fastPreset := PresetClass{
+	fastPreset := PresetClassFixed{
 		AllowMultipleFills: false,
 		AllowPartialFills:  false,
 		AuctionDuration:    20.0,
 		AuctionEndAmount:   "2000",
 		AuctionStartAmount: "1000",
 		BankFee:            "10",
 		EstP:               0.2,
-		ExclusiveResolver:  map[string]interface{}{"resolver": "value"},
+		ExclusiveResolver:  "resolver",
 		GasCost: GasCostConfigClass{
 			GasBumpEstimate:  2.0,
 			GasPriceEstimate: "200",
@@ -171,15 +171,15 @@ func TestGetPreset(t *testing.T) {
 		TokenFee:       "2",
 	}
 
-	mediumPreset := PresetClass{
+	mediumPreset := PresetClassFixed{
 		AllowMultipleFills: true,
 		AllowPartialFills:  false,
 		AuctionDuration:    30.0,
 		AuctionEndAmount:   "3000",
 		AuctionStartAmount: "1500",
 		BankFee:            "15",
 		EstP:               0.3,
-		ExclusiveResolver:  map[string]interface{}{"resolver": "value"},
+		ExclusiveResolver:  "resolver",
 		GasCost: GasCostConfigClass{
 			GasBumpEstimate:  3.0,
 			GasPriceEstimate: "300",
@@ -192,15 +192,15 @@ func TestGetPreset(t *testing.T) {
 		TokenFee:       "3",
 	}
 
-	slowPreset := PresetClass{
+	slowPreset := PresetClassFixed{
 		AllowMultipleFills: false,
 		AllowPartialFills:  true,
 		AuctionDuration:    40.0,
 		AuctionEndAmount:   "4000",
 		AuctionStartAmount: "2000",
 		BankFee:            "20",
 		EstP:               0.4,
-		ExclusiveResolver:  map[string]interface{}{"resolver": "value"},
+		ExclusiveResolver:  "resolver",
 		GasCost: GasCostConfigClass{
 			GasBumpEstimate:  4.0,
 			GasPriceEstimate: "400",
@@ -213,7 +213,7 @@ func TestGetPreset(t *testing.T) {
 		TokenFee:       "4",
 	}
 
-	presets := QuotePresetsClass{
+	presets := QuotePresetsClassFixed{
 		Custom: customPreset,
 		Fast:   fastPreset,
 		Medium: mediumPreset,
@@ -223,7 +223,7 @@ func TestGetPreset(t *testing.T) {
 	tests := []struct {
 		name       string
 		presetType GetQuoteOutputRecommendedPreset
-		expected   *PresetClass
+		expected   *PresetClassFixed
 		expectErr  bool
 	}{
 		{
@@ -274,22 +274,22 @@ func TestGetPreset(t *testing.T) {
 func TestCreateAuctionDetails(t *testing.T) {
 	tests := []struct {
 		name                 string
-		preset               *PresetClass
+		preset               *PresetClassFixed
 		additionalWaitPeriod float32
 		expected             *AuctionDetails
 		expectErr            bool
 	}{
 		{
 			name: "Valid Preset",
-			preset: &PresetClass{
+			preset: &PresetClassFixed{
 				AllowMultipleFills: true,
 				AllowPartialFills:  true,
 				AuctionDuration:    60.0,
 				AuctionEndAmount:   "1000",
 				AuctionStartAmount: "500",
 				BankFee:            "5",
 				EstP:               0.1,
-				ExclusiveResolver:  map[string]interface{}{"resolver": "value"},
+				ExclusiveResolver:  "resolver",
 				GasCost: GasCostConfigClass{
 					GasBumpEstimate:  1.0,
 					GasPriceEstimate: "100",
@@ -318,15 +318,15 @@ func TestCreateAuctionDetails(t *testing.T) {
 		},
 		{
 			name: "Invalid Gas Price Estimate",
-			preset: &PresetClass{
+			preset: &PresetClassFixed{
 				AllowMultipleFills: true,
 				AllowPartialFills:  true,
 				AuctionDuration:    60.0,
 				AuctionEndAmount:   "1000",
 				AuctionStartAmount: "500",
 				BankFee:            "5",
 				EstP:               0.1,
-				ExclusiveResolver:  map[string]interface{}{"resolver": "value"},
+				ExclusiveResolver:  "resolver",
 				GasCost: GasCostConfigClass{
 					GasBumpEstimate:  1.0,
 					GasPriceEstimate: "invalid",