Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions cmd/goal/clerk.go
Original file line number Diff line number Diff line change
Expand Up @@ -1229,9 +1229,6 @@ var dryrunRemoteCmd = &cobra.Command{
trace = *txnResult.LogicSigTrace
}
}
if txnResult.Cost != nil {
fmt.Fprintf(os.Stdout, "tx[%d] cost: %d\n", i, *txnResult.Cost)
Comment thread
algochoi marked this conversation as resolved.
}
if txnResult.BudgetConsumed != nil {
fmt.Fprintf(os.Stdout, "tx[%d] budget consumed: %d\n", i, *txnResult.BudgetConsumed)
}
Expand Down
4 changes: 0 additions & 4 deletions daemon/algod/api/algod.oas2.json
Original file line number Diff line number Diff line change
Expand Up @@ -3223,10 +3223,6 @@
"budget-consumed": {
"description": "Budget consumed during execution of app call transaction.",
"type": "integer"
},
"cost": {
"description": "Net cost of app execution. Field is DEPRECATED and is subject for removal. Instead, use `budget-added` and `budget-consumed.",
"type": "integer"
}
}
},
Expand Down
4 changes: 0 additions & 4 deletions daemon/algod/api/algod.oas3.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1634,10 +1634,6 @@
"description": "Budget consumed during execution of app call transaction.",
"type": "integer"
},
"cost": {
"description": "Net cost of app execution. Field is DEPRECATED and is subject for removal. Instead, use `budget-added` and `budget-consumed.",
"type": "integer"
},
"disassembly": {
"description": "Disassembled program line by line.",
"items": {
Expand Down
3 changes: 0 additions & 3 deletions daemon/algod/api/server/v2/dryrun.go
Original file line number Diff line number Diff line change
Expand Up @@ -554,11 +554,8 @@ func doDryrunRequest(dr *DryrunRequest, response *model.DryrunResponse) {
// This is necessary because the fields can only be represented as unsigned
// integers, so a negative cost would underflow. The two fields also provide
// more information, which can be useful for testing purposes.
// cost = budgetConsumed - budgetAdded
netCost := uint64(cost)
budgetAdded := uint64(proto.MaxAppProgramCost * numInnerTxns(delta))
budgetConsumed := uint64(cost) + budgetAdded
result.Cost = &netCost
result.BudgetAdded = &budgetAdded
result.BudgetConsumed = &budgetConsumed
maxCurrentBudget = pooledAppBudget
Expand Down
331 changes: 165 additions & 166 deletions daemon/algod/api/server/v2/generated/data/routes.go

Large diffs are not rendered by default.

3 changes: 0 additions & 3 deletions daemon/algod/api/server/v2/generated/model/types.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

335 changes: 167 additions & 168 deletions daemon/algod/api/server/v2/generated/nonparticipating/private/routes.go

Large diffs are not rendered by default.

443 changes: 221 additions & 222 deletions daemon/algod/api/server/v2/generated/nonparticipating/public/routes.go

Large diffs are not rendered by default.

339 changes: 169 additions & 170 deletions daemon/algod/api/server/v2/generated/participating/private/routes.go

Large diffs are not rendered by default.

355 changes: 177 additions & 178 deletions daemon/algod/api/server/v2/generated/participating/public/routes.go

Large diffs are not rendered by default.

12 changes: 4 additions & 8 deletions data/transactions/logic/sourcemap.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,7 @@ type SourceMap struct {
SourceRoot string `json:"sourceRoot,omitempty"`
Sources []string `json:"sources"`
Names []string `json:"names"`
// Mapping field is deprecated. Use `Mappings` field instead.
Mapping string `json:"mapping"`
Mappings string `json:"mappings"`
Mappings string `json:"mappings"`
}

// GetSourceMap returns a struct containing details about
Expand All @@ -64,11 +62,9 @@ func GetSourceMap(sourceNames []string, offsetToLine map[int]int) SourceMap {
}

return SourceMap{
Version: sourceMapVersion,
Sources: sourceNames,
Names: []string{}, // TEAL code does not generate any names.
// Mapping is deprecated, and only for backwards compatibility.
Mapping: strings.Join(pcToLine, ";"),
Version: sourceMapVersion,
Sources: sourceNames,
Names: []string{}, // TEAL code does not generate any names.
Mappings: strings.Join(pcToLine, ";"),
}
}
Expand Down
2 changes: 1 addition & 1 deletion test/scripts/e2e_subs/tealprogs/quine.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.