Skip to content

Commit b56419d

Browse files
FedericoAmuraFedericoAmura
committed
Merge branch 'refs/heads/staging/v7' into feature/lit-3796-js-sdk-research-to-use-zod
# Conflicts: # typedoc.json # yarn.lock
2 parents c9bf970 + f702464 commit b56419d

File tree

33 files changed

+1877
-1547
lines changed

33 files changed

+1877
-1547
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
fetch-depth: 0
5757
repository: LIT-Protocol/lit-assets
5858
ref: ${{env.DATIL_COMMIT_HASH}}
59-
token: ${{secrets.GH_PAT}}
59+
token: ${{secrets.GH_PAT_FOR_SHIVA}}
6060
path: ${{ github.workspace }}/lit-assets/
6161
submodules: false
6262
sparse-checkout: |
@@ -69,13 +69,13 @@ jobs:
6969
working-directory: ${{github.workspace}}/lit-assets/blockchain/contracts
7070
- name: Docker login
7171
id: login
72-
run: docker login ghcr.io/ -u ${{secrets.GH_USER}} --password ${{secrets.GH_PAT}}
72+
run: docker login ghcr.io/ -u ${{ github.actor }} --password ${{secrets.GH_PAT_FOR_SHIVA}}
7373
- name: Pull Shiva Container
7474
id: shiva-pull
7575
run: docker pull ghcr.io/lit-protocol/shiva:latest
7676
- name: Run Shiva Container
7777
id: shiva-runner
78-
run: docker run -d -m 32g -p 8000:8000 -p 8545:8545 -p 7470:7470 -p 7471:7471 -p 7472:7472 -p 7473:7473 -p 7474:7474 -p 7475:7475 -v ${{github.workspace}}/lit-assets:/data -e GH_PAT=${{secrets.GH_PAT}} -e HASH=$DATIL_COMMIT_HASH -e IPFS_API_KEY=${{secrets.IPFS_API_KEY}} --name shiva ghcr.io/lit-protocol/shiva:latest
78+
run: docker run -d -m 32g -p 8000:8000 -p 8545:8545 -p 7470:7470 -p 7471:7471 -p 7472:7472 -p 7473:7473 -p 7474:7474 -p 7475:7475 -v ${{github.workspace}}/lit-assets:/data -e GH_PAT=${{secrets.GH_PAT_FOR_SHIVA}} -e HASH=$DATIL_COMMIT_HASH -e IPFS_API_KEY=${{secrets.IPFS_API_KEY}} --name shiva ghcr.io/lit-protocol/shiva:latest
7979
- name: Set up Node.js
8080
uses: actions/setup-node@v3
8181
with:

‎README.md‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div align="center">
2-
<h1>Lit Protocol Javascript/Typescript SDK V6.5.x</h1>
2+
<h1>Lit Protocol Javascript/Typescript SDK V7.x.x</h1>
33

44
<img src="https://i.ibb.co/p2xfzK1/Screenshot-2022-11-15-at-09-56-57.png">
55
<br/>
@@ -86,11 +86,12 @@ If you're a tech-savvy user and wish to utilize only specific submodules that ou
8686

8787
## API Doc
8888

89-
| Version | Link |
90-
| ---------------- | -------------------------------------------------------- |
91-
| V6 (Beta) | [6.x.x docs](https://v6-api-doc-lit-js-sdk.vercel.app/) |
92-
| V5 (**Current**) | [5.x.x docs](https://v3.api-docs.getlit.dev/) |
93-
| V2 | [2.x.x docs](http://docs.lit-js-sdk-v2.litprotocol.com/) |
89+
| Version | Link |
90+
| ------------ | -------------------------------------------------------- |
91+
| V7 (Current) | [7.x.x docs](https://v7-api-doc-lit-js-sdk.vercel.app/) |
92+
| V6 | [6.x.x docs](https://v6-api-doc-lit-js-sdk.vercel.app/) |
93+
| V5 | [5.x.x docs](https://v3.api-docs.getlit.dev/) |
94+
| V2 | [2.x.x docs](http://docs.lit-js-sdk-v2.litprotocol.com/) |
9495

9596
</div>
9697

‎doc.css‎

Lines changed: 310 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,310 @@
1+
/* Base styles */
2+
:root {
3+
/* Colors */
4+
--background-color: hsl(0, 0%, 100%);
5+
--foreground-color: hsl(222.2, 84%, 4.9%);
6+
7+
--card-bg: hsl(0, 0%, 100%);
8+
--card-color: hsl(222.2, 84%, 4.9%);
9+
10+
--primary-color: hsl(221.2, 83.2%, 53.3%);
11+
--primary-foreground: hsl(210, 40%, 98%);
12+
13+
--secondary-color: hsl(222, 47.4%, 34.7%);
14+
--secondary-foreground: hsl(210, 40%, 98%);
15+
16+
--muted-color: hsl(210, 40%, 96.1%);
17+
--muted-foreground: hsl(215.4, 16.3%, 46.9%);
18+
19+
--accent-color: hsl(210, 40%, 96.1%);
20+
--accent-foreground: hsl(222.2, 47.4%, 11.2%);
21+
22+
--destructive-color: hsl(0, 84.2%, 60.2%);
23+
--destructive-foreground: hsl(210, 40%, 98%);
24+
25+
--border-color: hsl(214.3, 31.8%, 91.4%);
26+
--input-color: hsl(214.3, 31.8%, 91.4%);
27+
--ring-color: hsl(221.2, 83.2%, 53.3%);
28+
29+
/* Spacing & Sizing */
30+
--radius: 0.5rem;
31+
--spacing-1: 0.25rem;
32+
--spacing-2: 0.5rem;
33+
--spacing-3: 0.75rem;
34+
--spacing-4: 1rem;
35+
--spacing-6: 1.5rem;
36+
}
37+
38+
/* Dark mode */
39+
@media (prefers-color-scheme: dark) {
40+
:root {
41+
--background-color: hsl(222.2, 84%, 4.9%);
42+
--foreground-color: hsl(210, 40%, 98%);
43+
44+
--card-bg: hsl(222.2, 84%, 4.9%);
45+
--card-color: hsl(210, 40%, 98%);
46+
47+
--primary-color: hsl(217.2, 91.2%, 59.8%);
48+
--primary-foreground: hsl(222.2, 47.4%, 11.2%);
49+
50+
--secondary-color: hsl(217.2, 32.6%, 17.5%);
51+
--secondary-foreground: hsl(210, 40%, 98%);
52+
53+
--muted-color: hsl(217.2, 32.6%, 17.5%);
54+
--muted-foreground: hsl(215, 20.2%, 65.1%);
55+
56+
--accent-color: hsl(217.2, 32.6%, 17.5%);
57+
--accent-foreground: hsl(210, 40%, 98%);
58+
59+
--destructive-color: hsl(0, 62.8%, 30.6%);
60+
--destructive-foreground: hsl(210, 40%, 98%);
61+
62+
--border-color: hsl(217.2, 32.6%, 17.5%);
63+
--input-color: hsl(217.2, 32.6%, 17.5%);
64+
--ring-color: hsl(224.3, 76.3%, 48%);
65+
}
66+
}
67+
68+
/* Base elements */
69+
* {
70+
margin: 0;
71+
padding: 0;
72+
box-sizing: border-box;
73+
border-color: var(--border-color);
74+
}
75+
76+
body {
77+
background-color: var(--background-color);
78+
color: var(--foreground-color);
79+
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto,
80+
'Helvetica Neue', Arial, sans-serif;
81+
line-height: 1.6;
82+
-webkit-font-smoothing: antialiased;
83+
-moz-osx-font-smoothing: grayscale;
84+
font-feature-settings: 'rlig' 1, 'calt' 1;
85+
}
86+
87+
/* Typography */
88+
h1,
89+
h2,
90+
h3,
91+
h4,
92+
h5,
93+
h6 {
94+
letter-spacing: -0.025em;
95+
font-weight: 700;
96+
line-height: 1.2;
97+
}
98+
99+
h1 {
100+
font-size: 2.5rem;
101+
}
102+
103+
h2 {
104+
font-size: 2rem;
105+
}
106+
107+
h3 {
108+
font-size: 1.75rem;
109+
}
110+
111+
h4 {
112+
font-size: 1.5rem;
113+
}
114+
115+
p {
116+
line-height: 1.75;
117+
margin-top: 1.5rem;
118+
}
119+
120+
p:first-child {
121+
margin-top: 0;
122+
}
123+
124+
/* Block elements */
125+
blockquote {
126+
margin-top: 1.5rem;
127+
border-left: 4px solid var(--primary-color);
128+
padding-left: 1.5rem;
129+
font-style: italic;
130+
}
131+
132+
code {
133+
position: relative;
134+
border-radius: var(--radius);
135+
background-color: var(--muted-color);
136+
padding: 0.2rem 0.3rem;
137+
font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, monospace;
138+
font-size: 0.875rem;
139+
}
140+
141+
pre {
142+
margin: 1.5rem 0 1rem 0;
143+
padding: 1rem;
144+
overflow-x: auto;
145+
border-radius: var(--radius);
146+
border: 1px solid var(--border-color);
147+
background-color: var(--muted-color);
148+
}
149+
150+
pre code {
151+
background-color: transparent;
152+
padding: 0;
153+
}
154+
155+
/* Tables */
156+
table {
157+
width: 100%;
158+
border-collapse: collapse;
159+
}
160+
161+
tr {
162+
margin: 0;
163+
border-top: 1px solid var(--border-color);
164+
padding: 0;
165+
}
166+
167+
th,
168+
td {
169+
border: 1px solid var(--border-color);
170+
padding: 0.5rem 1rem;
171+
text-align: left;
172+
}
173+
174+
th[align='center'],
175+
td[align='center'] {
176+
text-align: center;
177+
}
178+
179+
th[align='right'],
180+
td[align='right'] {
181+
text-align: right;
182+
}
183+
184+
/* Lists */
185+
ul,
186+
ol {
187+
margin: 1.5rem 0;
188+
padding-left: 1.5rem;
189+
}
190+
191+
ul {
192+
list-style-type: disc;
193+
}
194+
195+
ol {
196+
list-style-type: decimal;
197+
}
198+
199+
li {
200+
margin-top: 0.5rem;
201+
}
202+
203+
/* Interactive elements */
204+
details {
205+
border-radius: var(--radius);
206+
border: 1px solid var(--border-color);
207+
padding: 1rem;
208+
}
209+
210+
summary {
211+
cursor: pointer;
212+
font-weight: 600;
213+
}
214+
215+
summary:hover {
216+
color: var(--primary-color);
217+
}
218+
219+
/* Media elements */
220+
img {
221+
max-width: 100%;
222+
height: auto;
223+
border-radius: var(--radius);
224+
}
225+
226+
/* Scrollbar */
227+
::-webkit-scrollbar {
228+
width: 0.5rem;
229+
}
230+
231+
::-webkit-scrollbar-track {
232+
background-color: var(--muted-color);
233+
}
234+
235+
::-webkit-scrollbar-thumb {
236+
border-radius: 9999px;
237+
background-color: color-mix(
238+
in srgb,
239+
var(--muted-foreground) 50%,
240+
transparent
241+
);
242+
}
243+
244+
::-webkit-scrollbar-thumb:hover {
245+
background-color: var(--muted-foreground);
246+
}
247+
248+
/* Selection */
249+
::selection {
250+
background-color: color-mix(in srgb, var(--primary-color) 20%, transparent);
251+
color: var(--foreground-color);
252+
}
253+
254+
/* Focus */
255+
:focus-visible {
256+
outline: none;
257+
box-shadow: 0 0 0 2px var(--background-color), 0 0 0 4px var(--ring-color);
258+
}
259+
260+
/* Animations */
261+
@keyframes enter {
262+
from {
263+
opacity: 0;
264+
}
265+
to {
266+
opacity: 1;
267+
}
268+
}
269+
270+
@keyframes exit {
271+
from {
272+
opacity: 1;
273+
}
274+
to {
275+
opacity: 0;
276+
}
277+
}
278+
279+
.animate-in {
280+
animation: enter 0.2s ease-out;
281+
}
282+
283+
.animate-out {
284+
animation: exit 0.2s ease-in;
285+
}
286+
287+
/* Responsive Design */
288+
@media (min-width: 768px) {
289+
h1 {
290+
font-size: 3rem;
291+
}
292+
293+
h2 {
294+
font-size: 2.5rem;
295+
}
296+
297+
h3 {
298+
font-size: 2rem;
299+
}
300+
301+
h4 {
302+
font-size: 1.75rem;
303+
}
304+
}
305+
.tsd-page-title {
306+
display: none;
307+
}
308+
.col-content {
309+
margin-left: 16px;
310+
}

‎local-tests/tests/wrapped-keys/testGenerateEthereumWrappedKey.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ export const testGenerateEthereumWrappedKey = async (
2424
alice,
2525
null,
2626
new Date(Date.now() + 1000 * 60 * 10).toISOString()
27-
); // 10 mins expiry
27+
);
2828

2929
const { pkpAddress, generatedPublicKey, id } = await generatePrivateKey({
3030
pkpSessionSigs,

‎package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@
122122
"prettier": "^2.6.2",
123123
"ts-jest": "29.2.5",
124124
"typedoc": "^0.26.6",
125+
"typedoc-theme-hierarchy": "^5.0.0",
125126
"typescript": "5.5.4"
126127
},
127128
"workspaces": [

‎packages/access-control-conditions/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@
2424
"version": "7.0.0-alpha.9",
2525
"main": "./dist/src/index.js",
2626
"typings": "./dist/src/index.d.ts"
27-
}
27+
}

‎packages/auth-browser/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,4 @@
3333
"version": "7.0.0-alpha.9",
3434
"main": "./dist/src/index.js",
3535
"typings": "./dist/src/index.d.ts"
36-
}
36+
}

‎packages/auth-helpers/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,4 @@
2828
"version": "7.0.0-alpha.9",
2929
"main": "./dist/src/index.js",
3030
"typings": "./dist/src/index.d.ts"
31-
}
31+
}

0 commit comments

Comments
 (0)