add delayedrefund field and parse uuids in bundles params (#57)

1. parse UUID in bundles to return errors to users early
* note: we modify semantics of unique key but its not a problem since
this is only used internally to distinguish bundles in memory
2. add `delayedRefund` field

Author: dvush

rpctypes/types.go

@@ -48,18 +48,19 @@ type EthSendBundleArgs struct {
 	MinTimestamp      *uint64         `json:"minTimestamp,omitempty"`
 	MaxTimestamp      *uint64         `json:"maxTimestamp,omitempty"`
 	RevertingTxHashes []common.Hash   `json:"revertingTxHashes,omitempty"`
-	ReplacementUUID   *string         `json:"replacementUuid,omitempty"`
+	ReplacementUUID   *uuid.UUID      `json:"replacementUuid,omitempty"`
 	Version           *string         `json:"version,omitempty"`
 
 	ReplacementNonce *uint64         `json:"replacementNonce,omitempty"`
 	SigningAddress   *common.Address `json:"signingAddress,omitempty"` // may or may not be respected depending on the context
 	RefundIdentity   *common.Address `json:"refundIdentity,omitempty"` // metadata field to improve redistribution ux
 
 	DroppingTxHashes []common.Hash   `json:"droppingTxHashes,omitempty"`
-	UUID             *string         `json:"uuid,omitempty"`
+	UUID             *uuid.UUID      `json:"uuid,omitempty"`
 	RefundPercent    *uint64         `json:"refundPercent,omitempty"`
 	RefundRecipient  *common.Address `json:"refundRecipient,omitempty"`
 	RefundTxHashes   []string        `json:"refundTxHashes,omitempty"`
+	DelayedRefund    *bool           `json:"delayedRefund,omitempty"` // if set to true refund will be paid out of block
 }
 
 const (
@@ -106,7 +107,7 @@ type MevBundleMetadata struct {
 
 type MevSendBundleArgs struct {
 	Version         string             `json:"version"`
-	ReplacementUUID string             `json:"replacementUuid,omitempty"`
+	ReplacementUUID *uuid.UUID         `json:"replacementUuid,omitempty"`
 	Inclusion       MevBundleInclusion `json:"inclusion"`
 	// when empty its considered cancel
 	Body     []MevBundleBody    `json:"body"`
@@ -184,7 +185,7 @@ func (b *EthSendBundleArgs) UniqueKey() uuid.UUID {
 		_, _ = hash.Write(txHash.Bytes())
 	}
 	if b.ReplacementUUID != nil {
-		_, _ = hash.Write([]byte(*b.ReplacementUUID))
+		_, _ = hash.Write((*b.ReplacementUUID)[:])
 	}
 	if b.ReplacementNonce != nil {
 		_ = binary.Write(hash, binary.LittleEndian, *b.ReplacementNonce)
@@ -371,7 +372,9 @@ func (b *MevSendBundleArgs) UniqueKey() uuid.UUID {
 }
 
 func uniqueKeyMevSendBundle(b *MevSendBundleArgs, hash hash.Hash) {
-	hash.Write([]byte(b.ReplacementUUID))
+	if b.ReplacementUUID != nil {
+		hash.Write(b.ReplacementUUID[:])
+	}
 	_ = binary.Write(hash, binary.LittleEndian, b.Inclusion.BlockNumber)
 	_ = binary.Write(hash, binary.LittleEndian, b.Inclusion.MaxBlock)
 	for _, body := range b.Body {
@@ -394,7 +397,7 @@ func uniqueKeyMevSendBundle(b *MevSendBundleArgs, hash hash.Hash) {
 func (b *MevSendBundleArgs) Validate() (common.Hash, error) {
 	// only cancell call can be without txs
 	// cancell call must have ReplacementUUID set
-	if len(b.Body) == 0 && b.ReplacementUUID == "" {
+	if len(b.Body) == 0 && b.ReplacementUUID == nil {
 		return common.Hash{}, ErrBundleNoTxs
 	}
 	return hashMevSendBundle(0, b)

rpctypes/types_test.go

@@ -78,15 +78,15 @@ func TestEthSendBundleArgsValidate(t *testing.T) {
 			}`),
 			ExpectedHash:      "0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470",
 			ExpectedUUID:      "35718fe4-5d24-51c8-93bf-9c961d7c3ea3",
-			ExpectedUniqueKey: "1655edd0-29a6-5372-a19b-1ddedda14b20",
+			ExpectedUniqueKey: "62b35666-4162-51a4-b2dc-fb42aed171ac",
 		},
 		{
 			Payload: []byte(`{
 		                 "replacementUuid": "35718fe4-5d24-51c8-93bf-9c961d7c3ea3"
 			}`),
 			ExpectedHash:      "0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470",
 			ExpectedUUID:      "35718fe4-5d24-51c8-93bf-9c961d7c3ea3",
-			ExpectedUniqueKey: "3c718cb9-3f6c-5dc0-9d99-264dafc0b4e9",
+			ExpectedUniqueKey: "7a362520-e7de-526a-8281-ed2e4cdbfccb",
 		},
 		{
 			Payload: []byte(`  {