From 9771889277669a34fe404fd3522e8ec654bbbf33 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 27 Sep 2024 17:20:36 +0000 Subject: [PATCH 1/4] build(deps): bump rollup from 2.79.1 to 2.79.2 Bumps [rollup](https://github.com/rollup/rollup) from 2.79.1 to 2.79.2. - [Release notes](https://github.com/rollup/rollup/releases) - [Changelog](https://github.com/rollup/rollup/blob/master/CHANGELOG.md) - [Commits](https://github.com/rollup/rollup/compare/v2.79.1...v2.79.2) --- updated-dependencies: - dependency-name: rollup dependency-type: indirect ... Signed-off-by: dependabot[bot] --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 1aec1fd6f..040275e3a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -16520,9 +16520,9 @@ rollup-plugin-terser@^7.0.0: terser "^5.0.0" rollup@^2.43.1: - version "2.79.1" - resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.79.1.tgz#bedee8faef7c9f93a2647ac0108748f497f081c7" - integrity sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw== + version "2.79.2" + resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.79.2.tgz#f150e4a5db4b121a21a747d762f701e5e9f49090" + integrity sha512-fS6iqSPZDs3dr/y7Od6y5nha8dW1YnbgtsyotCVvoFGKbERG++CVRFv1meyGDE1SNItQA8BrnCw7ScdAhRJ3XQ== optionalDependencies: fsevents "~2.3.2" From 1a7013e6e68d68fccc2a5d224521ad93a10f6476 Mon Sep 17 00:00:00 2001 From: Keith Date: Tue, 1 Oct 2024 20:34:05 +0000 Subject: [PATCH 2/4] fix: fix typo --- src/pages/Address/Cells.tsx | 4 ++-- src/pages/Address/InvalidRGBPPAssetList.tsx | 4 ++-- src/pages/Address/RgbppAssets.tsx | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/pages/Address/Cells.tsx b/src/pages/Address/Cells.tsx index 5cdb8d8c5..4d632beaa 100644 --- a/src/pages/Address/Cells.tsx +++ b/src/pages/Address/Cells.tsx @@ -9,7 +9,7 @@ import SUDTTokenIcon from '../../assets/sudt_token.png' import CKBTokenIcon from './ckb_token_icon.png' import { ReactComponent as TypeHashIcon } from './type_script.svg' import { ReactComponent as DataIcon } from './data.svg' -import { ReactComponent as SporeCluterIcon } from './spore_cluster.svg' +import { ReactComponent as SporeClusterIcon } from './spore_cluster.svg' import { ReactComponent as SporeCellIcon } from './spore_cell.svg' import { ReactComponent as SortIcon } from '../../assets/sort_icon.svg' import { ReactComponent as TimeDownIcon } from '../../assets/time_down.svg' @@ -182,7 +182,7 @@ const getCellDetails = (cell: LiveCell, t: TFunction) => { break } case 'spore_cluster': { - icon = + icon = assetName = 'Spore Cluster' assetTypeText = 'NFT' if (cell.data.length > ATTRIBUTE_LENGTH) { diff --git a/src/pages/Address/InvalidRGBPPAssetList.tsx b/src/pages/Address/InvalidRGBPPAssetList.tsx index feecc341b..b28677d5a 100644 --- a/src/pages/Address/InvalidRGBPPAssetList.tsx +++ b/src/pages/Address/InvalidRGBPPAssetList.tsx @@ -8,7 +8,7 @@ import CKBTokenIcon from './ckb_token_icon.png' import { ReactComponent as CopyIcon } from './copy.svg' import { ReactComponent as TypeHashIcon } from './type_script.svg' import { ReactComponent as DataIcon } from './data.svg' -import { ReactComponent as SporeCluterIcon } from './spore_cluster.svg' +import { ReactComponent as SporeClusterIcon } from './spore_cluster.svg' import { ReactComponent as SporeCellIcon } from './spore_cell.svg' import SmallLoading from '../../components/Loading/SmallLoading' import { parseUDTAmount } from '../../utils/number' @@ -140,7 +140,7 @@ const getCellDetails = (cell: LiveCell, t: TFunction) => { break } case 'spore_cluster': { - icon = + icon = assetName = 'Spore Cluster' if (cell.data.length > ATTRIBUTE_LENGTH) { attribute = `${cell.data.slice(0, ATTRIBUTE_LENGTH)}...` diff --git a/src/pages/Address/RgbppAssets.tsx b/src/pages/Address/RgbppAssets.tsx index 46248a4d7..193cf5331 100644 --- a/src/pages/Address/RgbppAssets.tsx +++ b/src/pages/Address/RgbppAssets.tsx @@ -11,7 +11,7 @@ import CKBTokenIcon from './ckb_token_icon.png' import { ReactComponent as CopyIcon } from './copy.svg' import { ReactComponent as TypeHashIcon } from './type_script.svg' import { ReactComponent as DataIcon } from './data.svg' -import { ReactComponent as SporeCluterIcon } from './spore_cluster.svg' +import { ReactComponent as SporeClusterIcon } from './spore_cluster.svg' import { ReactComponent as SporeCellIcon } from './spore_cell.svg' import { ReactComponent as RedirectIcon } from '../../assets/redirect-icon.svg' import { ReactComponent as AlertIcon } from '../../assets/alert-icon.svg' @@ -177,7 +177,7 @@ const getCellDetails = (cell: LiveCell, t: TFunction) => { break } case 'spore_cluster': { - icon = + icon = assetName = 'Spore Cluster' if (cell.data.length > ATTRIBUTE_LENGTH) { attribute = `${cell.data.slice(0, ATTRIBUTE_LENGTH)}...` From e414b09a3909859aa8a8a764c9b92f72cef6b8b9 Mon Sep 17 00:00:00 2001 From: Chen Yu Date: Wed, 2 Oct 2024 06:29:58 +0900 Subject: [PATCH 3/4] feat: add script info of ickb (#1788) Co-authored-by: phroi <90913182+phroi@users.noreply.github.com> --- src/constants/scripts.ts | 42 ++++++++++++++++++++++++++++++++++ src/pages/ScriptList/index.tsx | 29 +++++++++++++++++++++++ 2 files changed, 71 insertions(+) diff --git a/src/constants/scripts.ts b/src/constants/scripts.ts index d2f38c539..0c1fc1d3a 100644 --- a/src/constants/scripts.ts +++ b/src/constants/scripts.ts @@ -338,6 +338,27 @@ export const MainnetContractHashTags: ContractHashTag[] = [ tag: 'Single Use Lock', category: 'lock', }, + { + codeHashes: ['0x2a8100ab5990fa055ab1b50891702e1e895c7bd1df6322cd725c1a6115873bd3'], + txHashes: ['0x621a6f38de3b9f453016780edac3b26bfcbfa3e2ecb47c2da275471a5d3ed165-0'], + depType: 'dep_group', + hashType: 'data1', + tag: 'iCKB Logic', + }, + { + codeHashes: ['0xacc79e07d107831feef4c70c9e683dac5644d5993b9cb106dca6e74baa381bd0'], + txHashes: ['0x621a6f38de3b9f453016780edac3b26bfcbfa3e2ecb47c2da275471a5d3ed165-0'], + depType: 'dep_group', + hashType: 'data1', + tag: 'WR Owned-Owner', + }, + { + codeHashes: ['0x49dfb6afee5cc8ac4225aeea8cb8928b150caf3cd92fea33750683c74b13254a'], + txHashes: ['0x621a6f38de3b9f453016780edac3b26bfcbfa3e2ecb47c2da275471a5d3ed165-0'], + depType: 'dep_group', + hashType: 'data1', + tag: 'UDT Limit Order', + }, ] export const TestnetContractHashTags: ContractHashTag[] = [ @@ -728,6 +749,27 @@ export const TestnetContractHashTags: ContractHashTag[] = [ tag: 'Single Use Lock', category: 'lock', }, + { + codeHashes: ['0x2a8100ab5990fa055ab1b50891702e1e895c7bd1df6322cd725c1a6115873bd3'], + txHashes: ['0xf7ece4fb33d8378344cab11fcd6a4c6f382fd4207ac921cf5821f30712dcd311-0'], + depType: 'dep_group', + hashType: 'data1', + tag: 'iCKB Logic', + }, + { + codeHashes: ['0xacc79e07d107831feef4c70c9e683dac5644d5993b9cb106dca6e74baa381bd0'], + txHashes: ['0xf7ece4fb33d8378344cab11fcd6a4c6f382fd4207ac921cf5821f30712dcd311-0'], + depType: 'dep_group', + hashType: 'data1', + tag: 'WR Owned-Owner', + }, + { + codeHashes: ['0x49dfb6afee5cc8ac4225aeea8cb8928b150caf3cd92fea33750683c74b13254a'], + txHashes: ['0xf7ece4fb33d8378344cab11fcd6a4c6f382fd4207ac921cf5821f30712dcd311-0'], + depType: 'dep_group', + hashType: 'data1', + tag: 'UDT Limit Order', + }, ] const getLumosScripts = (scripts: ContractHashTag[]): ScriptConfigs => diff --git a/src/pages/ScriptList/index.tsx b/src/pages/ScriptList/index.tsx index 4bbdc6a5d..7dd4a3f6f 100644 --- a/src/pages/ScriptList/index.tsx +++ b/src/pages/ScriptList/index.tsx @@ -277,6 +277,35 @@ export const scripts = new Map([ code: 'https://github.com/ckb-ecofund/ckb-proxy-locks', }, ], + [ + 'iCKB Logic', + { + name: 'iCKB Logic', + description: 'iCKB Logic tokenizes NervosDAO deposits into the iCKB xUDT token.', + rfc: 'https://github.com/ickb/proposal', + code: 'https://github.com/ickb/v1-core/tree/454cfa966052a621c4e8b67001718c29ee8191a2/scripts/contracts/ickb_logic', + website: 'https://ickb.org/', + }, + ], + [ + 'WR Owned-Owner', + { + name: 'WR Owned-Owner', + description: + 'WR Owned-Owner enable to create Withdrawals Request from NervosDAO deposits locked with zero length args locks, developed as part of iCKB.', + rfc: 'https://github.com/ickb/proposal#owned-owner-script', + code: 'https://github.com/ickb/v1-core/tree/454cfa966052a621c4e8b67001718c29ee8191a2/scripts/contracts/owned_owner', + }, + ], + [ + 'UDT Limit Order', + { + name: 'UDT Limit Order', + description: 'UDT Limit Order is a general purpose UDT based Limit Order, developed as part of iCKB.', + rfc: 'https://github.com/ickb/proposal#limit-order-script', + code: 'https://github.com/ickb/v1-core/tree/454cfa966052a621c4e8b67001718c29ee8191a2/scripts/contracts/limit_order', + }, + ], ]) const keysWithLinkValueInScript: (keyof ScriptAttributes)[] = ['rfc', 'code', 'doc', 'deprecated', 'website'] From e14c6a1c5439a441012931ed5cc42d312c773bf5 Mon Sep 17 00:00:00 2001 From: Keith Date: Fri, 11 Oct 2024 17:26:27 +0900 Subject: [PATCH 4/4] fix: fix link style of btc tx --- src/pages/RGBPP/TransactionList/List/item.tsx | 12 +++++++----- .../RGBPP/TransactionList/List/styles.module.scss | 4 ++++ 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/pages/RGBPP/TransactionList/List/item.tsx b/src/pages/RGBPP/TransactionList/List/item.tsx index d59a41d39..88f08468e 100644 --- a/src/pages/RGBPP/TransactionList/List/item.tsx +++ b/src/pages/RGBPP/TransactionList/List/item.tsx @@ -77,11 +77,13 @@ const Item = ({ item }: { item: Transaction }) => { style={{ display: 'flex', alignItems: 'center', justifyContent: 'flex-end', gap: 8 }} title={t('rgbpp.transaction.view_on_bitcoin_explorer')} > - - - {item.btcTxId} - - +
+ + + {item.btcTxId} + + +
diff --git a/src/pages/RGBPP/TransactionList/List/styles.module.scss b/src/pages/RGBPP/TransactionList/List/styles.module.scss index 01e775f5f..81d4ba91e 100644 --- a/src/pages/RGBPP/TransactionList/List/styles.module.scss +++ b/src/pages/RGBPP/TransactionList/List/styles.module.scss @@ -19,6 +19,10 @@ } } + .btcTx { + overflow: hidden; + } + .split { width: 100%; background-color: #f5f5f5;