From afaa5946e771278d07b39a099fecd7f26e44a67d Mon Sep 17 00:00:00 2001 From: Blair Currey <12960453+BlairCurrey@users.noreply.github.com> Date: Fri, 1 Mar 2024 12:46:02 -0500 Subject: [PATCH] chore: upgrade op client --- openapi/auth-server.yaml | 2 +- openapi/schemas.yaml | 7 ++++--- pnpm-lock.yaml | 20 ++++++++++++++++++-- scripts/fetch-schemas.sh | 2 +- test/integration/package.json | 2 +- 5 files changed, 25 insertions(+), 8 deletions(-) diff --git a/openapi/auth-server.yaml b/openapi/auth-server.yaml index 66129f2f4d..1f868fcea2 100644 --- a/openapi/auth-server.yaml +++ b/openapi/auth-server.yaml @@ -110,7 +110,7 @@ paths: - read identifier: 'https://ilp.rafiki.money/alice' limits: - receiver: 'https://ilp.rafiki.money/connections/45a0d0ee-26dc-4c66-89e0-01fbf93156f7' + receiver: 'https://ilp.rafiki.money/incoming-payments/45a0d0ee-26dc-4c66-89e0-01fbf93156f7' interval: 'R12/2019-08-24T14:15:22Z/P1M' debitAmount: value: '500' diff --git a/openapi/schemas.yaml b/openapi/schemas.yaml index fc0bce4435..c08ff83204 100644 --- a/openapi/schemas.yaml +++ b/openapi/schemas.yaml @@ -40,12 +40,13 @@ components: receiver: title: Receiver type: string - description: The URL of the incoming payment or ILP STREAM connection that is being paid. + description: The URL of the incoming payment that is being paid. format: uri - pattern: '^https://(.+)/(incoming-payments|connections)/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$' + pattern: '^(https|http)://(.+)/incoming-payments/(.+)$' examples: - 'https://ilp.rafiki.money/incoming-payments/08394f02-7b7b-45e2-b645-51d04e7c330c' - - 'https://ilp.rafiki.money/connections/016da9d5-c9a4-4c80-a354-86b915a04ff8' + - 'http://ilp.rafiki.money/incoming-payments/08394f02-7b7b-45e2-b645-51d04e7c330c' + - 'https://ilp.rafiki.money/incoming-payments/1' walletAddress: title: Wallet Address type: string diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f4d2c12f31..efa41767de 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -621,8 +621,8 @@ importers: specifier: 2.0.0 version: 2.0.0 '@interledger/open-payments': - specifier: ^6.5.0 - version: 6.6.0 + specifier: ^6.7.0 + version: 6.7.0 '@types/koa': specifier: 2.14.0 version: 2.14.0 @@ -3267,6 +3267,22 @@ packages: transitivePeerDependencies: - debug - supports-color + dev: false + + /@interledger/open-payments@6.7.0: + resolution: {integrity: sha512-ibIpNHNZknhYWCy/SqUNWybwDkkhaM/H9lIXruEKsBogkh5l/ouXw78DrOYuzTTIb+3T4x6LlTJk/PGBht8S8Q==} + dependencies: + '@interledger/http-signature-utils': 2.0.2 + '@interledger/openapi': 1.2.1 + axios: 1.6.7 + base64url: 3.0.1 + http-message-signatures: 0.1.2 + pino: 8.19.0 + uuid: 9.0.1 + transitivePeerDependencies: + - debug + - supports-color + dev: true /@interledger/openapi@1.2.1: resolution: {integrity: sha512-CVEMjLH94svT5ikaojplgZ3YlZAe7ml6G6bt0ZCbqkbwHszUwY1E6RexZZejiGju5QvwS/6Jl/Op5ymv/ECaLg==} diff --git a/scripts/fetch-schemas.sh b/scripts/fetch-schemas.sh index 48530ecf3a..c2b7c57426 100755 --- a/scripts/fetch-schemas.sh +++ b/scripts/fetch-schemas.sh @@ -1,7 +1,7 @@ #!/bin/bash REPO_ROOT=$(git rev-parse --show-toplevel) -BRANCH_OR_TAG="${1:-%40interledger/open-payments%406.5.1}" +BRANCH_OR_TAG="${1:-%40interledger/open-payments%406.7.0}" BASE_URL="https://raw.githubusercontent.com/interledger/open-payments/$BRANCH_OR_TAG" OUT_DIR="$REPO_ROOT/openapi" diff --git a/test/integration/package.json b/test/integration/package.json index 134adbb94e..e80d2b75c3 100644 --- a/test/integration/package.json +++ b/test/integration/package.json @@ -13,7 +13,7 @@ "devDependencies": { "@apollo/client": "^3.8.10", "@interledger/http-signature-utils": "2.0.0", - "@interledger/open-payments": "^6.5.0", + "@interledger/open-payments": "^6.7.0", "@types/koa": "2.14.0", "@types/koa-bodyparser": "^4.3.12", "dotenv": "^16.4.1",