@atxp/solana 0.10.7 → 0.10.10

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (11) hide show
  1. package/dist/index.cjs +28 -1
  2. package/dist/index.cjs.map +1 -1
  3. package/dist/index.d.ts +5 -1
  4. package/dist/index.js +28 -1
  5. package/dist/index.js.map +1 -1
  6. package/dist/solanaAccount.d.ts +5 -1
  7. package/dist/solanaAccount.d.ts.map +1 -1
  8. package/dist/solanaAccount.js +28 -0
  9. package/dist/solanaAccount.js.map +1 -1
  10. package/package.json +3 -3
  11. package/dist/solanaPaymentMaker.d.ts +0 -25
package/dist/index.cjs CHANGED
@@ -1,11 +1,11 @@
1
1
  'use strict';
2
2
 
3
+ var BigNumber = require('bignumber.js');
3
4
  var client = require('@atxp/client');
4
5
  var web3_js = require('@solana/web3.js');
5
6
  var pay = require('@solana/pay');
6
7
  var splToken = require('@solana/spl-token');
7
8
  var bs58 = require('bs58');
8
- var BigNumber = require('bignumber.js');
9
9
  var common = require('@atxp/common');
10
10
  var jose = require('jose');
11
11
 
@@ -168,6 +168,33 @@ class SolanaAccount {
168
168
  async createSpendPermission(_resourceUrl) {
169
169
  return null;
170
170
  }
171
+ /**
172
+ * Authorize a payment through the appropriate channel for Solana accounts.
173
+ */
174
+ async authorize(params) {
175
+ const { protocol } = params;
176
+ switch (protocol) {
177
+ case 'atxp': {
178
+ const destination = {
179
+ chain: 'solana',
180
+ currency: 'USDC',
181
+ address: params.destination,
182
+ amount: new BigNumber.BigNumber(params.amount),
183
+ };
184
+ const result = await this.paymentMakers[0].makePayment([destination], params.memo || '');
185
+ if (!result) {
186
+ throw new Error('SolanaAccount: payment execution returned no result');
187
+ }
188
+ return { protocol, credential: JSON.stringify(result) };
189
+ }
190
+ case 'x402':
191
+ throw new Error('SolanaAccount does not support x402 protocol');
192
+ case 'mpp':
193
+ throw new Error('SolanaAccount does not support MPP protocol');
194
+ default:
195
+ throw new Error(`SolanaAccount: unsupported protocol '${protocol}'`);
196
+ }
197
+ }
171
198
  }
172
199
 
173
200
  exports.SolanaAccount = SolanaAccount;
package/dist/index.cjs.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.cjs","sources":["../src/solanaPaymentMaker.ts","../src/solanaAccount.ts"],"sourcesContent":[null,null],"names":["PublicKey","_ValidateTransferError","importJWK","generateJWT","UnsupportedCurrencyError","getAssociatedTokenAddress","getAccount","InsufficientFundsError","ComputeBudgetProgram","createTransfer","sendAndConfirmTransaction","ATXPPaymentError","RpcError","PaymentNetworkError","Connection","Keypair","ConsoleLogger"],"mappings":"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"}
1
+ {"version":3,"file":"index.cjs","sources":["../src/solanaPaymentMaker.ts","../src/solanaAccount.ts"],"sourcesContent":[null,null],"names":["PublicKey","_ValidateTransferError","importJWK","generateJWT","UnsupportedCurrencyError","getAssociatedTokenAddress","getAccount","InsufficientFundsError","ComputeBudgetProgram","createTransfer","sendAndConfirmTransaction","ATXPPaymentError","RpcError","PaymentNetworkError","Connection","Keypair","ConsoleLogger","BigNumber"],"mappings":"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"}
package/dist/index.d.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  import { Account, PaymentMaker } from '@atxp/client';
2
- import { AccountId, Source, Logger, Currency, Destination, PaymentIdentifier } from '@atxp/common';
2
+ import { AccountId, Source, AuthorizeParams, AuthorizeResult, Logger, Currency, Destination, PaymentIdentifier } from '@atxp/common';
3
3
  import { ValidateTransferError as ValidateTransferError$1 } from '@solana/pay';
4
4
  import BigNumber from 'bignumber.js';
5
5
 
@@ -21,6 +21,10 @@ declare class SolanaAccount implements Account {
21
21
  * Solana accounts don't support spend permissions, so this returns null.
22
22
  */
23
23
  createSpendPermission(_resourceUrl: string): Promise<string | null>;
24
+ /**
25
+ * Authorize a payment through the appropriate channel for Solana accounts.
26
+ */
27
+ authorize(params: AuthorizeParams): Promise<AuthorizeResult>;
24
28
  }
25
29
 
26
30
  declare const ValidateTransferError: typeof ValidateTransferError$1;
package/dist/index.js CHANGED
@@ -1,9 +1,9 @@
1
+ import BigNumber, { BigNumber as BigNumber$1 } from 'bignumber.js';
1
2
  import { UnsupportedCurrencyError, InsufficientFundsError, ATXPPaymentError, RpcError, PaymentNetworkError } from '@atxp/client';
2
3
  import { PublicKey, ComputeBudgetProgram, sendAndConfirmTransaction, Connection, Keypair } from '@solana/web3.js';
3
4
  import { ValidateTransferError as ValidateTransferError$1, createTransfer } from '@solana/pay';
4
5
  import { getAssociatedTokenAddress, getAccount } from '@solana/spl-token';
5
6
  import bs58 from 'bs58';
6
- import BigNumber from 'bignumber.js';
7
7
  import { generateJWT, ConsoleLogger } from '@atxp/common';
8
8
  import { importJWK } from 'jose';
9
9
 
@@ -166,6 +166,33 @@ class SolanaAccount {
166
166
  async createSpendPermission(_resourceUrl) {
167
167
  return null;
168
168
  }
169
+ /**
170
+ * Authorize a payment through the appropriate channel for Solana accounts.
171
+ */
172
+ async authorize(params) {
173
+ const { protocol } = params;
174
+ switch (protocol) {
175
+ case 'atxp': {
176
+ const destination = {
177
+ chain: 'solana',
178
+ currency: 'USDC',
179
+ address: params.destination,
180
+ amount: new BigNumber$1(params.amount),
181
+ };
182
+ const result = await this.paymentMakers[0].makePayment([destination], params.memo || '');
183
+ if (!result) {
184
+ throw new Error('SolanaAccount: payment execution returned no result');
185
+ }
186
+ return { protocol, credential: JSON.stringify(result) };
187
+ }
188
+ case 'x402':
189
+ throw new Error('SolanaAccount does not support x402 protocol');
190
+ case 'mpp':
191
+ throw new Error('SolanaAccount does not support MPP protocol');
192
+ default:
193
+ throw new Error(`SolanaAccount: unsupported protocol '${protocol}'`);
194
+ }
195
+ }
169
196
  }
170
197
 
171
198
  export { SolanaAccount, SolanaPaymentMaker, ValidateTransferError };
package/dist/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sources":["../src/solanaPaymentMaker.ts","../src/solanaAccount.ts"],"sourcesContent":[null,null],"names":["_ValidateTransferError"],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sources":["../src/solanaPaymentMaker.ts","../src/solanaAccount.ts"],"sourcesContent":[null,null],"names":["_ValidateTransferError","BigNumber"],"mappings":"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"}
package/dist/solanaAccount.d.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  import type { Account, PaymentMaker } from '@atxp/client';
2
- import type { AccountId, Source } from '@atxp/common';
2
+ import type { AccountId, Source, AuthorizeParams, AuthorizeResult } from '@atxp/common';
3
3
  export declare class SolanaAccount implements Account {
4
4
  private _accountId;
5
5
  paymentMakers: PaymentMaker[];
@@ -18,5 +18,9 @@ export declare class SolanaAccount implements Account {
18
18
  * Solana accounts don't support spend permissions, so this returns null.
19
19
  */
20
20
  createSpendPermission(_resourceUrl: string): Promise<string | null>;
21
+ /**
22
+ * Authorize a payment through the appropriate channel for Solana accounts.
23
+ */
24
+ authorize(params: AuthorizeParams): Promise<AuthorizeResult>;
21
25
  }
22
26
  //# sourceMappingURL=solanaAccount.d.ts.map
package/dist/solanaAccount.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"solanaAccount.d.ts","sourceRoot":"","sources":["../src/solanaAccount.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAC1D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAKtD,qBAAa,aAAc,YAAW,OAAO;IAC3C,OAAO,CAAC,UAAU,CAAY;IAC9B,aAAa,EAAE,YAAY,EAAE,CAAC;IAC9B,OAAO,CAAC,eAAe,CAAS;gBAEpB,cAAc,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM;IAiB3D;;OAEG;IACG,YAAY,IAAI,OAAO,CAAC,SAAS,CAAC;IAIxC;;OAEG;IACG,UAAU,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAQrC;;;OAGG;IACG,qBAAqB,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;CAG1E"}
1
+ {"version":3,"file":"solanaAccount.d.ts","sourceRoot":"","sources":["../src/solanaAccount.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAC1D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,eAAe,EAAE,eAAe,EAAe,MAAM,cAAc,CAAC;AAMrG,qBAAa,aAAc,YAAW,OAAO;IAC3C,OAAO,CAAC,UAAU,CAAY;IAC9B,aAAa,EAAE,YAAY,EAAE,CAAC;IAC9B,OAAO,CAAC,eAAe,CAAS;gBAEpB,cAAc,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM;IAiB3D;;OAEG;IACG,YAAY,IAAI,OAAO,CAAC,SAAS,CAAC;IAIxC;;OAEG;IACG,UAAU,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAQrC;;;OAGG;IACG,qBAAqB,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAIzE;;OAEG;IACG,SAAS,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,eAAe,CAAC;CAyBnE"}
package/dist/solanaAccount.js CHANGED
@@ -1,3 +1,4 @@
1
+ import { BigNumber } from 'bignumber.js';
1
2
  import { SolanaPaymentMaker } from './solanaPaymentMaker.js';
2
3
  import { Keypair } from '@solana/web3.js';
3
4
  import bs58 from 'bs58';
@@ -41,6 +42,33 @@ class SolanaAccount {
41
42
  async createSpendPermission(_resourceUrl) {
42
43
  return null;
43
44
  }
45
+ /**
46
+ * Authorize a payment through the appropriate channel for Solana accounts.
47
+ */
48
+ async authorize(params) {
49
+ const { protocol } = params;
50
+ switch (protocol) {
51
+ case 'atxp': {
52
+ const destination = {
53
+ chain: 'solana',
54
+ currency: 'USDC',
55
+ address: params.destination,
56
+ amount: new BigNumber(params.amount),
57
+ };
58
+ const result = await this.paymentMakers[0].makePayment([destination], params.memo || '');
59
+ if (!result) {
60
+ throw new Error('SolanaAccount: payment execution returned no result');
61
+ }
62
+ return { protocol, credential: JSON.stringify(result) };
63
+ }
64
+ case 'x402':
65
+ throw new Error('SolanaAccount does not support x402 protocol');
66
+ case 'mpp':
67
+ throw new Error('SolanaAccount does not support MPP protocol');
68
+ default:
69
+ throw new Error(`SolanaAccount: unsupported protocol '${protocol}'`);
70
+ }
71
+ }
44
72
  }
45
73
 
46
74
  export { SolanaAccount };
package/dist/solanaAccount.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"solanaAccount.js","sources":["../src/solanaAccount.ts"],"sourcesContent":[null],"names":[],"mappings":";;;;MAMa,aAAa,CAAA;IAKxB,WAAA,CAAY,cAAsB,EAAE,eAAuB,EAAA;QACzD,IAAI,CAAC,cAAc,EAAE;AACnB,YAAA,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC;QAChD;QACA,IAAI,CAAC,eAAe,EAAE;AACpB,YAAA,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC;QAClD;AACA,QAAA,MAAM,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;QAClE,IAAI,CAAC,eAAe,GAAG,MAAM,CAAC,SAAS,CAAC,QAAQ,EAAE;;QAGlD,IAAI,CAAC,UAAU,GAAG,CAAA,OAAA,EAAU,IAAI,CAAC,eAAe,EAAe;QAC/D,IAAI,CAAC,aAAa,GAAG;AACnB,YAAA,IAAI,kBAAkB,CAAC,cAAc,EAAE,eAAe;SACvD;IACH;AAEA;;AAEG;AACH,IAAA,MAAM,YAAY,GAAA;QAChB,OAAO,IAAI,CAAC,UAAU;IACxB;AAEA;;AAEG;AACH,IAAA,MAAM,UAAU,GAAA;AACd,QAAA,OAAO,CAAC;gBACN,OAAO,EAAE,IAAI,CAAC,eAAe;AAC7B,gBAAA,KAAK,EAAE,QAAQ;AACf,gBAAA,UAAU,EAAE;AACb,aAAA,CAAC;IACJ;AAEA;;;AAGG;IACH,MAAM,qBAAqB,CAAC,YAAoB,EAAA;AAC9C,QAAA,OAAO,IAAI;IACb;AACD;;;;"}
1
+ {"version":3,"file":"solanaAccount.js","sources":["../src/solanaAccount.ts"],"sourcesContent":[null],"names":[],"mappings":";;;;;MAOa,aAAa,CAAA;IAKxB,WAAA,CAAY,cAAsB,EAAE,eAAuB,EAAA;QACzD,IAAI,CAAC,cAAc,EAAE;AACnB,YAAA,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC;QAChD;QACA,IAAI,CAAC,eAAe,EAAE;AACpB,YAAA,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC;QAClD;AACA,QAAA,MAAM,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;QAClE,IAAI,CAAC,eAAe,GAAG,MAAM,CAAC,SAAS,CAAC,QAAQ,EAAE;;QAGlD,IAAI,CAAC,UAAU,GAAG,CAAA,OAAA,EAAU,IAAI,CAAC,eAAe,EAAe;QAC/D,IAAI,CAAC,aAAa,GAAG;AACnB,YAAA,IAAI,kBAAkB,CAAC,cAAc,EAAE,eAAe;SACvD;IACH;AAEA;;AAEG;AACH,IAAA,MAAM,YAAY,GAAA;QAChB,OAAO,IAAI,CAAC,UAAU;IACxB;AAEA;;AAEG;AACH,IAAA,MAAM,UAAU,GAAA;AACd,QAAA,OAAO,CAAC;gBACN,OAAO,EAAE,IAAI,CAAC,eAAe;AAC7B,gBAAA,KAAK,EAAE,QAAQ;AACf,gBAAA,UAAU,EAAE;AACb,aAAA,CAAC;IACJ;AAEA;;;AAGG;IACH,MAAM,qBAAqB,CAAC,YAAoB,EAAA;AAC9C,QAAA,OAAO,IAAI;IACb;AAEA;;AAEG;IACH,MAAM,SAAS,CAAC,MAAuB,EAAA;AACrC,QAAA,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM;QAE3B,QAAQ,QAAQ;YACd,KAAK,MAAM,EAAE;AACX,gBAAA,MAAM,WAAW,GAAgB;AAC/B,oBAAA,KAAK,EAAE,QAAQ;AACf,oBAAA,QAAQ,EAAE,MAAM;oBAChB,OAAO,EAAE,MAAM,CAAC,WAAW;AAC3B,oBAAA,MAAM,EAAE,IAAI,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC;iBACrC;gBACD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC;gBACxF,IAAI,CAAC,MAAM,EAAE;AACX,oBAAA,MAAM,IAAI,KAAK,CAAC,qDAAqD,CAAC;gBACxE;AACA,gBAAA,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE;YACzD;AACA,YAAA,KAAK,MAAM;AACT,gBAAA,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC;AACjE,YAAA,KAAK,KAAK;AACR,gBAAA,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC;AAChE,YAAA;AACE,gBAAA,MAAM,IAAI,KAAK,CAAC,wCAAwC,QAAQ,CAAA,CAAA,CAAG,CAAC;;IAE1E;AACD;;;;"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atxp/solana",
3
- "version": "0.10.7",
3
+ "version": "0.10.10",
4
4
  "description": "ATXP Solana - Solana blockchain support for ATXP",
5
5
  "license": "MIT",
6
6
  "repository": {
@@ -33,8 +33,8 @@
33
33
  "pack:dry": "npm pack --dry-run"
34
34
  },
35
35
  "dependencies": {
36
- "@atxp/client": "0.10.7",
37
- "@atxp/common": "0.10.7",
36
+ "@atxp/client": "0.10.10",
37
+ "@atxp/common": "0.10.10",
38
38
  "@solana/pay": "^0.2.5",
39
39
  "@solana/web3.js": "^1.98.1",
40
40
  "bignumber.js": "^9.3.0",
package/dist/solanaPaymentMaker.d.ts DELETED
@@ -1,25 +0,0 @@
1
- import type { PaymentMaker } from '@atxp/client';
2
- import { ValidateTransferError as _ValidateTransferError } from "@solana/pay";
3
- import BigNumber from "bignumber.js";
4
- import { Currency, AccountId, PaymentIdentifier, Destination } from '@atxp/common';
5
- import { Logger } from '@atxp/common';
6
- export declare const ValidateTransferError: typeof _ValidateTransferError;
7
- export declare class SolanaPaymentMaker implements PaymentMaker {
8
- private connection;
9
- private source;
10
- private logger;
11
- constructor(solanaEndpoint: string, sourceSecretKey: string, logger?: Logger);
12
- getSourceAddress(_params: {
13
- amount: BigNumber;
14
- currency: Currency;
15
- receiver: string;
16
- memo: string;
17
- }): string;
18
- generateJWT: ({ paymentRequestId, codeChallenge, accountId }: {
19
- paymentRequestId: string;
20
- codeChallenge: string;
21
- accountId?: AccountId | null;
22
- }) => Promise<string>;
23
- makePayment: (destinations: Destination[], memo: string, _paymentRequestId?: string) => Promise<PaymentIdentifier | null>;
24
- }
25
- //# sourceMappingURL=solanaPaymentMaker.d.ts.map