astriaorg · jbowen93 · Nov 6, 2024 · Nov 6, 2024 · Nov 7, 2024 · Nov 18, 2024
@@ -67,7 +67,8 @@ jobs:
           tags: |
             type=ref,event=pr
             type=match,pattern=refs/tags/${{ inputs.binary-name }}-v(.*),group=1,enable=${{ startsWith(env.FULL_REF, 'refs/tags/') }},value=${{ env.FULL_REF }}
-            type=sha
+            type=sha,format=short
+            type=sha,format=long
             # set the actual commit SHA from the PR head instead of from the PR merge commit (alternatively, we could checkout the PR head in actions/checkout)
             type=raw,value=sha-${{ github.event.pull_request.head.sha || github.sha }},enable=${{ startsWith(env.FULL_REF, 'refs/pull/') }}
             # set latest tag for `main` branch

@@ -62,6 +62,8 @@ modules:
       ignore_only:
         PACKAGE_VERSION_SUFFIX:
           - proto/protocolapis/astria_vendored/tendermint
+        ENUM_ZERO_VALUE_SUFFIX:
+          - proto/protocolapis/astria_vendored/tendermint
       disallow_comment_ignores: true
     breaking:
       use:

@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.7.1
+version: 0.7.2
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.4.0
+version: 0.4.1
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.0.1
+version: 1.2.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

@@ -38,9 +38,11 @@
         "astriaBridgeAddresses": {{ toPrettyJson .Values.genesis.bridgeAddresses | indent 8 | trim }},
         "astriaFeeCollectors": {{ toPrettyJson .Values.genesis.feeCollectors | indent 8 | trim }},
         "astriaEIP1559Params": {{ toPrettyJson .Values.genesis.eip1559Params | indent 8 | trim }},
-        "astriaSequencerAddressPrefix": "{{ .Values.genesis.sequencerAddressPrefix }}"
+        "astriaSequencerAddressPrefix": "{{ .Values.genesis.sequencerAddressPrefix }}",
         {{- if not .Values.global.dev }}
         {{- else }}
+        "astriaOracleCallerAddress": "{{ .Values.genesis.astriaOracleCallerAddress }}",
+        "astriaOracleContractAddress": "{{ .Values.genesis.astriaOracleContractAddress }}"
         {{- end }}
     },
     "difficulty": "0",

@@ -11,14 +11,13 @@ images:
     repo: ghcr.io/astriaorg/astria-geth
     pullPolicy: IfNotPresent
     tag: 1.0.0
-    devTag: latest
+    devTag: sha-7ded202
     overrideTag: ""
   conductor:
     repo: ghcr.io/astriaorg/conductor
     pullPolicy: IfNotPresent
     tag: 1.0.0
-    devTag: latest
-
+    devTag: pr-1866
 
 genesis:
   ## These values are used to configure the genesis block of the rollup chain
@@ -57,6 +56,14 @@ genesis:
     #   senderAddress: "0x0000000000000000000000000000000000000000"
     #   assetPrecision: 9
 
+  ## Native oracle configuration
+
+  # address from which injected oracle transactions are called from;
+  # must not have a known private key for mainnet
+  astriaOracleCallerAddress: "0x0000000000000000000000000000000000000088"
+  # address where the oracle contract is deployed at (at genesis)
+  # must match the `alloc` genesis field
+  astriaOracleContractAddress: "0x0000000000000000000000000000000000000089"
 
   ## Fee configuration
 
@@ -89,6 +96,10 @@ genesis:
       value:
         balance: "0"
         code: "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe03601600081602082378035828234f58015156039578182fd5b8082525050506014600cf3"
+    - address: "0x0000000000000000000000000000000000000089"  ## oracle contract
+      value:
+        balance: "0"
+        code: "0x608060405234801561001057600080fd5b50600436106100ea5760003560e01c80638da5cb5b1161008c578063abcdd06911610066578063abcdd0691461021a578063dad84e9d1461023d578063f2fde38b1461029a578063f6dad934146102ad57600080fd5b80638da5cb5b146101d257806395009a53146101e35780639c97f6d8146101f657600080fd5b806348832f3c116100c857806348832f3c1461015f578063715018a614610172578063859bd5b51461017a578063888810c9146101bf57600080fd5b806338013f02146100ef5780633a6a7162146101335780634599c78814610148575b600080fd5b6101167f000000000000000000000000000000000000000000000000000000000000008881565b6040516001600160a01b0390911681526020015b60405180910390f35b610146610141366004610865565b6102c0565b005b61015160045481565b60405190815260200161012a565b61014661016d366004610891565b6103da565b6101466104ea565b6101a66101883660046108c7565b60026020526000908152604090205460ff8082169161010090041682565b60408051921515835260ff90911660208301520161012a565b6101466101cd3660046108e0565b6104fe565b6000546001600160a01b0316610116565b6101466101f13660046109e6565b610524565b60005461020a90600160a01b900460ff1681565b604051901515815260200161012a565b61020a6102283660046108c7565b60016020526000908152604090205460ff1681565b61027b61024b366004610a9f565b6003602090815260009283526040808420909152908252902080546001909101546001600160801b039091169082565b604080516001600160801b03909316835260208301919091520161012a565b6101466102a8366004610ac1565b610768565b6101466102bb3660046108c7565b6107a6565b336001600160a01b037f000000000000000000000000000000000000000000000000000000000000008816146103115760405162461bcd60e51b815260040161030890610aea565b60405180910390fd5b4360045560008281526002602052604090205460ff166103475760405163183c4ba760e01b815260006004820152602401610308565b6040805180820182526001600160801b038381168083524260208085019182526004546000908152600382528681208982528252869020945185546001600160801b0319169416939093178455516001909301929092558251858152908101919091527fd616ae5f8d378c1264fdbbbc72af91e16e3645564d7eae37e267ef1c67bf5cee91015b60405180910390a15050565b336001600160a01b037f000000000000000000000000000000000000000000000000000000000000008816146104225760405162461bcd60e51b815260040161030890610aea565b600054600160a01b900460ff16801561044a575060008281526001602052604090205460ff16155b1561046b5760405163401e592360e01b815260048101839052602401610308565b6040805180820182526001815260ff838116602080840182815260008881526002835286902094518554915161ffff1990921690151561ff001916176101009190941602929092179092558251858152908101919091527f675b5c62c7826a107baf315a10339c41c59f32f58ac6431f359e9ac89c64a01b91016103ce565b6104f26107cc565b6104fc60006107f9565b565b6105066107cc565b60008054911515600160a01b0260ff60a01b19909216919091179055565b336001600160a01b037f0000000000000000000000000000000000000000000000000000000000000088161461056c5760405162461bcd60e51b815260040161030890610aea565b80518251146105cd5760405162461bcd60e51b815260206004820152602760248201527f63757272656e6379207061697220616e64207072696365206c656e677468206d6044820152660d2e6dac2e8c6d60cb1b6064820152608401610308565b4360045560005b825181101561076357600260008483815181106105f3576105f3610b2e565b60209081029190910181015182528101919091526040016000205460ff166106315760405163183c4ba760e01b815260048101829052602401610308565b604051806040016040528083838151811061064e5761064e610b2e565b60200260200101516001600160801b0316815260200142815250600360006004548152602001908152602001600020600085848151811061069157610691610b2e565b602090810291909101810151825281810192909252604001600020825181546001600160801b0319166001600160801b0390911617815591015160019091015582517fd616ae5f8d378c1264fdbbbc72af91e16e3645564d7eae37e267ef1c67bf5cee9084908390811061070757610707610b2e565b602002602001015183838151811061072157610721610b2e565b60200260200101516040516107499291909182526001600160801b0316602082015260400190565b60405180910390a18061075b81610b44565b9150506105d4565b505050565b6107706107cc565b6001600160a01b03811661079a57604051631e4fbdf760e01b815260006004820152602401610308565b6107a3816107f9565b50565b6107ae6107cc565b6000908152600160208190526040909120805460ff19169091179055565b6000546001600160a01b031633146104fc5760405163118cdaa760e01b8152336004820152602401610308565b600080546001600160a01b038381166001600160a01b0319831681178455604051919092169283917f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e09190a35050565b80356001600160801b038116811461086057600080fd5b919050565b6000806040838503121561087857600080fd5b8235915061088860208401610849565b90509250929050565b600080604083850312156108a457600080fd5b82359150602083013560ff811681146108bc57600080fd5b809150509250929050565b6000602082840312156108d957600080fd5b5035919050565b6000602082840312156108f257600080fd5b8135801515811461090257600080fd5b9392505050565b634e487b7160e01b600052604160045260246000fd5b604051601f8201601f1916810167ffffffffffffffff8111828210171561094857610948610909565b604052919050565b600067ffffffffffffffff82111561096a5761096a610909565b5060051b60200190565b600082601f83011261098557600080fd5b8135602061099a61099583610950565b61091f565b82815260059290921b840181019181810190868411156109b957600080fd5b8286015b848110156109db576109ce81610849565b83529183019183016109bd565b509695505050505050565b600080604083850312156109f957600080fd5b823567ffffffffffffffff80821115610a1157600080fd5b818501915085601f830112610a2557600080fd5b81356020610a3561099583610950565b82815260059290921b84018101918181019089841115610a5457600080fd5b948201945b83861015610a7257853582529482019490820190610a59565b96505086013592505080821115610a8857600080fd5b50610a9585828601610974565b9150509250929050565b60008060408385031215610ab257600080fd5b50508035926020909101359150565b600060208284031215610ad357600080fd5b81356001600160a01b038116811461090257600080fd5b60208082526024908201527f4173747269614f7261636c653a206f6e6c79206f7261636c652063616e2075706040820152636461746560e01b606082015260800190565b634e487b7160e01b600052603260045260246000fd5b600060018201610b6457634e487b7160e01b600052601160045260246000fd5b506001019056fea26469706673582212203dba20374b20748c9e2f92d4416b253adb31e624e5086145f955c848297d924c64736f6c63430008150033"
     # Example of simple genesis account funding
     # - address: "0xaC21B97d35Bf75A7dAb16f35b111a50e78A72F30"
     #   value:
@@ -159,7 +170,8 @@ config:
         condition: .Values.metrics.enabled
       - name: txpool.nolocals
         value: "true"
-
+      - name: verbosity
+        value: "4"  # 3=info, 4=debug
 
   conductor:
     # Determines what will drive block execution, options are:

@@ -1,10 +1,10 @@
 dependencies:
 - name: celestia-node
   repository: file://../celestia-node
-  version: 0.4.0
+  version: 0.4.1
 - name: evm-rollup
   repository: file://../evm-rollup
-  version: 1.0.1
+  version: 1.2.0
 - name: composer
   repository: file://../composer
   version: 1.0.0
@@ -20,5 +20,5 @@ dependencies:
 - name: blockscout-stack
   repository: https://blockscout.github.io/helm-charts
   version: 1.6.8
-digest: sha256:371c35af96fc5d82aa2b4d894dc7d2e11e150380fd6f09eb0ca94b4202b24698
-generated: "2025-01-08T11:22:41.273867-08:00"
+digest: sha256:0264763bccb70e719cba335adf68e78937b18a421cc7aca747a8a0e8a9b0343a
+generated: "2025-02-18T15:41:14.204535563-05:00"
@@ -15,15 +15,15 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.0.7
+version: 1.1.1
 
 dependencies:
   - name: celestia-node
-    version: 0.4.0
+    version: 0.4.1
     repository: "file://../celestia-node"
     condition: celestia-node.enabled
   - name: evm-rollup
-    version: 1.0.1
+    version: 1.2.0
     repository: "file://../evm-rollup"
   - name: composer
     version: 1.0.0

@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.5.2
+version: 0.5.3
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

@@ -3,4 +3,4 @@ dependencies:
   repository: file://../sequencer-relayer
   version: 1.0.1
 digest: sha256:3b3ce65ff473606fcc86027653cadd212ba45ac8b39d5806d713b48f695ad235
-generated: "2024-11-20T11:24:11.85775+02:00"
+generated: "2024-12-23T18:31:36.564565164Z"
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.0.2
+version: 1.0.5
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.

@@ -111,7 +111,7 @@ grpc_laddr = ""
 # 0 - unlimited.
 # Should be < {ulimit -Sn} - {MaxNumInboundPeers} - {MaxNumOutboundPeers} - {N of wal, db and other open files}
 # 1024 - 40 - 10 - 50 = 924 = ~900
-grpc_max_open_connections = {{ .Values.cometbft.config.grpc.maxOpenConnections }} 
+grpc_max_open_connections = {{ .Values.cometbft.config.grpc.maxOpenConnections }}
 
 # Activate unsafe RPC commands like /dial_seeds and /unsafe_flush_mempool
 unsafe = false

@@ -108,7 +108,7 @@
       {{- if $index }},{{- end }}
       {
         "address": {{ include "sequencer.address" $value.address }},
-        "balance": {{ include "sequencer.toUint128Proto" ( toString $value.balance | replace "\"" "" ) }} 
+        "balance": {{ include "sequencer.toUint128Proto" ( toString $value.balance | replace "\"" "" ) }}
       }
       {{- end }}
     ],
@@ -119,11 +119,78 @@
       {{- if $index }},{{- end }}
       {{ include "sequencer.address" $value }}
       {{- end }}
-    ]
+    ],
     {{- if not .Values.global.dev }}
     {{- else }}
-    {{- end}}
+    "connect": {
+      "marketMap": {
+        "marketMap": {
+          "markets": {
+            {{- range $index, $market := .Values.sequencer.oracle.markets }}
+            {{- if $index }},{{- end }}
+            "{{ $market.name }}": {
+              "providerConfigs": [
+                {{- range $providerIndex, $provider := $market.providerConfigs }}
+                {{- if $providerIndex }},{{- end }}
+                {
+                  "name": "{{ $provider.name }}",
+                  {{- if $provider.normalizeByPair }}
+                  "normalizeByPair": {
+                    "Base": "{{ $provider.normalizeByPair.Base }}",
+                    "Quote": "{{ $provider.normalizeByPair.Quote }}"
+                  },
+                  {{- end }}
+                  "offChainTicker": "{{ $provider.offChainTicker }}"
+                }
+                {{- end }}
+              ],
+              "ticker": {
+                "currencyPair": {
+                  "Base": "{{ $market.ticker.currencyPair.Base }}",
+                  "Quote": "{{ $market.ticker.currencyPair.Quote }}"
+                },
+                "decimals": "{{ $market.ticker.decimals }}",
+                "enabled": {{ $market.ticker.enabled }},
+                "minProviderCount": "{{ $market.ticker.minProviderCount }}"
+              }
+            }
+            {{- end }}
+          }
+        },
+        "params": {
+          "admin": "{{ .Values.genesis.oracle.marketAdminAddress }}",
+          "marketAuthorities": [
+            {{- range $index, $authority := .Values.genesis.oracle.marketAuthorities }}
+            {{- if $index }},{{- end }}
+            "{{ $authority }}"
+            {{- end }}
+          ]
+        }
+      },
+      "oracle": {
+        "currencyPairGenesis": [
+          {{- range $index, $genesis := .Values.sequencer.oracle.currencyPairGenesis }}
+          {{- if $index }},{{- end }}
+          {
+            "currencyPair": {
+              "Base": "{{ $genesis.currencyPair.Base }}",
+              "Quote": "{{ $genesis.currencyPair.Quote }}"
+            },
+            "currencyPairPrice": {
+              "blockTimestamp": "{{ $genesis.currencyPairPrice.blockTimestamp }}",
+              "price": "{{ $genesis.currencyPairPrice.price }}"
+            }
+            {{- if $genesis.id }},
+            "id": "{{ $genesis.id }}"
+            {{- end }}
+          }
+          {{- end }}
+        ],
+        "nextId": "{{ .Values.sequencer.oracle.nextId }}"
+      }
+    }
   },
+  {{- end}}
   "chain_id": "{{ .Values.genesis.chainId }}",
   "consensus_params": {
     "block": {
@@ -142,6 +209,9 @@
     },
     "version": {
       "app": "0"
+    },
+    "abci": {
+      "vote_extensions_enable_height": "{{ .Values.genesis.consensusParams.voteExtensionsEnableHeight }}"
     }
   },
   "genesis_time": "{{ .Values.genesis.genesisTime }}",

@@ -0,0 +1,38 @@
+{
+  "markets": {
+    "BTC/USD": {
+      "ticker": {
+        "currency_pair": {
+          "Base": "BTC",
+          "Quote": "USD"
+        },
+        "decimals": 5,
+        "min_provider_count": 1,
+        "enabled": true
+      },
+      "provider_configs": [
+        {
+          "name": "coingecko_api",
+          "off_chain_ticker": "bitcoin/usd"
+        }
+      ]
+    },
+    "ETH/USD": {
+      "ticker": {
+        "currency_pair": {
+          "Base": "ETH",
+          "Quote": "USD"
+        },
+        "decimals": 6,
+        "min_provider_count": 1,
+        "enabled": true
+      },
+      "provider_configs": [
+        {
+          "name": "coingecko_api",
+          "off_chain_ticker": "ethereum/usd"
+        }
+      ]
+    }
+  }
+}
@@ -11,6 +11,9 @@ Namepsace to deploy elements into.
 {{- define "cometBFT.image" -}}
 {{ .Values.images.cometBFT.repo }}:{{ if .Values.global.dev }}{{ .Values.images.cometBFT.devTag }}{{ else }}{{ .Values.images.cometBFT.tag }}{{ end }}
 {{- end }}
+{{- define "connect.image" -}}
+{{ .Values.images.connect.repo }}:{{ if .Values.global.dev }}{{ .Values.images.connect.devTag }}{{ else }}{{ .Values.images.connect.tag }}{{ end }}
+{{- end }}
 
 {{/*
 Return if ingress is stable.

@@ -30,6 +30,11 @@ metadata:
 data:
   init-cometbft.sh: |
     {{- tpl (.Files.Get "files/scripts/init-cometbft.sh") $ | nindent 4 }}
+  {{- if not .Values.global.dev }}
+  {{- else }}
+  markets.json: |
+    {{- tpl (.Files.Get "files/scripts/markets.json") $ | nindent 4 }}
+  {{- end }}
 ---
 apiVersion: v1
 kind: ConfigMap
@@ -75,5 +80,8 @@ data:
   OTEL_SERVICE_NAME: "{{ tpl .Values.sequencer.otel.serviceName . }}"
   {{- if not .Values.global.dev }}
   {{- else }}
+  ASTRIA_SEQUENCER_NO_ORACLE: "{{ not .Values.sequencer.oracle.enabled }}"
+  ASTRIA_SEQUENCER_ORACLE_GRPC_ADDR: "http://127.0.0.1:{{ .Values.ports.oracleGrpc }}"
+  ASTRIA_SEQUENCER_ORACLE_CLIENT_TIMEOUT_MILLISECONDS: "{{ .Values.sequencer.oracle.clientTimeout }}"
   {{- end }}
 ---