diff options
| author | Felix Lange <fjl@users.noreply.github.com> | 2018-01-08 20:15:57 +0800 |
|---|---|---|
| committer | Péter Szilágyi <peterke@gmail.com> | 2018-01-08 20:15:57 +0800 |
| commit | 5c2f1e00148f16655d3fb63b93920b1108165c56 (patch) | |
| tree | f3b453e05a8da60ceb006b5899554f8fbad86cf4 /accounts/usbwallet | |
| parent | a139041d409d0ffaf81c7cf931c6b24299a05705 (diff) | |
| download | dexon-5c2f1e00148f16655d3fb63b93920b1108165c56.tar dexon-5c2f1e00148f16655d3fb63b93920b1108165c56.tar.gz dexon-5c2f1e00148f16655d3fb63b93920b1108165c56.tar.bz2 dexon-5c2f1e00148f16655d3fb63b93920b1108165c56.tar.lz dexon-5c2f1e00148f16655d3fb63b93920b1108165c56.tar.xz dexon-5c2f1e00148f16655d3fb63b93920b1108165c56.tar.zst dexon-5c2f1e00148f16655d3fb63b93920b1108165c56.zip | |
all: update generated code (#15808)
* core/types, core/vm, eth, tests: regenerate gencodec files
* Makefile: update devtools target
Install protoc-gen-go and print reminders about npm, solc and protoc.
Also switch to github.com/kevinburke/go-bindata because it's more
maintained.
* contracts/ens: update contracts and regenerate with solidity v0.4.19
The newer upstream version of the FIFSRegistrar contract doesn't set the
resolver anymore. The resolver is now deployed separately.
* contracts/release: regenerate with solidity v0.4.19
* contracts/chequebook: fix fallback and regenerate with solidity v0.4.19
The contract didn't have a fallback function, payments would be rejected
when compiled with newer solidity. References to 'mortal' and 'owned'
use the local file system so we can compile without network access.
* p2p/discv5: regenerate with recent stringer
* cmd/faucet: regenerate
* dashboard: regenerate
* eth/tracers: regenerate
* internal/jsre/deps: regenerate
* dashboard: avoid sed -i because it's not portable
* accounts/usbwallet/internal/trezor: fix go generate warnings
Diffstat (limited to 'accounts/usbwallet')
| -rw-r--r-- | accounts/usbwallet/internal/trezor/messages.proto | 2 | ||||
| -rw-r--r-- | accounts/usbwallet/internal/trezor/trezor.go | 2 | ||||
| -rw-r--r-- | accounts/usbwallet/internal/trezor/types.proto | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/accounts/usbwallet/internal/trezor/messages.proto b/accounts/usbwallet/internal/trezor/messages.proto index 178956457..8cb9c8cc2 100644 --- a/accounts/usbwallet/internal/trezor/messages.proto +++ b/accounts/usbwallet/internal/trezor/messages.proto @@ -2,6 +2,8 @@ // https://github.com/trezor/trezor-common/blob/master/protob/messages.proto // dated 28.07.2017, commit dd8ec3231fb5f7992360aff9bdfe30bb58130f4b. +syntax = "proto2"; + /** * Messages for TREZOR communication */ diff --git a/accounts/usbwallet/internal/trezor/trezor.go b/accounts/usbwallet/internal/trezor/trezor.go index 487aeb5f8..8ae9e726e 100644 --- a/accounts/usbwallet/internal/trezor/trezor.go +++ b/accounts/usbwallet/internal/trezor/trezor.go @@ -18,7 +18,7 @@ // wallets. The wire protocol spec can be found on the SatoshiLabs website: // https://doc.satoshilabs.com/trezor-tech/api-protobuf.html -//go:generate protoc --go_out=Mgoogle/protobuf/descriptor.proto=github.com/golang/protobuf/protoc-gen-go/descriptor,import_path=trezor:. types.proto messages.proto +//go:generate protoc --go_out=import_path=trezor:. types.proto messages.proto // Package trezor contains the wire protocol wrapper in Go. package trezor diff --git a/accounts/usbwallet/internal/trezor/types.proto b/accounts/usbwallet/internal/trezor/types.proto index 3a358a584..acbe79e3f 100644 --- a/accounts/usbwallet/internal/trezor/types.proto +++ b/accounts/usbwallet/internal/trezor/types.proto @@ -2,6 +2,8 @@ // https://github.com/trezor/trezor-common/blob/master/protob/types.proto // dated 28.07.2017, commit dd8ec3231fb5f7992360aff9bdfe30bb58130f4b. +syntax = "proto2"; + /** * Types for TREZOR communication * |