Merge pull request #325 from algorandfoundation/dev

0.11.8

.vscode/settings.json

@@ -3,7 +3,6 @@
   "editor.formatOnSave": true,
   "editor.defaultFormatter": "esbenp.prettier-vscode",
   "editor.codeActionsOnSave": {
-    "source.fixAll.eslint": "explicit",
-    "source.organizeImports": "explicit"
-  },
+    "source.fixAll.eslint": "explicit"
+  }
 }

contracts/__test__/contracts.test.ts

@@ -103,6 +103,10 @@ describe('reti', () => {
         const composer = validatorMasterClient
             .newGroup()
             .initStakingContract({ args: { approvalProgramSize: stakingApprovalProgram.length } })
+        // simple sanity check for checking on contract sizes
+        consoleLogger.info(
+            `registry size:${result.compiledApproval?.compiledBase64ToBytes.length}, pool size:${stakingApprovalProgram.length}`,
+        )
 
         // load the StakingPool contract into box storage of the validator
         // call loadStakingContractData - chunking the data from approvalCompiled 2000 bytes at a time

contracts/bootstrap/package.json

@@ -1,6 +1,6 @@
 {
     "name": "bootstrap",
-    "version": "0.11.7",
+    "version": "0.11.8",
     "description": "",
     "main": "index.ts",
     "scripts": {

contracts/package.json

@@ -1,6 +1,6 @@
 {
     "name": "reti-contracts",
-    "version": "0.11.7",
+    "version": "0.11.8",
     "license": "MIT",
     "scripts": {
         "generate-client": "pnpx @algorandfoundation/[email protected] generate -a contracts/artifacts/StakingPool.arc56_draft.json -o contracts/clients/StakingPoolClient.ts && pnpx @algorandfoundation/[email protected] generate -a contracts/artifacts/ValidatorRegistry.arc56_draft.json -o contracts/clients/ValidatorRegistryClient.ts && ./update_contract_artifacts.sh",

nodemgr/app.go

@@ -34,7 +34,7 @@ func initApp() *RetiApp {
 		logger = slog.New(misc.NewMinimalHandler(os.Stdout,
 			misc.MinimalHandlerOptions{SlogOpts: slog.HandlerOptions{Level: logLevel, AddSource: true}}))
 	} else {
-		// not on console - output as json, but change json key names to be more compatibl w/ what google logging
+		// not on console - output as json, but change json key names to be more compatible w/ what google logging
 		// expects
 		opts := &slog.HandlerOptions{
 			AddSource: true,

nodemgr/daemon.go

@@ -237,7 +237,7 @@ func (d *Daemon) updatePoolVersions(ctx context.Context) {
 	}
 	versString = fmt.Sprintf("%s : %s", versString, getVersionInfo())
 
-	for _, poolAppId := range App.retiClient.Info().LocalPools {
+	for poolId, poolAppId := range App.retiClient.Info().LocalPools {
 		algodVer, err := App.retiClient.GetAlgodVer(poolAppId)
 		if err != nil && !errors.Is(err, algo.ErrStateKeyNotFound) {
 			misc.Errorf(d.logger, "unable to fetch algod version from staking pool app id:%d, err:%v", poolAppId, err)
@@ -250,6 +250,7 @@ func (d *Daemon) updatePoolVersions(ctx context.Context) {
 				misc.Errorf(d.logger, "unable to update algod version in staking pool app id:%d, err:%v", poolAppId, err)
 				return
 			}
+			misc.Infof(d.logger, "new algod version detected. Updated to:%s in pool:%d", versString, poolId)
 		}
 	}
 }
@@ -273,7 +274,7 @@ func (d *Daemon) setAverageBlockTime(ctx context.Context) error {
 	d.Lock()
 	d.avgBlockTime = blockTime
 	d.Unlock()
-	misc.Infof(d.logger, "average block time set to:%v", d.AverageBlockTime())
+	misc.Debugf(d.logger, "average block time set to:%v", d.AverageBlockTime())
 	return nil
 }
 

ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "reti-ui",
-  "version": "0.11.7",
+  "version": "0.11.8",
   "private": true,
   "type": "module",
   "engines": {

ui/src/routeTree.gen.ts

@@ -19,21 +19,25 @@ import { Route as ValidatorsValidatorIdImport } from './routes/validators_.$vali
 // Create/Update Routes
 
 const ValidatorsRoute = ValidatorsImport.update({
+  id: '/validators',
   path: '/validators',
   getParentRoute: () => rootRoute,
 } as any)
 
 const AddRoute = AddImport.update({
+  id: '/add',
   path: '/add',
   getParentRoute: () => rootRoute,
 } as any)
 
 const IndexRoute = IndexImport.update({
+  id: '/',
   path: '/',
   getParentRoute: () => rootRoute,
 } as any)
 
 const ValidatorsValidatorIdRoute = ValidatorsValidatorIdImport.update({
+  id: '/validators_/$validatorId',
   path: '/validators/$validatorId',
   getParentRoute: () => rootRoute,
 } as any)
@@ -63,8 +67,8 @@ declare module '@tanstack/react-router' {
       preLoaderRoute: typeof ValidatorsImport
       parentRoute: typeof rootRoute
     }
-    '/validators/$validatorId': {
-      id: '/validators/$validatorId'
+    '/validators_/$validatorId': {
+      id: '/validators_/$validatorId'
       path: '/validators/$validatorId'
       fullPath: '/validators/$validatorId'
       preLoaderRoute: typeof ValidatorsValidatorIdImport
@@ -94,15 +98,15 @@ export interface FileRoutesById {
   '/': typeof IndexRoute
   '/add': typeof AddRoute
   '/validators': typeof ValidatorsRoute
-  '/validators/$validatorId': typeof ValidatorsValidatorIdRoute
+  '/validators_/$validatorId': typeof ValidatorsValidatorIdRoute
 }
 
 export interface FileRouteTypes {
   fileRoutesByFullPath: FileRoutesByFullPath
   fullPaths: '/' | '/add' | '/validators' | '/validators/$validatorId'
   fileRoutesByTo: FileRoutesByTo
   to: '/' | '/add' | '/validators' | '/validators/$validatorId'
-  id: '__root__' | '/' | '/add' | '/validators' | '/validators/$validatorId'
+  id: '__root__' | '/' | '/add' | '/validators' | '/validators_/$validatorId'
   fileRoutesById: FileRoutesById
 }
 
@@ -135,7 +139,7 @@ export const routeTree = rootRoute
         "/",
         "/add",
         "/validators",
-        "/validators/$validatorId"
+        "/validators_/$validatorId"
       ]
     },
     "/": {
@@ -147,7 +151,7 @@ export const routeTree = rootRoute
     "/validators": {
       "filePath": "validators.tsx"
     },
-    "/validators/$validatorId": {
+    "/validators_/$validatorId": {
       "filePath": "validators_.$validatorId.tsx"
     }
   }

ui/src/routes/validators_.$validatorId.tsx

@@ -9,7 +9,7 @@ import { PageMain } from '@/components/PageMain'
 import { ValidatorDetails } from '@/components/ValidatorDetails'
 import { DetailsHeader } from '@/components/ValidatorDetails/DetailsHeader'
 
-export const Route = createFileRoute('/validators/$validatorId')({
+export const Route = createFileRoute('/validators_/$validatorId')({
   beforeLoad: () => {
     return {
       validatorQueryOptions,