update

0xsequence · Dec 13, 2024 · 41f03cd · 41f03cd
1 parent 95a7923
commit 41f03cd
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 42 deletions.
diff --git a/intents/intent.gen.go b/intents/intent.gen.go
diff --git a/intents/intent.ridl b/intents/intent.ridl
@@ -109,6 +109,7 @@ struct IntentDataSignTypedData
   - network: string
   - wallet: string
   - typedData: any
+    + go.field.type = *ethcoder.TypedData
 
 struct IntentDataFeeOptions
   - network: string

diff --git a/intents/intent_data_sign_712_ext.go b/intents/intent_data_sign_712_ext.go
@@ -2,39 +2,13 @@ package intents
 
 import (
 	"bytes"
-	"encoding/json"
 	"fmt"
 	"math/big"
 
-	"github.com/0xsequence/ethkit/ethcoder"
 	"github.com/0xsequence/ethkit/go-ethereum/common"
 	"github.com/0xsequence/go-sequence"
 )
 
-func (p *IntentDataSignTypedData) UnmarshalJSON(data []byte) error {
-	type Raw struct {
-		Network   string          `json:"network"`
-		Wallet    string          `json:"wallet"`
-		TypedData json.RawMessage `json:"typedData"`
-	}
-
-	dec := json.NewDecoder(bytes.NewReader(data))
-	var raw Raw
-	if err := dec.Decode(&raw); err != nil {
-		return err
-	}
-
-	typedData, err := ethcoder.TypedDataFromJSON(string(raw.TypedData))
-	if err != nil {
-		return err
-	}
-
-	p.Network = raw.Network
-	p.Wallet = raw.Wallet
-	p.TypedData = typedData
-	return nil
-}
-
 func (p *IntentDataSignTypedData) chainID() (*big.Int, error) {
 	n, ok := sequence.ParseHexOrDec(p.Network)
 	if !ok {
@@ -44,12 +18,12 @@ func (p *IntentDataSignTypedData) chainID() (*big.Int, error) {
 }
 
 func (p *IntentDataSignTypedData) message() ([]byte, error) {
-	typedData, ok := p.TypedData.(*ethcoder.TypedData)
-	if !ok {
-		return nil, fmt.Errorf("typedData field is not a valid typed data object")
-	}
+	// typedData, ok := p.TypedData.(*ethcoder.TypedData)
+	// if !ok {
+	// 	return nil, fmt.Errorf("typedData field is not a valid typed data object")
+	// }
 
-	_, encodedMessage, err := typedData.Encode()
+	_, encodedMessage, err := p.TypedData.Encode()
 	if err != nil {
 		return nil, err
 	}
@@ -81,3 +55,27 @@ func (p *IntentDataSignTypedData) IsValidInterpretation(subdigest common.Hash) b
 
 	return bytes.Equal(selfSubDigest, subdigest[:])
 }
+
+// func (p *IntentDataSignTypedData) UnmarshalJSON(data []byte) error {
+// 	type Raw struct {
+// 		Network   string          `json:"network"`
+// 		Wallet    string          `json:"wallet"`
+// 		TypedData json.RawMessage `json:"typedData"`
+// 	}
+
+// 	dec := json.NewDecoder(bytes.NewReader(data))
+// 	var raw Raw
+// 	if err := dec.Decode(&raw); err != nil {
+// 		return err
+// 	}
+
+// 	typedData, err := ethcoder.TypedDataFromJSON(string(raw.TypedData))
+// 	if err != nil {
+// 		return err
+// 	}
+
+// 	p.Network = raw.Network
+// 	p.Wallet = raw.Wallet
+// 	p.TypedData = typedData
+// 	return nil
+// }
diff --git a/intents/intent_data_sign_712_ext_test.go b/intents/intent_data_sign_712_ext_test.go
@@ -6,7 +6,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/0xsequence/ethkit/ethcoder"
 	"github.com/0xsequence/ethkit/ethwallet"
 	"github.com/0xsequence/ethkit/go-ethereum/common"
 	"github.com/0xsequence/go-sequence"
@@ -79,15 +78,11 @@ func TestRecoverTypedDataIntent(t *testing.T) {
 	intentTyped, err := NewIntentTypedFromIntent[IntentDataSignTypedData](intent)
 	require.NoError(t, err)
 
-	typedData, ok := intentTyped.Data.TypedData.(*ethcoder.TypedData)
-	require.True(t, ok)
-	require.NotNil(t, typedData)
-
 	signers := intent.Signers()
 	require.Equal(t, 1, len(signers))
 	require.Equal(t, "0x"+common.Bytes2Hex(append([]byte{0x00}, wallet.Address().Bytes()...)), signers[0])
 
-	messageDigest, err := typedData.EncodeDigest()
+	messageDigest, err := intentTyped.Data.TypedData.EncodeDigest()
 	require.NoError(t, err)
 	require.NotNil(t, messageDigest)