Skip to content

Commit 5ad4773

Browse files
onetechnicalonetechnical
committed
Merge branch 'hotfix/2.6.1'
2 parents 1997c0f + 7a43fcc commit 5ad4773

File tree

6 files changed

+258
-9
lines changed

6 files changed

+258
-9
lines changed

‎.version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.6.0
1+
2.6.1

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
SRCPATH := $(shell pwd)
22
VERSION := $(shell $(SRCPATH)/mule/scripts/compute_build_number.sh)
3-
OS_TYPE := $(shell $(SRCPATH)/mule/scripts/ostype.sh)
4-
ARCH := $(shell $(SRCPATH)/mule/scripts/archtype.sh)
3+
OS_TYPE ?= $(shell $(SRCPATH)/mule/scripts/ostype.sh)
4+
ARCH ?= $(shell $(SRCPATH)/mule/scripts/archtype.sh)
55
PKG_DIR = $(SRCPATH)/tmp/node_pkgs/$(OS_TYPE)/$(ARCH)/$(VERSION)
66

77
# TODO: ensure any additions here are mirrored in misc/release.py

‎mule/sign.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ echo
77
date "+build_indexer begin SIGN stage %Y%m%d_%H%M%S"
88
echo
99

10-
ARCH=$(./mule/scripts/archtype.sh)
11-
OS_TYPE=$(./mule/scripts/ostype.sh)
10+
ARCH=${ARCH:-(./mule/scripts/archtype.sh)}
11+
OS_TYPE=${OS_TYPE:-$(./mule/scripts/ostype.sh)}
1212
VERSION=$(./mule/scripts/compute_build_number.sh)
1313
PKG_DIR="./tmp/node_pkgs/$OS_TYPE/$ARCH/$VERSION"
1414
SIGNING_KEY_ADDR=dev@algorand.com

‎types/protocols.json‎

Lines changed: 125 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
"DownCommitteeSize": 6000,
2222
"DownCommitteeThreshold": 4560,
2323
"EnableAssetCloseAmount": true,
24+
"EnableExtraPagesOnAppUpdate": true,
2425
"EnableFeePooling": true,
2526
"EnableKeyregCoherencyCheck": true,
2627
"FastPartitionRecovery": true,
@@ -32,7 +33,7 @@
3233
"LateCommitteeThreshold": 320,
3334
"LogicSigMaxCost": 20000,
3435
"LogicSigMaxSize": 1000,
35-
"LogicSigVersion": 4,
36+
"LogicSigVersion": 5,
3637
"MaxAppArgs": 16,
3738
"MaxAppBytesValueLen": 128,
3839
"MaxAppKeyLen": 64,
@@ -120,6 +121,7 @@
120121
"DownCommitteeSize": 6000,
121122
"DownCommitteeThreshold": 4560,
122123
"EnableAssetCloseAmount": false,
124+
"EnableExtraPagesOnAppUpdate": false,
123125
"EnableFeePooling": false,
124126
"EnableKeyregCoherencyCheck": false,
125127
"FastPartitionRecovery": true,
@@ -219,6 +221,7 @@
219221
"DownCommitteeSize": 6000,
220222
"DownCommitteeThreshold": 4560,
221223
"EnableAssetCloseAmount": false,
224+
"EnableExtraPagesOnAppUpdate": false,
222225
"EnableFeePooling": false,
223226
"EnableKeyregCoherencyCheck": false,
224227
"FastPartitionRecovery": true,
@@ -318,6 +321,7 @@
318321
"DownCommitteeSize": 6000,
319322
"DownCommitteeThreshold": 4560,
320323
"EnableAssetCloseAmount": false,
324+
"EnableExtraPagesOnAppUpdate": false,
321325
"EnableFeePooling": false,
322326
"EnableKeyregCoherencyCheck": false,
323327
"FastPartitionRecovery": true,
@@ -417,6 +421,7 @@
417421
"DownCommitteeSize": 6000,
418422
"DownCommitteeThreshold": 4560,
419423
"EnableAssetCloseAmount": false,
424+
"EnableExtraPagesOnAppUpdate": false,
420425
"EnableFeePooling": false,
421426
"EnableKeyregCoherencyCheck": false,
422427
"FastPartitionRecovery": true,
@@ -516,6 +521,7 @@
516521
"DownCommitteeSize": 6000,
517522
"DownCommitteeThreshold": 4560,
518523
"EnableAssetCloseAmount": false,
524+
"EnableExtraPagesOnAppUpdate": false,
519525
"EnableFeePooling": false,
520526
"EnableKeyregCoherencyCheck": false,
521527
"FastPartitionRecovery": true,
@@ -615,6 +621,7 @@
615621
"DownCommitteeSize": 6000,
616622
"DownCommitteeThreshold": 4560,
617623
"EnableAssetCloseAmount": false,
624+
"EnableExtraPagesOnAppUpdate": false,
618625
"EnableFeePooling": false,
619626
"EnableKeyregCoherencyCheck": false,
620627
"FastPartitionRecovery": true,
@@ -714,6 +721,7 @@
714721
"DownCommitteeSize": 6000,
715722
"DownCommitteeThreshold": 4560,
716723
"EnableAssetCloseAmount": false,
724+
"EnableExtraPagesOnAppUpdate": false,
717725
"EnableFeePooling": false,
718726
"EnableKeyregCoherencyCheck": false,
719727
"FastPartitionRecovery": true,
@@ -813,6 +821,7 @@
813821
"DownCommitteeSize": 6000,
814822
"DownCommitteeThreshold": 4560,
815823
"EnableAssetCloseAmount": false,
824+
"EnableExtraPagesOnAppUpdate": false,
816825
"EnableFeePooling": false,
817826
"EnableKeyregCoherencyCheck": false,
818827
"FastPartitionRecovery": true,
@@ -912,6 +921,7 @@
912921
"DownCommitteeSize": 6000,
913922
"DownCommitteeThreshold": 4560,
914923
"EnableAssetCloseAmount": false,
924+
"EnableExtraPagesOnAppUpdate": false,
915925
"EnableFeePooling": false,
916926
"EnableKeyregCoherencyCheck": false,
917927
"FastPartitionRecovery": true,
@@ -994,7 +1004,9 @@
9941004
"AppFlatParamsMinBalance": 100000,
9951005
"Application": true,
9961006
"ApplyData": true,
997-
"ApprovedUpgrades": {},
1007+
"ApprovedUpgrades": {
1008+
"https://github.com/algorandfoundation/specs/tree/abc54f79f9ad679d2d22f0fb9909fb005c16f8a1": 60000
1009+
},
9981010
"Asset": true,
9991011
"CertCommitteeSize": 1500,
10001012
"CertCommitteeThreshold": 1112,
@@ -1009,6 +1021,7 @@
10091021
"DownCommitteeSize": 6000,
10101022
"DownCommitteeThreshold": 4560,
10111023
"EnableAssetCloseAmount": true,
1024+
"EnableExtraPagesOnAppUpdate": false,
10121025
"EnableFeePooling": true,
10131026
"EnableKeyregCoherencyCheck": true,
10141027
"FastPartitionRecovery": true,
@@ -1108,6 +1121,7 @@
11081121
"DownCommitteeSize": 6000,
11091122
"DownCommitteeThreshold": 4560,
11101123
"EnableAssetCloseAmount": false,
1124+
"EnableExtraPagesOnAppUpdate": false,
11111125
"EnableFeePooling": false,
11121126
"EnableKeyregCoherencyCheck": false,
11131127
"FastPartitionRecovery": true,
@@ -1207,6 +1221,7 @@
12071221
"DownCommitteeSize": 6000,
12081222
"DownCommitteeThreshold": 4560,
12091223
"EnableAssetCloseAmount": false,
1224+
"EnableExtraPagesOnAppUpdate": false,
12101225
"EnableFeePooling": false,
12111226
"EnableKeyregCoherencyCheck": false,
12121227
"FastPartitionRecovery": true,
@@ -1282,6 +1297,104 @@
12821297
"UpgradeThreshold": 9000,
12831298
"UpgradeVoteRounds": 10000
12841299
},
1300+
"https://github.com/algorandfoundation/specs/tree/abc54f79f9ad679d2d22f0fb9909fb005c16f8a1": {
1301+
"AgreementFilterTimeout": 4000000000,
1302+
"AgreementFilterTimeoutPeriod0": 4000000000,
1303+
"AppFlatOptInMinBalance": 100000,
1304+
"AppFlatParamsMinBalance": 100000,
1305+
"Application": true,
1306+
"ApplyData": true,
1307+
"ApprovedUpgrades": {},
1308+
"Asset": true,
1309+
"CertCommitteeSize": 1500,
1310+
"CertCommitteeThreshold": 1112,
1311+
"CompactCertRounds": 0,
1312+
"CompactCertSecKQ": 0,
1313+
"CompactCertTopVoters": 0,
1314+
"CompactCertVotersLookback": 0,
1315+
"CompactCertWeightThreshold": 0,
1316+
"CredentialDomainSeparationEnabled": true,
1317+
"DefaultKeyDilution": 10000,
1318+
"DefaultUpgradeWaitRounds": 140000,
1319+
"DownCommitteeSize": 6000,
1320+
"DownCommitteeThreshold": 4560,
1321+
"EnableAssetCloseAmount": true,
1322+
"EnableExtraPagesOnAppUpdate": true,
1323+
"EnableFeePooling": true,
1324+
"EnableKeyregCoherencyCheck": true,
1325+
"FastPartitionRecovery": true,
1326+
"FastRecoveryLambda": 300000000000,
1327+
"FixTransactionLeases": true,
1328+
"ForceNonParticipatingFeeSink": true,
1329+
"InitialRewardsRateCalculation": true,
1330+
"LateCommitteeSize": 500,
1331+
"LateCommitteeThreshold": 320,
1332+
"LogicSigMaxCost": 20000,
1333+
"LogicSigMaxSize": 1000,
1334+
"LogicSigVersion": 4,
1335+
"MaxAppArgs": 16,
1336+
"MaxAppBytesValueLen": 128,
1337+
"MaxAppKeyLen": 64,
1338+
"MaxAppProgramCost": 700,
1339+
"MaxAppProgramLen": 2048,
1340+
"MaxAppSumKeyValueLens": 128,
1341+
"MaxAppTotalArgLen": 2048,
1342+
"MaxAppTotalProgramLen": 2048,
1343+
"MaxAppTotalTxnReferences": 8,
1344+
"MaxAppTxnAccounts": 4,
1345+
"MaxAppTxnForeignApps": 8,
1346+
"MaxAppTxnForeignAssets": 8,
1347+
"MaxAppsCreated": 10,
1348+
"MaxAppsOptedIn": 10,
1349+
"MaxAssetDecimals": 19,
1350+
"MaxAssetNameBytes": 32,
1351+
"MaxAssetURLBytes": 96,
1352+
"MaxAssetUnitNameBytes": 8,
1353+
"MaxAssetsPerAccount": 1000,
1354+
"MaxBalLookback": 320,
1355+
"MaxExtraAppProgramPages": 3,
1356+
"MaxGlobalSchemaEntries": 64,
1357+
"MaxLocalSchemaEntries": 16,
1358+
"MaxTimestampIncrement": 25,
1359+
"MaxTxGroupSize": 16,
1360+
"MaxTxnBytesPerBlock": 1000000,
1361+
"MaxTxnLife": 1000,
1362+
"MaxTxnNoteBytes": 1024,
1363+
"MaxUpgradeWaitRounds": 150000,
1364+
"MaxVersionStringLen": 128,
1365+
"MaximumMinimumBalance": 100100000,
1366+
"MinBalance": 100000,
1367+
"MinTxnFee": 1000,
1368+
"MinUpgradeWaitRounds": 10000,
1369+
"NextCommitteeSize": 5000,
1370+
"NextCommitteeThreshold": 3838,
1371+
"NoEmptyLocalDeltas": true,
1372+
"NumProposers": 20,
1373+
"PaysetCommit": 2,
1374+
"PendingResidueRewards": true,
1375+
"RedoCommitteeSize": 2400,
1376+
"RedoCommitteeThreshold": 1768,
1377+
"RequireGenesisHash": true,
1378+
"RewardUnit": 1000000,
1379+
"RewardsInApplyData": true,
1380+
"RewardsRateRefreshInterval": 500000,
1381+
"SchemaBytesMinBalance": 25000,
1382+
"SchemaMinBalancePerEntry": 25000,
1383+
"SchemaUintMinBalance": 3500,
1384+
"SeedLookback": 2,
1385+
"SeedRefreshInterval": 80,
1386+
"SoftCommitteeSize": 2990,
1387+
"SoftCommitteeThreshold": 2267,
1388+
"SupportBecomeNonParticipatingTransactions": true,
1389+
"SupportGenesisHash": true,
1390+
"SupportRekeying": true,
1391+
"SupportSignedTxnInBlock": true,
1392+
"SupportTransactionLeases": true,
1393+
"SupportTxGroups": true,
1394+
"TxnCounter": true,
1395+
"UpgradeThreshold": 9000,
1396+
"UpgradeVoteRounds": 10000
1397+
},
12851398
"https://github.com/algorandfoundation/specs/tree/ac2255d586c4474d4ebcf3809acccb59b7ef34ff": {
12861399
"AgreementFilterTimeout": 4000000000,
12871400
"AgreementFilterTimeoutPeriod0": 4000000000,
@@ -1306,6 +1419,7 @@
13061419
"DownCommitteeSize": 6000,
13071420
"DownCommitteeThreshold": 4560,
13081421
"EnableAssetCloseAmount": true,
1422+
"EnableExtraPagesOnAppUpdate": false,
13091423
"EnableFeePooling": false,
13101424
"EnableKeyregCoherencyCheck": false,
13111425
"FastPartitionRecovery": true,
@@ -1405,6 +1519,7 @@
14051519
"DownCommitteeSize": 6000,
14061520
"DownCommitteeThreshold": 4560,
14071521
"EnableAssetCloseAmount": true,
1522+
"EnableExtraPagesOnAppUpdate": false,
14081523
"EnableFeePooling": false,
14091524
"EnableKeyregCoherencyCheck": false,
14101525
"FastPartitionRecovery": true,
@@ -1504,6 +1619,7 @@
15041619
"DownCommitteeSize": 6000,
15051620
"DownCommitteeThreshold": 4560,
15061621
"EnableAssetCloseAmount": true,
1622+
"EnableExtraPagesOnAppUpdate": false,
15071623
"EnableFeePooling": false,
15081624
"EnableKeyregCoherencyCheck": false,
15091625
"FastPartitionRecovery": true,
@@ -1603,6 +1719,7 @@
16031719
"DownCommitteeSize": 6000,
16041720
"DownCommitteeThreshold": 4560,
16051721
"EnableAssetCloseAmount": false,
1722+
"EnableExtraPagesOnAppUpdate": false,
16061723
"EnableFeePooling": false,
16071724
"EnableKeyregCoherencyCheck": false,
16081725
"FastPartitionRecovery": true,
@@ -1702,6 +1819,7 @@
17021819
"DownCommitteeSize": 6000,
17031820
"DownCommitteeThreshold": 4560,
17041821
"EnableAssetCloseAmount": false,
1822+
"EnableExtraPagesOnAppUpdate": false,
17051823
"EnableFeePooling": false,
17061824
"EnableKeyregCoherencyCheck": false,
17071825
"FastPartitionRecovery": true,
@@ -1801,6 +1919,7 @@
18011919
"DownCommitteeSize": 6000,
18021920
"DownCommitteeThreshold": 4560,
18031921
"EnableAssetCloseAmount": false,
1922+
"EnableExtraPagesOnAppUpdate": false,
18041923
"EnableFeePooling": false,
18051924
"EnableKeyregCoherencyCheck": false,
18061925
"FastPartitionRecovery": true,
@@ -1900,6 +2019,7 @@
19002019
"DownCommitteeSize": 6000,
19012020
"DownCommitteeThreshold": 4560,
19022021
"EnableAssetCloseAmount": false,
2022+
"EnableExtraPagesOnAppUpdate": false,
19032023
"EnableFeePooling": false,
19042024
"EnableKeyregCoherencyCheck": false,
19052025
"FastPartitionRecovery": true,
@@ -1999,6 +2119,7 @@
19992119
"DownCommitteeSize": 10000,
20002120
"DownCommitteeThreshold": 7750,
20012121
"EnableAssetCloseAmount": false,
2122+
"EnableExtraPagesOnAppUpdate": false,
20022123
"EnableFeePooling": false,
20032124
"EnableKeyregCoherencyCheck": false,
20042125
"FastPartitionRecovery": false,
@@ -2098,6 +2219,7 @@
20982219
"DownCommitteeSize": 5000,
20992220
"DownCommitteeThreshold": 3838,
21002221
"EnableAssetCloseAmount": false,
2222+
"EnableExtraPagesOnAppUpdate": false,
21012223
"EnableFeePooling": false,
21022224
"EnableKeyregCoherencyCheck": false,
21032225
"FastPartitionRecovery": false,
@@ -2197,6 +2319,7 @@
21972319
"DownCommitteeSize": 5000,
21982320
"DownCommitteeThreshold": 3838,
21992321
"EnableAssetCloseAmount": false,
2322+
"EnableExtraPagesOnAppUpdate": false,
22002323
"EnableFeePooling": false,
22012324
"EnableKeyregCoherencyCheck": false,
22022325
"FastPartitionRecovery": false,

0 commit comments

Comments
 (0)