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.

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

Merge branch 'master' into teal7 #463

Merged
merged 5 commits into from
Jul 21, 2022
Merged

Merge branch 'master' into teal7 #463

merged 5 commits into from
Jul 21, 2022

Conversation

michaeldiamant
Copy link
Contributor

Merges branch 'master' into teal7. The merge generated no conflicts.

barnjamin and others added 5 commits July 1, 2022 12:16
* fix misspelling of uint
* replacing foreignapps with applications

* fix assets as well
* adding execute method to allow omission of begin/submit for common use case

* exec docstring

* update testcase

Co-authored-by: Hang Su <[email protected]>
@michaeldiamant michaeldiamant marked this pull request as ready for review July 21, 2022 14:14
@jdtzmn jdtzmn merged commit e86fae6 into teal7 Jul 21, 2022
@michaeldiamant michaeldiamant deleted the teal7_merge_master branch July 21, 2022 14:31
ahangsu added a commit that referenced this pull request Jul 22, 2022
* 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 <[email protected]>

* 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 <[email protected]>

Co-authored-by: Ben Guidarelli <[email protected]>
Co-authored-by: Hang Su <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>
Co-authored-by: Michael Diamant <[email protected]>

* max program version

Co-authored-by: Ben Guidarelli <[email protected]>
Co-authored-by: Michael Diamant <[email protected]>
Co-authored-by: Jacob Daitzman <[email protected]>
ahangsu added a commit that referenced this pull request Nov 3, 2022
* 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 <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* Update docs/state.rst

Co-authored-by: Zeph Grunschlag <[email protected]>

* Update docs/state.rst

Co-authored-by: Zeph Grunschlag <[email protected]>

* Update docs/state.rst

Co-authored-by: Zeph Grunschlag <[email protected]>

* Update docs/state.rst

Co-authored-by: Zeph Grunschlag <[email protected]>

* Update docs/state.rst

Co-authored-by: Zeph Grunschlag <[email protected]>

* Update docs/state.rst

Co-authored-by: Zeph Grunschlag <[email protected]>

* Update docs/state.rst

Co-authored-by: Zeph Grunschlag <[email protected]>

* Update docs/state.rst

Co-authored-by: Zeph Grunschlag <[email protected]>

* hex box size goes wild

* Update docs/state.rst

Co-authored-by: Zeph Grunschlag <[email protected]>

* warning about MBR

* wording

* Update docs/state.rst

Co-authored-by: Zeph Grunschlag <[email protected]>

* emphasize

* Update docs/state.rst

Co-authored-by: Zeph Grunschlag <[email protected]>

* Update docs/state.rst

Co-authored-by: Zeph Grunschlag <[email protected]>

* 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 <[email protected]>

* creating boxes

* Update docs/state.rst

Co-authored-by: Michael Diamant <[email protected]>

* per pr review

* table for state types

Co-authored-by: Ben Guidarelli <[email protected]>
Co-authored-by: Zeph Grunschlag <[email protected]>
Co-authored-by: Michael Diamant <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

Co-authored-by: Ben Guidarelli <[email protected]>
Co-authored-by: Hang Su <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>
Co-authored-by: Michael Diamant <[email protected]>

* max program version

Co-authored-by: Ben Guidarelli <[email protected]>
Co-authored-by: Michael Diamant <[email protected]>
Co-authored-by: Jacob Daitzman <[email protected]>

* 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 <[email protected]>
Co-authored-by: Jacob Daitzman <[email protected]>
Co-authored-by: Hang Su <[email protected]>
Co-authored-by: Hang Su <[email protected]>
Co-authored-by: Zeph Grunschlag <[email protected]>
Co-authored-by: Jason Paulos <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants