Skip to content
This repository has been archived by the owner on Apr 4, 2024. It is now read-only.

Commit

Permalink
fixes for 19.0.1 (#1305) (#1306)
Browse files Browse the repository at this point in the history
  • Loading branch information
facs95 committed Aug 27, 2022
1 parent 9ec604a commit 0b1a3ae
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 0 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,12 @@ Ref: https://keepachangelog.com/en/1.0.0/

# Changelog

## [v0.19.1] - 2022-08-26

### State Machine Breaking

* (eth) [#1305](https://github.com/evmos/ethermint/pull/1305) Added support for optional params, basic types arrays and `time` type on eip712.

## [v0.19.0] - 2022-08-15

### State Machine Breaking
Expand Down
14 changes: 14 additions & 0 deletions ethereum/eip712/eip712.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"math/big"
"reflect"
"strings"
"time"

"golang.org/x/text/cases"
"golang.org/x/text/language"
Expand Down Expand Up @@ -231,6 +232,11 @@ func traverseFields(
// then continue as normal
}

// If its a nil pointer, do not include in types
if fieldType.Kind() == reflect.Ptr && field.IsNil() {
continue
}

for {
if fieldType.Kind() == reflect.Ptr {
fieldType = fieldType.Elem()
Expand Down Expand Up @@ -295,6 +301,11 @@ func traverseFields(

ethTyp := typToEth(fieldType)
if len(ethTyp) > 0 {
// Support array of uint64
if isCollection && fieldType.Kind() != reflect.Slice && fieldType.Kind() != reflect.Array {
ethTyp += "[]"
}

if prefix == typeDefPrefix {
typeMap[rootType] = append(typeMap[rootType], apitypes.Type{
Name: fieldName,
Expand Down Expand Up @@ -381,6 +392,7 @@ var (
bigIntType = reflect.TypeOf(big.Int{})
cosmIntType = reflect.TypeOf(sdk.Int{})
cosmosAnyType = reflect.TypeOf(&codectypes.Any{})
timeType = reflect.TypeOf(time.Time{})
)

// typToEth supports only basic types and arrays of basic types.
Expand Down Expand Up @@ -425,13 +437,15 @@ func typToEth(typ reflect.Type) string {
}
case reflect.Ptr:
if typ.Elem().ConvertibleTo(bigIntType) ||
typ.Elem().ConvertibleTo(timeType) ||
typ.Elem().ConvertibleTo(cosmIntType) {
return str
}
case reflect.Struct:
if typ.ConvertibleTo(hashType) ||
typ.ConvertibleTo(addressType) ||
typ.ConvertibleTo(bigIntType) ||
typ.ConvertibleTo(timeType) ||
typ.ConvertibleTo(cosmIntType) {
return str
}
Expand Down

0 comments on commit 0b1a3ae

Please sign in to comment.