Merge branch 'main' into 2852/mk/get-or-create-grants

# Conflicts: # packages/backend/src/open_payments/receiver/service.ts
interledger · Aug 22, 2024 · 7a36395 · 7a36395
2 parents 0e66265 + b08a157
commit 7a36395
Show file tree

Hide file tree

Showing 161 changed files with 6,514 additions and 1,381 deletions.
diff --git a/.github/workflows/node-build.yml b/.github/workflows/node-build.yml
@@ -29,7 +29,7 @@ jobs:
       - uses: actions/checkout@v4
       - 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
+      - run: NODE_OPTIONS="--max-old-space-size=4096" pnpm --filter backend test:ci
       - name: AsyncAPI extension
         run: |
           echo "{\"extends\":[\"spectral:oas\",\"spectral:asyncapi\"]}" >> .spectral.json

diff --git a/...Admin API - only locally/Peer-to-Peer Cross Currency Payment/Create Outgoing Payment.bru b/...Admin API - only locally/Peer-to-Peer Cross Currency Payment/Create Outgoing Payment.bru
@@ -59,8 +59,10 @@ script:pre-request {
 
 script:post-response {
   const body = res.getBody();
-
-  bru.setEnvVar("outgoingPaymentId", body.data.createOutgoingPayment.payment.id);
+
+  if (body?.data) {
+    bru.setEnvVar("outgoingPaymentId", body.data.createOutgoingPayment.payment.id);
+  }
 }
 
 tests {

diff --git a/...i/Examples/Admin API - only locally/Peer-to-Peer Cross Currency Payment/Create Quote.bru b/...i/Examples/Admin API - only locally/Peer-to-Peer Cross Currency Payment/Create Quote.bru
@@ -16,11 +16,7 @@ body:graphql {
       quote {
         createdAt
         expiresAt
-        highEstimatedExchangeRate
         id
-        lowEstimatedExchangeRate
-        maxPacketAmount
-        minExchangeRate
         walletAddressId
         receiveAmount {
           assetCode
@@ -57,8 +53,10 @@ script:pre-request {
 
 script:post-response {
   const body = res.getBody();
-
-  bru.setEnvVar("quoteId", body.data.createQuote.quote.id);
+
+  if (body?.data) {
+    bru.setEnvVar("quoteId", body.data.createQuote.quote.id);
+  }
 }
 
 tests {

diff --git a/...locally/Peer-to-Peer Cross Currency Payment/Create Receiver (remote Incoming Payment).bru b/...locally/Peer-to-Peer Cross Currency Payment/Create Receiver (remote Incoming Payment).bru
@@ -65,8 +65,10 @@ script:pre-request {
 
 script:post-response {
   const body = res.getBody();
-
-  bru.setEnvVar("receiverId", body.data.createReceiver.receiver.id);
+
+  if (body?.data) {
+    bru.setEnvVar("receiverId", body.data.createReceiver.receiver.id);
+  }
 }
 
 tests {

diff --git a/...afiki/Examples/Admin API - only locally/Peer-to-Peer Payment/Create Outgoing Payment.bru b/...afiki/Examples/Admin API - only locally/Peer-to-Peer Payment/Create Outgoing Payment.bru
@@ -59,8 +59,10 @@ script:pre-request {
 
 script:post-response {
   const body = res.getBody();
-
-  bru.setEnvVar("outgoingPaymentId", body.data.createOutgoingPayment.payment.id);
+
+  if (body?.data) {
+    bru.setEnvVar("outgoingPaymentId", body.data.createOutgoingPayment.payment.id);
+  }
 }
 
 tests {

diff --git a/...llections/Rafiki/Examples/Admin API - only locally/Peer-to-Peer Payment/Create Quote.bru b/...llections/Rafiki/Examples/Admin API - only locally/Peer-to-Peer Payment/Create Quote.bru
@@ -16,11 +16,7 @@ body:graphql {
       quote {
         createdAt
         expiresAt
-        highEstimatedExchangeRate
         id
-        lowEstimatedExchangeRate
-        maxPacketAmount
-        minExchangeRate
         walletAddressId
         receiveAmount {
           assetCode
@@ -57,8 +53,10 @@ script:pre-request {
 
 script:post-response {
   const body = res.getBody();
-
-  bru.setEnvVar("quoteId", body.data.createQuote.quote.id);
+
+  if (body?.data) {
+    bru.setEnvVar("quoteId", body.data.createQuote.quote.id);
+  }
 }
 
 tests {

diff --git a/...in API - only locally/Peer-to-Peer Payment/Create Receiver -remote Incoming Payment-.bru b/...in API - only locally/Peer-to-Peer Payment/Create Receiver -remote Incoming Payment-.bru
@@ -60,8 +60,10 @@ script:pre-request {
 
 script:post-response {
   const body = res.getBody();
-
-  bru.setEnvVar("receiverId", body.data.createReceiver.receiver.id);
+
+  if (body?.data) {
+    bru.setEnvVar("receiverId", body.data.createReceiver.receiver.id);
+  }
 }
 
 tests {

diff --git a/...s/Rafiki/Examples/Admin API - only locally/Peer-to-Peer Payment/Get Outgoing Payment.bru b/...s/Rafiki/Examples/Admin API - only locally/Peer-to-Peer Payment/Get Outgoing Payment.bru
@@ -17,6 +17,7 @@ body:graphql {
       error
       metadata
       id
+      grantId
       walletAddressId
       quote {
         id

diff --git a/bruno/collections/Rafiki/Rafiki Admin APIs/Approve Incoming Payment.bru b/bruno/collections/Rafiki/Rafiki Admin APIs/Approve Incoming Payment.bru
@@ -0,0 +1,35 @@
+meta {
+  name: Approve Incoming Payment
+  type: graphql
+  seq: 47
+}
+
+post {
+  url: {{PeerGraphqlHost}}/graphql
+  body: graphql
+  auth: none
+}
+
+body:graphql {
+  mutation ApproveIncomingPayment($input: ApproveIncomingPaymentInput!) {
+  	approveIncomingPayment(input:$input) {
+      payment {
+        id
+      }
+    }
+  }
+}
+
+body:graphql:vars {
+  {
+    "input": {
+      "id": "{{incomingPaymentId}}"
+    }
+  }
+}
+
+script:pre-request {
+  const scripts = require('./scripts');
+
+  scripts.addApiSignatureHeader();
+}
diff --git a/bruno/collections/Rafiki/Rafiki Admin APIs/Cancel Incoming Payment.bru b/bruno/collections/Rafiki/Rafiki Admin APIs/Cancel Incoming Payment.bru
@@ -0,0 +1,36 @@
+meta {
+  name: Cancel Incoming Payment
+  type: graphql
+  seq: 48
+}
+
+post {
+  url: {{PeerGraphqlHost}}/graphql
+  body: graphql
+  auth: none
+}
+
+body:graphql {
+  mutation CancelIncomingPayment($input: CancelIncomingPaymentInput!) {
+    cancelIncomingPayment(input: $input) {
+      payment {
+        id
+      }
+    }
+  }
+
+}
+
+body:graphql:vars {
+  {
+    "input": {
+      "id": "{{incomingPaymentId}}"
+    }
+  }
+}
+
+script:pre-request {
+  const scripts = require('./scripts');
+
+  scripts.addApiSignatureHeader();
+}
diff --git a/bruno/collections/Rafiki/Rafiki Admin APIs/Cancel Outgoing Payment.bru b/bruno/collections/Rafiki/Rafiki Admin APIs/Cancel Outgoing Payment.bru
@@ -22,11 +22,8 @@ body:graphql {
         quote {
           createdAt
           expiresAt
-          highEstimatedExchangeRate
           id
-          lowEstimatedExchangeRate
-          maxPacketAmount
-          minExchangeRate
+          estimatedExchangeRate
           walletAddressId
           receiveAmount {
             assetCode

diff --git a/bruno/collections/Rafiki/Rafiki Admin APIs/Create Asset.bru b/bruno/collections/Rafiki/Rafiki Admin APIs/Create Asset.bru
@@ -44,6 +44,8 @@ script:pre-request {
 
 script:post-response {
   const body = res.getBody();
-
-  bru.setEnvVar("assetId", body.data.createAsset.asset?.id);
+
+  if (body?.data) {
+    bru.setEnvVar("assetId", body.data.createAsset.asset?.id);
+  }
 }
diff --git a/bruno/collections/Rafiki/Rafiki Admin APIs/Create Incoming Payment.bru b/bruno/collections/Rafiki/Rafiki Admin APIs/Create Incoming Payment.bru
@@ -57,8 +57,10 @@ script:pre-request {
 
 script:post-response {
   const body = res.getBody();
-
-  bru.setEnvVar("incomingPaymentId", body.data.createIncomingPayment.payment.id);
+
+  if (body?.data) {
+    bru.setEnvVar("incomingPaymentId", body.data.createIncomingPayment.payment.id);
+  }
 }
 
 tests {

diff --git a/bruno/collections/Rafiki/Rafiki Admin APIs/Create Or Update Peer By Url.bru b/bruno/collections/Rafiki/Rafiki Admin APIs/Create Or Update Peer By Url.bru
@@ -45,6 +45,8 @@ script:pre-request {
 
 script:post-response {
   const body = res.getBody();
-
-  bru.setEnvVar("peerId", body.data.createOrUpdatePeerByUrl?.peer.id);
+
+  if (body?.data) {
+    bru.setEnvVar("peerId", body.data.createOrUpdatePeerByUrl?.peer.id);
+  }
 }
diff --git a/bruno/collections/Rafiki/Rafiki Admin APIs/Create Outgoing Payment From Incoming Payment.bru b/bruno/collections/Rafiki/Rafiki Admin APIs/Create Outgoing Payment From Incoming Payment.bru
@@ -22,12 +22,9 @@ body:graphql {
         quote {
           createdAt
           expiresAt
-          highEstimatedExchangeRate
           id
-          lowEstimatedExchangeRate
-          maxPacketAmount
-          minExchangeRate
           walletAddressId
+          estimatedExchangeRate
           receiveAmount {
             assetCode
             assetScale
@@ -89,8 +86,10 @@ script:pre-request {
 
 script:post-response {
   const body = res.getBody();
-
-  bru.setEnvVar("outgoingPaymentId", body.data.createOutgoingPaymentFromIncomingPayment.payment.id);
+
+  if (body?.data) {
+    bru.setEnvVar("outgoingPaymentId", body.data.createOutgoingPaymentFromIncomingPayment.payment.id);  
+  }
 }
 
 tests {

diff --git a/bruno/collections/Rafiki/Rafiki Admin APIs/Create Outgoing Payment.bru b/bruno/collections/Rafiki/Rafiki Admin APIs/Create Outgoing Payment.bru
@@ -22,11 +22,8 @@ body:graphql {
         quote {
           createdAt
           expiresAt
-          highEstimatedExchangeRate
           id
-          lowEstimatedExchangeRate
-          maxPacketAmount
-          minExchangeRate
+          estimatedExchangeRate
           walletAddressId
           receiveAmount {
             assetCode
@@ -84,8 +81,10 @@ script:pre-request {
 
 script:post-response {
   const body = res.getBody();
-
-  bru.setEnvVar("outgoingPaymentId", body.data.createOutgoingPayment.payment.id);
+
+  if (body?.data) {
+    bru.setEnvVar("outgoingPaymentId", body.data.createOutgoingPayment.payment.id);
+  }
 }
 
 tests {

diff --git a/bruno/collections/Rafiki/Rafiki Admin APIs/Create Peer.bru b/bruno/collections/Rafiki/Rafiki Admin APIs/Create Peer.bru
@@ -54,6 +54,8 @@ script:pre-request {
 
 script:post-response {
   const body = res.getBody();
-
-  bru.setEnvVar("peerId", body.data.createPeer.peer.id);
+
+  if (body?.data) {
+    bru.setEnvVar("peerId", body.data.createPeer.peer.id);
+  }
 }
diff --git a/bruno/collections/Rafiki/Rafiki Admin APIs/Create Quote.bru b/bruno/collections/Rafiki/Rafiki Admin APIs/Create Quote.bru
@@ -16,11 +16,7 @@ body:graphql {
       quote {
         createdAt
         expiresAt
-        highEstimatedExchangeRate
         id
-        lowEstimatedExchangeRate
-        maxPacketAmount
-        minExchangeRate
         walletAddressId
         receiveAmount {
           assetCode
@@ -87,6 +83,8 @@ script:pre-request {
 
 script:post-response {
   const body = res.getBody();
-
-  bru.setEnvVar("quoteId", body.data.createQuote.quote.id);
+
+  if (body?.data) {
+    bru.setEnvVar("quoteId", body.data.createQuote.quote.id);
+  }
 }
diff --git a/bruno/collections/Rafiki/Rafiki Admin APIs/Create Receiver (remote Incoming Payment).bru b/bruno/collections/Rafiki/Rafiki Admin APIs/Create Receiver (remote Incoming Payment).bru
@@ -62,6 +62,8 @@ script:pre-request {
 
 script:post-response {
   const body = res.getBody();
-
-  bru.setEnvVar("receiverId", body.data.createReceiver.receiver.id);
+
+  if (body?.data) {
+    bru.setEnvVar("receiverId", body.data.createReceiver.receiver.id);
+  }
 }
diff --git a/bruno/collections/Rafiki/Rafiki Admin APIs/Create Wallet Address Key.bru b/bruno/collections/Rafiki/Rafiki Admin APIs/Create Wallet Address Key.bru
@@ -53,6 +53,8 @@ script:pre-request {
 
 script:post-response {
   const body = res.getBody();
-
-  bru.setEnvVar("walletAddressKeyId", body.data.createWalletAddressKey.walletAddressKey.id);
+
+  if (body?.data) {
+    bru.setEnvVar("walletAddressKeyId", body.data.createWalletAddressKey.walletAddressKey.id);
+  }
 }
diff --git a/bruno/collections/Rafiki/Rafiki Admin APIs/Create Wallet Address.bru b/bruno/collections/Rafiki/Rafiki Admin APIs/Create Wallet Address.bru
@@ -61,12 +61,12 @@ script:pre-request {
 
 script:post-response {
   const body = res.getBody();
-  
-  bru.setEnvVar("walletAddressId", body.data.createWalletAddress.walletAddress.id);
-
-  bru.setEnvVar("walletAddressUrl", body.data.createWalletAddress.walletAddress.url);
-
-  bru.setEnvVar('initialWalletAddressRequest',req)
+
+  if (body?.data) {
+    bru.setEnvVar("walletAddressId", body.data.createWalletAddress.walletAddress.id);
+    bru.setEnvVar("walletAddressUrl", body.data.createWalletAddress.walletAddress.url);
+    bru.setEnvVar('initialWalletAddressRequest',req)
+  }
 }
 
 tests {
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,6 +17,7 @@ body:graphql { @@
           error
           metadata
           id
+          grantId
           walletAddressId
           quote {
             id
@@ Expand Down @@