Checkpoint before testing MBR changes to run CI

Author: jannotti

data/basics/teal.go

@@ -107,10 +107,13 @@ func (sm StateSchema) SubSchema(osm StateSchema) (out StateSchema) {
 }
 
 // NumEntries counts the total number of values that may be stored for particular schema
-func (sm StateSchema) NumEntries() (tot uint64) {
-	tot = AddSaturate(tot, sm.NumUint)
-	tot = AddSaturate(tot, sm.NumByteSlice)
-	return tot
+func (sm StateSchema) NumEntries() uint64 {
+	return AddSaturate(sm.NumUint, sm.NumByteSlice)
+}
+
+// Allows determines if `other` "fits" within this schema.
+func (sm StateSchema) Allows(other StateSchema) bool {
+	return other.NumUint <= sm.NumUint && other.NumByteSlice <= sm.NumByteSlice
 }
 
 // MinBalance computes the MinBalance requirements for a StateSchema based on

data/bookkeeping/block.go

@@ -110,7 +110,7 @@ type BlockHeader struct {
 	// Each block is associated with at most one active upgrade proposal
 	// (a new version of the protocol).  An upgrade proposal can be made
 	// by a block proposer, as long as no other upgrade proposal is active.
-	// The upgrade proposal lasts for many rounds (UpgradeVoteRounds), and
+	// The upgrade proposal lasts for consensus.UpgradeVoteRounds, and
 	// in each round, that round's block proposer votes to support (or not)
 	// the proposed upgrade.
 	//
@@ -232,7 +232,7 @@ type UpgradeState struct {
 	NextProtocol    protocol.ConsensusVersion `codec:"nextproto"`
 	// NextProtocolApprovals is the number of approvals for the next protocol proposal. It is expressed in basics.Round because it is a count of rounds.
 	NextProtocolApprovals basics.Round `codec:"nextyes"`
-	// NextProtocolVoteBefore specify the last voting round for the next protocol proposal. If there is no voting for
+	// NextProtocolVoteBefore specifies the last voting round for the next protocol proposal. If there is no voting for
 	// an upgrade taking place, this would be zero.
 	NextProtocolVoteBefore basics.Round `codec:"nextbefore"`
 	// NextProtocolSwitchOn specify the round number at which the next protocol would be adopted. If there is no upgrade taking place,

data/transactions/application.go

@@ -453,7 +453,7 @@ func (ac ApplicationCallTxnFields) wellFormed(proto config.ConsensusParams) erro
 	effectiveEPP := ac.ExtraProgramPages
 	// Schemas and ExtraProgramPages may only be set during application creation
 	// and explicit attempts to change size during updates.
-	if ac.ApplicationID != 0 && !ac.UpdatingSizes(proto.AppSizeUpdates) {
+	if ac.ApplicationID != 0 && !(proto.AppSizeUpdates && ac.UpdatingSizes()) {
 		if ac.GlobalStateSchema != (basics.StateSchema{}) {
 			return fmt.Errorf("inappropriate non-zero tx.GlobalStateSchema (%v)",
 				ac.GlobalStateSchema)
@@ -559,10 +559,9 @@ func (ac ApplicationCallTxnFields) wellFormed(proto config.ConsensusParams) erro
 	return nil
 }
 
-// UpdatingSizes returns true if the transaction is setting the
-// extra-program-pages or global schema size during an update.
-func (ac ApplicationCallTxnFields) UpdatingSizes(allowed bool) bool {
-	return allowed && ac.OnCompletion == UpdateApplicationOC &&
+// UpdatingSizes returns true if the transaction is has non-zero sizing fields.
+func (ac ApplicationCallTxnFields) UpdatingSizes() bool {
+	return ac.OnCompletion == UpdateApplicationOC &&
 		(ac.ExtraProgramPages != 0 || ac.GlobalStateSchema != (basics.StateSchema{}))
 }
 

data/transactions/logic/evalAppTxn_test.go

@@ -1308,15 +1308,53 @@ func TestApplSubmission(t *testing.T) {
 	// Can't set epp when app id is given
 	tx.ForeignApps = append(tx.ForeignApps, basics.AppIndex(7))
 	TestApp(t, p+`int 1; itxn_field ExtraProgramPages;
-                  int 7; itxn_field ApplicationID`+s, ep, "immutable")
+                  int 7; itxn_field ApplicationID`+s, ep, "inappropriate non-zero tx.Extra")
+	// nor can global schema be set
+	TestApp(t, p+`int 1; itxn_field GlobalNumUint;
+                  int 7; itxn_field ApplicationID`+s, ep, "inappropriate non-zero tx.Global")
+	// nor can local schema be set
+	TestApp(t, p+`int 1; itxn_field LocalNumUint;
+                  int 7; itxn_field ApplicationID`+s, ep, "inappropriate non-zero tx.Local")
+
+	// When performing an update, we can set epp and (global only) schema
+	ledger.NewApp(tx.Receiver, 7, basics.AppParams{
+		ApprovalProgram: ops.Program, // which is "int 1"
+	})
+	TestApp(t, p+a+`int UpdateApplication; itxn_field OnCompletion;
+                  int 1; itxn_field ExtraProgramPages;
+                  int 7; itxn_field ApplicationID`+s, ep)
+	// global schema can be set
+	TestApp(t, p+a+`int UpdateApplication; itxn_field OnCompletion;
+                  int 1; itxn_field GlobalNumUint;
+                  int 7; itxn_field ApplicationID`+s, ep)
+	// but local schema still cannot be set
+	TestApp(t, p+a+`int UpdateApplication; itxn_field OnCompletion;
+                  int 1; itxn_field LocalNumUint;
+                  int 7; itxn_field ApplicationID`+s, ep, "inappropriate non-zero tx.Local")
+
+	// Even when performing an update, they cannot be set (in old consensus)
+	ep.Proto.AppSizeUpdates = false
+	TestApp(t, p+a+`int UpdateApplication; itxn_field OnCompletion;
+                  int 1; itxn_field ExtraProgramPages;
+                  int 7; itxn_field ApplicationID`+s, ep, "inappropriate non-zero tx.Extra")
+	// global schema can be set
+	TestApp(t, p+a+`int UpdateApplication; itxn_field OnCompletion;
+                  int 1; itxn_field GlobalNumUint;
+                  int 7; itxn_field ApplicationID`+s, ep, "inappropriate non-zero tx.Global")
+	// but local schema still cannot be set
+	TestApp(t, p+a+`int UpdateApplication; itxn_field OnCompletion;
+                  int 1; itxn_field LocalNumUint;
+                  int 7; itxn_field ApplicationID`+s, ep, "inappropriate non-zero tx.Local")
 
 	TestApp(t, p+a+"int 20; itxn_field GlobalNumUint; int 11; itxn_field GlobalNumByteSlice"+s,
 		ep, "too large")
 	TestApp(t, p+a+"int 7; itxn_field LocalNumUint; int 7; itxn_field LocalNumByteSlice"+s,
 		ep, "too large")
 }
 
-func TestInnerApplCreate(t *testing.T) {
+// TestInnerApplLifecycle tests creation, update, and deletion of apps with
+// inner transactions.
+func TestInnerApplLifecycle(t *testing.T) {
 	partitiontest.PartitionTest(t)
 	t.Parallel()
 
@@ -1345,6 +1383,7 @@ itxn_submit
 int 1
 `)
 
+		// Can't examine it without ForeignApps
 		test("int 5000; app_params_get AppGlobalNumByteSlice; assert; int 0; ==; assert",
 			"unavailable App 5000")
 
@@ -1358,7 +1397,8 @@ int 1
 		// Can't call it either
 		test(call, "unavailable App 5000")
 
-		tx.ForeignApps = []basics.AppIndex{basics.AppIndex(5000)}
+		// Add to ForeignApps, then we can examine and call it.
+		tx.ForeignApps = []basics.AppIndex{5000}
 		test(`
 int 5000; app_params_get AppGlobalNumByteSlice; assert; int 0; ==; assert
 int 5000; app_params_get AppGlobalNumUint;      assert; int 1; ==; assert
@@ -1387,10 +1427,33 @@ int 1
 		test(update)
 
 		if v >= 12 {
-			// Version starts at 0
+			// Version is up to 1
 			test(`int 5000; app_params_get AppVersion; assert; int 1; ==`)
 		}
 
+		updateSchema := `
+itxn_begin
+int appl;    itxn_field TypeEnum
+int 5000;    itxn_field ApplicationID
+` + approve + `; itxn_field ApprovalProgram
+` + approve + `; itxn_field ClearStateProgram
+int 2;       itxn_field GlobalNumUint
+int UpdateApplication; itxn_field OnCompletion
+itxn_submit
+int 1
+`
+		test(updateSchema)
+		if v >= 12 {
+			// Version is up to 2
+			test(`int 5000; app_params_get AppVersion; assert; int 2; ==`)
+		}
+
+		test(`
+int 5000; app_params_get AppGlobalNumUint;      assert; int 2; ==; assert
+int 1
+`)
+
+		// Delete it
 		test(`
 itxn_begin
 int appl;              itxn_field TypeEnum
@@ -1405,7 +1468,6 @@ int 1
 
 		// Can't call it either
 		test(call, "no app 5000")
-
 	})
 }