diff options
author | Martin Holst Swende <martin@swende.se> | 2019-01-24 18:36:30 +0800 |
---|---|---|
committer | Felix Lange <fjl@twurst.com> | 2019-01-30 00:49:27 +0800 |
commit | c7664b06361663e2027e74574804f3210542f19f (patch) | |
tree | ac1f0dc6fd116b4cbd9385b5f3899dd07a14a477 /tests/rlp_test_util.go | |
parent | 9dc5d1a915ac0e0bd8429d6ac41df50eec91de5f (diff) | |
download | go-tangerine-c7664b06361663e2027e74574804f3210542f19f.tar go-tangerine-c7664b06361663e2027e74574804f3210542f19f.tar.gz go-tangerine-c7664b06361663e2027e74574804f3210542f19f.tar.bz2 go-tangerine-c7664b06361663e2027e74574804f3210542f19f.tar.lz go-tangerine-c7664b06361663e2027e74574804f3210542f19f.tar.xz go-tangerine-c7664b06361663e2027e74574804f3210542f19f.tar.zst go-tangerine-c7664b06361663e2027e74574804f3210542f19f.zip |
core, cmd/puppeth: implement constantinople fix, disable EIP-1283 (#18486)
This PR adds a new fork which disables EIP-1283. Internally it's called Petersburg,
but the genesis/config field is ConstantinopleFix.
The block numbers are:
7280000 for Constantinople on Mainnet
7280000 for ConstantinopleFix on Mainnet
4939394 for ConstantinopleFix on Ropsten
9999999 for ConstantinopleFix on Rinkeby (real number decided later)
This PR also defaults to using the same ConstantinopleFix number as whatever
Constantinople is set to. That is, it will default to mainnet behaviour if ConstantinopleFix
is not set.This means that for private networks which have already transitioned
to Constantinople, this PR will break the network unless ConstantinopleFix is
explicitly set!
Diffstat (limited to 'tests/rlp_test_util.go')
-rw-r--r-- | tests/rlp_test_util.go | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/tests/rlp_test_util.go b/tests/rlp_test_util.go index 58ef8a642..9069ec55a 100644 --- a/tests/rlp_test_util.go +++ b/tests/rlp_test_util.go @@ -42,9 +42,22 @@ type RLPTest struct { Out string } +// FromHex returns the bytes represented by the hexadecimal string s. +// s may be prefixed with "0x". +// This is copy-pasted from bytes.go, which does not return the error +func FromHex(s string) ([]byte, error) { + if len(s) > 1 && (s[0:2] == "0x" || s[0:2] == "0X") { + s = s[2:] + } + if len(s)%2 == 1 { + s = "0" + s + } + return hex.DecodeString(s) +} + // Run executes the test. func (t *RLPTest) Run() error { - outb, err := hex.DecodeString(t.Out) + outb, err := FromHex(t.Out) if err != nil { return fmt.Errorf("invalid hex in Out") } |