Merge branch 'hotfix/2.6.1'

algorand · Aug 6, 2021 · 5ad4773 · 5ad4773
2 parents 1997c0f + 7a43fcc
commit 5ad4773
Show file tree

Hide file tree

Showing 6 changed files with 258 additions and 9 deletions.
diff --git a/.version b/.version
@@ -1 +1 @@
-2.6.0
+2.6.1
diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
 SRCPATH		:= $(shell pwd)
 VERSION		:= $(shell $(SRCPATH)/mule/scripts/compute_build_number.sh)
-OS_TYPE		:= $(shell $(SRCPATH)/mule/scripts/ostype.sh)
-ARCH			:= $(shell $(SRCPATH)/mule/scripts/archtype.sh)
+OS_TYPE		?= $(shell $(SRCPATH)/mule/scripts/ostype.sh)
+ARCH			?= $(shell $(SRCPATH)/mule/scripts/archtype.sh)
 PKG_DIR		= $(SRCPATH)/tmp/node_pkgs/$(OS_TYPE)/$(ARCH)/$(VERSION)
 
 # TODO: ensure any additions here are mirrored in misc/release.py

diff --git a/mule/sign.sh b/mule/sign.sh
@@ -7,8 +7,8 @@ echo
 date "+build_indexer begin SIGN stage %Y%m%d_%H%M%S"
 echo
 
-ARCH=$(./mule/scripts/archtype.sh)
-OS_TYPE=$(./mule/scripts/ostype.sh)
+ARCH=${ARCH:-(./mule/scripts/archtype.sh)}
+OS_TYPE=${OS_TYPE:-$(./mule/scripts/ostype.sh)}
 VERSION=$(./mule/scripts/compute_build_number.sh)
 PKG_DIR="./tmp/node_pkgs/$OS_TYPE/$ARCH/$VERSION"
 [email protected]

diff --git a/types/protocols.json b/types/protocols.json
@@ -21,6 +21,7 @@
     "DownCommitteeSize": 6000,
     "DownCommitteeThreshold": 4560,
     "EnableAssetCloseAmount": true,
+    "EnableExtraPagesOnAppUpdate": true,
     "EnableFeePooling": true,
     "EnableKeyregCoherencyCheck": true,
     "FastPartitionRecovery": true,
@@ -32,7 +33,7 @@
     "LateCommitteeThreshold": 320,
     "LogicSigMaxCost": 20000,
     "LogicSigMaxSize": 1000,
-    "LogicSigVersion": 4,
+    "LogicSigVersion": 5,
     "MaxAppArgs": 16,
     "MaxAppBytesValueLen": 128,
     "MaxAppKeyLen": 64,
@@ -120,6 +121,7 @@
     "DownCommitteeSize": 6000,
     "DownCommitteeThreshold": 4560,
     "EnableAssetCloseAmount": false,
+    "EnableExtraPagesOnAppUpdate": false,
     "EnableFeePooling": false,
     "EnableKeyregCoherencyCheck": false,
     "FastPartitionRecovery": true,
@@ -219,6 +221,7 @@
     "DownCommitteeSize": 6000,
     "DownCommitteeThreshold": 4560,
     "EnableAssetCloseAmount": false,
+    "EnableExtraPagesOnAppUpdate": false,
     "EnableFeePooling": false,
     "EnableKeyregCoherencyCheck": false,
     "FastPartitionRecovery": true,
@@ -318,6 +321,7 @@
     "DownCommitteeSize": 6000,
     "DownCommitteeThreshold": 4560,
     "EnableAssetCloseAmount": false,
+    "EnableExtraPagesOnAppUpdate": false,
     "EnableFeePooling": false,
     "EnableKeyregCoherencyCheck": false,
     "FastPartitionRecovery": true,
@@ -417,6 +421,7 @@
     "DownCommitteeSize": 6000,
     "DownCommitteeThreshold": 4560,
     "EnableAssetCloseAmount": false,
+    "EnableExtraPagesOnAppUpdate": false,
     "EnableFeePooling": false,
     "EnableKeyregCoherencyCheck": false,
     "FastPartitionRecovery": true,
@@ -516,6 +521,7 @@
     "DownCommitteeSize": 6000,
     "DownCommitteeThreshold": 4560,
     "EnableAssetCloseAmount": false,
+    "EnableExtraPagesOnAppUpdate": false,
     "EnableFeePooling": false,
     "EnableKeyregCoherencyCheck": false,
     "FastPartitionRecovery": true,
@@ -615,6 +621,7 @@
     "DownCommitteeSize": 6000,
     "DownCommitteeThreshold": 4560,
     "EnableAssetCloseAmount": false,
+    "EnableExtraPagesOnAppUpdate": false,
     "EnableFeePooling": false,
     "EnableKeyregCoherencyCheck": false,
     "FastPartitionRecovery": true,
@@ -714,6 +721,7 @@
     "DownCommitteeSize": 6000,
     "DownCommitteeThreshold": 4560,
     "EnableAssetCloseAmount": false,
+    "EnableExtraPagesOnAppUpdate": false,
     "EnableFeePooling": false,
     "EnableKeyregCoherencyCheck": false,
     "FastPartitionRecovery": true,
@@ -813,6 +821,7 @@
     "DownCommitteeSize": 6000,
     "DownCommitteeThreshold": 4560,
     "EnableAssetCloseAmount": false,
+    "EnableExtraPagesOnAppUpdate": false,
     "EnableFeePooling": false,
     "EnableKeyregCoherencyCheck": false,
     "FastPartitionRecovery": true,
@@ -912,6 +921,7 @@
     "DownCommitteeSize": 6000,
     "DownCommitteeThreshold": 4560,
     "EnableAssetCloseAmount": false,
+    "EnableExtraPagesOnAppUpdate": false,
     "EnableFeePooling": false,
     "EnableKeyregCoherencyCheck": false,
     "FastPartitionRecovery": true,
@@ -994,7 +1004,9 @@
     "AppFlatParamsMinBalance": 100000,
     "Application": true,
     "ApplyData": true,
-    "ApprovedUpgrades": {},
+    "ApprovedUpgrades": {
+      "https://github.com/algorandfoundation/specs/tree/abc54f79f9ad679d2d22f0fb9909fb005c16f8a1": 60000
+    },
     "Asset": true,
     "CertCommitteeSize": 1500,
     "CertCommitteeThreshold": 1112,
@@ -1009,6 +1021,7 @@
     "DownCommitteeSize": 6000,
     "DownCommitteeThreshold": 4560,
     "EnableAssetCloseAmount": true,
+    "EnableExtraPagesOnAppUpdate": false,
     "EnableFeePooling": true,
     "EnableKeyregCoherencyCheck": true,
     "FastPartitionRecovery": true,
@@ -1108,6 +1121,7 @@
     "DownCommitteeSize": 6000,
     "DownCommitteeThreshold": 4560,
     "EnableAssetCloseAmount": false,
+    "EnableExtraPagesOnAppUpdate": false,
     "EnableFeePooling": false,
     "EnableKeyregCoherencyCheck": false,
     "FastPartitionRecovery": true,
@@ -1207,6 +1221,7 @@
     "DownCommitteeSize": 6000,
     "DownCommitteeThreshold": 4560,
     "EnableAssetCloseAmount": false,
+    "EnableExtraPagesOnAppUpdate": false,
     "EnableFeePooling": false,
     "EnableKeyregCoherencyCheck": false,
     "FastPartitionRecovery": true,
@@ -1282,6 +1297,104 @@
     "UpgradeThreshold": 9000,
     "UpgradeVoteRounds": 10000
   },
+  "https://github.com/algorandfoundation/specs/tree/abc54f79f9ad679d2d22f0fb9909fb005c16f8a1": {
+    "AgreementFilterTimeout": 4000000000,
+    "AgreementFilterTimeoutPeriod0": 4000000000,
+    "AppFlatOptInMinBalance": 100000,
+    "AppFlatParamsMinBalance": 100000,
+    "Application": true,
+    "ApplyData": true,
+    "ApprovedUpgrades": {},
+    "Asset": true,
+    "CertCommitteeSize": 1500,
+    "CertCommitteeThreshold": 1112,
+    "CompactCertRounds": 0,
+    "CompactCertSecKQ": 0,
+    "CompactCertTopVoters": 0,
+    "CompactCertVotersLookback": 0,
+    "CompactCertWeightThreshold": 0,
+    "CredentialDomainSeparationEnabled": true,
+    "DefaultKeyDilution": 10000,
+    "DefaultUpgradeWaitRounds": 140000,
+    "DownCommitteeSize": 6000,
+    "DownCommitteeThreshold": 4560,
+    "EnableAssetCloseAmount": true,
+    "EnableExtraPagesOnAppUpdate": true,
+    "EnableFeePooling": true,
+    "EnableKeyregCoherencyCheck": true,
+    "FastPartitionRecovery": true,
+    "FastRecoveryLambda": 300000000000,
+    "FixTransactionLeases": true,
+    "ForceNonParticipatingFeeSink": true,
+    "InitialRewardsRateCalculation": true,
+    "LateCommitteeSize": 500,
+    "LateCommitteeThreshold": 320,
+    "LogicSigMaxCost": 20000,
+    "LogicSigMaxSize": 1000,
+    "LogicSigVersion": 4,
+    "MaxAppArgs": 16,
+    "MaxAppBytesValueLen": 128,
+    "MaxAppKeyLen": 64,
+    "MaxAppProgramCost": 700,
+    "MaxAppProgramLen": 2048,
+    "MaxAppSumKeyValueLens": 128,
+    "MaxAppTotalArgLen": 2048,
+    "MaxAppTotalProgramLen": 2048,
+    "MaxAppTotalTxnReferences": 8,
+    "MaxAppTxnAccounts": 4,
+    "MaxAppTxnForeignApps": 8,
+    "MaxAppTxnForeignAssets": 8,
+    "MaxAppsCreated": 10,
+    "MaxAppsOptedIn": 10,
+    "MaxAssetDecimals": 19,
+    "MaxAssetNameBytes": 32,
+    "MaxAssetURLBytes": 96,
+    "MaxAssetUnitNameBytes": 8,
+    "MaxAssetsPerAccount": 1000,
+    "MaxBalLookback": 320,
+    "MaxExtraAppProgramPages": 3,
+    "MaxGlobalSchemaEntries": 64,
+    "MaxLocalSchemaEntries": 16,
+    "MaxTimestampIncrement": 25,
+    "MaxTxGroupSize": 16,
+    "MaxTxnBytesPerBlock": 1000000,
+    "MaxTxnLife": 1000,
+    "MaxTxnNoteBytes": 1024,
+    "MaxUpgradeWaitRounds": 150000,
+    "MaxVersionStringLen": 128,
+    "MaximumMinimumBalance": 100100000,
+    "MinBalance": 100000,
+    "MinTxnFee": 1000,
+    "MinUpgradeWaitRounds": 10000,
+    "NextCommitteeSize": 5000,
+    "NextCommitteeThreshold": 3838,
+    "NoEmptyLocalDeltas": true,
+    "NumProposers": 20,
+    "PaysetCommit": 2,
+    "PendingResidueRewards": true,
+    "RedoCommitteeSize": 2400,
+    "RedoCommitteeThreshold": 1768,
+    "RequireGenesisHash": true,
+    "RewardUnit": 1000000,
+    "RewardsInApplyData": true,
+    "RewardsRateRefreshInterval": 500000,
+    "SchemaBytesMinBalance": 25000,
+    "SchemaMinBalancePerEntry": 25000,
+    "SchemaUintMinBalance": 3500,
+    "SeedLookback": 2,
+    "SeedRefreshInterval": 80,
+    "SoftCommitteeSize": 2990,
+    "SoftCommitteeThreshold": 2267,
+    "SupportBecomeNonParticipatingTransactions": true,
+    "SupportGenesisHash": true,
+    "SupportRekeying": true,
+    "SupportSignedTxnInBlock": true,
+    "SupportTransactionLeases": true,
+    "SupportTxGroups": true,
+    "TxnCounter": true,
+    "UpgradeThreshold": 9000,
+    "UpgradeVoteRounds": 10000
+  },
   "https://github.com/algorandfoundation/specs/tree/ac2255d586c4474d4ebcf3809acccb59b7ef34ff": {
     "AgreementFilterTimeout": 4000000000,
     "AgreementFilterTimeoutPeriod0": 4000000000,
@@ -1306,6 +1419,7 @@
     "DownCommitteeSize": 6000,
     "DownCommitteeThreshold": 4560,
     "EnableAssetCloseAmount": true,
+    "EnableExtraPagesOnAppUpdate": false,
     "EnableFeePooling": false,
     "EnableKeyregCoherencyCheck": false,
     "FastPartitionRecovery": true,
@@ -1405,6 +1519,7 @@
     "DownCommitteeSize": 6000,
     "DownCommitteeThreshold": 4560,
     "EnableAssetCloseAmount": true,
+    "EnableExtraPagesOnAppUpdate": false,
     "EnableFeePooling": false,
     "EnableKeyregCoherencyCheck": false,
     "FastPartitionRecovery": true,
@@ -1504,6 +1619,7 @@
     "DownCommitteeSize": 6000,
     "DownCommitteeThreshold": 4560,
     "EnableAssetCloseAmount": true,
+    "EnableExtraPagesOnAppUpdate": false,
     "EnableFeePooling": false,
     "EnableKeyregCoherencyCheck": false,
     "FastPartitionRecovery": true,
@@ -1603,6 +1719,7 @@
     "DownCommitteeSize": 6000,
     "DownCommitteeThreshold": 4560,
     "EnableAssetCloseAmount": false,
+    "EnableExtraPagesOnAppUpdate": false,
     "EnableFeePooling": false,
     "EnableKeyregCoherencyCheck": false,
     "FastPartitionRecovery": true,
@@ -1702,6 +1819,7 @@
     "DownCommitteeSize": 6000,
     "DownCommitteeThreshold": 4560,
     "EnableAssetCloseAmount": false,
+    "EnableExtraPagesOnAppUpdate": false,
     "EnableFeePooling": false,
     "EnableKeyregCoherencyCheck": false,
     "FastPartitionRecovery": true,
@@ -1801,6 +1919,7 @@
     "DownCommitteeSize": 6000,
     "DownCommitteeThreshold": 4560,
     "EnableAssetCloseAmount": false,
+    "EnableExtraPagesOnAppUpdate": false,
     "EnableFeePooling": false,
     "EnableKeyregCoherencyCheck": false,
     "FastPartitionRecovery": true,
@@ -1900,6 +2019,7 @@
     "DownCommitteeSize": 6000,
     "DownCommitteeThreshold": 4560,
     "EnableAssetCloseAmount": false,
+    "EnableExtraPagesOnAppUpdate": false,
     "EnableFeePooling": false,
     "EnableKeyregCoherencyCheck": false,
     "FastPartitionRecovery": true,
@@ -1999,6 +2119,7 @@
     "DownCommitteeSize": 10000,
     "DownCommitteeThreshold": 7750,
     "EnableAssetCloseAmount": false,
+    "EnableExtraPagesOnAppUpdate": false,
     "EnableFeePooling": false,
     "EnableKeyregCoherencyCheck": false,
     "FastPartitionRecovery": false,
@@ -2098,6 +2219,7 @@
     "DownCommitteeSize": 5000,
     "DownCommitteeThreshold": 3838,
     "EnableAssetCloseAmount": false,
+    "EnableExtraPagesOnAppUpdate": false,
     "EnableFeePooling": false,
     "EnableKeyregCoherencyCheck": false,
     "FastPartitionRecovery": false,
@@ -2197,6 +2319,7 @@
     "DownCommitteeSize": 5000,
     "DownCommitteeThreshold": 3838,
     "EnableAssetCloseAmount": false,
+    "EnableExtraPagesOnAppUpdate": false,
     "EnableFeePooling": false,
     "EnableKeyregCoherencyCheck": false,
     "FastPartitionRecovery": false,