fixes for 19.0.1 (#1305)
* fixes for 19.0.1 * changelog * changelog Co-authored-by: Federico Kunze Küllmer <31522760+fedekunze@users.noreply.github.com>
This commit is contained in:
parent
524e25c038
commit
c9fe1d1913
@ -46,6 +46,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
|
||||
recompute eth tx hashes in JSON-RPC APIs to fix old blocks.
|
||||
* (deps) [#1168](https://github.com/evmos/ethermint/pull/1168) Upgrade cosmos-sdk to v0.46.
|
||||
* (feemarket) [#1194](https://github.com/evmos/ethermint/pull/1194) Apply feemarket to native cosmos tx.
|
||||
* (eth) [#1305](https://github.com/evmos/ethermint/pull/1305) Added support for optional params, basic types arrays and `time` type on eip712.
|
||||
|
||||
### API Breaking
|
||||
|
||||
|
@ -7,6 +7,7 @@ import (
|
||||
"math/big"
|
||||
"reflect"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
sdkmath "cosmossdk.io/math"
|
||||
"golang.org/x/text/cases"
|
||||
@ -232,6 +233,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()
|
||||
@ -296,6 +302,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,
|
||||
@ -381,6 +392,7 @@ var (
|
||||
bigIntType = reflect.TypeOf(big.Int{})
|
||||
cosmIntType = reflect.TypeOf(sdkmath.Int{})
|
||||
cosmosAnyType = reflect.TypeOf(&codectypes.Any{})
|
||||
timeType = reflect.TypeOf(time.Time{})
|
||||
)
|
||||
|
||||
// typToEth supports only basic types and arrays of basic types.
|
||||
@ -425,6 +437,7 @@ func typToEth(typ reflect.Type) string {
|
||||
}
|
||||
case reflect.Ptr:
|
||||
if typ.Elem().ConvertibleTo(bigIntType) ||
|
||||
typ.Elem().ConvertibleTo(timeType) ||
|
||||
typ.Elem().ConvertibleTo(cosmIntType) {
|
||||
return str
|
||||
}
|
||||
@ -432,6 +445,7 @@ func typToEth(typ reflect.Type) string {
|
||||
if typ.ConvertibleTo(hashType) ||
|
||||
typ.ConvertibleTo(addressType) ||
|
||||
typ.ConvertibleTo(bigIntType) ||
|
||||
typ.ConvertibleTo(timeType) ||
|
||||
typ.ConvertibleTo(cosmIntType) {
|
||||
return str
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user