Skip to content

Commit 72f820e

Browse files
authored
Merge pull request #958 from stellar/philip/sync-11-27
Chore: Merge `develop` into `feature/c-accounts`
2 parents 4a405fe + 2c59d60 commit 72f820e

File tree

403 files changed

+10607
-7391
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

403 files changed

+10607
-7391
lines changed

.env.example

Lines changed: 0 additions & 64 deletions
This file was deleted.

.github/workflows/automated_release_process.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
fi
3434
3535
- name: Checkout repository
36-
uses: actions/checkout@v5
36+
uses: actions/checkout@v6
3737
with:
3838
fetch-depth: 0
3939

.github/workflows/ci.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
runs-on: ubuntu-latest
1616
steps:
1717
- name: Checkout
18-
uses: actions/checkout@v5
18+
uses: actions/checkout@v6
1919

2020
- name: Set up Go
2121
uses: actions/setup-go@v6
@@ -72,7 +72,7 @@ jobs:
7272
runs-on: ubuntu-latest
7373
steps:
7474
- name: Checkout
75-
uses: actions/checkout@v5
75+
uses: actions/checkout@v6
7676

7777
- name: Install NodeJs
7878
uses: actions/setup-node@v6
@@ -100,7 +100,7 @@ jobs:
100100
runs-on: ubuntu-latest
101101
steps:
102102
- name: Checkout
103-
uses: actions/checkout@v5
103+
uses: actions/checkout@v6
104104

105105
- name: Install NodeJs
106106
uses: actions/setup-node@v6
@@ -128,7 +128,7 @@ jobs:
128128
runs-on: ubuntu-latest
129129
steps:
130130
- name: Checkout
131-
uses: actions/checkout@v5
131+
uses: actions/checkout@v6
132132

133133
- name: Set up Go
134134
uses: actions/setup-go@v6
@@ -167,7 +167,7 @@ jobs:
167167

168168
steps:
169169
- name: Checkout
170-
uses: actions/checkout@v5
170+
uses: actions/checkout@v6
171171

172172
- name: Setup Go
173173
uses: actions/setup-go@v6

.github/workflows/docker_image_public_release.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ jobs:
2222
uses: ./.github/workflows/contract_build.yml # execute the callable contract_build.yml
2323
secrets: inherit # pass all secrets
2424

25-
anchor_platform_integration_check:
26-
uses: ./.github/workflows/anchor_platform_integration_check.yml # execute the callable anchor_platform_integration_check.yml
25+
internal_sep_validation:
26+
uses: ./.github/workflows/internal_sep_validation.yml
2727
needs:
2828
- tests
29-
secrets: inherit # pass all secrets
29+
secrets: inherit
3030

3131
e2e_integration_test:
3232
uses: ./.github/workflows/e2e_integration_test.yml # execute the callable e2e_integration_test.yml
@@ -41,8 +41,8 @@ jobs:
4141
needs:
4242
- tests
4343
- contract_build
44-
- anchor_platform_integration_check
4544
- e2e_integration_test
45+
- internal_sep_validation
4646
steps:
4747
- name: Check if tag is not empty
4848
run: |
@@ -60,7 +60,7 @@ jobs:
6060
echo "TAGS=stellar/stellar-disbursement-platform-backend:${{ github.event.release.tag_name }}" >> $GITHUB_OUTPUT
6161
fi
6262
63-
- uses: actions/checkout@v5
63+
- uses: actions/checkout@v6
6464

6565
- name: Login to DockerHub
6666
uses: docker/[email protected]
@@ -84,10 +84,10 @@ jobs:
8484
needs:
8585
- tests
8686
- contract_build
87-
- anchor_platform_integration_check
87+
- internal_sep_validation
8888
- e2e_integration_test
8989
steps:
90-
- uses: actions/checkout@v5
90+
- uses: actions/checkout@v6
9191

9292
- name: Login to DockerHub
9393
uses: docker/[email protected]

.github/workflows/e2e_integration_test.yml

Lines changed: 16 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -88,17 +88,16 @@ jobs:
8888
CIRCLE_API_TYPE: ${{ matrix.CIRCLE_API_TYPE || 'TRANSFERS' }}
8989
steps:
9090
- name: Checkout
91-
uses: actions/checkout@v5
91+
uses: actions/checkout@v6
9292

9393
- name: Cleanup data
9494
working-directory: internal/integrationtests/docker
9595
run: docker compose -f docker-compose-e2e-tests.yml down -v
9696
shell: bash
9797

98-
- name: Run Docker Compose for SDP, Anchor Platform and TSS
98+
- name: Run Docker Compose for SDP and TSS
9999
working-directory: internal/integrationtests/docker
100100
run: docker compose -f docker-compose-e2e-tests.yml up --build -V -d
101-
shell: bash
102101

103102
- name: Install curl
104103
run: sudo apt-get update && sudo apt-get install -y curl
@@ -131,40 +130,29 @@ jobs:
131130
docker exec e2e-sdp-api sh -c "./stellar-disbursement-platform integration-tests create-data"
132131
shell: bash
133132

134-
- name: Restart Anchor Platform
133+
- name: Verify SEP endpoints configuration
135134
run: |
136-
docker restart e2e-anchor-platform
137-
shell: bash
138-
139-
- name: Wait for the Anchor Platform to be up
140-
run: |
141-
wait_for_server() {
142-
local endpoint=$1
143-
local max_wait_time=$2
144-
145-
SECONDS=0
146-
while ! curl -s $endpoint > /dev/null; do
147-
echo "Waiting for server at $endpoint to be up... $SECONDS seconds elapsed"
148-
sleep 4
149-
if [ $SECONDS -ge $max_wait_time ]; then
150-
echo "Server at $endpoint is not up after $max_wait_time seconds."
151-
exit 1
152-
fi
153-
done
154-
echo "Server at $endpoint is up."
155-
}
156-
157-
wait_for_server http://localhost:8080/health 120
158-
wait_for_server http://localhost:8085/health 120
135+
echo "Checking stellar.toml configuration..."
136+
TOML=$(curl -s http://localhost:8000/.well-known/stellar.toml)
137+
138+
echo "Verifying SEP endpoints in stellar.toml..."
139+
if echo "$TOML" | grep -q "TRANSFER_SERVER.*8000"; then
140+
echo "✅ TOML correctly points to SEP-24 endpoints"
141+
else
142+
echo "❌ TOML does not point to SEP-24 endpoints"
143+
echo "$TOML"
144+
exit 1
145+
fi
159146
shell: bash
160147

161148
- name: Start integration test command
162149
run: |
150+
echo "Running integration tests with native SDP SEP services"
163151
docker exec e2e-sdp-api sh -c "./stellar-disbursement-platform integration-tests start"
164152
shell: bash
165153

166154
- name: Docker logs
167155
if: always()
168156
working-directory: internal/integrationtests/docker
169157
run: docker compose -f docker-compose-e2e-tests.yml logs && docker compose -f docker-compose-e2e-tests.yml down
170-
shell: bash
158+
shell: bash
Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
1-
name: SDP<>AnchorPlatform Integration
1+
name: Internal SEP Services Validation
2+
# this workflow tests that SDP's SEP implementations adhere to Stellar's SEP specifications
23

34
on:
45
push:
56
branches:
67
- main
78
pull_request:
8-
workflow_call: # allows this workflow to be called from another workflow
9+
workflow_call:
910

1011
permissions:
1112
contents: read
1213

1314
jobs:
14-
anchor-integration:
15+
internal-sep-validation:
1516
runs-on: ubuntu-latest
16-
environment: "Anchor Integration Tests"
17+
environment: "Internal SEP Tests"
1718
env:
1819
DISTRIBUTION_PUBLIC_KEY: ${{ vars.DISTRIBUTION_PUBLIC_KEY }}
1920
DISTRIBUTION_SEED: ${{ vars.DISTRIBUTION_SEED }}
@@ -23,23 +24,25 @@ jobs:
2324
SEP10_SIGNING_PRIVATE_KEY: ${{ vars.SEP10_SIGNING_PRIVATE_KEY }}
2425
steps:
2526
- name: Checkout
26-
uses: actions/checkout@v5
27+
uses: actions/checkout@v6
2728

28-
- name: Run Docker Compose for SDP and Anchor Platform
29+
- name: Run Docker Compose for SDP
2930
working-directory: dev
30-
run: docker compose -f docker-compose-sdp-anchor.yml down && docker compose -f docker-compose-sdp-anchor.yml up --build -d
31+
run: |
32+
export SEP10_CLIENT_ATTRIBUTION_REQUIRED=false
33+
docker compose -f docker-compose-sdp.yml down && docker compose -f docker-compose-sdp.yml up --build -d
3134
3235
- name: Install curl
3336
run: sudo apt-get update && sudo apt-get install -y curl
3437

35-
- name: Wait for localhost:8080/health
38+
- name: Wait for localhost:8000/health
3639
timeout-minutes: 5
3740
run: |
38-
until curl --output /dev/null --silent --head --fail http://localhost:8080/health; do
39-
echo 'Waiting for anchor-platform to be up and running...'
41+
until curl --output /dev/null --silent --fail http://localhost:8000/health; do
42+
echo 'Waiting for SDP to be up and running...'
4043
sleep 15
4144
done
42-
echo 'Anchor-platform is up and running.'
45+
echo 'SDP is up and running.'
4346
4447
- name: Install NodeJs
4548
uses: actions/setup-node@v6
@@ -54,4 +57,4 @@ jobs:
5457
- name: Docker logs
5558
if: always()
5659
working-directory: dev
57-
run: docker compose -f docker-compose-sdp-anchor.yml logs && docker compose -f docker-compose-sdp-anchor.yml down
60+
run: docker compose -f docker-compose-sdp.yml logs && docker compose -f docker-compose-sdp.yml down

.github/workflows/singletenant_to_multitenant_db_migration_test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,14 @@ jobs:
3030
environment: "Receiver Registration - E2E Integration Tests (Stellar)"
3131
steps:
3232
- name: Checkout
33-
uses: actions/checkout@v5
33+
uses: actions/checkout@v6
3434

3535
- name: Cleanup data
3636
working-directory: internal/integrationtests/docker
3737
run: docker compose -f docker-compose-e2e-tests.yml down -v
3838
shell: bash
3939

40-
- name: Run Docker Compose for SDP, Anchor Platform and TSS
40+
- name: Run Docker Compose for SDP and TSS
4141
working-directory: internal/integrationtests/docker
4242
run: docker compose -f docker-compose-e2e-tests.yml up --build -V -d
4343
shell: bash

.gitignore

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,10 @@
1111
# Output of the go coverage tool, specifically when used with LiteIDE
1212
*.out
1313

14-
# Environment file
14+
# Environment files
1515
.env
16+
.env.*
17+
!.env.example
1618

1719
# subproject used for testing:
1820
v1_compatibility/stellar-relief-backoffice-backend
@@ -25,12 +27,9 @@ stellar-disbursement-platform-backend
2527
.idea
2628
.cursor
2729

30+
# Local HTTPS certificates
31+
dev/certs/
32+
2833
# Rust & Soroban
2934
target/
3035
test_snapshots/
31-
32-
# Local HTTPS certificates
33-
dev/certs/
34-
*.pem
35-
*.key
36-
*.crt

0 commit comments

Comments
 (0)