diff --git a/.github/workflows/ci-benchmarks.yml b/.github/workflows/ci-benchmarks.yml index 8458e5a4..cb987839 100644 --- a/.github/workflows/ci-benchmarks.yml +++ b/.github/workflows/ci-benchmarks.yml @@ -36,7 +36,7 @@ jobs: ports: - 5432:5432 env: - OASIS_CORE_VERSION: "23.0.1" + OASIS_CORE_VERSION: "23.0.6" OASIS_NODE: ${{ github.workspace }}/oasis_core/oasis-node OASIS_NET_RUNNER: ${{ github.workspace }}/oasis_core/oasis-net-runner SAPPHIRE_PARATIME_VERSION: 0.6.4 diff --git a/.github/workflows/ci-test.yaml b/.github/workflows/ci-test.yaml index f3d4424b..1d68911a 100644 --- a/.github/workflows/ci-test.yaml +++ b/.github/workflows/ci-test.yaml @@ -35,7 +35,7 @@ jobs: ports: - 5432:5432 env: - OASIS_CORE_VERSION: "23.0.1" + OASIS_CORE_VERSION: "23.0.6" OASIS_NODE: ${{ github.workspace }}/oasis_core/oasis-node OASIS_NET_RUNNER: ${{ github.workspace }}/oasis_core/oasis-net-runner EMERALD_PARATIME_VERSION: 11.0.0-testnet @@ -106,14 +106,14 @@ jobs: ports: - 5432:5432 env: - OASIS_CORE_VERSION: "23.0.1" + OASIS_CORE_VERSION: "23.0.6" OASIS_NODE: ${{ github.workspace }}/oasis_core/oasis-node OASIS_NET_RUNNER: ${{ github.workspace }}/oasis_core/oasis-net-runner SAPPHIRE_PARATIME_VERSION: 0.7.0-testnet GATEWAY__CHAIN_ID: 23293 GATEWAY__OASIS_RPCS: true SAPPHIRE_PARATIME: ${{ github.workspace }}/oasis_core/sapphire-paratime - KEYMANAGER_ARTIFACT_URL: https://buildkite.com/organizations/oasisprotocol/pipelines/oasis-core-ci/builds/12039/jobs/018b246a-3e49-4b0e-9d15-a9b7845dce55/artifacts/018b246c-e46c-437d-baa3-9ebd193a676c # Find this at https://buildkite.com/oasisprotocol/oasis-core-ci/builds?branch=stable%2F<...> under "Build runtimes". + KEYMANAGER_ARTIFACT_URL: https://buildkite.com/organizations/oasisprotocol/pipelines/oasis-core-ci/builds/12411/jobs/018c1053-3187-4498-9317-cc122f6e6808/artifacts/018c1056-039a-45bd-bdac-9fd267052c75 # Find this at https://buildkite.com/oasisprotocol/oasis-core-ci/builds?branch=stable%2F<...> under "Build runtimes". KEYMANAGER_BINARY: ${{ github.workspace }}/oasis_core/simple-keymanager OASIS_NODE_DATADIR: /tmp/eth-runtime-test steps: diff --git a/benchmarks/go.mod b/benchmarks/go.mod index f770dc91..83c0949a 100644 --- a/benchmarks/go.mod +++ b/benchmarks/go.mod @@ -16,7 +16,7 @@ replace ( require ( github.com/ethereum/go-ethereum v1.13.4 - github.com/oasisprotocol/oasis-core/go v0.2300.1 + github.com/oasisprotocol/oasis-core/go v0.2300.6 github.com/oasisprotocol/oasis-sdk/client-sdk/go v0.7.0 github.com/prometheus/client_golang v1.17.0 github.com/spf13/cobra v1.7.0 diff --git a/benchmarks/go.sum b/benchmarks/go.sum index 6c64f429..8ba64901 100644 --- a/benchmarks/go.sum +++ b/benchmarks/go.sum @@ -572,8 +572,8 @@ github.com/oasisprotocol/curve25519-voi v0.0.0-20230904125328-1f23a7beb09a h1:dl github.com/oasisprotocol/curve25519-voi v0.0.0-20230904125328-1f23a7beb09a/go.mod h1:hVoHR2EVESiICEMbg137etN/Lx+lSrHPTD39Z/uE+2s= github.com/oasisprotocol/deoxysii v0.0.0-20220228165953-2091330c22b7 h1:1102pQc2SEPp5+xrS26wEaeb26sZy6k9/ZXlZN+eXE4= github.com/oasisprotocol/deoxysii v0.0.0-20220228165953-2091330c22b7/go.mod h1:UqoUn6cHESlliMhOnKLWr+CBH+e3bazUPvFj1XZwAjs= -github.com/oasisprotocol/oasis-core/go v0.2300.1 h1:E/7MITypNSJq+AWGIPkJ/Fb4aI5+afj+3F4OkTIZA9o= -github.com/oasisprotocol/oasis-core/go v0.2300.1/go.mod h1:lWZtDYY7ziW20hVzqnSt8UQlUkXNHisG3bS6Q3eTsqQ= +github.com/oasisprotocol/oasis-core/go v0.2300.6 h1:LveIyqsIof+WhLVIAQRTMNlhuiQGqZaztVeu/gBCyE0= +github.com/oasisprotocol/oasis-core/go v0.2300.6/go.mod h1:3ub+3LT8GEjuzeAXrve9pZEDkM/goL1HKBXVp4queNM= github.com/oasisprotocol/oasis-sdk/client-sdk/go v0.7.0 h1:2/SNCfzxTVq+wGSYtzrBQr9beEw9xa30UDhPCL+c2Lc= github.com/oasisprotocol/oasis-sdk/client-sdk/go v0.7.0/go.mod h1:oRZDB09CU4KeKup7ZQVA6uENK4OdzKYfSQfRF0c/JEg= github.com/oasisprotocol/safeopen v0.0.0-20200528085122-e01cfdfc7661 h1:MB73kGMtuMGS+6VDoU/mitzff7Cu+aZo9ta5wabuxVA= diff --git a/docker/common/oasis-deposit/go.mod b/docker/common/oasis-deposit/go.mod index 7c62faa0..655e6bca 100644 --- a/docker/common/oasis-deposit/go.mod +++ b/docker/common/oasis-deposit/go.mod @@ -15,7 +15,7 @@ replace ( ) require ( - github.com/oasisprotocol/oasis-core/go v0.2300.1 + github.com/oasisprotocol/oasis-core/go v0.2300.6 github.com/oasisprotocol/oasis-sdk/client-sdk/go v0.7.0 google.golang.org/grpc v1.59.0 ) @@ -95,10 +95,10 @@ require ( github.com/oasisprotocol/deoxysii v0.0.0-20220228165953-2091330c22b7 // indirect github.com/oklog/run v1.0.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/prometheus/client_golang v1.14.0 // indirect - github.com/prometheus/client_model v0.4.0 // indirect - github.com/prometheus/common v0.42.0 // indirect - github.com/prometheus/procfs v0.11.0 // indirect + github.com/prometheus/client_golang v1.17.0 // indirect + github.com/prometheus/client_model v0.4.1-0.20230718164431-9a2bf3000d16 // indirect + github.com/prometheus/common v0.44.0 // indirect + github.com/prometheus/procfs v0.11.1 // indirect github.com/spf13/afero v1.9.3 // indirect github.com/spf13/cast v1.5.0 // indirect github.com/spf13/cobra v1.7.0 // indirect diff --git a/docker/common/oasis-deposit/go.sum b/docker/common/oasis-deposit/go.sum index cf6b25b1..461a84b6 100644 --- a/docker/common/oasis-deposit/go.sum +++ b/docker/common/oasis-deposit/go.sum @@ -539,8 +539,8 @@ github.com/oasisprotocol/curve25519-voi v0.0.0-20230904125328-1f23a7beb09a h1:dl github.com/oasisprotocol/curve25519-voi v0.0.0-20230904125328-1f23a7beb09a/go.mod h1:hVoHR2EVESiICEMbg137etN/Lx+lSrHPTD39Z/uE+2s= github.com/oasisprotocol/deoxysii v0.0.0-20220228165953-2091330c22b7 h1:1102pQc2SEPp5+xrS26wEaeb26sZy6k9/ZXlZN+eXE4= github.com/oasisprotocol/deoxysii v0.0.0-20220228165953-2091330c22b7/go.mod h1:UqoUn6cHESlliMhOnKLWr+CBH+e3bazUPvFj1XZwAjs= -github.com/oasisprotocol/oasis-core/go v0.2300.1 h1:E/7MITypNSJq+AWGIPkJ/Fb4aI5+afj+3F4OkTIZA9o= -github.com/oasisprotocol/oasis-core/go v0.2300.1/go.mod h1:lWZtDYY7ziW20hVzqnSt8UQlUkXNHisG3bS6Q3eTsqQ= +github.com/oasisprotocol/oasis-core/go v0.2300.6 h1:LveIyqsIof+WhLVIAQRTMNlhuiQGqZaztVeu/gBCyE0= +github.com/oasisprotocol/oasis-core/go v0.2300.6/go.mod h1:3ub+3LT8GEjuzeAXrve9pZEDkM/goL1HKBXVp4queNM= github.com/oasisprotocol/oasis-sdk/client-sdk/go v0.7.0 h1:2/SNCfzxTVq+wGSYtzrBQr9beEw9xa30UDhPCL+c2Lc= github.com/oasisprotocol/oasis-sdk/client-sdk/go v0.7.0/go.mod h1:oRZDB09CU4KeKup7ZQVA6uENK4OdzKYfSQfRF0c/JEg= github.com/oklog/run v1.0.0 h1:Ru7dDtJNOyC66gQ5dQmaCa0qIsAUFY3sFpK1Xk8igrw= @@ -583,22 +583,22 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= -github.com/prometheus/client_golang v1.14.0 h1:nJdhIvne2eSX/XRAFV9PcvFFRbrjbcTUj0VP62TMhnw= -github.com/prometheus/client_golang v1.14.0/go.mod h1:8vpkKitgIVNcqrRBWh1C4TIUQgYNtG/XQE4E/Zae36Y= +github.com/prometheus/client_golang v1.17.0 h1:rl2sfwZMtSthVU752MqfjQozy7blglC+1SOtjMAMh+Q= +github.com/prometheus/client_golang v1.17.0/go.mod h1:VeL+gMmOAxkS2IqfCq0ZmHSL+LjWfWDUmp1mBz9JgUY= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/client_model v0.4.0 h1:5lQXD3cAg1OXBf4Wq03gTrXHeaV0TQvGfUooCfx1yqY= -github.com/prometheus/client_model v0.4.0/go.mod h1:oMQmHW1/JoDwqLtg57MGgP/Fb1CJEYF2imWWhWtMkYU= +github.com/prometheus/client_model v0.4.1-0.20230718164431-9a2bf3000d16 h1:v7DLqVdK4VrYkVD5diGdl4sxJurKJEMnODWRJlxV9oM= +github.com/prometheus/client_model v0.4.1-0.20230718164431-9a2bf3000d16/go.mod h1:oMQmHW1/JoDwqLtg57MGgP/Fb1CJEYF2imWWhWtMkYU= github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.6.0/go.mod h1:eBmuwkDJBwy6iBfxCBob6t6dR6ENT/y+J+Zk0j9GMYc= -github.com/prometheus/common v0.42.0 h1:EKsfXEYo4JpWMHH5cg+KOUWeuJSov1Id8zGR8eeI1YM= -github.com/prometheus/common v0.42.0/go.mod h1:xBwqVerjNdUDjgODMpudtOMwlOwf2SaTr1yjz4b7Zbc= +github.com/prometheus/common v0.44.0 h1:+5BrQJwiBB9xsMygAB3TNvpQKOwlkc25LbISbrdOOfY= +github.com/prometheus/common v0.44.0/go.mod h1:ofAIvZbQ1e/nugmZGz4/qCb9Ap1VoSTIO7x0VV9VvuY= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= -github.com/prometheus/procfs v0.11.0 h1:5EAgkfkMl659uZPbe9AS2N68a7Cc1TJbPEuGzFuRbyk= -github.com/prometheus/procfs v0.11.0/go.mod h1:nwNm2aOCAYw8uTR/9bWRREkZFxAUcWzPHWJq+XBB/FM= +github.com/prometheus/procfs v0.11.1 h1:xRC8Iq1yyca5ypa9n1EZnWZkt7dwcoRPQwX/5gwaUuI= +github.com/prometheus/procfs v0.11.1/go.mod h1:eesXgaPo1q7lBpVMoMy0ZOFTth9hBn4W/y0/p/ScXhY= github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= github.com/quic-go/qpack v0.4.0 h1:Cr9BXA1sQS2SmDUWjSofMPNKmvF6IiIfDRmgU0w1ZCo= github.com/quic-go/qpack v0.4.0/go.mod h1:UZVnYIfi5GRk+zI9UMaCPsmZ2xKJP7XBUvVyT1Knj9A= @@ -616,8 +616,8 @@ github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJ github.com/rjeczalik/notify v0.9.1/go.mod h1:rKwnCoCGeuQnwBtTSPL9Dad03Vh2n40ePRrjvIXnJho= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= -github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8= -github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= +github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= +github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= diff --git a/docker/emerald-dev/Dockerfile b/docker/emerald-dev/Dockerfile index 7d12f991..6dd0093a 100644 --- a/docker/emerald-dev/Dockerfile +++ b/docker/emerald-dev/Dockerfile @@ -8,7 +8,7 @@ RUN cd oasis-web3-gateway && make build FROM ubuntu:22.04 # Docker-specific variables -ENV OASIS_CORE_VERSION=23.0.1 +ENV OASIS_CORE_VERSION=23.0.6 ENV OASIS_CLI_VERSION=0.6.0 ENV PARATIME_VERSION=11.0.0-testnet ENV PARATIME_NAME=emerald diff --git a/docker/sapphire-dev/Dockerfile b/docker/sapphire-dev/Dockerfile index ce5ff043..5d22b6e5 100644 --- a/docker/sapphire-dev/Dockerfile +++ b/docker/sapphire-dev/Dockerfile @@ -33,7 +33,7 @@ RUN apt update -qq \ && su -c "psql --command \"ALTER USER postgres WITH SUPERUSER PASSWORD 'postgres';\"" postgres # Docker-specific variables -ENV OASIS_CORE_VERSION=23.0.1 +ENV OASIS_CORE_VERSION=23.0.6 ENV OASIS_CLI_VERSION=0.6.0 ENV PARATIME_VERSION=0.7.0-testnet ENV PARATIME_NAME=sapphire diff --git a/go.mod b/go.mod index c038d4e4..e6de3180 100644 --- a/go.mod +++ b/go.mod @@ -20,7 +20,7 @@ require ( github.com/gorilla/mux v1.8.1 github.com/gorilla/websocket v1.5.1 github.com/knadh/koanf v1.5.0 - github.com/oasisprotocol/oasis-core/go v0.2300.1 + github.com/oasisprotocol/oasis-core/go v0.2300.6 github.com/oasisprotocol/oasis-sdk/client-sdk/go v0.7.0 github.com/prometheus/client_golang v1.17.0 github.com/rs/cors v1.10.1 diff --git a/go.sum b/go.sum index 02c22279..0b29ea4f 100644 --- a/go.sum +++ b/go.sum @@ -632,8 +632,8 @@ github.com/oasisprotocol/curve25519-voi v0.0.0-20230904125328-1f23a7beb09a h1:dl github.com/oasisprotocol/curve25519-voi v0.0.0-20230904125328-1f23a7beb09a/go.mod h1:hVoHR2EVESiICEMbg137etN/Lx+lSrHPTD39Z/uE+2s= github.com/oasisprotocol/deoxysii v0.0.0-20220228165953-2091330c22b7 h1:1102pQc2SEPp5+xrS26wEaeb26sZy6k9/ZXlZN+eXE4= github.com/oasisprotocol/deoxysii v0.0.0-20220228165953-2091330c22b7/go.mod h1:UqoUn6cHESlliMhOnKLWr+CBH+e3bazUPvFj1XZwAjs= -github.com/oasisprotocol/oasis-core/go v0.2300.1 h1:E/7MITypNSJq+AWGIPkJ/Fb4aI5+afj+3F4OkTIZA9o= -github.com/oasisprotocol/oasis-core/go v0.2300.1/go.mod h1:lWZtDYY7ziW20hVzqnSt8UQlUkXNHisG3bS6Q3eTsqQ= +github.com/oasisprotocol/oasis-core/go v0.2300.6 h1:LveIyqsIof+WhLVIAQRTMNlhuiQGqZaztVeu/gBCyE0= +github.com/oasisprotocol/oasis-core/go v0.2300.6/go.mod h1:3ub+3LT8GEjuzeAXrve9pZEDkM/goL1HKBXVp4queNM= github.com/oasisprotocol/oasis-sdk/client-sdk/go v0.7.0 h1:2/SNCfzxTVq+wGSYtzrBQr9beEw9xa30UDhPCL+c2Lc= github.com/oasisprotocol/oasis-sdk/client-sdk/go v0.7.0/go.mod h1:oRZDB09CU4KeKup7ZQVA6uENK4OdzKYfSQfRF0c/JEg= github.com/oklog/run v1.0.0 h1:Ru7dDtJNOyC66gQ5dQmaCa0qIsAUFY3sFpK1Xk8igrw=