diff options
| author | winsvega <winsvega@mail.ru> | 2018-08-28 19:29:58 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-28 19:29:58 +0800 |
| commit | e25d2306414373a82dbd561a7bfe84b794ba2aaa (patch) | |
| tree | a6f68542511984af83bf57783a7fc99d9eff57d5 /JSONSchema | |
| parent | ad2184adca367c0b68c65b44519dba16e1d0b9e2 (diff) | |
| parent | 3be71ec3364a01fd4f2cb9b9fd086f3f69f0225c (diff) | |
| download | tangerine-tests-e25d2306414373a82dbd561a7bfe84b794ba2aaa.tar tangerine-tests-e25d2306414373a82dbd561a7bfe84b794ba2aaa.tar.gz tangerine-tests-e25d2306414373a82dbd561a7bfe84b794ba2aaa.tar.bz2 tangerine-tests-e25d2306414373a82dbd561a7bfe84b794ba2aaa.tar.lz tangerine-tests-e25d2306414373a82dbd561a7bfe84b794ba2aaa.tar.xz tangerine-tests-e25d2306414373a82dbd561a7bfe84b794ba2aaa.tar.zst tangerine-tests-e25d2306414373a82dbd561a7bfe84b794ba2aaa.zip | |
Merge pull request #486 from ethereum/create2
create2 collision tests
Diffstat (limited to 'JSONSchema')
| -rw-r--r-- | JSONSchema/bc-filler-schema.json | 23 | ||||
| -rw-r--r-- | JSONSchema/bc-schema.json | 8 | ||||
| -rw-r--r-- | JSONSchema/definitions.json | 12 |
3 files changed, 40 insertions, 3 deletions
diff --git a/JSONSchema/bc-filler-schema.json b/JSONSchema/bc-filler-schema.json index 2f9ecfbb5..a5306c5c3 100644 --- a/JSONSchema/bc-filler-schema.json +++ b/JSONSchema/bc-filler-schema.json @@ -218,6 +218,9 @@ ], "type": "object" }, + "sealEngine": { + "$ref": "#/definitions/SealEngineType" + }, "Transaction": { "additionalProperties": true, "not": { @@ -227,7 +230,7 @@ }, "properties": { "data": { - "$ref": "#/definitions/HexDataOrEmpty" + "$ref": "#/definitions/TxData" }, "gasLimit": { "$ref": "#/definitions/IntegerOrEmptyOrConfusedHex" @@ -258,6 +261,19 @@ ], "type": "object" }, + "TxData": { + "anyOf": [ + { + "$ref": "#/definitions/HexData" + }, + { + "$ref": "#/definitions/EmptyString" + }, + { + "$ref": "#/definitions/LLLCode" + } + ] + }, "TxSigR": { "oneOf": [ { @@ -318,7 +334,10 @@ "description": "prestate account address with 0x prefix" } } - } + }, + "sealEngine": { + "$ref": "#/definitions/SealEngineType" + } }, "required": [ "pre", diff --git a/JSONSchema/bc-schema.json b/JSONSchema/bc-schema.json index 729638d1a..fb7d92e76 100644 --- a/JSONSchema/bc-schema.json +++ b/JSONSchema/bc-schema.json @@ -198,6 +198,9 @@ ], "type": "object" }, + "sealEngine": { + "$ref": "#/definitions/SealEngineType" + }, "Transaction": { "additionalProperties": true, "not": { @@ -301,7 +304,10 @@ "description": "prestate account address with 0x prefix" } } - } + }, + "sealEngine": { + "$ref": "#/definitions/SealEngineType" + } }, "required": [ "postState", diff --git a/JSONSchema/definitions.json b/JSONSchema/definitions.json index 4d00794c5..529e08763 100644 --- a/JSONSchema/definitions.json +++ b/JSONSchema/definitions.json @@ -279,6 +279,18 @@ } ] }, + "SealEngineType": { + "anyOf": [ + { + "pattern": "NoProof", + "type": "string" + }, + { + "pattern": "Ethash", + "type": "string" + } + ] + }, "TransactionResults": { "items": { "additionalProperties": false, |