Skip to content

Commit 63ac695

Browse files
FedericoAmuraFedericoAmura
committed
Merge branch 'refs/heads/feat/naga-fix-bls-wasm-cleanup' into feat/rc-naga-2025-01-30b
2 parents 80b49b2 + 1196d13 commit 63ac695

File tree

140 files changed

+2039
-5054
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

140 files changed

+2039
-5054
lines changed

‎local-tests/index.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
import { TinnyEnvironment } from './setup/tinny-environment';
22
import { runInBand, runTestsParallel } from './setup/tinny-operations';
33
import * as tinnyTests from './tests';
4-
import { getEoaSessionSigs } from './setup/session-sigs/get-eoa-session-sigs';
5-
import { getLitActionSessionSigs } from './setup/session-sigs/get-lit-action-session-sigs';
6-
import { getPkpSessionSigs } from './setup/session-sigs/get-pkp-session-sigs';
4+
import { getEoaAuthContext } from './setup/session-sigs/get-eoa-session-sigs';
5+
import { getLitActionAuthContext } from './setup/session-sigs/get-lit-action-session-sigs';
6+
import { getPkpAuthContext } from './setup/session-sigs/get-pkp-session-sigs';
77
import { AccessControlConditions } from './setup/accs/accs';
88

99
export {
1010
TinnyEnvironment,
1111
runInBand,
1212
runTestsParallel,
1313
tinnyTests,
14-
getEoaSessionSigs,
15-
getLitActionSessionSigs,
16-
getPkpSessionSigs,
14+
getEoaAuthContext,
15+
getLitActionAuthContext,
16+
getPkpAuthContext,
1717
AccessControlConditions,
1818
};
1919

‎local-tests/setup/accs/accs.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import {
55
} from '@lit-protocol/accs-schemas';
66

77
export namespace AccessControlConditions {
8-
export const getEmvBasicAccessControlConditions = ({
8+
export const getEvmBasicAccessControlConditions = ({
99
userAddress,
1010
}): LPACC_EVM_BASIC[] => {
1111
return [

‎local-tests/setup/session-sigs/get-eoa-session-sigs.ts‎

Lines changed: 17 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -18,43 +18,28 @@ import {
1818
import { TinnyPerson } from '../tinny-person';
1919
import { TinnyEnvironment } from '../tinny-environment';
2020

21-
/**
22-
* Retrieves the session signatures for an EOA in a given Tinny environment.
23-
*
24-
* @param devEnv - The Tinny environment object.
25-
* @param person - The Tinny person object representing the EOA.
26-
* @param resourceAbilityRequests - Optional. An array of resource ability requests. If not provided, default requests will be used.
27-
* @returns A promise that resolves to the session signatures.
28-
*/
29-
export const getEoaSessionSigs = async (
21+
export const getEoaAuthContext = (
3022
devEnv: TinnyEnvironment,
3123
person: TinnyPerson,
3224
resourceAbilityRequests?: LitResourceAbilityRequest[]
3325
) => {
3426
const centralisation =
3527
CENTRALISATION_BY_NETWORK[devEnv.litNodeClient.config.litNetwork];
3628

37-
if (centralisation === 'decentralised') {
38-
console.warn(
39-
'Decentralised network detected. Adding superCapacityDelegationAuthSig to eoaSessionSigs'
40-
);
41-
}
42-
4329
// Use default resourceAbilityRequests if not provided
44-
const _resourceAbilityRequests = resourceAbilityRequests || [
45-
{
46-
resource: new LitPKPResource('*'),
47-
ability: LIT_ABILITY.PKPSigning,
48-
},
49-
{
50-
resource: new LitActionResource('*'),
51-
ability: LIT_ABILITY.LitActionExecution,
52-
},
53-
];
54-
55-
const sessionSigs = await devEnv.litNodeClient.getSessionSigs({
30+
return {
31+
pkpPublicKey: person.authMethodOwnedPkp.publicKey,
5632
chain: 'ethereum',
57-
resourceAbilityRequests: _resourceAbilityRequests,
33+
resourceAbilityRequests: resourceAbilityRequests || [
34+
{
35+
resource: new LitPKPResource('*'),
36+
ability: LIT_ABILITY.PKPSigning,
37+
},
38+
{
39+
resource: new LitActionResource('*'),
40+
ability: LIT_ABILITY.LitActionExecution,
41+
},
42+
],
5843
authNeededCallback: async ({
5944
uri,
6045
expiration,
@@ -94,28 +79,18 @@ export const getEoaSessionSigs = async (
9479
...(centralisation === 'decentralised' && {
9580
capabilityAuthSigs: [devEnv.superCapacityDelegationAuthSig],
9681
}),
97-
});
98-
99-
log('[getEoaSessionSigs]: ', getEoaSessionSigs);
100-
101-
return sessionSigs;
82+
};
10283
};
10384

104-
export const getEoaSessionSigsWithCapacityDelegations = async (
85+
export const getEoaAuthContextWithCapacityDelegations = (
10586
devEnv: TinnyEnvironment,
10687
fromWallet: ethers.Wallet,
10788
capacityDelegationAuthSig: AuthSig
10889
) => {
10990
const centralisation =
11091
CENTRALISATION_BY_NETWORK[devEnv.litNodeClient.config.litNetwork];
11192

112-
if (centralisation === 'decentralised') {
113-
console.warn(
114-
'Decentralised network detected. Adding superCapacityDelegationAuthSig to eoaSessionSigs'
115-
);
116-
}
117-
118-
const sessionSigs = await devEnv.litNodeClient.getSessionSigs({
93+
return {
11994
chain: 'ethereum',
12095
resourceAbilityRequests: [
12196
{
@@ -165,9 +140,5 @@ export const getEoaSessionSigsWithCapacityDelegations = async (
165140
capacityDelegationAuthSig ?? devEnv.superCapacityDelegationAuthSig,
166141
],
167142
}),
168-
});
169-
170-
log('[getEoaSessionSigs]: ', getEoaSessionSigs);
171-
172-
return sessionSigs;
143+
};
173144
};

‎local-tests/setup/session-sigs/get-lit-action-session-sigs.ts‎

Lines changed: 22 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -35,20 +35,14 @@ export const VALID_IPFS_ID = 'QmRf5K7PVi5TWXiJdw7YYtcgpgRY6ufXGr9yYnxBLvLjDp';
3535
*/
3636
export const INVALID_IPFS_ID = 'QmeUByesskboEkLLcE9Hd3bWFZT5Xt53RSauMNTJSVhfqm';
3737

38-
export const getLitActionSessionSigs = async (
38+
export const getLitActionAuthContext = (
3939
devEnv: TinnyEnvironment,
4040
alice: TinnyPerson,
4141
resourceAbilityRequests?: LitResourceAbilityRequest[]
4242
) => {
4343
const centralisation =
4444
CENTRALISATION_BY_NETWORK[devEnv.litNodeClient.config.litNetwork];
4545

46-
if (centralisation === 'decentralised') {
47-
console.warn(
48-
'Decentralised network detected. Adding superCapacityDelegationAuthSig to eoaSessionSigs'
49-
);
50-
}
51-
5246
// Use default resourceAbilityRequests if not provided
5347
const _resourceAbilityRequests = resourceAbilityRequests || [
5448
{
@@ -61,41 +55,32 @@ export const getLitActionSessionSigs = async (
6155
},
6256
];
6357

64-
const litActionSessionSigs =
65-
await devEnv.litNodeClient.getLitActionSessionSigs({
66-
pkpPublicKey: alice.authMethodOwnedPkp.publicKey,
67-
authMethods: [alice.authMethod],
68-
resourceAbilityRequests: _resourceAbilityRequests,
69-
litActionCode: Buffer.from(VALID_SESSION_SIG_LIT_ACTION_CODE).toString(
70-
'base64'
71-
),
72-
jsParams: {
73-
publicKey: alice.authMethodOwnedPkp.publicKey,
74-
sigName: 'unified-auth-sig',
75-
},
76-
77-
...(centralisation === 'decentralised' && {
78-
capabilityAuthSigs: [devEnv.superCapacityDelegationAuthSig],
79-
}),
80-
});
58+
return devEnv.litNodeClient.getPkpAuthContext({
59+
pkpPublicKey: alice.authMethodOwnedPkp.publicKey,
60+
authMethods: [alice.authMethod],
61+
resourceAbilityRequests: _resourceAbilityRequests,
62+
litActionCode: Buffer.from(VALID_SESSION_SIG_LIT_ACTION_CODE).toString(
63+
'base64'
64+
),
65+
jsParams: {
66+
publicKey: alice.authMethodOwnedPkp.publicKey,
67+
sigName: 'unified-auth-sig',
68+
},
8169

82-
return litActionSessionSigs;
70+
...(centralisation === 'decentralised' && {
71+
capabilityAuthSigs: [devEnv.superCapacityDelegationAuthSig],
72+
}),
73+
});
8374
};
8475

85-
export const getLitActionSessionSigsUsingIpfsId = async (
76+
export const getLitActionAuthContextUsingIpfsId = (
8677
devEnv: TinnyEnvironment,
8778
alice: TinnyPerson,
8879
resourceAbilityRequests?: LitResourceAbilityRequest[]
8980
) => {
9081
const centralisation =
9182
CENTRALISATION_BY_NETWORK[devEnv.litNodeClient.config.litNetwork];
9283

93-
if (centralisation === 'decentralised') {
94-
console.warn(
95-
'Decentralised network detected. Adding superCapacityDelegationAuthSig to eoaSessionSigs'
96-
);
97-
}
98-
9984
// Use default resourceAbilityRequests if not provided
10085
const _resourceAbilityRequests = resourceAbilityRequests || [
10186
{
@@ -108,7 +93,7 @@ export const getLitActionSessionSigsUsingIpfsId = async (
10893
},
10994
];
11095

111-
const litActionSessionSigs = await devEnv.litNodeClient.getPkpSessionSigs({
96+
return devEnv.litNodeClient.getPkpAuthContext({
11297
pkpPublicKey: alice.authMethodOwnedPkp.publicKey,
11398
authMethods: [alice.authMethod],
11499
resourceAbilityRequests: _resourceAbilityRequests,
@@ -122,15 +107,13 @@ export const getLitActionSessionSigsUsingIpfsId = async (
122107
capabilityAuthSigs: [devEnv.superCapacityDelegationAuthSig],
123108
}),
124109
});
125-
126-
return litActionSessionSigs;
127110
};
128111

129-
export const getInvalidLitActionSessionSigs = async (
112+
export const getInvalidLitActionAuthContext = (
130113
devEnv: TinnyEnvironment,
131114
alice: TinnyPerson
132115
) => {
133-
const litActionSessionSigs = await devEnv.litNodeClient.getPkpSessionSigs({
116+
return devEnv.litNodeClient.getPkpAuthContext({
134117
pkpPublicKey: alice.authMethodOwnedPkp.publicKey,
135118
authMethods: [alice.authMethod],
136119
resourceAbilityRequests: [
@@ -153,15 +136,13 @@ export const getInvalidLitActionSessionSigs = async (
153136
],
154137
},
155138
});
156-
157-
return litActionSessionSigs;
158139
};
159140

160-
export const getInvalidLitActionIpfsSessionSigs = async (
141+
export const getInvalidLitActionIpfsAuthContext = (
161142
devEnv: TinnyEnvironment,
162143
alice: TinnyPerson
163144
) => {
164-
const litActionSessionSigs = await devEnv.litNodeClient.getPkpSessionSigs({
145+
return devEnv.litNodeClient.getPkpAuthContext({
165146
pkpPublicKey: alice.authMethodOwnedPkp.publicKey,
166147
authMethods: [alice.authMethod],
167148
resourceAbilityRequests: [
@@ -182,6 +163,4 @@ export const getInvalidLitActionIpfsSessionSigs = async (
182163
],
183164
},
184165
});
185-
186-
return litActionSessionSigs;
187166
};

‎local-tests/setup/session-sigs/get-pkp-session-sigs.ts‎

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
import { LitActionResource, LitPKPResource } from '@lit-protocol/auth-helpers';
2-
import { LitResourceAbilityRequest } from '@lit-protocol/types';
2+
import {
3+
type AuthenticationContext,
4+
LitResourceAbilityRequest,
5+
} from '@lit-protocol/types';
36
import { log } from '@lit-protocol/misc';
47
import {
58
LIT_ABILITY,
@@ -8,21 +11,15 @@ import {
811
import { TinnyEnvironment } from '../tinny-environment';
912
import { TinnyPerson } from '../tinny-person';
1013

11-
export const getPkpSessionSigs = async (
14+
export const getPkpAuthContext = (
1215
devEnv: TinnyEnvironment,
1316
alice: TinnyPerson,
1417
resourceAbilityRequests?: LitResourceAbilityRequest[],
1518
expiration?: string
16-
) => {
19+
): AuthenticationContext => {
1720
const centralisation =
1821
CENTRALISATION_BY_NETWORK[devEnv.litNodeClient.config.litNetwork];
1922

20-
if (centralisation === 'decentralised') {
21-
console.warn(
22-
'Decentralised network detected. Adding superCapacityDelegationAuthSig to eoaSessionSigs'
23-
);
24-
}
25-
2623
// Use default resourceAbilityRequests if not provided
2724
const _resourceAbilityRequests = resourceAbilityRequests || [
2825
{
@@ -35,7 +32,7 @@ export const getPkpSessionSigs = async (
3532
},
3633
];
3734

38-
const pkpSessionSigs = await devEnv.litNodeClient.getPkpSessionSigs({
35+
const authContext = devEnv.litNodeClient.getPkpAuthContext({
3936
pkpPublicKey: alice.authMethodOwnedPkp.publicKey,
4037
authMethods: [alice.authMethod],
4138
expiration,
@@ -46,7 +43,7 @@ export const getPkpSessionSigs = async (
4643
}),
4744
});
4845

49-
log('[getPkpSessionSigs]: ', pkpSessionSigs);
46+
log('[getPkpAuthContext]: ', authContext);
5047

51-
return pkpSessionSigs;
48+
return authContext;
5249
};

‎local-tests/setup/shiva-client.d.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ type ContractAbis = {
1010
pkpHelper: string;
1111
contractResolver: string;
1212
paymentDelegation: string;
13+
priceFeed: string;
1314
};
1415

1516
type ContractAddresses = {
@@ -23,6 +24,7 @@ type ContractAddresses = {
2324
contractResolver: string;
2425
keyDeriver: string;
2526
paymentDelegation: string;
27+
priceFeed: string;
2628
};
2729

2830
type TestNetCreateRequest = {

‎local-tests/setup/shiva-client.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,9 @@ export class TestnetClient {
117117
},
118118
PKPNFTMetadata: {},
119119
PubkeyRouter: {},
120-
PriceFeed: {},
120+
PriceFeed: {
121+
abi: JSON.parse(testNetConfig.contractAbis.priceFeed),
122+
},
121123
},
122124
};
123125
return networkContext;

‎local-tests/setup/tinny-config.ts‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,12 @@ export interface ProcessEnvs {
9090
* this value will be ignored
9191
*/
9292
NETWORK_CONFIG: string;
93+
94+
/**
95+
* Max prices to be sent to nodes -- an array of strings that will be parsed as bigints
96+
* in order of PRODUCT_ID's values -- DECRYPTION, SIGN, LIT_ACTION
97+
*/
98+
DEFAULT_MAX_PRICES: bigint[];
9399
}
94100

95101
/**

0 commit comments

Comments
 (0)