Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dynamic teal #2126

Merged
merged 19 commits into from
May 14, 2021
Merged

Dynamic teal #2126

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
b4a55af
basics for divw, teal v4
jannotti Mar 15, 2021
1b98e69
Docs and tests for divw
jannotti Mar 19, 2021
cdd1a59
back branches
jannotti Apr 27, 2021
c6ddaa1
Allow labels to proceed instructions on a line
jannotti Apr 27, 2021
2d8e221
callsub, retsub
jannotti Apr 27, 2021
736be24
code review suggestions
jannotti May 6, 2021
8b8aba2
callsub arg correction, infinite recursion test
jannotti May 6, 2021
fbc896b
check back branches for alignment
jannotti May 6, 2021
a7346a3
make dry run test closer to reality
jannotti May 7, 2021
60ce9ee
Move cost checking into Check() for static cost checks.
jannotti May 10, 2021
ca53930
ignore langspec files. we might consdier checkin instead
jannotti May 10, 2021
0430d1c
test that v4 teal is not available early
jannotti May 11, 2021
4137ada
check programs against last static version
jannotti May 11, 2021
1802d7b
mistaken checkin of commented test, removed
jannotti May 11, 2021
f8e281d
Use TEAL v4, rather than new consenus parameter to go dynamic.
jannotti May 11, 2021
838d411
Spec updates for backjumps
jannotti May 11, 2021
511cf69
typo
jannotti May 11, 2021
12d90f8
Further explanation of callstack
jannotti May 14, 2021
acbc483
code review
jannotti May 14, 2021
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
Prev Previous commit
code review
  • Loading branch information
@jannotti
jannotti committed May 14, 2021
commit acbc483b59ae19c520015ec37a2106c902082a23
59 changes: 31 additions & 28 deletions data/transactions/logic/assembler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ func (ops *OpStream) createLabel(label string) {
ops.labels = make(map[string]int)
}
if _, ok := ops.labels[label]; ok {
ops.errorf("duplicate label %s", label)
ops.errorf("duplicate label %#v", label)
}
ops.labels[label] = ops.pending.Len()
}
Expand Down Expand Up @@ -590,14 +590,14 @@ func assembleTxn(ops *OpStream, spec *OpSpec, args []string) error {
}
fs, ok := txnFieldSpecByName[args[0]]
if !ok {
return ops.errorf("txn unknown field: %v", args[0])
return ops.errorf("txn unknown field: %#v", args[0])
}
_, ok = txnaFieldSpecByField[fs.field]
if ok {
return ops.errorf("found array field %v in txn op", args[0])
return ops.errorf("found array field %#v in txn op", args[0])
}
if fs.version > ops.Version {
return ops.errorf("field %s available in version %d. Missed #pragma version?", args[0], fs.version)
return ops.errorf("field %#v available in version %d. Missed #pragma version?", args[0], fs.version)
}
ops.pending.WriteByte(spec.Opcode)
ops.pending.WriteByte(uint8(fs.field))
Expand All @@ -623,14 +623,14 @@ func assembleTxna(ops *OpStream, spec *OpSpec, args []string) error {
}
fs, ok := txnFieldSpecByName[args[0]]
if !ok {
return ops.errorf("txna unknown field: %v", args[0])
return ops.errorf("txna unknown field: %#v", args[0])
}
_, ok = txnaFieldSpecByField[fs.field]
if !ok {
return ops.errorf("txna unknown field: %v", args[0])
return ops.errorf("txna unknown field: %#v", args[0])
}
if fs.version > ops.Version {
return ops.errorf("txna %s available in version %d. Missed #pragma version?", args[0], fs.version)
return ops.errorf("txna %#v available in version %d. Missed #pragma version?", args[0], fs.version)
}
arrayFieldIdx, err := strconv.ParseUint(args[1], 0, 64)
if err != nil {
Expand Down Expand Up @@ -661,14 +661,14 @@ func assembleGtxn(ops *OpStream, spec *OpSpec, args []string) error {

fs, ok := txnFieldSpecByName[args[1]]
if !ok {
return ops.errorf("gtxn unknown field: %v", args[1])
return ops.errorf("gtxn unknown field: %#v", args[1])
}
_, ok = txnaFieldSpecByField[fs.field]
if ok {
return ops.errorf("found array field %v in gtxn op", args[1])
return ops.errorf("found array field %#v in gtxn op", args[1])
}
if fs.version > ops.Version {
return ops.errorf("field %s available in version %d. Missed #pragma version?", args[1], fs.version)
return ops.errorf("field %#v available in version %d. Missed #pragma version?", args[1], fs.version)
}

ops.pending.WriteByte(spec.Opcode)
Expand Down Expand Up @@ -703,14 +703,14 @@ func assembleGtxna(ops *OpStream, spec *OpSpec, args []string) error {

fs, ok := txnFieldSpecByName[args[1]]
if !ok {
return ops.errorf("gtxna unknown field: %v", args[1])
return ops.errorf("gtxna unknown field: %#v", args[1])
}
_, ok = txnaFieldSpecByField[fs.field]
if !ok {
return ops.errorf("gtxna unknown field: %v", args[1])
return ops.errorf("gtxna unknown field: %#v", args[1])
}
if fs.version > ops.Version {
return ops.errorf("gtxna %s available in version %d. Missed #pragma version?", args[1], fs.version)
return ops.errorf("gtxna %#v available in version %d. Missed #pragma version?", args[1], fs.version)
}
arrayFieldIdx, err := strconv.ParseUint(args[2], 0, 64)
if err != nil {
Expand Down Expand Up @@ -738,14 +738,14 @@ func assembleGtxns(ops *OpStream, spec *OpSpec, args []string) error {
}
fs, ok := txnFieldSpecByName[args[0]]
if !ok {
return ops.errorf("gtxns unknown field: %v", args[0])
return ops.errorf("gtxns unknown field: %#v", args[0])
}
_, ok = txnaFieldSpecByField[fs.field]
if ok {
return ops.errorf("found array field %v in gtxns op", args[0])
return ops.errorf("found array field %#v in gtxns op", args[0])
}
if fs.version > ops.Version {
return ops.errorf("field %s available in version %d. Missed #pragma version?", args[0], fs.version)
return ops.errorf("field %#v available in version %d. Missed #pragma version?", args[0], fs.version)
}

ops.pending.WriteByte(spec.Opcode)
Expand All @@ -760,14 +760,14 @@ func assembleGtxnsa(ops *OpStream, spec *OpSpec, args []string) error {
}
fs, ok := txnFieldSpecByName[args[0]]
if !ok {
return ops.errorf("gtxnsa unknown field: %v", args[0])
return ops.errorf("gtxnsa unknown field: %#v", args[0])
}
_, ok = txnaFieldSpecByField[fs.field]
if !ok {
return ops.errorf("gtxnsa unknown field: %v", args[0])
return ops.errorf("gtxnsa unknown field: %#v", args[0])
}
if fs.version > ops.Version {
return ops.errorf("gtxnsa %s available in version %d. Missed #pragma version?", args[0], fs.version)
return ops.errorf("gtxnsa %#v available in version %d. Missed #pragma version?", args[0], fs.version)
}
arrayFieldIdx, err := strconv.ParseUint(args[1], 0, 64)
if err != nil {
Expand All @@ -789,7 +789,7 @@ func assembleGlobal(ops *OpStream, spec *OpSpec, args []string) error {
}
fs, ok := globalFieldSpecByName[args[0]]
if !ok {
return ops.errorf("global unknown field: %v", args[0])
return ops.errorf("global unknown field: %#v", args[0])
}
if fs.version > ops.Version {
// no return here. we may as well continue to maintain typestack
Expand All @@ -810,7 +810,7 @@ func assembleAssetHolding(ops *OpStream, spec *OpSpec, args []string) error {
}
val, ok := assetHoldingFields[args[0]]
if !ok {
return ops.errorf("asset_holding_get unknown arg: %v", args[0])
return ops.errorf("asset_holding_get unknown arg: %#v", args[0])
}
ops.pending.WriteByte(spec.Opcode)
ops.pending.WriteByte(uint8(val))
Expand All @@ -824,7 +824,7 @@ func assembleAssetParams(ops *OpStream, spec *OpSpec, args []string) error {
}
val, ok := assetParamsFields[args[0]]
if !ok {
return ops.errorf("asset_params_get unknown arg: %v", args[0])
return ops.errorf("asset_params_get unknown arg: %#v", args[0])
}
ops.pending.WriteByte(spec.Opcode)
ops.pending.WriteByte(uint8(val))
Expand Down Expand Up @@ -1077,7 +1077,7 @@ func (ops *OpStream) assemble(fin io.Reader) error {
if ops.Version <= 1 {
for label, dest := range ops.labels {
if dest == ops.pending.Len() {
ops.errorf("label %v is too far away", label)
ops.errorf("label %#v is too far away", label)
}
}
}
Expand Down Expand Up @@ -1148,20 +1148,20 @@ func (ops *OpStream) resolveLabels() {
dest, ok := ops.labels[lr.label]
if !ok {
if !reported[lr.label] {
ops.errorf("reference to undefined label %v", lr.label)
ops.errorf("reference to undefined label %#v", lr.label)
}
reported[lr.label] = true
continue
}
// all branch instructions (currently) are opcode byte and 2 offset bytes, and the destination is relative to the next pc as if the branch was a no-op
naturalPc := lr.position + 3
if ops.Version < backBranchEnabledVersion && dest < naturalPc {
ops.errorf("label %v is a back reference, back jump support was introduced in TEAL v4", lr.label)
ops.errorf("label %#v is a back reference, back jump support was introduced in TEAL v4", lr.label)
continue
}
jump := dest - naturalPc
if jump > 0x7fff {
ops.errorf("label %v is too far away", lr.label)
ops.errorf("label %#v is too far away", lr.label)
continue
}
raw[lr.position+1] = uint8(jump >> 8)
Expand Down Expand Up @@ -1563,7 +1563,7 @@ func guessByteFormat(bytes []byte) string {
return fmt.Sprintf("addr %s", short.String())
}
if allPrintableASCII(bytes) {
return fmt.Sprintf("\"%s\"", string(bytes))
return fmt.Sprintf("%#v", string(bytes))
}
return "0x" + hex.EncodeToString(bytes)
}
Expand Down Expand Up @@ -1720,9 +1720,12 @@ func disBranch(dis *disassembleState, spec *OpSpec) (string, error) {
dis.nextpc = dis.pc + 3
offset := (uint(dis.program[dis.pc+1]) << 8) | uint(dis.program[dis.pc+2])
target := int(offset) + dis.pc + 3
if target > 0xffff {
target -= 0x10000
}
var label string
if dis.numericTargets {
label = fmt.Sprintf("+%d", offset+3) // +3 so it's easy to calculate destination from current
label = fmt.Sprintf("%d", target)
} else {
if known, ok := dis.pendingLabels[target]; ok {
label = known
Expand Down
30 changes: 15 additions & 15 deletions data/transactions/logic/assembler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,11 +414,11 @@ func testLine(t *testing.T, line string, ver uint64, expected string) {
func TestAssembleTxna(t *testing.T) {
testLine(t, "txna Accounts 256", AssemblerMaxVersion, "txna array index beyond 255: 256")
testLine(t, "txna ApplicationArgs 256", AssemblerMaxVersion, "txna array index beyond 255: 256")
testLine(t, "txna Sender 256", AssemblerMaxVersion, "txna unknown field: Sender")
testLine(t, "txna Sender 256", AssemblerMaxVersion, "txna unknown field: \"Sender\"")
testLine(t, "gtxna 0 Accounts 256", AssemblerMaxVersion, "gtxna array index beyond 255: 256")
testLine(t, "gtxna 0 ApplicationArgs 256", AssemblerMaxVersion, "gtxna array index beyond 255: 256")
testLine(t, "gtxna 256 Accounts 0", AssemblerMaxVersion, "gtxna group index beyond 255: 256")
testLine(t, "gtxna 0 Sender 256", AssemblerMaxVersion, "gtxna unknown field: Sender")
testLine(t, "gtxna 0 Sender 256", AssemblerMaxVersion, "gtxna unknown field: \"Sender\"")
testLine(t, "txn Accounts 0", 1, "txn expects one argument")
testLine(t, "txn Accounts 0 1", 2, "txn expects one or two arguments")
testLine(t, "txna Accounts 0 1", AssemblerMaxVersion, "txna expects two arguments")
Expand All @@ -428,20 +428,20 @@ func TestAssembleTxna(t *testing.T) {
testLine(t, "gtxna 0 Accounts 1 2", AssemblerMaxVersion, "gtxna expects three arguments")
testLine(t, "gtxna a Accounts 0", AssemblerMaxVersion, "strconv.ParseUint...")
testLine(t, "gtxna 0 Accounts a", AssemblerMaxVersion, "strconv.ParseUint...")
testLine(t, "txn ABC", 2, "txn unknown field: ABC")
testLine(t, "gtxn 0 ABC", 2, "gtxn unknown field: ABC")
testLine(t, "txn ABC", 2, "txn unknown field: \"ABC\"")
testLine(t, "gtxn 0 ABC", 2, "gtxn unknown field: \"ABC\"")
testLine(t, "gtxn a ABC", 2, "strconv.ParseUint...")
testLine(t, "txn Accounts", AssemblerMaxVersion, "found array field Accounts in txn op")
testLine(t, "txn Accounts", 1, "found array field Accounts in txn op")
testLine(t, "txn Accounts", AssemblerMaxVersion, "found array field \"Accounts\" in txn op")
testLine(t, "txn Accounts", 1, "found array field \"Accounts\" in txn op")
testLine(t, "txn Accounts 0", AssemblerMaxVersion, "")
testLine(t, "gtxn 0 Accounts", AssemblerMaxVersion, "found array field Accounts in gtxn op")
testLine(t, "gtxn 0 Accounts", 1, "found array field Accounts in gtxn op")
testLine(t, "gtxn 0 Accounts", AssemblerMaxVersion, "found array field \"Accounts\" in gtxn op")
testLine(t, "gtxn 0 Accounts", 1, "found array field \"Accounts\" in gtxn op")
testLine(t, "gtxn 0 Accounts 1", AssemblerMaxVersion, "")
}

func TestAssembleGlobal(t *testing.T) {
testLine(t, "global", AssemblerMaxVersion, "global expects one argument")
testLine(t, "global a", AssemblerMaxVersion, "global unknown field: a")
testLine(t, "global a", AssemblerMaxVersion, "global unknown field: \"a\"")
}

func TestAssembleDefault(t *testing.T) {
Expand Down Expand Up @@ -779,7 +779,7 @@ bnz wat
int 2`
for v := uint64(1); v < backBranchEnabledVersion; v++ {
t.Run(fmt.Sprintf("v=%d", v), func(t *testing.T) {
testProg(t, source, v, expect{3, "label wat is a back reference..."})
testProg(t, source, v, expect{3, "label \"wat\" is a back reference..."})
})
}
for v := uint64(backBranchEnabledVersion); v <= AssemblerMaxVersion; v++ {
Expand Down Expand Up @@ -820,7 +820,7 @@ bnz nowhere
int 2`
for v := uint64(1); v <= AssemblerMaxVersion; v++ {
t.Run(fmt.Sprintf("v=%d", v), func(t *testing.T) {
testProg(t, source, v, expect{2, "reference to undefined label nowhere"})
testProg(t, source, v, expect{2, "reference to undefined label \"nowhere\""})
})
}
}
Expand Down Expand Up @@ -850,8 +850,8 @@ int 2`
for v := uint64(1); v <= AssemblerMaxVersion; v++ {
t.Run(fmt.Sprintf("v=%d", v), func(t *testing.T) {
testProg(t, source, v,
expect{2, "reference to undefined label nowhere"},
expect{4, "txn unknown field: XYZ"})
expect{2, "reference to undefined label \"nowhere\""},
expect{4, "txn unknown field: \"XYZ\""})
})
}
}
Expand Down Expand Up @@ -1171,13 +1171,13 @@ func TestAssembleAsset(t *testing.T) {
testProg(t, "int 1; int 1; asset_holding_get ABC 1", v,
expect{3, "asset_holding_get expects one argument"})
testProg(t, "int 1; int 1; asset_holding_get ABC", v,
expect{3, "asset_holding_get unknown arg: ABC"})
expect{3, "asset_holding_get unknown arg: \"ABC\""})

testProg(t, "byte 0x1234; asset_params_get ABC 1", v,
expect{2, "asset_params_get arg 0 wanted type uint64..."})

testLine(t, "asset_params_get ABC 1", v, "asset_params_get expects one argument")
testLine(t, "asset_params_get ABC", v, "asset_params_get unknown arg: ABC")
testLine(t, "asset_params_get ABC", v, "asset_params_get unknown arg: \"ABC\"")
}
}

Expand Down
8 changes: 4 additions & 4 deletions data/transactions/logic/backwardCompat_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -458,7 +458,7 @@ func TestBackwardCompatTxnFields(t *testing.T) {
if _, ok := txnaFieldSpecByField[fs.field]; ok {
parts := strings.Split(text, " ")
op := parts[0]
asmError = fmt.Sprintf("found array field %s in %s op", field, op)
asmError = fmt.Sprintf("found array field %#v in %s op", field, op)
}
// check assembler fails if version before introduction
testLine(t, text, assemblerNoVersion, asmError)
Expand Down Expand Up @@ -521,15 +521,15 @@ bnz done
done:`

t.Run("v=default", func(t *testing.T) {
testProg(t, source, assemblerNoVersion, expect{4, "label done is too far away"})
testProg(t, source, assemblerNoVersion, expect{4, "label \"done\" is too far away"})
})

t.Run("v=default", func(t *testing.T) {
testProg(t, source, 0, expect{4, "label done is too far away"})
testProg(t, source, 0, expect{4, "label \"done\" is too far away"})
})

t.Run("v=default", func(t *testing.T) {
testProg(t, source, 1, expect{4, "label done is too far away"})
testProg(t, source, 1, expect{4, "label \"done\" is too far away"})
})

for v := uint64(2); v <= AssemblerMaxVersion; v++ {
Expand Down
14 changes: 6 additions & 8 deletions data/transactions/logic/eval.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,20 +432,18 @@ func eval(program []byte, cx *evalContext) (pass bool, err error) {
}

// CheckStateful should be faster than EvalStateful. It can perform
// static checks and reject programs that are invalid. Returns a cost
// estimate of relative execution time. This cost is not relevent when
// the program is v4 or higher, and so 1 is returned so that callers
// may continue to check for a high cost being invalid.
// static checks and reject programs that are invalid. Prior to v4,
// these static checks include a cost estimate that must be low enough
// (controlled by params.Proto).
func CheckStateful(program []byte, params EvalParams) error {
params.runModeFlags = runModeApplication
return check(program, params)
}

// Check should be faster than Eval. It can perform static checks and
// reject programs that are invalid. Returns a cost estimate of
// relative execution time. This cost is not relevent when
// the program is v4 or higher, and so 1 is returned so that callers
// may continue to check for a high cost being invalid.
// reject programs that are invalid. Prior to v4, these static checks
// include a cost estimate that must be low enough (controlled by
// params.Proto).
func Check(program []byte, params EvalParams) error {
params.runModeFlags = runModeSignature
return check(program, params)
Expand Down
Loading