diff --git a/charts/abstract-node/Chart.yaml b/charts/abstract-node/Chart.yaml index eec68b1..a599a4c 100644 --- a/charts/abstract-node/Chart.yaml +++ b/charts/abstract-node/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 name: abstract-node description: External node for syncing and serving blockchain data for Abstract -version: 0.1.33 +version: 0.1.34 type: application icon: https://abstract-assets.abs.xyz/icons/light.png keywords: @@ -11,7 +11,7 @@ keywords: home: https://abs.xyz sources: - https://github.com/matter-labs/zksync-era -appVersion: "29.4.1" +appVersion: "29.6.0" dependencies: - name: common diff --git a/charts/abstract-node/templates/statefulset.yaml b/charts/abstract-node/templates/statefulset.yaml index 508348c..affb4a0 100644 --- a/charts/abstract-node/templates/statefulset.yaml +++ b/charts/abstract-node/templates/statefulset.yaml @@ -172,6 +172,18 @@ spec: - name: EN_CONSENSUS_SECRETS_PATH value: "/consensus/secrets.yaml" {{- end }} + {{- if .Values.node.statekeeper.l2BlockCommitDeadline }} + - name: EN_STATE_KEEPER_L2_BLOCK_COMMIT_DEADLINE + value: {{ .Values.node.statekeeper.l2BlockCommitDeadline | quote }} + {{- end }} + {{- if .Values.rpc.sendRawTxSyncMaxTimeout }} + - name: EN_API_SEND_RAW_TX_SYNC_MAX_TIMEOUT_MS + value: {{ .Values.rpc.sendRawTxSyncMaxTimeout | quote }} + {{- end }} + {{- if .Values.rpc.sendRawTxSyncDefaultTimeout }} + - name: EN_API_SEND_RAW_TX_SYNC_DEFAULT_TIMEOUT_MS + value: {{ .Values.rpc.sendRawTxSyncDefaultTimeout | quote }} + {{- end }} ports: {{- if .Values.rpc.http.enabled }} - name: http diff --git a/charts/abstract-node/values.yaml b/charts/abstract-node/values.yaml index 5fff6c7..0629491 100644 --- a/charts/abstract-node/values.yaml +++ b/charts/abstract-node/values.yaml @@ -79,7 +79,7 @@ image: registry: docker.io repository: matterlabs/external-node pullPolicy: IfNotPresent - tag: "v29.4.1" + tag: "v29.6.0-alpha" # This is for the secretes for pulling an image from a private repository more information can be found here: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/ imagePullSecrets: [] @@ -165,6 +165,13 @@ rpc: enabled: true port: "3061" + ## Configuration for eth_sendRawTransactionSync timeouts + ## Default timeout is 2 seconds with a max of 10 seconds + ## ref: https://github.com/matter-labs/zksync-era/blob/54dc61c6faff53d314227ffe26961b1abfc999a7/core/lib/config/src/configs/api.rs#L405-L410 + ## + ## sendRawTxSyncDefaultTimeout: 2000 + ## sendRawTxSyncMaxTimeout: 10000 + consensus: # Consensus is currently disabled for Abstract enabled: false @@ -252,6 +259,8 @@ node: pruningEnabled: true snapshotRecoveryEnabled: true snapshotBucket: 'raas-abstract-mainnet-external-node-snapshots' + statekeeper: + l2BlockCommitDeadline: 200 ## Whether or not to allocate persistent volume disk for the rocksdb directories. ## In case of node failure, the node data directory will still persist. diff --git a/docker/.env.mainnet b/docker/.env.mainnet index 680be95..8f6b9c6 100644 --- a/docker/.env.mainnet +++ b/docker/.env.mainnet @@ -1,6 +1,6 @@ # Don't change these values unless you know what you're doing NETWORK=mainnet -EN_VERSION=v29.4.1 +EN_VERSION=v29.6.0-alpha EN_MAIN_NODE_URL=https://api.mainnet.abs.xyz EN_L1_CHAIN_ID=1 EN_L2_CHAIN_ID=2741 @@ -26,3 +26,7 @@ DB_PASSWORD=notsecurepassword # Pruning - set to false to disable pruning (full archive) # EN_PRUNING_ENABLED= + +# eth_sendRawTransactionSync timeouts +# EN_API_SEND_RAW_TX_SYNC_DEFAULT_TIMEOUT_MS= +# EN_API_SEND_RAW_TX_SYNC_MAX_TIMEOUT_MS= diff --git a/docker/.env.testnet b/docker/.env.testnet index c9a24dd..8f1c7ed 100644 --- a/docker/.env.testnet +++ b/docker/.env.testnet @@ -1,6 +1,6 @@ # Don't change these values unless you know what you're doing NETWORK=testnet -EN_VERSION=v29.4.1 +EN_VERSION=v29.6.0-alpha EN_MAIN_NODE_URL=https://api.testnet.abs.xyz EN_L1_CHAIN_ID=11155111 EN_L2_CHAIN_ID=11124 @@ -26,3 +26,7 @@ DB_PASSWORD=notsecurepassword # Pruning - set to false to disable pruning (full archive) # EN_PRUNING_ENABLED= + +# eth_sendRawTransactionSync timeouts +# EN_API_SEND_RAW_TX_SYNC_DEFAULT_TIMEOUT_MS= +# EN_API_SEND_RAW_TX_SYNC_MAX_TIMEOUT_MS= diff --git a/docker/external-node.yml b/docker/external-node.yml index e97a7b0..a9faf9f 100644 --- a/docker/external-node.yml +++ b/docker/external-node.yml @@ -109,6 +109,11 @@ services: # Consensus is currently disabled for Abstract #EN_CONSENSUS_CONFIG_PATH: "/configs/consensus_config.yaml" #EN_CONSENSUS_SECRETS_PATH: "/configs/consensus_secrets.yaml" + # Statekeeper config for block times + EN_STATE_KEEPER_L2_BLOCK_COMMIT_DEADLINE: ${EN_STATE_KEEPER_L2_BLOCK_COMMIT_DEADLINE:-200} + # API configuration for eth_sendRawTransactionSync timeouts + EN_API_SEND_RAW_TX_SYNC_DEFAULT_TIMEOUT_MS: ${EN_API_SEND_RAW_TX_SYNC_DEFAULT_TIMEOUT_MS:-2000} + EN_API_SEND_RAW_TX_SYNC_MAX_TIMEOUT_MS: ${EN_API_SEND_RAW_TX_SYNC_MAX_TIMEOUT_MS:-10000} volumes: postgres: {}