Move opcodeBudget field and update state outside renderer

Author: algochoi

cmd/tealdbg/cdtSession.go

@@ -169,7 +169,7 @@ func (s *cdtSession) websocketHandler(w http.ResponseWriter, r *http.Request) {
 		state.Update(cdtStateUpdate{
 			dbgState.Stack, dbgState.Scratch,
 			0, 0, "",
-			s.debugger.GetStates(nil),
+			0, s.debugger.GetStates(nil),
 		})
 
 		hash := sha256.Sum256([]byte(state.disassembly)) // some random hash
@@ -247,7 +247,7 @@ func (s *cdtSession) websocketHandler(w http.ResponseWriter, r *http.Request) {
 				state.Update(cdtStateUpdate{
 					dbgState.Stack, dbgState.Scratch,
 					dbgState.PC, dbgState.Line, dbgState.Error,
-					appState,
+					dbgState.OpcodeBudget, appState,
 				})
 				dbgStateMu.Unlock()
 

cmd/tealdbg/cdtState.go

@@ -42,12 +42,13 @@ type cdtState struct {
 	globals     []basics.TealValue
 
 	// mutable program state
-	mu      deadlock.Mutex
-	stack   []basics.TealValue
-	scratch []basics.TealValue
-	pc      atomicInt
-	line    atomicInt
-	err     atomicString
+	mu           deadlock.Mutex
+	stack        []basics.TealValue
+	scratch      []basics.TealValue
+	pc           atomicInt
+	line         atomicInt
+	err          atomicString
+	opcodeBudget int
 	AppState
 
 	// debugger states
@@ -58,11 +59,12 @@ type cdtState struct {
 }
 
 type cdtStateUpdate struct {
-	stack   []basics.TealValue
-	scratch []basics.TealValue
-	pc      int
-	line    int
-	err     string
+	stack        []basics.TealValue
+	scratch      []basics.TealValue
+	pc           int
+	line         int
+	err          string
+	opcodeBudget int
 
 	AppState
 }
@@ -74,6 +76,8 @@ const (
 	addressHint
 )
 
+const opcodeBudgetFieldIdx = 12
+
 var txnFileTypeHints = map[logic.TxnField]typeHint{
 	logic.Sender:              addressHint,
 	logic.Receiver:            addressHint,
@@ -107,6 +111,8 @@ func (s *cdtState) Update(state cdtStateUpdate) {
 	s.stack = state.stack
 	s.scratch = state.scratch
 	s.AppState = state.AppState
+	// We need to dynamically override opcodeBudget with the proper value each step.
+	s.globals[opcodeBudgetFieldIdx].Uint = uint64(state.opcodeBudget)
 }
 
 const localScopeObjID = "localScopeObjId"
@@ -839,10 +845,6 @@ func makeGlobals(s *cdtState, preview bool) (desc []cdt.RuntimePropertyDescripto
 	fields := prepareGlobals(s.globals)
 	desc = make([]cdt.RuntimePropertyDescriptor, len(fields))
 	for i, field := range fields {
-		// We need to dynamically override this field with the proper value each step.
-		if field.Name == "OpcodeBudget" {
-			field.Value = strconv.Itoa(s.opcodeBudget)
-		}
 		desc[i] = makePrimitive(field)
 	}
 	return

cmd/tealdbg/debugger.go

@@ -369,8 +369,6 @@ func (s *session) GetStates(st *logic.DebugState) AppState {
 		newStates.innerTxns = changes.InnerTxns
 	}
 
-	newStates.opcodeBudget = st.OpcodeBudget
-
 	return newStates
 }
 

cmd/tealdbg/local.go

@@ -158,13 +158,12 @@ type evalResult struct {
 
 // AppState encapsulates information about execution of stateful teal program
 type AppState struct {
-	appIdx       basics.AppIndex
-	schemas      basics.StateSchemas
-	global       map[basics.AppIndex]basics.TealKeyValue
-	locals       map[basics.Address]map[basics.AppIndex]basics.TealKeyValue
-	logs         []string
-	innerTxns    []transactions.SignedTxnWithAD
-	opcodeBudget int
+	appIdx    basics.AppIndex
+	schemas   basics.StateSchemas
+	global    map[basics.AppIndex]basics.TealKeyValue
+	locals    map[basics.Address]map[basics.AppIndex]basics.TealKeyValue
+	logs      []string
+	innerTxns []transactions.SignedTxnWithAD
 }
 
 func cloneInners(a []transactions.SignedTxnWithAD) (b []transactions.SignedTxnWithAD) {
@@ -194,7 +193,6 @@ func (a *AppState) clone() (b AppState) {
 	b.logs = make([]string, len(a.logs))
 	copy(b.logs, a.logs)
 	b.innerTxns = cloneInners(a.innerTxns)
-	b.opcodeBudget = a.opcodeBudget
 	return
 }
 
@@ -203,8 +201,7 @@ func (a *AppState) empty() bool {
 		len(a.global) == 0 &&
 		len(a.locals) == 0 &&
 		len(a.logs) == 0 &&
-		len(a.innerTxns) == 0 &&
-		a.opcodeBudget == 0
+		len(a.innerTxns) == 0
 }
 
 type modeType int