Merge pull request algorand#4 from pzbitskiy/pavel/stf-teal

Implement TEAL versioning
pzbitskiy · Mar 6, 2020 · b392994 · b392994
2 parents de8abf6 + e3c80d6
commit b392994
Show file tree

Hide file tree

Showing 10 changed files with 1,715 additions and 1,315 deletions.
diff --git a/cmd/opdoc/opdoc.go b/cmd/opdoc/opdoc.go
@@ -120,8 +120,9 @@ func opToMarkdown(out io.Writer, op *logic.OpSpec) (err error) {
 
 func opsToMarkdown(out io.Writer) (err error) {
 	out.Write([]byte("# Opcodes\n\nOps have a 'cost' of 1 unless otherwise specified.\n\n"))
-	for i := range logic.OpSpecs {
-		err = opToMarkdown(out, &logic.OpSpecs[i])
+	opSpecs := logic.OpcodesByVersion(logic.LogicVersion)
+	for _, spec := range opSpecs {
+		err = opToMarkdown(out, &spec)
 		if err != nil {
 			return
 		}
@@ -197,8 +198,9 @@ func argEnumTypes(name string) string {
 }
 
 func buildLanguageSpec(opGroups map[string][]string) *LanguageSpec {
-	records := make([]OpRecord, len(logic.OpSpecs))
-	for i, spec := range logic.OpSpecs {
+	opSpecs := logic.OpcodesByVersion(logic.LogicVersion)
+	records := make([]OpRecord, len(opSpecs))
+	for i, spec := range opSpecs {
 		records[i].Opcode = spec.Opcode
 		records[i].Name = spec.Name
 		records[i].Args = typeString(spec.Args)
@@ -213,7 +215,7 @@ func buildLanguageSpec(opGroups map[string][]string) *LanguageSpec {
 		records[i].Groups = opGroups[spec.Name]
 	}
 	return &LanguageSpec{
-		EvalMaxVersion:  logic.EvalMaxVersion,
+		EvalMaxVersion:  logic.LogicVersion,
 		LogicSigVersion: config.Consensus[protocol.ConsensusCurrentVersion].LogicSigVersion,
 		Ops:             records,
 	}

diff --git a/config/consensus.go b/config/consensus.go
@@ -552,6 +552,7 @@ func initConsensusProtocols() {
 	vFuture.MinUpgradeWaitRounds = 10000
 	vFuture.MaxUpgradeWaitRounds = 150000
 	vFuture.Application = true
+	vFuture.LogicSigVersion = 2
 	Consensus[protocol.ConsensusFuture] = vFuture
 }
 

diff --git a/data/transactions/logic/Makefile b/data/transactions/logic/Makefile
@@ -1,6 +1,6 @@
 all:	TEAL_opcodes.md wat.md
 
-TEAL_opcodes.md:	../../../cmd/opdoc/opdoc.go eval.go assembler.go doc.go
+TEAL_opcodes.md:	../../../cmd/opdoc/opdoc.go eval.go assembler.go doc.go opcodes.go
 	go run ../../../cmd/opdoc/opdoc.go
 
 wat.md:	TEAL_opcodes.md README_in.md

diff --git a/data/transactions/logic/TEAL_opcodes.md b/data/transactions/logic/TEAL_opcodes.md
@@ -373,7 +373,7 @@ TypeEnum mapping:
 | 3 | acfg | AssetConfig |
 | 4 | axfer | AssetTransfer |
 | 5 | afrz | AssetFreeze |
-| 6 | appl | invalid type name |
+| 6 | appl | ApplicationCall |
 
 
 FirstValidTime causes the program to fail. The field is reserved for future use.
@@ -398,7 +398,7 @@ FirstValidTime causes the program to fail. The field is reserved for future use.
 
 ## gtxn
 
-- Opcode: 0x33 {uint8 transaction group index}{uint8 transaction field index}
+- Opcode: 0x33 {uint8 transaction group index}{uint8 transaction field index}{uint8 transaction field array index}
 - Pops: _None_
 - Pushes: any
 - push field to the stack from a transaction in the current transaction group
@@ -501,7 +501,7 @@ params: state key (top of the stack), application id, account index. Return: is_
 
 ## app_arg
 
-- Opcode: 0x67
+- Opcode: 0x67 {uint8 arg index N}
 - Pops: _None_
 - Pushes: []byte
 - push ApplicationArgs[N] value to stack by index