Consolidate TEAL and AVM versioning #441

jdtzmn · 2022-07-13T20:26:34Z

This PR replaces TEAL version language with program version. In certain places where the language made more sense, AVM was used instead of program.

Some considerations:

Language in CHANGELOG.md was left unchanged.
verifyTealVersion was renamed to verifyProgramVersion. My assumption is that no deprecation notice is needed as verifyTealVersion is not listed in the __init__.py.
The following breaking renames were made. The *_TEAL_VERSION constants are still exported for the time being, but have been marked as deprecated.
- MAX_TEAL_VERSION → MAX_PROGRAM_VERSION
- MIN_TEAL_VERSION → MIN_PROGRAM_VERSION
- DEFAULT_TEAL_VERSION → DEFAULT_PROGRAM_VERSION

* fix misspelling of uint

docs/arithmetic_expression.rst

docs/versions.rst

Co-authored-by: Michael Diamant <michaeldiamant@users.noreply.github.com>

# Conflicts: # docs/accessing_transaction_field.rst # pyteal/ast/ecdsa.py # pyteal/ast/ecdsa_test.py # pyteal/ast/ternaryexpr_test.py # pyteal/ast/unaryexpr_test.py # pyteal/compiler/compiler.py

jasonpaulos

Looks good to me, I just have one comment

pyteal/ast/opup.py

michaeldiamant

@jdtzmn Thanks for the effort here! ☕

Leaving approval under the assumption that open threads are resolved prior to merge, and #450 is merged into teal7, and then merged into this PR.

# Conflicts: # docs/accessing_transaction_field.rst # pyteal/ast/ecdsa.py # pyteal/ast/txn.py

jasonpaulos · 2022-07-20T22:25:48Z

Be aware that InnerTxnBuilder.Execute (#444) was just merged into master, which references "TEAL version" in its docstring

* swapping base64 modes to match the rest (#446) * Merge master into teal7 (#450) * AVM 7: Address integration branch feedback (#452) * Add Execute Method (#444) * adding execute method to allow omission of begin/submit for common use case * exec docstring * update testcase Co-authored-by: Hang Su <hang.su@algorand.com> * Merge branch 'master' into teal7 (#463) * fix misspelling of uint (#431) * fix misspelling of uint * Clarify minimum Python version management docs (#435) * Foreign prefix on App and Asset arrays (#440) * replacing foreignapps with applications * fix assets as well * Add Execute Method (#444) * adding execute method to allow omission of begin/submit for common use case * exec docstring * update testcase Co-authored-by: Hang Su <hang.su@algorand.com> Co-authored-by: Ben Guidarelli <ben.guidarelli@gmail.com> Co-authored-by: Hang Su <hang.su@algorand.com> * Consolidate TEAL and AVM versioning (#441) * fix misspelling of uint (#431) * fix misspelling of uint * Clarify minimum Python version management docs (#435) * Convert TEAL version references to program version by hand * Replace `teal#Options` with `avm#Options` * Deprecate `*_TEAL_VERSION` in favor of `*_PROGRAM_VERSION` * Fix docs typo Co-authored-by: Michael Diamant <michaeldiamant@users.noreply.github.com> * Minor `versions.rst` changes * Fix `verifyTealVersion` in new opcode files * Fix linter errors * Fix language discrepencies introduced by the merge * Remove incorrect avm replacement * Fix inconsistent language introduced by merge Co-authored-by: Ben Guidarelli <ben.guidarelli@gmail.com> Co-authored-by: Michael Diamant <michaeldiamant@users.noreply.github.com> * max program version Co-authored-by: Ben Guidarelli <ben.guidarelli@gmail.com> Co-authored-by: Michael Diamant <michaeldiamant@users.noreply.github.com> Co-authored-by: Jacob Daitzman <jdtzmn@gmail.com>

* upping max teal version * adding program page related ops (#412) * adding program page related ops * Add Replace (#413) * Add Replace * Remove replace auto-import * Use scripts/generate_init.py * Add more tests to replace, substring, and extract (#1) Co-authored-by: Michael Diamant <michaeldiamant@users.noreply.github.com> * Add Block (#415) * Add Block # Conflicts: # pyteal/ir/ops.py * Disable flake8 errors on formatted lines * Add past version failure check * Remove unnecessary ignore Expr equality context * Add JsonRef (#417) * Add JsonRef * Use named class methods to specify value type * Remove unnecessary ignore Expr equality context * Fix docstring link * Add Base64Decode (#418) * Add Base64Decode * Remove unnecessary ignore Expr equality context * Support Secp256r1 curve (#423) * Support Secp256r1 curve * Fix type errors in ecdsa tests * Fix typo * Test Secp256k1 curve against TEAL 5 instead * Add compile check to `MultiValue` class * Use `MultiValue` compile checks instead of inheritance * Add VrfVerify (#419) * Add VrfVerify # Conflicts: # pyteal/ast/__init__.py # pyteal/ir/ops.py * Tidy with `MultiValue`’s compile check * Add `Sha3_256` (#425) * Add sha3_256 * Add crypto docs * Support `FirstValidTime` transaction field (#424) * Add first valid time factory and update min version * Include FirstValidTime in txn tests * Add transaction field docs * Add `Ed25519Verify_Bare` (#426) * Add ed25519verify_bare * Fix typos in Ed25519 docstrings (#2) * Add crypto doc for Ed25519Verify_Bare Co-authored-by: Michael Diamant <michaeldiamant@users.noreply.github.com> * AVM Boxes Ops in Pyteal (#438) * add box ops * full support on ops * first set of test, add versioning in multi * remove some seemingly not necessary code? * update testcase * check invalid arguments * finish testcase * move stuffs to app * version check trick * verifyTealVersion apply * error message * update docs structures * period * update doc * update doc * update doc * per pr review on implementation * Update docs/state.rst Co-authored-by: Zeph Grunschlag <tzaffi@users.noreply.github.com> * Update docs/state.rst Co-authored-by: Zeph Grunschlag <tzaffi@users.noreply.github.com> * Update docs/state.rst Co-authored-by: Zeph Grunschlag <tzaffi@users.noreply.github.com> * Update docs/state.rst Co-authored-by: Zeph Grunschlag <tzaffi@users.noreply.github.com> * Update docs/state.rst Co-authored-by: Zeph Grunschlag <tzaffi@users.noreply.github.com> * Update docs/state.rst Co-authored-by: Zeph Grunschlag <tzaffi@users.noreply.github.com> * Update docs/state.rst Co-authored-by: Zeph Grunschlag <tzaffi@users.noreply.github.com> * Update docs/state.rst Co-authored-by: Zeph Grunschlag <tzaffi@users.noreply.github.com> * Update docs/state.rst Co-authored-by: Zeph Grunschlag <tzaffi@users.noreply.github.com> * hex box size goes wild * Update docs/state.rst Co-authored-by: Zeph Grunschlag <tzaffi@users.noreply.github.com> * warning about MBR * wording * Update docs/state.rst Co-authored-by: Zeph Grunschlag <tzaffi@users.noreply.github.com> * emphasize * Update docs/state.rst Co-authored-by: Zeph Grunschlag <tzaffi@users.noreply.github.com> * Update docs/state.rst Co-authored-by: Zeph Grunschlag <tzaffi@users.noreply.github.com> * polishing * remove redundant box_put doc segment * per zeph pr review * use note and warning * per zeph's pr review * Update docs/state.rst Co-authored-by: Michael Diamant <michaeldiamant@users.noreply.github.com> * creating boxes * Update docs/state.rst Co-authored-by: Michael Diamant <michaeldiamant@users.noreply.github.com> * per pr review * table for state types Co-authored-by: Ben Guidarelli <ben.guidarelli@gmail.com> Co-authored-by: Zeph Grunschlag <tzaffi@users.noreply.github.com> Co-authored-by: Michael Diamant <michaeldiamant@users.noreply.github.com> * Merge Teal7 to AVM8, and consolidate Teal to AVM versioning (#470) * swapping base64 modes to match the rest (#446) * Merge master into teal7 (#450) * AVM 7: Address integration branch feedback (#452) * Add Execute Method (#444) * adding execute method to allow omission of begin/submit for common use case * exec docstring * update testcase Co-authored-by: Hang Su <hang.su@algorand.com> * Merge branch 'master' into teal7 (#463) * fix misspelling of uint (#431) * fix misspelling of uint * Clarify minimum Python version management docs (#435) * Foreign prefix on App and Asset arrays (#440) * replacing foreignapps with applications * fix assets as well * Add Execute Method (#444) * adding execute method to allow omission of begin/submit for common use case * exec docstring * update testcase Co-authored-by: Hang Su <hang.su@algorand.com> Co-authored-by: Ben Guidarelli <ben.guidarelli@gmail.com> Co-authored-by: Hang Su <hang.su@algorand.com> * Consolidate TEAL and AVM versioning (#441) * fix misspelling of uint (#431) * fix misspelling of uint * Clarify minimum Python version management docs (#435) * Convert TEAL version references to program version by hand * Replace `teal#Options` with `avm#Options` * Deprecate `*_TEAL_VERSION` in favor of `*_PROGRAM_VERSION` * Fix docs typo Co-authored-by: Michael Diamant <michaeldiamant@users.noreply.github.com> * Minor `versions.rst` changes * Fix `verifyTealVersion` in new opcode files * Fix linter errors * Fix language discrepencies introduced by the merge * Remove incorrect avm replacement * Fix inconsistent language introduced by merge Co-authored-by: Ben Guidarelli <ben.guidarelli@gmail.com> Co-authored-by: Michael Diamant <michaeldiamant@users.noreply.github.com> * max program version Co-authored-by: Ben Guidarelli <ben.guidarelli@gmail.com> Co-authored-by: Michael Diamant <michaeldiamant@users.noreply.github.com> Co-authored-by: Jacob Daitzman <jdtzmn@gmail.com> * change according to https://github.com/algorand/go-algorand/pull/4323/files (#488) * Changes to avm8 docs (#546) * Support new AVM 8 account parameters (#555) * CHANGELOG.md * Frame Ops to `avm8` branch PR (#585) * add frame ops to avm8 branch * specify FRAME_POINTER_VERSION in frame-op branch * per review comments * per review comments * per review comments, depth -> frame_depth * take bury out * pop popn * unexport use of frame ops * hide FRAME_POINTER_VERISON * CHANGELOG 0.20.0 Co-authored-by: Ben Guidarelli <ben.guidarelli@gmail.com> Co-authored-by: Jacob Daitzman <jdtzmn@gmail.com> Co-authored-by: Hang Su <hang.su@algorand.com> Co-authored-by: Hang Su <87964331+ahangsu@users.noreply.github.com> Co-authored-by: Zeph Grunschlag <tzaffi@users.noreply.github.com> Co-authored-by: Jason Paulos <jasonpaulos@users.noreply.github.com>

barnjamin and others added 2 commits July 1, 2022 12:16

fix misspelling of uint (algorand#431)

52396c2

* fix misspelling of uint

Clarify minimum Python version management docs (algorand#435)

d995a89

jdtzmn force-pushed the consolidate-versioning branch from 3454808 to ce212e5 Compare July 13, 2022 20:32

jdtzmn added 3 commits July 13, 2022 16:32

Convert TEAL version references to program version by hand

711fee5

Replace teal#Options with avm#Options

cbe6970

Deprecate *_TEAL_VERSION in favor of *_PROGRAM_VERSION

e949ecd

jdtzmn force-pushed the consolidate-versioning branch from ce212e5 to e949ecd Compare July 13, 2022 20:35

jdtzmn requested a review from michaeldiamant July 14, 2022 19:33

michaeldiamant reviewed Jul 15, 2022

View reviewed changes

docs/arithmetic_expression.rst Outdated Show resolved Hide resolved

michaeldiamant reviewed Jul 15, 2022

View reviewed changes

docs/versions.rst Outdated Show resolved Hide resolved

michaeldiamant reviewed Jul 15, 2022

View reviewed changes

docs/versions.rst Show resolved Hide resolved

michaeldiamant mentioned this pull request Jul 15, 2022

Prep for v1.0.0 release #443

Open

2 tasks

jdtzmn and others added 2 commits July 18, 2022 13:42

Fix docs typo

b15ab92

Co-authored-by: Michael Diamant <michaeldiamant@users.noreply.github.com>

Minor versions.rst changes

2760a2d

jdtzmn changed the base branch from master to teal7 July 18, 2022 17:48

jdtzmn added 4 commits July 18, 2022 15:33

Merge branch 'teal7' into consolidate-versioning

b4f0c19

# Conflicts: # docs/accessing_transaction_field.rst # pyteal/ast/ecdsa.py # pyteal/ast/ecdsa_test.py # pyteal/ast/ternaryexpr_test.py # pyteal/ast/unaryexpr_test.py # pyteal/compiler/compiler.py

Fix verifyTealVersion in new opcode files

95f6c31

Fix linter errors

5b3c5a5

Fix language discrepencies introduced by the merge

375c87d

jasonpaulos reviewed Jul 19, 2022

View reviewed changes

pyteal/ast/opup.py Outdated Show resolved Hide resolved

michaeldiamant approved these changes Jul 19, 2022

View reviewed changes

jdtzmn added 3 commits July 20, 2022 10:20

Remove incorrect avm replacement

0d9b75d

Merge branch 'teal7' into consolidate-versioning

a75589b

Merge branch 'teal7' into consolidate-versioning

70918f4

# Conflicts: # docs/accessing_transaction_field.rst # pyteal/ast/ecdsa.py # pyteal/ast/txn.py

jdtzmn added 2 commits July 21, 2022 10:28

Merge branch 'teal7' into consolidate-versioning

b336576

Fix inconsistent language introduced by merge

f5a8e7d

jasonpaulos approved these changes Jul 21, 2022

View reviewed changes

jdtzmn merged commit dc80b34 into algorand:teal7 Jul 22, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Consolidate TEAL and AVM versioning #441

Consolidate TEAL and AVM versioning #441

jdtzmn commented Jul 13, 2022

jasonpaulos left a comment

michaeldiamant left a comment

jasonpaulos commented Jul 20, 2022 •

edited

Loading

Consolidate TEAL and AVM versioning #441

Consolidate TEAL and AVM versioning #441

Conversation

jdtzmn commented Jul 13, 2022

jasonpaulos left a comment

Choose a reason for hiding this comment

michaeldiamant left a comment

Choose a reason for hiding this comment

jasonpaulos commented Jul 20, 2022 • edited Loading

jasonpaulos commented Jul 20, 2022 •

edited

Loading