-
Notifications
You must be signed in to change notification settings - Fork 13
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #68 from hyperledger/struct-hashing
Expose API to directly call HashStruct from EIP-712 and M+N dims
- Loading branch information
Showing
19 changed files
with
397 additions
and
37 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,85 @@ | ||
| // Copyright © 2024 Kaleido, Inc. | ||
| // | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package ethtypes | ||
|
|
||
| import ( | ||
| "context" | ||
| "encoding/json" | ||
| "fmt" | ||
| "strconv" | ||
|
|
||
| "github.com/hyperledger/firefly-common/pkg/i18n" | ||
| ) | ||
|
|
||
| // HexUint64 is a positive integer - serializes to JSON as an 0x hex string (no leading zeros), and parses flexibly depending on the prefix (so 0x for hex, or base 10 for plain string / float64) | ||
| type HexUint64 uint64 | ||
|
|
||
| func (h *HexUint64) String() string { | ||
| if h == nil { | ||
| return "0x0" | ||
| } | ||
| return "0x" + strconv.FormatUint(uint64(*h), 16) | ||
| } | ||
|
|
||
| func (h HexUint64) MarshalJSON() ([]byte, error) { | ||
| return []byte(fmt.Sprintf(`"%s"`, h.String())), nil | ||
| } | ||
|
|
||
| func (h *HexUint64) UnmarshalJSON(b []byte) error { | ||
| var i interface{} | ||
| _ = json.Unmarshal(b, &i) | ||
| switch i := i.(type) { | ||
| case float64: | ||
| *h = HexUint64(i) | ||
| return nil | ||
| case string: | ||
| i64, err := strconv.ParseUint(i, 0, 64) | ||
| if err != nil { | ||
| return fmt.Errorf("unable to parse integer: %s", i) | ||
| } | ||
| *h = HexUint64(i64) | ||
| return nil | ||
| default: | ||
| return fmt.Errorf("unable to parse integer from type %T", i) | ||
| } | ||
| } | ||
|
|
||
| func (h HexUint64) Uint64() uint64 { | ||
| return uint64(h) | ||
| } | ||
|
|
||
| func (h *HexUint64) Uint64OrZero() uint64 { | ||
| if h == nil { | ||
| return 0 | ||
| } | ||
| return uint64(*h) | ||
| } | ||
|
|
||
| func (h *HexUint64) Scan(src interface{}) error { | ||
| switch src := src.(type) { | ||
| case nil: | ||
| return nil | ||
| case int64: | ||
| *h = HexUint64(src) | ||
| return nil | ||
| case uint64: | ||
| *h = HexUint64(src) | ||
| return nil | ||
| default: | ||
| return i18n.NewError(context.Background(), i18n.MsgTypeRestoreFailed, src, h) | ||
| } | ||
| } |
Oops, something went wrong.