Include all upgradeable settings in the upgrade

[sisuresh]

Description

1. Update the upgrade test to create a single update that contains all upgradeable setting entries.
2. Reduce a couple minimum settings. The most important change here is the reduction to TX_MAX_INSTRUCTIONS so only 1 vm can be instantiated. The min is 2,000,000, and the upgrade contract test currently uses 1476437.

Checklist

• Reviewed the contributing document
• Rebased on top of master (no merge commits)
• Ran clang-format v8.0.0 (via make format or the Visual Studio extension)
• Compiles
• Ran all tests
• If change impacts performance, include supporting evidence per the performance document

[dmkozh]

This is actually not consistent with the entry and contract sizes. I think the following should be true:

TX_MAX_READ_BYTES == MAX_CONTRACT_DATA_KEY_SIZE_BYTES + MAX_CONTRACT_DATA_ENTRY_SIZE_BYTES && MAX_CONTRACT_SIZE == MAX_CONTRACT_DATA_ENTRY_SIZE_BYTES

[dmkozh]

FWIW we wanted MAX_CONTRACT_SIZE is kind of redundant; for v1 we decided to keep it consistent with the contract data entry size.

[sisuresh]

Hmm good point. Shouldn't TX_MAX_WRITE_BYTES == MAX_CONTRACT_DATA_KEY_SIZE_BYTES + MAX_CONTRACT_DATA_ENTRY_SIZE_BYTES be true as well?

[dmkozh]

Yeah, that would make sense as well. Maybe these should also be the validation conditions (with >=). These are not as critical to get right, but would be a bit annoying if messed up.

[sisuresh]

I updated the settings. I don't think we need validation for this, but don't feel strongly so I can add it if you think we should.

[dmkozh]

I think this is a bit of a footgun, so I would prefer to have a validation on this. It's ok to do in a separate PR though.

[dmkozh]

r+ de3feb4