Merge branch 'develop' into michael/support-unbatched-calls

.circleci/config.yml

@@ -600,7 +600,7 @@ jobs:
       - run:
           name: run lint
           command: |
-            golangci-lint run -E goimports,sqlclosecheck,bodyclose,asciicheck,misspell,errorlint --timeout 2m -e "errors.As" -e "errors.Is" ./...
+            golangci-lint run -E goimports,sqlclosecheck,bodyclose,asciicheck,misspell,errorlint --timeout 5m -e "errors.As" -e "errors.Is" ./...
           working_directory: <<parameters.module>>
 
   go-test:

specs/proposals.md

@@ -207,7 +207,7 @@ function deleteL2Outputs(uint256 _l2OutputIndex) external
 /**
  * @notice Computes the block number of the next L2 block that needs to be checkpointed.
  */
-function getNextBlockNumber() public view returns (uint256)
+function nextBlockNumber() public view returns (uint256)
 ```
 
 ### Configuration