Simplifying user input for new limit order structure

Author: Tanz0rz

sdk-clients/fusion/order.go

@@ -152,18 +152,17 @@ func CreateFusionOrderData(quote GetQuoteOutputFixed, orderParams OrderParams, w
 	}
 
 	limitOrder, err := orderbook.CreateLimitOrderMessage(orderbook.CreateOrderParams{
-		Wallet:             wallet,
-		MakerTraits:        makerTraits,
-		MakerTraitsEncoded: makerTraits.Encode(),
-		Extension:          *orderbookExtension,
-		ExtensionEncoded:   orderbookExtensionEncoded,
-		Salt:               salt,
-		Maker:              fusionOrder.OrderInfo.Maker,
-		MakerAsset:         fusionOrder.OrderInfo.MakerAsset,
-		TakerAsset:         fusionOrder.OrderInfo.TakerAsset,
-		TakingAmount:       fusionOrder.OrderInfo.TakingAmount,
-		MakingAmount:       fusionOrder.OrderInfo.MakingAmount,
-		Taker:              fusionOrder.OrderInfo.Receiver,
+		Wallet:           wallet,
+		MakerTraits:      makerTraits,
+		Extension:        *orderbookExtension,
+		ExtensionEncoded: orderbookExtensionEncoded,
+		Salt:             salt,
+		Maker:            fusionOrder.OrderInfo.Maker,
+		MakerAsset:       fusionOrder.OrderInfo.MakerAsset,
+		TakerAsset:       fusionOrder.OrderInfo.TakerAsset,
+		TakingAmount:     fusionOrder.OrderInfo.TakingAmount,
+		MakingAmount:     fusionOrder.OrderInfo.MakingAmount,
+		Taker:            fusionOrder.OrderInfo.Receiver,
 	}, int(chainId))
 	if err != nil {
 		return nil, nil, fmt.Errorf("error creating limit order message: %v", err)

sdk-clients/orderbook/examples/create_order/main.go

@@ -50,6 +50,9 @@ func main() {
 		log.Fatal(err)
 	}
 	client, err := orderbook.NewClient(config)
+	if err != nil {
+		log.Fatalf("Failed to create client: %v\n", err)
+	}
 
 	ecdsaPrivateKey, err := crypto.HexToECDSA(privateKey)
 	if err != nil {
@@ -90,7 +93,7 @@ func main() {
 		log.Fatalf("Failed to create extension: %v\n", err)
 	}
 
-	salt, err := orderbook.GenerateSaltNew(&orderbook.GetSaltParams{
+	salt, err := orderbook.GenerateSaltWithFees(&orderbook.GetSaltParams{
 		Extension: extensionEncoded,
 	})
 	if err != nil {
@@ -109,7 +112,6 @@ func main() {
 		SkipWarnings:                   false,
 		EnableOnchainApprovalsIfNeeded: false,
 		MakerTraits:                    orderbook.NewMakerTraitsDefault(),
-		MakerTraitsEncoded:             orderbook.NewMakerTraitsDefault().Encode(),
 		ExtensionEncoded:               extensionEncoded,
 	})
 	if err != nil {

sdk-clients/orderbook/examples/create_order_permit/main.go

@@ -123,7 +123,7 @@ func main() {
 		log.Fatalf("Failed to create extension: %v\n", err)
 	}
 
-	salt, err := orderbook.GenerateSaltNew(&orderbook.GetSaltParams{
+	salt, err := orderbook.GenerateSaltWithFees(&orderbook.GetSaltParams{
 		Extension: extensionEncoded,
 	})
 	if err != nil {
@@ -134,7 +134,6 @@ func main() {
 		Wallet:                         client.Wallet,
 		Salt:                           fmt.Sprintf("%d", salt),
 		MakerTraits:                    orderbook.NewMakerTraitsDefault(), // Defaults to a 1 hour expiration
-		MakerTraitsEncoded:             orderbook.NewMakerTraitsDefault().Encode(),
 		ExtensionEncoded:               extensionEncoded,
 		Maker:                          publicAddress.Hex(),
 		MakerAsset:                     makerAsset,

sdk-clients/orderbook/limitorder.go

@@ -17,6 +17,13 @@ import (
 
 func CreateLimitOrderMessage(orderRequest CreateOrderParams, chainId int) (*Order, error) {
 
+	var makerTraitsEncoded string
+	if orderRequest.MakerTraits == nil {
+		makerTraitsEncoded = ""
+	} else {
+		makerTraitsEncoded = orderRequest.MakerTraits.Encode()
+	}
+
 	orderData := OrderData{
 		MakerAsset:    orderRequest.MakerAsset,
 		TakerAsset:    orderRequest.TakerAsset,
@@ -26,7 +33,7 @@ func CreateLimitOrderMessage(orderRequest CreateOrderParams, chainId int) (*Orde
 		Maker:         orderRequest.Maker,
 		AllowedSender: "0x0000000000000000000000000000000000000000",
 		Receiver:      orderRequest.Taker,
-		MakerTraits:   orderRequest.MakerTraitsEncoded,
+		MakerTraits:   makerTraitsEncoded,
 		Extension:     orderRequest.ExtensionEncoded,
 	}
 

sdk-clients/orderbook/limitorder_test.go

@@ -148,35 +148,18 @@ func TestPrivateKeyProviderSignatures(t *testing.T) {
 		{
 			name: "Basic order without extension",
 			createOrderParams: CreateOrderParams{
-				Wallet:             wallet,
-				Salt:               "618054093254",
-				MakerAsset:         "0xe9e7cea3dedca5984780bafc599bd69add087d56",
-				TakerAsset:         "0x111111111117dc0aa78b770fa6a738034120c302",
-				Maker:              "0xfb3c7eb936cAA12B5A884d612393969A557d4307", // wrong maker, but original test used this incorrect maker too
-				Taker:              "0x0000000000000000000000000000000000000000",
-				MakingAmount:       "1000000000000000000",
-				TakingAmount:       "1000000000000000000",
-				MakerTraitsEncoded: "0",
-				ExtensionEncoded:   "",
+				Wallet:           wallet,
+				Salt:             "618054093254",
+				MakerAsset:       "0xe9e7cea3dedca5984780bafc599bd69add087d56",
+				TakerAsset:       "0x111111111117dc0aa78b770fa6a738034120c302",
+				Maker:            "0xfb3c7eb936cAA12B5A884d612393969A557d4307", // wrong maker, but original test used this incorrect maker too
+				Taker:            "0x0000000000000000000000000000000000000000",
+				MakingAmount:     "1000000000000000000",
+				TakingAmount:     "1000000000000000000",
+				ExtensionEncoded: "",
 			},
 			expectedSignature: "0x8e1cbdc41ebb253aea91bfa41a028e735be4a5b25d93da0e3a6817070f40dcd31dfbc38bd3800ce2ff88089c77ca2f442dc84637006808aab0af00d966c917b11b",
 		},
-		{
-			name: "Order with encoded makerTraits and extension",
-			createOrderParams: CreateOrderParams{
-				Wallet:             wallet,
-				Maker:              "0xa07c1d51497fb6e66aa2329cecb86fca0a957fdb",
-				MakerAsset:         "0x7ceb23fd6bc0add59e62ac25578270cff1b9f619",
-				TakerAsset:         "0x3c499c542cef5e3811e1192ce70d8cc03d5c3359",
-				MakerTraitsEncoded: "62419173104490761595518734107265470028567163848515356096567424516114421383168",
-				Salt:               "45578086814670124218059628060064361542707758903711135432287335709451338446788",
-				MakingAmount:       "200000000000000",
-				TakingAmount:       "473918",
-				ExtensionEncoded:   "0x00000203000001220000012200000122000001220000009100000000000000002ad5004c60e16e54d5007c80ce329adde5b51ef500000000000000685ac44a0000b401bf90000000000000640ac0866635457d36ab318d0000000000000000000066593d4e7d3a5f55167fd18bd45f0b94f54a968f000000000000000000000000000000000000000000000000000000000000c976bf098c4dba0a061d972ad4499f120902631a95770895ad27ad6b0d952ad5004c60e16e54d5007c80ce329adde5b51ef500000000000000685ac44a0000b401bf90000000000000640ac0866635457d36ab318d0000000000000000000066593d4e7d3a5f55167fd18bd45f0b94f54a968f000000000000000000000000000000000000000000000000000000000000c976bf098c4dba0a061d972ad4499f120902631a95770895ad27ad6b0d952ad5004c60e16e54d5007c80ce329adde5b51ef50000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000064685ac4390ac0866635457d36ab318d000000000000000000000000000066593d4e7d3a5f55167f0000d18bd45f0b94f54a968f0000000000000000000000000000000000000000000000000000000000000000000000000000c976bf098c4dba0a061d0000972ad4499f120902631a000095770895ad27ad6b0d95000000000000000000000000000000000000000000000000000000000000000765bc00",
-				Taker:              "0x0000000000000000000000000000000000000000",
-			},
-			expectedSignature: "0xa51b91494f030cb9bdf3b902d5a29a98ec23f5f6606c9255f87571e9423dc135432208f3dd78b66d369f543e92c712d22be63e8fc048058c7a2c7fefcc5181f61c",
-		},
 	}
 
 	for _, tc := range tests {

sdk-clients/orderbook/orderbook_types_manual.go

@@ -14,7 +14,6 @@ type CreateOrderParams struct {
 	MakerTraits                    *MakerTraits
 	Extension                      Extension
 	ExtensionEncoded               string
-	MakerTraitsEncoded             string
 	Salt                           string
 	Maker                          string
 	MakerAsset                     string

sdk-clients/orderbook/salt.go

@@ -15,8 +15,8 @@ type GetSaltParams struct {
 	UseRandom bool    // If true, uses random bits for the middle section; otherwise uses timestamp
 }
 
-// GenerateSaltNew generates a salt value with specific bit patterns
-func GenerateSaltNew(params *GetSaltParams) (*big.Int, error) {
+// GenerateSaltWithFees generates a salt value with specific bit patterns
+func GenerateSaltWithFees(params *GetSaltParams) (*big.Int, error) {
 	salt := big.NewInt(0)
 
 	// Generate upper 32 bits (bits 224-255) - tracking code mask