Merge pull request #3650 from Algo-devops-service/relbeta3.4.1

go-algorand 3.4.1-beta

Author: algojohnlee

.circleci/config.yml

@@ -321,7 +321,7 @@ commands:
             export PACKAGE_NAMES=$(echo $PACKAGES | tr -d '\n')
             export PARTITION_TOTAL=${CIRCLE_NODE_TOTAL}
             export PARTITION_ID=${CIRCLE_NODE_INDEX}
-            gotestsum --format testname --junitfile << parameters.result_path >>/<< parameters.result_subdir >>/${CIRCLE_NODE_INDEX}/results.xml --jsonfile << parameters.result_path >>/<< parameters.result_subdir >>/${CIRCLE_NODE_INDEX}/testresults.json -- --tags "sqlite_unlock_notify sqlite_omit_load_extension" << parameters.short_test_flag >> -race -timeout 1h -coverprofile=coverage.txt -covermode=atomic -p 1 $PACKAGE_NAMES
+            gotestsum --format standard-verbose --junitfile << parameters.result_path >>/<< parameters.result_subdir >>/${CIRCLE_NODE_INDEX}/results.xml --jsonfile << parameters.result_path >>/<< parameters.result_subdir >>/${CIRCLE_NODE_INDEX}/testresults.json -- --tags "sqlite_unlock_notify sqlite_omit_load_extension" << parameters.short_test_flag >> -race -timeout 1h -coverprofile=coverage.txt -covermode=atomic -p 1 $PACKAGE_NAMES
       - store_artifacts:
           path: << parameters.result_path >>
           destination: test-results

buildnumber.dat

@@ -1 +1 @@
-0
+1

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),
+			dbgState.OpcodeBudget, 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/cdtSession_test.go

@@ -527,6 +527,42 @@ func TestCdtSessionGetObjects(t *testing.T) {
 					},
 				},
 			},
+			logs: []string{"test log 1", "test log 2"},
+			innerTxns: []transactions.SignedTxnWithAD{
+				{
+					SignedTxn: transactions.SignedTxn{
+						Txn: transactions.Transaction{
+							Type: protocol.ApplicationCallTx,
+							ApplicationCallTxnFields: transactions.ApplicationCallTxnFields{
+								ApplicationArgs: [][]byte{{0, 1, 2, 3}},
+							},
+						},
+					},
+					ApplyData: transactions.ApplyData{
+						EvalDelta: transactions.EvalDelta{
+							InnerTxns: transactions.WrapSignedTxnsWithAD([]transactions.SignedTxn{
+								{
+									Txn: transactions.Transaction{
+										Type: protocol.PaymentTx,
+										Header: transactions.Header{
+											Sender: basics.Address{}, Fee: basics.MicroAlgos{Raw: 1000}, FirstValid: 10,
+										},
+									},
+								},
+								{
+									Txn: transactions.Transaction{
+										Type: protocol.ApplicationCallTx,
+										ApplicationCallTxnFields: transactions.ApplicationCallTxnFields{
+											ApplicationArgs: [][]byte{{0, 1, 2, 3}},
+										},
+									},
+								},
+							}),
+							Logs: []string{"test nested log"},
+						},
+					},
+				},
+			},
 		},
 	}
 
@@ -555,6 +591,9 @@ func TestCdtSessionGetObjects(t *testing.T) {
 		encodeAppLocalsAddr(basics.Address{}.String()),
 		encodeAppGlobalAppID("0"), encodeAppGlobalAppID("1"),
 		encodeAppLocalsAppID(basics.Address{}.String(), "1"),
+		encodeLogsID([]int{0}), encodeLogsID([]int{0, 1}),
+		encodeInnerTxnID([]int{0}), encodeInnerTxnID([]int{0, 0}),
+		encodeInnerTxnID([]int{0, 1}),
 	}
 	for _, k := range objIds {
 		req.Params = map[string]interface{}{"objectId": k, "generatePreview": true}