@atxp/base 0.9.2 → 0.10.0
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.
- package/dist/baseAccount.d.ts +5 -1
- package/dist/baseAccount.d.ts.map +1 -1
- package/dist/baseAccount.js +7 -1
- package/dist/baseAccount.js.map +1 -1
- package/dist/baseAppAccount.d.ts +5 -1
- package/dist/baseAppAccount.d.ts.map +1 -1
- package/dist/baseAppAccount.js +8 -2
- package/dist/baseAppAccount.js.map +1 -1
- package/dist/index.cjs +15 -3
- package/dist/index.cjs.map +1 -1
- package/dist/index.d.ts +10 -2
- package/dist/index.js +15 -3
- package/dist/index.js.map +1 -1
- package/package.json +3 -3
package/dist/baseAccount.d.ts
CHANGED
|
@@ -2,11 +2,15 @@ import type { Account, PaymentMaker } from '@atxp/client';
|
|
|
2
2
|
import type { AccountId, Source } from '@atxp/common';
|
|
3
3
|
import { LocalAccount } from 'viem';
|
|
4
4
|
export declare class BaseAccount implements Account {
|
|
5
|
-
|
|
5
|
+
private _accountId;
|
|
6
6
|
paymentMakers: PaymentMaker[];
|
|
7
7
|
private walletClient;
|
|
8
8
|
private account;
|
|
9
9
|
constructor(baseRPCUrl: string, sourceSecretKey: string);
|
|
10
|
+
/**
|
|
11
|
+
* Get the account ID
|
|
12
|
+
*/
|
|
13
|
+
getAccountId(): Promise<AccountId>;
|
|
10
14
|
/**
|
|
11
15
|
* Get the LocalAccount (signer) for this account.
|
|
12
16
|
* This can be used with the x402 library or other signing operations.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"baseAccount.d.ts","sourceRoot":"","sources":["../src/baseAccount.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,YAAY,EAAO,MAAM,cAAc,CAAC;AAC/D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAGtD,OAAO,EAA0C,YAAY,EAAE,MAAM,MAAM,CAAC;AAG5E,qBAAa,WAAY,YAAW,OAAO;IACzC,
|
|
1
|
+
{"version":3,"file":"baseAccount.d.ts","sourceRoot":"","sources":["../src/baseAccount.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,YAAY,EAAO,MAAM,cAAc,CAAC;AAC/D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAGtD,OAAO,EAA0C,YAAY,EAAE,MAAM,MAAM,CAAC;AAG5E,qBAAa,WAAY,YAAW,OAAO;IACzC,OAAO,CAAC,UAAU,CAAY;IAC9B,aAAa,EAAE,YAAY,EAAE,CAAC;IAC9B,OAAO,CAAC,YAAY,CAAe;IACnC,OAAO,CAAC,OAAO,CAAoB;gBAEvB,UAAU,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM;IAsBvD;;OAEG;IACG,YAAY,IAAI,OAAO,CAAC,SAAS,CAAC;IAIxC;;;OAGG;IACH,eAAe,IAAI,YAAY;IAI/B;;OAEG;IACG,UAAU,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;CAOtC"}
|
package/dist/baseAccount.js
CHANGED
|
@@ -13,7 +13,7 @@ class BaseAccount {
|
|
|
13
13
|
}
|
|
14
14
|
this.account = privateKeyToAccount(sourceSecretKey);
|
|
15
15
|
// Format accountId as network:address
|
|
16
|
-
this.
|
|
16
|
+
this._accountId = `base:${this.account.address}`;
|
|
17
17
|
this.walletClient = createWalletClient({
|
|
18
18
|
account: this.account,
|
|
19
19
|
chain: base,
|
|
@@ -23,6 +23,12 @@ class BaseAccount {
|
|
|
23
23
|
new BasePaymentMaker(baseRPCUrl, this.walletClient)
|
|
24
24
|
];
|
|
25
25
|
}
|
|
26
|
+
/**
|
|
27
|
+
* Get the account ID
|
|
28
|
+
*/
|
|
29
|
+
async getAccountId() {
|
|
30
|
+
return this._accountId;
|
|
31
|
+
}
|
|
26
32
|
/**
|
|
27
33
|
* Get the LocalAccount (signer) for this account.
|
|
28
34
|
* This can be used with the x402 library or other signing operations.
|
package/dist/baseAccount.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"baseAccount.js","sources":["../src/baseAccount.ts"],"sourcesContent":[null],"names":[],"mappings":";;;;;MAOa,WAAW,CAAA;IAMtB,WAAA,CAAY,UAAkB,EAAE,eAAuB,EAAA;QACrD,IAAI,CAAC,UAAU,EAAE;AACf,YAAA,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC;QAC7C;QACA,IAAI,CAAC,eAAe,EAAE;AACpB,YAAA,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC;QAClD;AAEA,QAAA,IAAI,CAAC,OAAO,GAAG,mBAAmB,CAAC,eAAsB,CAAC;;QAG1D,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"baseAccount.js","sources":["../src/baseAccount.ts"],"sourcesContent":[null],"names":[],"mappings":";;;;;MAOa,WAAW,CAAA;IAMtB,WAAA,CAAY,UAAkB,EAAE,eAAuB,EAAA;QACrD,IAAI,CAAC,UAAU,EAAE;AACf,YAAA,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC;QAC7C;QACA,IAAI,CAAC,eAAe,EAAE;AACpB,YAAA,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC;QAClD;AAEA,QAAA,IAAI,CAAC,OAAO,GAAG,mBAAmB,CAAC,eAAsB,CAAC;;QAG1D,IAAI,CAAC,UAAU,GAAG,CAAA,KAAA,EAAQ,IAAI,CAAC,OAAO,CAAC,OAAO,CAAA,CAAe;AAC7D,QAAA,IAAI,CAAC,YAAY,GAAG,kBAAkB,CAAC;YACrC,OAAO,EAAE,IAAI,CAAC,OAAO;AACrB,YAAA,KAAK,EAAE,IAAI;AACX,YAAA,SAAS,EAAE,IAAI,CAAC,UAAU,CAAC;AAC5B,SAAA,CAAC;QACF,IAAI,CAAC,aAAa,GAAG;AACnB,YAAA,IAAI,gBAAgB,CAAC,UAAU,EAAE,IAAI,CAAC,YAAY;SACnD;IACH;AAEA;;AAEG;AACH,IAAA,MAAM,YAAY,GAAA;QAChB,OAAO,IAAI,CAAC,UAAU;IACxB;AAEA;;;AAGG;IACH,eAAe,GAAA;QACb,OAAO,IAAI,CAAC,OAAO;IACrB;AAEA;;AAEG;AACH,IAAA,MAAM,UAAU,GAAA;AACd,QAAA,OAAO,CAAC;AACN,gBAAA,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO;AAC7B,gBAAA,KAAK,EAAE,MAAM;AACb,gBAAA,UAAU,EAAE;AACb,aAAA,CAAC;IACJ;AACD;;;;"}
|
package/dist/baseAppAccount.d.ts
CHANGED
|
@@ -5,7 +5,7 @@ import { ICache } from './cache.js';
|
|
|
5
5
|
import { type EphemeralSmartWallet } from './smartWalletHelpers.js';
|
|
6
6
|
import { Logger } from '@atxp/common';
|
|
7
7
|
export declare class BaseAppAccount implements Account {
|
|
8
|
-
|
|
8
|
+
private _accountId;
|
|
9
9
|
paymentMakers: PaymentMaker[];
|
|
10
10
|
private mainWalletAddress?;
|
|
11
11
|
private ephemeralSmartWallet?;
|
|
@@ -24,6 +24,10 @@ export declare class BaseAppAccount implements Account {
|
|
|
24
24
|
private static loadSavedWalletAndPermission;
|
|
25
25
|
private static deploySmartWallet;
|
|
26
26
|
constructor(spendPermission: SpendPermission | null, ephemeralSmartWallet: EphemeralSmartWallet | null, logger?: Logger, mainWalletAddress?: string, provider?: MainWalletProvider, chainId?: number);
|
|
27
|
+
/**
|
|
28
|
+
* Get the account ID
|
|
29
|
+
*/
|
|
30
|
+
getAccountId(): Promise<AccountId>;
|
|
27
31
|
getSources(): Promise<Source[]>;
|
|
28
32
|
/**
|
|
29
33
|
* Dynamically import the appropriate spend-permission module based on environment.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"baseAppAccount.d.ts","sourceRoot":"","sources":["../src/baseAppAccount.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAI7E,OAAO,EAA0B,KAAK,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AAI9F,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAE9D,OAAO,EAAE,MAAM,EAAsD,MAAM,YAAY,CAAC;AACxF,OAAO,EAA0B,KAAK,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AAC5F,OAAO,EAAiB,MAAM,EAAE,MAAM,cAAc,CAAC;AAKrD,qBAAa,cAAe,YAAW,OAAO;IAC5C,
|
|
1
|
+
{"version":3,"file":"baseAppAccount.d.ts","sourceRoot":"","sources":["../src/baseAppAccount.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAI7E,OAAO,EAA0B,KAAK,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AAI9F,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAE9D,OAAO,EAAE,MAAM,EAAsD,MAAM,YAAY,CAAC;AACxF,OAAO,EAA0B,KAAK,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AAC5F,OAAO,EAAiB,MAAM,EAAE,MAAM,cAAc,CAAC;AAKrD,qBAAa,cAAe,YAAW,OAAO;IAC5C,OAAO,CAAC,UAAU,CAAY;IAC9B,aAAa,EAAE,YAAY,EAAE,CAAC;IAC9B,OAAO,CAAC,iBAAiB,CAAC,CAAS;IACnC,OAAO,CAAC,oBAAoB,CAAC,CAAuB;IACpD,OAAO,CAAC,OAAO,CAAS;IAExB,OAAO,CAAC,MAAM,CAAC,UAAU;WAIZ,UAAU,CAAC,MAAM,EAAE;QAC5B,aAAa,EAAE,MAAM,CAAC;QACtB,QAAQ,EAAE,eAAe,CAAC;QAC1B,kBAAkB,CAAC,EAAE,OAAO,CAAC;QAC7B,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;QACvB,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,OAAO,CAAC,EAAE,MAAM,CAAC;KAClB,GACA,OAAO,CAAC,cAAc,CAAC;IAgE1B,OAAO,CAAC,MAAM,CAAC,4BAA4B;mBAkBtB,iBAAiB;gBAsBpC,eAAe,EAAE,eAAe,GAAG,IAAI,EACvC,oBAAoB,EAAE,oBAAoB,GAAG,IAAI,EACjD,MAAM,CAAC,EAAE,MAAM,EACf,iBAAiB,CAAC,EAAE,MAAM,EAC1B,QAAQ,CAAC,EAAE,kBAAkB,EAC7B,OAAO,GAAE,MAAgB;IA4B3B;;OAEG;IACG,YAAY,IAAI,OAAO,CAAC,SAAS,CAAC;IAIlC,UAAU,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAgBrC;;;;OAIG;IAEH,MAAM,CAAC,kBAAkB,CAAC,iBAAiB,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,GAAG,IAAI;CAanF"}
|
package/dist/baseAppAccount.js
CHANGED
|
@@ -101,7 +101,7 @@ class BaseAppAccount {
|
|
|
101
101
|
throw new Error('Spend permission is required for ephemeral wallet mode');
|
|
102
102
|
}
|
|
103
103
|
// Format accountId as network:address
|
|
104
|
-
this.
|
|
104
|
+
this._accountId = `base:${ephemeralSmartWallet.address}`;
|
|
105
105
|
this.ephemeralSmartWallet = ephemeralSmartWallet;
|
|
106
106
|
this.paymentMakers = [
|
|
107
107
|
new BaseAppPaymentMaker(spendPermission, ephemeralSmartWallet, logger, chainId)
|
|
@@ -113,13 +113,19 @@ class BaseAppAccount {
|
|
|
113
113
|
throw new Error('Main wallet address and provider are required for main wallet mode');
|
|
114
114
|
}
|
|
115
115
|
// Format accountId as network:address
|
|
116
|
-
this.
|
|
116
|
+
this._accountId = `base:${mainWalletAddress}`;
|
|
117
117
|
this.mainWalletAddress = mainWalletAddress;
|
|
118
118
|
this.paymentMakers = [
|
|
119
119
|
new MainWalletPaymentMaker(mainWalletAddress, provider, logger, chainId)
|
|
120
120
|
];
|
|
121
121
|
}
|
|
122
122
|
}
|
|
123
|
+
/**
|
|
124
|
+
* Get the account ID
|
|
125
|
+
*/
|
|
126
|
+
async getAccountId() {
|
|
127
|
+
return this._accountId;
|
|
128
|
+
}
|
|
123
129
|
async getSources() {
|
|
124
130
|
const address = this.ephemeralSmartWallet?.address || this.mainWalletAddress;
|
|
125
131
|
if (!address) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"baseAppAccount.js","sources":["../src/baseAppAccount.ts"],"sourcesContent":[null],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"baseAppAccount.js","sources":["../src/baseAppAccount.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}
|
package/dist/index.cjs
CHANGED
|
@@ -5442,7 +5442,7 @@ class BaseAppAccount {
|
|
|
5442
5442
|
throw new Error('Spend permission is required for ephemeral wallet mode');
|
|
5443
5443
|
}
|
|
5444
5444
|
// Format accountId as network:address
|
|
5445
|
-
this.
|
|
5445
|
+
this._accountId = `base:${ephemeralSmartWallet.address}`;
|
|
5446
5446
|
this.ephemeralSmartWallet = ephemeralSmartWallet;
|
|
5447
5447
|
this.paymentMakers = [
|
|
5448
5448
|
new BaseAppPaymentMaker(spendPermission, ephemeralSmartWallet, logger, chainId)
|
|
@@ -5454,13 +5454,19 @@ class BaseAppAccount {
|
|
|
5454
5454
|
throw new Error('Main wallet address and provider are required for main wallet mode');
|
|
5455
5455
|
}
|
|
5456
5456
|
// Format accountId as network:address
|
|
5457
|
-
this.
|
|
5457
|
+
this._accountId = `base:${mainWalletAddress}`;
|
|
5458
5458
|
this.mainWalletAddress = mainWalletAddress;
|
|
5459
5459
|
this.paymentMakers = [
|
|
5460
5460
|
new MainWalletPaymentMaker(mainWalletAddress, provider, logger, chainId)
|
|
5461
5461
|
];
|
|
5462
5462
|
}
|
|
5463
5463
|
}
|
|
5464
|
+
/**
|
|
5465
|
+
* Get the account ID
|
|
5466
|
+
*/
|
|
5467
|
+
async getAccountId() {
|
|
5468
|
+
return this._accountId;
|
|
5469
|
+
}
|
|
5464
5470
|
async getSources() {
|
|
5465
5471
|
const address = this.ephemeralSmartWallet?.address || this.mainWalletAddress;
|
|
5466
5472
|
if (!address) {
|
|
@@ -5690,7 +5696,7 @@ class BaseAccount {
|
|
|
5690
5696
|
}
|
|
5691
5697
|
this.account = accounts.privateKeyToAccount(sourceSecretKey);
|
|
5692
5698
|
// Format accountId as network:address
|
|
5693
|
-
this.
|
|
5699
|
+
this._accountId = `base:${this.account.address}`;
|
|
5694
5700
|
this.walletClient = viem.createWalletClient({
|
|
5695
5701
|
account: this.account,
|
|
5696
5702
|
chain: chains.base,
|
|
@@ -5700,6 +5706,12 @@ class BaseAccount {
|
|
|
5700
5706
|
new BasePaymentMaker(baseRPCUrl, this.walletClient)
|
|
5701
5707
|
];
|
|
5702
5708
|
}
|
|
5709
|
+
/**
|
|
5710
|
+
* Get the account ID
|
|
5711
|
+
*/
|
|
5712
|
+
async getAccountId() {
|
|
5713
|
+
return this._accountId;
|
|
5714
|
+
}
|
|
5703
5715
|
/**
|
|
5704
5716
|
* Get the LocalAccount (signer) for this account.
|
|
5705
5717
|
* This can be used with the x402 library or other signing operations.
|