From 5f2abf7fe1235eeedae348dd5b12846ef095c66a Mon Sep 17 00:00:00 2001 From: andri lim Date: Wed, 20 Feb 2019 19:31:42 +0700 Subject: [PATCH] pass additional 6 GST --- GeneralStateTests.md | 24 ++++++++++++------------ tests/test_generalstate_failing.nim | 8 +------- 2 files changed, 13 insertions(+), 19 deletions(-) diff --git a/GeneralStateTests.md b/GeneralStateTests.md index 4aefce412..b13315975 100644 --- a/GeneralStateTests.md +++ b/GeneralStateTests.md @@ -428,14 +428,14 @@ OK: 8/30 Fail: 0/30 Skip: 22/30 + delegatecallEmptycontract.json OK delegatecallInInitcodeToEmptyContract.json Skip delegatecallInInitcodeToExistingContract.json Skip - delegatecallInInitcodeToExistingContractOOG.json Skip ++ delegatecallInInitcodeToExistingContractOOG.json OK + delegatecallOOGinCall.json OK delegatecallSenderCheck.json Skip delegatecallValueCheck.json Skip delegatecodeDynamicCode.json Skip delegatecodeDynamicCode2SelfCall.json Skip ``` -OK: 4/34 Fail: 0/34 Skip: 30/34 +OK: 5/34 Fail: 0/34 Skip: 29/34 ## stEIP150Specific ```diff CallAndCallcodeConsumeMoreGasThenTransactionHas.json Skip @@ -504,13 +504,13 @@ OK: 0/6 Fail: 0/6 Skip: 6/6 OK: 1/1 Fail: 0/1 Skip: 0/1 ## stHomesteadSpecific ```diff - contractCreationOOGdontLeaveEmptyContract.json Skip ++ contractCreationOOGdontLeaveEmptyContract.json OK + contractCreationOOGdontLeaveEmptyContractViaTransaction.json OK createContractViaContract.json Skip createContractViaContractOOGInitCode.json Skip createContractViaTransactionCost53000.json Skip ``` -OK: 1/5 Fail: 0/5 Skip: 4/5 +OK: 2/5 Fail: 0/5 Skip: 3/5 ## stInitCodeTest ```diff CallContractToCreateContractAndCallItOOG.json Skip @@ -519,7 +519,7 @@ OK: 1/5 Fail: 0/5 Skip: 4/5 CallContractToCreateContractOOGBonusGas.json Skip CallContractToCreateContractWhichWouldCreateContractIfCalled.jsonSkip CallContractToCreateContractWhichWouldCreateContractInInitCode.jsonSkip - CallRecursiveContract.json Skip ++ CallRecursiveContract.json OK CallTheContractToCreateEmptyContract.json Skip + NotEnoughCashContractCreation.json OK OutOfGasContractCreation.json Skip @@ -532,7 +532,7 @@ OK: 1/5 Fail: 0/5 Skip: 4/5 + TransactionCreateStopInInitcode.json OK + TransactionCreateSuicideInInitcode.json OK ``` -OK: 7/18 Fail: 0/18 Skip: 11/18 +OK: 8/18 Fail: 0/18 Skip: 10/18 ## stLogTests ```diff + log0_emptyMem.json OK @@ -1624,7 +1624,7 @@ OK: 34/37 Fail: 0/37 Skip: 3/37 + RevertPrefoundEmptyCallOOG.json OK + RevertPrefoundEmptyOOG.json OK + RevertPrefoundOOG.json OK - RevertRemoteSubCallStorageOOG.json Skip ++ RevertRemoteSubCallStorageOOG.json OK + RevertRemoteSubCallStorageOOG2.json OK + RevertSubCallStorageOOG.json OK + RevertSubCallStorageOOG2.json OK @@ -1632,7 +1632,7 @@ OK: 34/37 Fail: 0/37 Skip: 3/37 + TouchToEmptyAccountRevert2.json OK TouchToEmptyAccountRevert3.json Skip ``` -OK: 27/43 Fail: 0/43 Skip: 16/43 +OK: 28/43 Fail: 0/43 Skip: 15/43 ## stShift ```diff sar00.json Skip @@ -2018,7 +2018,7 @@ OK: 0/284 Fail: 0/284 Skip: 284/284 + ABAcalls0.json OK ABAcalls1.json Skip ABAcalls2.json Skip - ABAcalls3.json Skip ++ ABAcalls3.json OK + ABAcallsSuicide0.json OK ABAcallsSuicide1.json Skip + Call10.json OK @@ -2064,7 +2064,7 @@ OK: 0/284 Fail: 0/284 Skip: 284/284 createNameRegistratorZeroMem.json Skip createNameRegistratorZeroMem2.json Skip createNameRegistratorZeroMemExpansion.json Skip - createWithInvalidOpcode.json Skip ++ createWithInvalidOpcode.json OK + currentAccountBalance.json OK + doubleSelfdestructTest.json OK + doubleSelfdestructTest2.json OK @@ -2083,7 +2083,7 @@ OK: 0/284 Fail: 0/284 Skip: 284/284 + suicideSendEtherToMe.json OK testRandomTest.json Skip ``` -OK: 43/67 Fail: 0/67 Skip: 24/67 +OK: 45/67 Fail: 0/67 Skip: 22/67 ## stTransactionTest ```diff + ContractStoreClearsOOG.json OK @@ -2520,4 +2520,4 @@ OK: 0/133 Fail: 0/133 Skip: 133/133 OK: 0/130 Fail: 0/130 Skip: 130/130 ---TOTAL--- -OK: 1116/2334 Fail: 0/2334 Skip: 1218/2334 +OK: 1122/2334 Fail: 0/2334 Skip: 1212/2334 diff --git a/tests/test_generalstate_failing.nim b/tests/test_generalstate_failing.nim index 164068b67..8e336388f 100644 --- a/tests/test_generalstate_failing.nim +++ b/tests/test_generalstate_failing.nim @@ -81,7 +81,6 @@ func allowedFailingGeneralStateTest*(folder, name: string): bool = "RawCreateGasMemory.json", "RawCreateGasValueTransfer.json", "RawCreateGasValueTransferMemory.json", - "contractCreationOOGdontLeaveEmptyContract.json", "createContractViaContract.json", "createContractViaContractOOGInitCode.json", "createContractViaTransactionCost53000.json", @@ -91,7 +90,6 @@ func allowedFailingGeneralStateTest*(folder, name: string): bool = "CallContractToCreateContractOOGBonusGas.json", "CallContractToCreateContractWhichWouldCreateContractIfCalled.json", "CallContractToCreateContractWhichWouldCreateContractInInitCode.json", - "CallRecursiveContract.json", "CallTheContractToCreateEmptyContract.json", "OutOfGasContractCreation.json", "OutOfGasPrefundedContractCreation.json", @@ -152,19 +150,16 @@ func allowedFailingGeneralStateTest*(folder, name: string): bool = "RevertOpcodeWithBigOutputInInit.json", "RevertPrefound.json", "RevertPrefoundEmpty.json", - "RevertRemoteSubCallStorageOOG.json", "TouchToEmptyAccountRevert3.json", "TestContractSuicide.json", "TestCryptographicFunctions.json", "tx_e1c174e2.json", - "ABAcalls3.json", "ABAcallsSuicide1.json", "CreateHashCollision.json", "createNameRegistrator.json", "createNameRegistratorZeroMem.json", "createNameRegistratorZeroMem2.json", "createNameRegistratorZeroMemExpansion.json", - "createWithInvalidOpcode.json", "suicideCoinbase.json", "suicideSendEtherPostDeath.json", "testRandomTest.json", @@ -183,7 +178,6 @@ func allowedFailingGeneralStateTest*(folder, name: string): bool = "delegatecallAtTransition.json", "delegatecallBeforeTransition.json", # 2018-12-07: - "delegatecallInInitcodeToExistingContractOOG.json", # 2019-02-07: "makeMoney.json", # 2019-02-15: @@ -196,7 +190,6 @@ func allowedFailingGeneralStateTest*(folder, name: string): bool = # 2019-02-17: "RawCreateFailGasValueTransfer.json", "createInitFail_OOGduringInit.json", - "Call1024BalanceTooLow.json", "NewGasPriceForCodes.json", "NewGasPriceForCodesWithMemExpandingCalls.json", "NonZeroValue_CALLCODE_ToNonNonZeroBalance.json", @@ -227,5 +220,6 @@ func allowedFailingGeneralStateTest*(folder, name: string): bool = "CallRecursiveBomb2.json", "CallRecursiveBombLog.json", "CallRecursiveBombLog2.json", + "Call1024BalanceTooLow.json" ] result = name in allowedFailingGeneralStateTests