Merge branch 'main' into cozmin/raf-996

Author: cozminu

.github/PULL_REQUEST_TEMPLATE/doc_template.md

@@ -0,0 +1,18 @@
+**Description of changes**
+
+
+
+**Required**
+
+- [ ] Used LinkOut component on external links
+- [ ] Reviewed Vale errors and made changes where appropriate
+- [ ] Ran Prettier
+- [ ] Previewed updates in Netlify
+- [ ] Received SME and/or peer approval if updates are significant
+- [ ] Included a "fixes #" comment
+
+**Conditional**
+
+- [ ] Ensured sequence diagrams follow our style guide
+- [ ] Included code samples where appropriate
+- [ ] Updated related READMEs

.github/PULL_REQUEST_TEMPLATE/eng_template.md

@@ -0,0 +1,32 @@
+<!--- Pull request titles should follow conventional commit format. -->
+
+<!--
+Thanks for opening a PR! Your contribution is much appreciated.
+In order to make sure your PR is handled as smoothly as possible we request that you follow the checklist sections below.
+Choose the right checklist for the change that you're making:
+-->
+
+## Changes proposed in this pull request
+<!--
+Provide a succinct description of what this pull request entails.
+-->
+- 
+
+## Context
+<!--
+What were you trying to do?
+Provide further details about how the feature should be tested/reviewed if necessary.
+Link issues here -  using `fixes #number`
+-->
+
+## Checklist
+<!--
+Checklist items become clickable check boxes once the pull request is created. There is no need to edit them now.
+-->
+
+- [ ] Related issues linked using `fixes #number`
+- [ ] Tests added/updated
+- [ ] Make sure that all checks pass
+- [ ] Bruno collection updated (if necessary)
+- [ ] Documentation issue created with `user-docs` label (if necessary)
+- [ ] OpenAPI specs updated (if necessary)

.github/pull_request_template.md

@@ -1,32 +1,4 @@
-<!--- Pull request titles should follow conventional commit format. -->
+Please go to the `Preview` tab and select the appropriate sub-template:
 
-<!--
-Thanks for opening a PR! Your contribution is much appreciated.
-In order to make sure your PR is handled as smoothly as possible we request that you follow the checklist sections below.
-Choose the right checklist for the change that you're making:
--->
-
-## Changes proposed in this pull request
-<!--
-Provide a succinct description of what this pull request entails.
--->
-- 
-
-## Context
-<!--
-What were you trying to do?
-Provide further details about how the feature should be tested/reviewed if necessary.
-Link issues here -  using `fixes #number`
--->
-
-## Checklist
-<!--
-Checklist items become clickable check boxes once the pull request is created. There is no need to edit them now.
--->
-
-- [ ] Related issues linked using `fixes #number`
-- [ ] Tests added/updated
-- [ ] Make sure that all checks pass
-- [ ] Bruno collection updated (if necessary)
-- [ ] Documentation issue created with `user-docs` label (if necessary)
-- [ ] OpenAPI specs updated (if necessary)
+* [Engineering](?expand=1&template=eng_template.md)
+* [Documentation](?expand=1&template=doc_template.md)

.github/workflows/node-build.yml

@@ -27,6 +27,9 @@ jobs:
     timeout-minutes: 25
     steps:
       - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          fetch-depth: 0
       - uses: ./.github/workflows/rafiki/env-setup
       - run: pnpm --filter backend build:deps
       - run: NODE_OPTIONS="--max-old-space-size=4096" pnpm --filter backend test:ci
@@ -53,6 +56,9 @@ jobs:
     timeout-minutes: 5
     steps:
       - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          fetch-depth: 0
       - uses: ./.github/workflows/rafiki/env-setup
       - run: pnpm --filter auth build:deps
       - run: pnpm --filter auth test
@@ -143,6 +149,9 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          fetch-depth: 0
 
       - name: Setup environment
         uses: ./.github/workflows/rafiki/env-setup
@@ -166,6 +175,9 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          fetch-depth: 0
 
       - name: Setup environment
         uses: ./.github/workflows/rafiki/env-setup
@@ -396,6 +408,8 @@ jobs:
           - backend
           - frontend
     steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
       - name: Build

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "open-payments-specifications"]
+	path = open-payments-specifications
+	url = https://github.com/interledger/open-payments-specifications.git

.prettierignore

@@ -14,4 +14,5 @@ build
 **/styles/*.css
 .docusaurus
 .cache-loader
-.astro
+.astro
+open-payments-specifications/**

README.md

@@ -67,6 +67,7 @@ Clone the Rafiki repository
 ```sh
 git clone https://github.com/interledger/rafiki.git
 cd rafiki
+git submodule update --init --recursive
 ```
 
 Install Node.js
@@ -94,6 +95,22 @@ Install dependencies
 pnpm i
 ```
 
+### Git submodules
+
+This repository uses a git submodule for Open Payments specifications located at `open-payments-specifications/`.
+
+- Initialize submodules after cloning:
+
+```sh
+git submodule update --init --recursive
+```
+
+- Alternatively, clone the repository with submodules in one step:
+
+```sh
+git clone --recurse-submodules https://github.com/interledger/rafiki.git
+```
+
 ### Local Development
 
 The Rafiki local environment is the best way to explore Rafiki locally. The [localenv](localenv) directory contains instructions for setting up a local playground. Please refer to the README for each individual package for more details.

bruno/collections/Rafiki/Examples/Open Payments/Get receiver wallet address.bru

@@ -47,7 +47,7 @@ script:post-response {
       resourceUrl.hostname.includes('cloud-nine-wallet') || 
       resourceUrl.hostname.includes('happy-life-bank')
   ){
-      const port = resourceUrl.hostname.includes('cloud-nine-wallet') ? 3000 : 4000
+      const port = resourceUrl.hostname.includes('cloud-nine-wallet') ? bru.getEnvVar('cloudNineOpenPaymentsPort') : bru.getEnvVar('happyLifeOpenPaymentsPort')
       bru.setEnvVar("receiverOpenPaymentsHost",  'http://localhost:' + port + resourceUrl.path);
   } else {
       bru.setEnvVar("receiverOpenPaymentsHost", body?.resourceServer);

bruno/collections/Rafiki/Examples/Open Payments/Get sender wallet address.bru

@@ -44,7 +44,7 @@ script:post-response {
 
   const resourceUrl = url.parse(body?.resourceServer)
   if (resourceUrl.hostname.includes('cloud-nine-wallet') || resourceUrl.hostname.includes('happy-life-bank')) {
-    const port = resourceUrl.hostname.includes('cloud-nine-wallet') ? bru.getEnvVar('senderOpenPaymentsPort') : bru.getEnvVar('receiverOpenPaymentsPort')
+    const port = resourceUrl.hostname.includes('happy-life-bank') ? bru.getEnvVar('happyLifeOpenPaymentsPort') : bru.getEnvVar('cloudNineOpenPaymentsPort')
       bru.setEnvVar("senderOpenPaymentsHost", 'http://localhost:' + port + resourceUrl.path);
   } else {
       bru.setEnvVar("senderOpenPaymentsHost", body?.resourceServer);

bruno/collections/Rafiki/Examples/Tenanted Open Payments - Tenanted Environment Only/Get sender wallet address.bru

@@ -43,8 +43,8 @@ script:post-response {
   }
 
   const resourceUrl = url.parse(body?.resourceServer)
-  if (resourceUrl.hostname.includes('cloud-nine-wallet') || resourceUrl.hostname.includes('happy-life-bank')) {
-    const port = resourceUrl.hostname.includes('cloud-nine-wallet') ? bru.getEnvVar('senderOpenPaymentsPort') : bru.getEnvVar('receiverOpenPaymentsPort')
+  if (resourceUrl.hostname.includes(bru.getEnvVar('senderHost')) || resourceUrl.hostname.includes('receiverHost')) {
+    const port = resourceUrl.hostname.includes(bru.getEnvVar('senderHost')) ? bru.getEnvVar('senderOpenPaymentsPort') : bru.getEnvVar('receiverOpenPaymentsPort')
       bru.setEnvVar("senderTenantOpenPaymentsHost", 'http://localhost:' + port + resourceUrl.path);
   } else {
       bru.setEnvVar("senderTenantOpenPaymentsHost", body?.resourceServer);