Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge latest master to soroban-xdr-next-next #4937

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
3274d0f
all: enforce simplified Golang code (#4852)
2opremio Apr 20, 2023
d795eee
Update completed sprint on issue/pr closed (#4857)
Apr 27, 2023
35250fe
Bump core image to latest stable release v19.10.0
mbsdf May 2, 2023
d92f1f5
Merge pull request #4862 from mbsdf/core_stable_v19.10.0
marta-lokhova May 3, 2023
c05dcf6
Add a simple test for asset case sorting in ascii (#4876)
May 19, 2023
148bf79
services/horizon: Suppress Core timeout error (#4860)
urvisavla May 19, 2023
928281e
Update CHANGELOG.md for latest release (#4828)
stellarsaur May 22, 2023
7a7b140
Bump core image to latest release v19.11.0 (#4885)
mbsdf May 31, 2023
b060996
services/horizon: Protect 'currentState' variable using Mutex to prev…
urvisavla Jun 5, 2023
da99d59
services/horizon: Update default for --captive-core-use-db to true (…
urvisavla Jun 6, 2023
060fd7a
services/horizon: Improve error handling for when stellar-core crashe…
urvisavla Jun 15, 2023
1c1800a
Parse LIMIT_TX_QUEUE_SOURCE_ACCOUNT in core config
mollykarcher Jun 16, 2023
01c7aa3
Merge pull request #4912 from mollykarcher/molly/main/limit-act-tx-le…
mollykarcher Jun 16, 2023
d2d01d3
updated changelog for 2.26.0 release notes
sreuland Jun 20, 2023
38dac4e
Pinning and updates golang and ubuntu images
mollykarcher Jun 16, 2023
34484c6
Merge pull request #4918 from mollykarcher/molly/master/versions
mollykarcher Jun 22, 2023
9e32d8c
services/horizon: Fix ledger endpoint url in HAL (#4928)
urvisavla Jun 22, 2023
23e8c63
Merge branch 'release-horizon-v2.26.0' into merge_2.26_rel_notes
sreuland Jun 23, 2023
090b454
Merge pull request #4931 from sreuland/merge_2.26_rel_notes
sreuland Jun 23, 2023
7aafb6d
Goreplay middleware (#4932)
urvisavla Jun 27, 2023
ff665ec
all: Fix improper use of errors.Wrap (#4926)
bartekn Jun 27, 2023
2ec1834
fix apt repo reference to focal now (#4929)
sreuland Jun 29, 2023
d21f217
Merge remote-tracking branch 'upstream/master' into soroban-xdr-next-…
sreuland Jun 29, 2023
d639314
fixed go fmt on bindata
sreuland Jun 29, 2023
7f4c0d9
fixed merge conflict snippet
sreuland Jun 29, 2023
47bea06
fixed manual merge commit omition
sreuland Jun 30, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ on:
jobs:
analyze:
name: Analyze
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

strategy:
fail-fast: false
Expand Down
15 changes: 7 additions & 8 deletions .github/workflows/go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,16 @@ jobs:
complete:
if: always()
needs: [check, build, test]
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- if: contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled')
run: exit 1

check:
strategy:
matrix:
os: [ubuntu-20.04]
# lmao semvers aren't floats never 4get
go: ["1.19.6", "1.20.1"]
os: [ubuntu-22.04]
go: ["1.20"]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
Expand All @@ -38,8 +37,8 @@ jobs:
build:
strategy:
matrix:
os: [ubuntu-20.04]
go: ["1.19.6", "1.20.1"]
os: [ubuntu-22.04]
go: ["1.19", "1.20"]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
Expand All @@ -56,8 +55,8 @@ jobs:
test:
strategy:
matrix:
os: [ubuntu-20.04]
go: ["1.19.6", "1.20.1"]
os: [ubuntu-22.04]
go: ["1.19", "1.20"]
pg: [9.6.5, 10]
runs-on: ${{ matrix.os }}
services:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/golangci-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ permissions:

jobs:
golangci:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- name: Checkout
uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b # version v3.0.2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/horizon-master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:

push-state-diff-image:
name: Push stellar/ledger-state-diff:{sha,latest} to DockerHub
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/horizon-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
jobs:

publish-artifacts:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
name: Upload artifacts to GitHub release
steps:
- name: Run deprecation tests
Expand All @@ -22,7 +22,7 @@ jobs:

- uses: ./.github/actions/setup-go
with:
go-version: "1.20.1"
go-version: "1.20"

- name: Check dependencies
run: ./gomod.sh
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/horizon.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ jobs:
name: Integration tests
strategy:
matrix:
os: [ubuntu-20.04]
go: ["1.19.6", "1.20.1"]
os: [ubuntu-20.04, ubuntu-22.04]
go: ["1.19", "1.20"]
pg: [9.6.5]
ingestion-backend: [db, captive-core, captive-core-remote-storage]
protocol-version: [19, 20]
Expand All @@ -36,8 +36,8 @@ jobs:
HORIZON_INTEGRATION_TESTS_CORE_MAX_SUPPORTED_PROTOCOL: ${{ matrix.protocol-version }}
PROTOCOL_20_CORE_DEBIAN_PKG_VERSION: 19.11.1-1357.e38ee728d.focal~sorobanP10
PROTOCOL_20_CORE_DOCKER_IMG: chowbao/stellar-core:19.11.1-1357.e38ee728d.focal-sorobanP10
PROTOCOL_19_CORE_DEBIAN_PKG_VERSION: 19.5.0-1108.ca2fb0605.focal
PROTOCOL_19_CORE_DOCKER_IMG: stellar/stellar-core:19.5.0-1108.ca2fb0605.focal
PROTOCOL_19_CORE_DEBIAN_PKG_VERSION: 19.11.0-1323.7fb6d5e88.focal
PROTOCOL_19_CORE_DOCKER_IMG: stellar/stellar-core:19.11.0-1323.7fb6d5e88.focal
PGHOST: localhost
PGPORT: 5432
PGUSER: postgres
Expand Down Expand Up @@ -108,9 +108,9 @@ jobs:

verify-range:
name: Test (and push) verify-range image
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
env:
STELLAR_CORE_VERSION: 19.10.0-1275.bff2c2b37.focal
STELLAR_CORE_VERSION: 19.11.0-1323.7fb6d5e88.focal
CAPTIVE_CORE_STORAGE_PATH: /tmp
steps:
- uses: actions/checkout@v3
Expand Down
2 changes: 2 additions & 0 deletions clients/horizonclient/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ file. This project adheres to [Semantic Versioning](http://semver.org/).

## Unreleased

## [v11.0.0](https://github.com/stellar/go/releases/tag/horizonclient-v11.0.0) - 2023-03-29

* Type of `AccountSequence` field in `protocols/horizon.Account` was changed to `int64`.

## [v10.0.0](https://github.com/stellar/go/releases/tag/horizonclient-v10.0.0) - 2022-04-18
Expand Down
4 changes: 2 additions & 2 deletions exp/services/recoverysigner/docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
FROM golang:1.19 as build
FROM golang:1.20-bullseye as build

ADD . /src/recoverysigner
WORKDIR /src/recoverysigner
RUN go build -o /bin/recoverysigner ./exp/services/recoverysigner


FROM ubuntu:20.04
FROM ubuntu:22.04

RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates
COPY --from=build /bin/recoverysigner /app/
Expand Down
4 changes: 2 additions & 2 deletions exp/services/webauth/docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
FROM golang:1.19 as build
FROM golang:1.20-bullseye as build

ADD . /src/webauth
WORKDIR /src/webauth
RUN go build -o /bin/webauth ./exp/services/webauth


FROM ubuntu:20.04
FROM ubuntu:22.04

RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends ca-certificates
COPY --from=build /bin/webauth /app/
Expand Down
2 changes: 1 addition & 1 deletion exp/tools/dump-ledger-state/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM ubuntu:20.04

ENV STELLAR_CORE_VERSION=19.10.0-1275.bff2c2b37.focal
ENV STELLAR_CORE_VERSION=19.11.0-1323.7fb6d5e88.focal
ENV DEBIAN_FRONTEND=noninteractive

RUN apt-get update && apt-get install -y --no-install-recommends ca-certificates curl wget gnupg apt-utils
Expand Down
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ require (
cloud.google.com/go/storage v1.10.0 // indirect
github.com/ajg/form v0.0.0-20160822230020-523a5da1a92f // indirect
github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973 // indirect
github.com/buger/goreplay v1.3.2
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/fatih/structs v1.0.0 // indirect
github.com/gavv/monotime v0.0.0-20161010190848-47d58efa6955 // indirect
Expand All @@ -82,7 +83,7 @@ require (
github.com/jstemmer/go-junit-report v0.9.1 // indirect
github.com/klauspost/compress v1.15.0 // indirect
github.com/konsorten/go-windows-terminal-sequences v1.0.1 // indirect
github.com/kr/pretty v0.1.0 // indirect
github.com/kr/pretty v0.2.0 // indirect
github.com/kr/text v0.1.0 // indirect
github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect
github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect
Expand All @@ -97,7 +98,6 @@ require (
github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1 // indirect
github.com/rs/xhandler v0.0.0-20160618193221-ed27b6fd6521 // indirect
github.com/sergi/go-diff v0.0.0-20161205080420-83532ca1c1ca // indirect
github.com/smartystreets/goconvey v0.0.0-20190731233626-505e41936337 // indirect
github.com/spf13/cast v0.0.0-20150508191742-4d07383ffe94 // indirect
github.com/spf13/jwalterweatherman v0.0.0-20141219030609-3d60171a6431 // indirect
github.com/stretchr/objx v0.3.0 // indirect
Expand Down
Loading