Merge branch 'main' into integration

interledger · Sep 17, 2023 · 69398bc · 69398bc
2 parents 6c82289 + 5e40509
commit 69398bc
Show file tree

Hide file tree

Showing 9 changed files with 61 additions and 28 deletions.
diff --git a/README.md b/README.md
@@ -29,3 +29,15 @@ The code for the landing [page](https://openpayments.guide) is in `./landing`.
 
 - [Payment Pointers](https://paymentpointers.org)
 - [Interledger](https://interledger.org)
+
+## Open Payments Catchup Call
+
+Our catchup calls are open to our community. We have them every Monday at 11:00 GMT, via Google Meet.
+
+Video call link: https://meet.google.com/htd-eefo-ovn
+
+Or dial: (DE) +49 30 300195061 and enter this PIN: 105 520 503#
+
+More phone numbers: https://tel.meet/htd-eefo-ovn?hs=5
+
+[Add to Google Calendar](https://calendar.google.com/calendar/event?action=TEMPLATE&tmeid=MTdkZTEwYThhNjliNDUxOGJmNTc0ZWE2NjgxZWViZjlfMjAyMzA5MDRUMTEwMDAwWiBzYWJpbmVAaW50ZXJsZWRnZXIub3Jn&tmsrc=sabine%40interledger.org&scp=ALL)
diff --git a/landing/yarn.lock b/landing/yarn.lock
@@ -1699,14 +1699,14 @@ scheduler@^0.22.0:
     loose-envify "^1.1.0"
 
 semver@^6.3.0:
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
-  integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
+  version "6.3.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
+  integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
 
 semver@^7.3.7:
-  version "7.3.7"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz#12c5b649afdbf9049707796e22a4028814ce523f"
-  integrity sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==
+  version "7.5.4"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
+  integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
   dependencies:
     lru-cache "^6.0.0"
 
@@ -1931,9 +1931,9 @@ which@^2.0.1:
     isexe "^2.0.0"
 
 word-wrap@^1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
-  integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.4.tgz#cb4b50ec9aca570abd1f52f33cd45b6c61739a9f"
+  integrity sha512-2V81OA4ugVo5pRo46hAoD2ivUJx8jXmWXfUkY4KFNw0hEptvN0QfH3K4nHiwzGeKl5rFKedV48QVoqYavy4YpA==
 
 wrappy@1:
   version "1.0.2"

diff --git a/packages/http-signature-utils/CHANGELOG.md b/packages/http-signature-utils/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @interledger/http-signature-utils
 
+## 1.0.4
+
+### Patch Changes
+
+- 805d6dd: Pin `httpbis-digest-headers` version
+
 ## 1.0.3
 
 ### Patch Changes

diff --git a/packages/http-signature-utils/package.json b/packages/http-signature-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@interledger/http-signature-utils",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "Provides utilities for working with HTTP signatures",
   "repository": {
     "type": "git",
@@ -25,7 +25,7 @@
   },
   "dependencies": {
     "http-message-signatures": "^0.1.2",
-    "httpbis-digest-headers": "github:interledger/httpbis-digest-headers",
+    "httpbis-digest-headers": "^1.0.0",
     "jose": "^4.13.1",
     "uuid": "^9.0.0"
   },

diff --git a/packages/open-payments/CHANGELOG.md b/packages/open-payments/CHANGELOG.md
@@ -1,5 +1,24 @@
 # @interledger/open-payments
 
+## 3.1.0
+
+### Minor Changes
+
+- 25cf507: Making interact property optional for grant requests
+
+## 3.0.1
+
+### Patch Changes
+
+- Updated dependencies [805d6dd]
+  - @interledger/http-signature-utils@1.0.4
+
+## 3.0.0
+
+### Major Changes
+
+- dd193c7: Adding properties for new quoting mechanism
+
 ## 2.0.0
 
 ### Major Changes

diff --git a/packages/open-payments/README.md b/packages/open-payments/README.md
@@ -179,7 +179,7 @@ const quote = await client.quote.create(
   { receiver: incomingPayment.id }
 )
 
-// quote.sendAmount.value = '5200'
+// quote.debitAmount.value = '5200'
 ```
 
 5. Create `OutgoingPayment` grant & start interaction flow:

diff --git a/packages/open-payments/package.json b/packages/open-payments/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@interledger/open-payments",
-  "version": "2.0.0",
+  "version": "3.1.0",
   "description": "Tools for interacting with the Open Payments API",
   "author": "Interledger Tech Team <[email protected]>",
   "repository": {
@@ -36,7 +36,7 @@
     "typescript": "^4.9.5"
   },
   "dependencies": {
-    "@interledger/http-signature-utils": "workspace:1.0.3",
+    "@interledger/http-signature-utils": "workspace:1.0.4",
     "@interledger/openapi": "workspace:1.0.3",
     "axios": "^1.3.4",
     "base64url": "^3.0.1",

diff --git a/packages/open-payments/src/types.ts b/packages/open-payments/src/types.ts
@@ -76,7 +76,7 @@ export type Grant = {
 export type GrantRequest = {
   access_token: ASOperations['post-request']['requestBody']['content']['application/json']['access_token']
   client: ASOperations['post-request']['requestBody']['content']['application/json']['client']
-  interact: ASOperations['post-request']['requestBody']['content']['application/json']['interact']
+  interact?: ASOperations['post-request']['requestBody']['content']['application/json']['interact']
 }
 export type GrantContinuationRequest = {
   interact_ref: ASOperations['post-continue']['requestBody']['content']['application/json']['interact_ref']

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml