diff options
| -rw-r--r-- | signer/core/signed_data.go | 6 | ||||
| -rw-r--r-- | signer/core/signed_data_test.go | 34 |
2 files changed, 38 insertions, 2 deletions
diff --git a/signer/core/signed_data.go b/signer/core/signed_data.go index 475a8837e..d264cbaa0 100644 --- a/signer/core/signed_data.go +++ b/signer/core/signed_data.go @@ -894,8 +894,10 @@ func (domain *TypedDataDomain) validate() error { // Map is a helper function to generate a map version of the domain func (domain *TypedDataDomain) Map() map[string]interface{} { - dataMap := map[string]interface{}{ - "chainId": domain.ChainId, + dataMap := map[string]interface{}{} + + if domain.ChainId != nil { + dataMap["chainId"] = domain.ChainId } if len(domain.Name) > 0 { diff --git a/signer/core/signed_data_test.go b/signer/core/signed_data_test.go index 76e1b72ee..b1d893221 100644 --- a/signer/core/signed_data_test.go +++ b/signer/core/signed_data_test.go @@ -225,6 +225,40 @@ func TestSignData(t *testing.T) { } } +func TestDomainChainId(t *testing.T) { + withoutChainID := TypedData{ + Types: Types{ + "EIP712Domain": []Type{ + {Name: "name", Type: "string"}, + }, + }, + Domain: TypedDataDomain{ + Name: "test", + }, + } + + if _, ok := withoutChainID.Domain.Map()["chainId"]; ok { + t.Errorf("Expected the chainId key to not be present in the domain map") + } + + withChainID := TypedData{ + Types: Types{ + "EIP712Domain": []Type{ + {Name: "name", Type: "string"}, + {Name: "chainId", Type: "uint256"}, + }, + }, + Domain: TypedDataDomain{ + Name: "test", + ChainId: big.NewInt(1), + }, + } + + if _, ok := withChainID.Domain.Map()["chainId"]; !ok { + t.Errorf("Expected the chainId key be present in the domain map") + } +} + func TestHashStruct(t *testing.T) { hash, err := typedData.HashStruct(typedData.PrimaryType, typedData.Message) if err != nil { |