Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge develop into testnet #1379

Merged
merged 15 commits into from
Nov 10, 2023
Merged

Merge develop into testnet #1379

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
a619d1f
Merge pull request #1359 from nervosnetwork/testnet
Keith-CY Oct 23, 2023
80724d5
Merge pull request #1361 from nervosnetwork/testnet
Keith-CY Oct 24, 2023
e2f2388
Merge pull request #1364 from nervosnetwork/testnet
Keith-CY Oct 27, 2023
63b6ba9
chore: add joy_id in en.json
Keith-CY Oct 27, 2023
d5107db
chore: add joy_id in sh.json
Keith-CY Oct 27, 2023
5a0f212
chore: update joy id tag name
Keith-CY Oct 27, 2023
f377c24
chore: rename joy_id to joy id (#1366)
Keith-CY Oct 27, 2023
a5f7dc2
chore: rename Joy ID to JoyID
Keith-CY Oct 27, 2023
a47a95d
Rename joy id to joyid (#1367)
Keith-CY Oct 27, 2023
64bc7e8
Merge pull request #1370 from nervosnetwork/testnet
Keith-CY Nov 2, 2023
a39ea4f
Merge pull request #1372 from nervosnetwork/testnet
Keith-CY Nov 3, 2023
2675007
Merge pull request #1375 from nervosnetwork/testnet
Keith-CY Nov 7, 2023
eccbbfb
Merge pull request #1377 from nervosnetwork/testnet
Keith-CY Nov 7, 2023
984c024
feat: add JoyID testnet (#141)
Keith-CY Nov 8, 2023
01495d0
feat: hide script item from list if its deployment info is not set (#…
Keith-CY Nov 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions src/constants/scripts.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -489,4 +489,12 @@ export const TestnetContractHashTags: ContractHashTag[] = [
tag: 'omni_lock v2',
category: 'lock',
},
{
codeHashes: ['0xd23761b364210735c19c60561d213fb3beae2fd6172743719eff6920e020baac'],
txHashes: ['0x4dcf3f3b09efac8995d6cbee87c5345e812d310094651e0c3d9a730f32dc9263-0'],
depType: 'dep_group',
hashType: 'type',
tag: 'JoyID',
category: 'lock',
},
]
35 changes: 16 additions & 19 deletions src/pages/ScriptList/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,7 @@ const ScriptList: FC = () => {
<div className={styles.container}>
{[...scripts].map(([label, meta]) => {
const script = scriptDataList.find(s => s.tag === label)
if (!script) return null
return (
<details key={label} id={label} open={label === defaultOpenLabel}>
<summary data-deprecated={!!meta.deprecated} title={meta.deprecated ? 'Deprecated' : undefined}>
Expand All @@ -226,22 +227,19 @@ const ScriptList: FC = () => {
</a>
) : null,
)}
{script ? (
<a
href={`/script/${script.codeHashes[0]}/${script.hashType}`}
target="_blank"
rel="noopener noreferrer"
>
{t('script_list.link.detail')}
</a>
) : null}
<a
href={`/script/${script.codeHashes[0]}/${script.hashType}`}
target="_blank"
rel="noopener noreferrer"
>
{t('script_list.link.detail')}
</a>
</div>
{script ? (
<>
<h3>{`${t(`script_list.on_chain_data`)}:`}</h3>
{script.codeHashes.map((codeHash: string, idx: number) => (
<pre key={codeHash}>
{`{
<>
<h3>{`${t(`script_list.on_chain_data`)}:`}</h3>
{script.codeHashes.map((codeHash: string, idx: number) => (
<pre key={codeHash}>
{`{
"code_hash": "${codeHash}",
"hash_type": "${script.hashType}",
"out_point": {
Expand All @@ -250,10 +248,9 @@ const ScriptList: FC = () => {
},
"dep_type": "${script.depType}"
}`}
</pre>
))}
</>
) : null}
</pre>
))}
</>
</div>
</details>
)
Expand Down