From cf175de3cfd99bef341ae84bbdb648aa01193936 Mon Sep 17 00:00:00 2001 From: JCNoguera <88061365+VmMad@users.noreply.github.com> Date: Mon, 23 Sep 2024 13:03:42 +0200 Subject: [PATCH 01/11] fix(apps-ui-kit): text overflowing tooltip (#2737) * fix: tooltip overflowing text * fix: words overflow in DisplayStats * fix: make tooltip take the max width if possible --- apps/ui-kit/src/lib/components/atoms/tooltip/Tooltip.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/ui-kit/src/lib/components/atoms/tooltip/Tooltip.tsx b/apps/ui-kit/src/lib/components/atoms/tooltip/Tooltip.tsx index db0e6d878ed..467aa94d316 100644 --- a/apps/ui-kit/src/lib/components/atoms/tooltip/Tooltip.tsx +++ b/apps/ui-kit/src/lib/components/atoms/tooltip/Tooltip.tsx @@ -22,12 +22,12 @@ export function Tooltip({ {children} ); From 1c21f106b3e416c049f702bfd334b54eeb4421d0 Mon Sep 17 00:00:00 2001 From: JCNoguera <88061365+VmMad@users.noreply.github.com> Date: Mon, 23 Sep 2024 13:09:18 +0200 Subject: [PATCH 02/11] feat(explorer): rebrand validators page table (#2428) * feat(explorer): rebrand validators page table * feat(explorer): Epoch page. Validators. Cherry picked. Signed-off-by: Eugene Panteleymonchuk * feat(explorer): Epoch page. Validators. Merge with another PR. Signed-off-by: Eugene Panteleymonchuk * feat(explorer): Epoch page. Validators. Merge with another PR. Signed-off-by: Eugene Panteleymonchuk * feat(explorer): Epoch page. Validators. Merge with another PR. Improve TopValidatorsCard. Signed-off-by: Eugene Panteleymonchuk * feat(explorer): Epoch page. Validators. Remove isRenderCell meta. Signed-off-by: Eugene Panteleymonchuk * feat(explorer): Epoch page. Validators. Remove unused file. Signed-off-by: Eugene Panteleymonchuk * fix: update imports * feat(explorer): Epoch page. Validators. PR updates. Signed-off-by: Eugene Panteleymonchuk * feat(explorer): Epoch page. Validators. Change default tab. Signed-off-by: Eugene Panteleymonchuk * fix: update table to not have duplicated `` * fix: validators accent color * fix: remove unnecessary number in epoch validator table * fix: replace import path * feat: improve validators table * fix: add missing number column --------- Signed-off-by: Eugene Panteleymonchuk Co-authored-by: Eugene Panteleymonchuk --- .../top-validators-card/StakeColumn.tsx | 19 ++++---- .../utils/generateValidatorsTableColumns.tsx | 47 +++++++++++++++++-- .../src/pages/validators/Validators.tsx | 12 +++++ .../molecules/table-cell/TableCell.tsx | 4 -- 4 files changed, 63 insertions(+), 19 deletions(-) diff --git a/apps/explorer/src/components/top-validators-card/StakeColumn.tsx b/apps/explorer/src/components/top-validators-card/StakeColumn.tsx index 486f11af235..1da7d3bc7a4 100644 --- a/apps/explorer/src/components/top-validators-card/StakeColumn.tsx +++ b/apps/explorer/src/components/top-validators-card/StakeColumn.tsx @@ -2,9 +2,9 @@ // Modifications Copyright (c) 2024 IOTA Stiftung // SPDX-License-Identifier: Apache-2.0 +import { TableCellText } from '@iota/apps-ui-kit'; import { useFormatCoin, CoinFormat, formatBalance } from '@iota/core'; import { IOTA_TYPE_ARG } from '@iota/iota-sdk/utils'; -import { Text } from '@iota/ui'; type StakeColumnProps = { stake: bigint | number | string; @@ -19,16 +19,13 @@ export function StakeColumn({ }: StakeColumnProps): JSX.Element { const coinFormat = hideCoinSymbol ? CoinFormat.FULL : CoinFormat.ROUNDED; const [amount, symbol] = useFormatCoin(stake, IOTA_TYPE_ARG, coinFormat); + + const label = inNano ? formatBalance(stake, 0, coinFormat) : amount; + const supportingLabel = inNano ? 'nano' : symbol; + return ( -
- - {inNano ? formatBalance(stake, 0, coinFormat) : amount} - - {!hideCoinSymbol && ( - - {inNano ? 'nano' : symbol} - - )} -
+ + {label} + ); } diff --git a/apps/explorer/src/lib/ui/utils/generateValidatorsTableColumns.tsx b/apps/explorer/src/lib/ui/utils/generateValidatorsTableColumns.tsx index 6875e772638..e175ba717d1 100644 --- a/apps/explorer/src/lib/ui/utils/generateValidatorsTableColumns.tsx +++ b/apps/explorer/src/lib/ui/utils/generateValidatorsTableColumns.tsx @@ -8,6 +8,7 @@ import { type ApyByValidator, formatPercentageDisplay } from '@iota/core'; import { ampli, getValidatorMoveEvent, VALIDATOR_LOW_STAKE_GRACE_PERIOD } from '~/lib'; import { StakeColumn, ValidatorLink, ImageIcon } from '~/components'; import type { IotaEvent, IotaValidatorSummary } from '@iota/iota-sdk/dist/cjs/client'; +import clsx from 'clsx'; interface generateValidatorsTableColumnsArgs { atRiskValidators: [string, string][]; @@ -16,9 +17,16 @@ interface generateValidatorsTableColumnsArgs { limit?: number; showValidatorIcon?: boolean; includeColumns?: string[]; + highlightValidatorName?: boolean; } -function ValidatorWithImage({ validator }: { validator: IotaValidatorSummary }) { +function ValidatorWithImage({ + validator, + highlightValidatorName, +}: { + validator: IotaValidatorSummary; + highlightValidatorName?: boolean; +}) { return ( - {validator.name} + + {validator.name} + } /> @@ -50,8 +64,20 @@ export function generateValidatorsTableColumns({ rollingAverageApys = null, showValidatorIcon = true, includeColumns, + highlightValidatorName, }: generateValidatorsTableColumnsArgs): ColumnDef[] { let columns: ColumnDef[] = [ + { + header: '#', + id: 'number', + cell({ row }) { + return ( + + {row.index + 1} + + ); + }, + }, { header: 'Name', id: 'name', @@ -59,9 +85,22 @@ export function generateValidatorsTableColumns({ return ( {showValidatorIcon ? ( - + ) : ( - {validator.name} + + + {validator.name} + + )} ); diff --git a/apps/explorer/src/pages/validators/Validators.tsx b/apps/explorer/src/pages/validators/Validators.tsx index 52255bff5c2..3d2baa90aae 100644 --- a/apps/explorer/src/pages/validators/Validators.tsx +++ b/apps/explorer/src/pages/validators/Validators.tsx @@ -80,6 +80,18 @@ function ValidatorPageResult(): JSX.Element { atRiskValidators: data.atRiskValidators, validatorEvents, rollingAverageApys: validatorsApy || null, + highlightValidatorName: true, + includeColumns: [ + '#', + 'Name', + 'Stake', + 'Proposed next Epoch gas price', + 'APY', + 'Comission', + 'Last Epoch Rewards', + 'Voting Power', + 'Status', + ], }); }, [data, validatorEvents, validatorsApy]); diff --git a/apps/ui-kit/src/lib/components/molecules/table-cell/TableCell.tsx b/apps/ui-kit/src/lib/components/molecules/table-cell/TableCell.tsx index 6b9d7e7a345..b12b9f83140 100644 --- a/apps/ui-kit/src/lib/components/molecules/table-cell/TableCell.tsx +++ b/apps/ui-kit/src/lib/components/molecules/table-cell/TableCell.tsx @@ -16,10 +16,6 @@ interface TableCellBaseProps { * Whether the cell content should be centered. */ isContentCentered?: boolean; - /** - * Whether to not wrap the text in the cell. - */ - noWrap?: boolean; } export function TableCellBase({ From 129bd743eac9a612b5165ec803b3b1a55e10e797 Mon Sep 17 00:00:00 2001 From: cpl121 <100352899+cpl121@users.noreply.github.com> Date: Mon, 23 Sep 2024 15:40:24 +0200 Subject: [PATCH 03/11] refactor(wallet): modify version format from `date.patch` to `x.y.z.n` (#2775) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat(wallet): modify the wallet version format * refactor: update versioning logic to allow for RCs * refactor: rename beta to rc * refactor: improve naming * chore: rename WALLET_BETA to WALLET_RC * chore: update version number formatting * chore: rename beta to rc --------- Co-authored-by: Begoña Alvarez --- .../configs/webpack/webpack.config.common.ts | 40 +++++++++---------- apps/wallet/package.json | 3 +- .../src/shared/experimentation/features.ts | 2 +- 3 files changed, 22 insertions(+), 23 deletions(-) diff --git a/apps/wallet/configs/webpack/webpack.config.common.ts b/apps/wallet/configs/webpack/webpack.config.common.ts index d039a578a49..8ef3c5cfa15 100644 --- a/apps/wallet/configs/webpack/webpack.config.common.ts +++ b/apps/wallet/configs/webpack/webpack.config.common.ts @@ -16,24 +16,8 @@ import type { Configuration } from 'webpack'; import packageJson from '../../package.json'; -function generateDateVersion(patch: number) { - const sha = gitRevSync.short(); - const date = new Date(); - const version = [ - String(date.getUTCFullYear()).slice(2), - String(date.getUTCMonth() + 1), - String(date.getUTCDate()), - patch, - ].join('.'); - - return { - version, - version_name: `${version} (${sha})`, - }; -} - -const WALLET_BETA = process.env.WALLET_BETA === 'true'; -const PATCH_VERSION = Number(process.env.PATCH_VERSION) || 0; +const WALLET_RC = process.env.WALLET_RC === 'true'; +const RC_VERSION = WALLET_RC ? Number(process.env.RC_VERSION) || 0 : undefined; const SDK_ROOT = resolve(__dirname, '..', '..', '..', '..', 'sdk'); const PROJECT_ROOT = resolve(__dirname, '..', '..'); @@ -44,12 +28,26 @@ const TS_CONFIGS_ROOT = resolve(CONFIGS_ROOT, 'ts'); const IS_DEV = process.env.NODE_ENV === 'development'; const IS_PROD = process.env.NODE_ENV === 'production'; const TS_CONFIG_FILE = resolve(TS_CONFIGS_ROOT, `tsconfig.${IS_DEV ? 'dev' : 'prod'}.json`); -const APP_NAME = WALLET_BETA ? 'IOTA Wallet (BETA)' : IS_DEV ? 'IOTA Wallet (DEV)' : 'IOTA Wallet'; +const APP_NAME = WALLET_RC ? 'IOTA Wallet (RC)' : IS_DEV ? 'IOTA Wallet (DEV)' : 'IOTA Wallet'; dotenv.config({ path: [resolve(SDK_ROOT, '.env'), resolve(SDK_ROOT, '.env.defaults')], }); +// From package.json: x.y.z +// App version (production): x.y.z +// App version (rc): x.y.z.n +function generateVersion(n: number | undefined) { + const sha = gitRevSync.short(); + const packageVersion = packageJson.version; + const version = n !== undefined ? `${packageVersion}.${n}` : packageVersion; + const improved_version = n !== undefined ? `${packageVersion}-rc.${n}` : packageVersion; + return { + version, + version_name: `${improved_version} (${sha})`, + }; +} + function loadTsConfig(tsConfigFilePath: string) { return new Promise((res, rej) => { exec( @@ -99,7 +97,7 @@ async function generateAliasFromTs() { const commonConfig: () => Promise = async () => { const alias = await generateAliasFromTs(); - const walletVersionDetails = generateDateVersion(PATCH_VERSION); + const walletVersionDetails = generateVersion(RC_VERSION); const sentryAuthToken = process.env.SENTRY_AUTH_TOKEN; return { context: SRC_ROOT, @@ -218,7 +216,7 @@ const commonConfig: () => Promise = async () => { 'process.env.WALLET_KEYRING_PASSWORD': JSON.stringify( IS_DEV ? 'DEV_PASS' : Buffer.from(randomBytes(64)).toString('hex'), ), - 'process.env.WALLET_BETA': WALLET_BETA, + 'process.env.WALLET_RC': WALLET_RC, 'process.env.APP_NAME': JSON.stringify(APP_NAME), 'process.env.DEFAULT_NETWORK': JSON.stringify(process.env.DEFAULT_NETWORK), 'process.env.IOTA_NETWORKS': JSON.stringify(process.env.IOTA_NETWORKS), diff --git a/apps/wallet/package.json b/apps/wallet/package.json index 02b03ae7cb8..2a50ed39fb3 100644 --- a/apps/wallet/package.json +++ b/apps/wallet/package.json @@ -1,5 +1,6 @@ { "name": "iota-wallet", + "version": "0.1.0", "private": true, "description": "A wallet for IOTA", "main": "./dist/ui.js", @@ -7,7 +8,7 @@ "build": "pnpm build:prod", "build:prod": "cross-env NODE_ENV=\"production\" TS_NODE_PROJECT=\"./configs/ts/tsconfig.webpack.json\" webpack --progress", "build:dev": "cross-env NODE_ENV=\"development\" TS_NODE_PROJECT=\"./configs/ts/tsconfig.webpack.json\" webpack --progress", - "build:beta": "cross-env WALLET_BETA=true NODE_ENV=\"production\" TS_NODE_PROJECT=\"./configs/ts/tsconfig.webpack.json\" webpack --progress", + "build:rc": "cross-env WALLET_RC=true NODE_ENV=\"production\" TS_NODE_PROJECT=\"./configs/ts/tsconfig.webpack.json\" webpack --progress", "prettier:check": "prettier -c --ignore-unknown --ignore-path=../../.prettierignore --ignore-path=.prettierignore .", "prettier:fix": "prettier -w --ignore-unknown --ignore-path=../../.prettierignore --ignore-path=.prettierignore .", "prettier:fix:watch": "onchange '**' -i -f add -f change -j 5 -- prettier -w --ignore-unknown --ignore-path=../../.prettierignore --ignore-path=.prettierignore {{file}}", diff --git a/apps/wallet/src/shared/experimentation/features.ts b/apps/wallet/src/shared/experimentation/features.ts index 1078472a2a1..22e2eaffaea 100644 --- a/apps/wallet/src/shared/experimentation/features.ts +++ b/apps/wallet/src/shared/experimentation/features.ts @@ -60,7 +60,7 @@ export function setAttributes(network?: { network: Network; customRpc?: string | growthbook.setAttributes({ network: activeNetwork, version: Browser.runtime.getManifest().version, - beta: process.env.WALLET_BETA || false, + rc: process.env.WALLET_RC || false, }); } From 27e2f51f929128f4a5bd4b24287c20e6e36b013a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bego=C3=B1a=20=C3=81lvarez=20de=20la=20Cruz?= Date: Mon, 23 Sep 2024 16:06:48 +0200 Subject: [PATCH 04/11] refactor: update wallet development key (#2809) --- apps/wallet/configs/webpack/webpack.config.common.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/wallet/configs/webpack/webpack.config.common.ts b/apps/wallet/configs/webpack/webpack.config.common.ts index 8ef3c5cfa15..3645f4e838a 100644 --- a/apps/wallet/configs/webpack/webpack.config.common.ts +++ b/apps/wallet/configs/webpack/webpack.config.common.ts @@ -198,7 +198,7 @@ const commonConfig: () => Promise = async () => { description: packageJson.description, ...(IS_DEV ? { - key: 'MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2HTQu/66edl64fM/SKDnHJmCz9SIYqM/QK7NM3vD1LTE2UNXzHX5Clj8geuoWAYS6HE/aFcd//qPnAh8TnPgqTS3IX+IbZsY/+kcokxIEWHly3eKEHWB32tQsGdJx6tgDzx8TRkFZEcCCdE4pFqQO68W3I/+8AQPosdd5fsIoF6OGKZ/i29mpGkYJSmMroCN5zYCQqvpjTBIkiTkI9TTjxmBid77pHyG4TsHz0wda4KxHV9ZtzZQXB4vexTku/Isczdtif7pDqFEDCAqEkpiGPyKoIuqrxc75IfpzIGFsIylycBr0fZellSsl2M6FM34R99/vUrGj5iWcjNmhYvZ8QIDAQAB', + key: 'MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1uOw+go7YTI8xNuHzIQC7J7x6Jw0in2UPptgcR1c+7aA3XSb03TVZkMXSMslCB7KTpaJOOQK1urLN3/FFos55f3vXixsjHT3pVbX/FhUmBK0kLOx8kl5Ns9ywVgBJyCSEnMrR1IlbiiU8GoXH1Bzb4SxkDELSQIZRetd+zTnwsUx/74grPT4EmgVglHBBYO75iJMsiJ/F0zMEsEQ+0SDfmU0v5Qh8slzryZr+8p8Q/mpNADzwS51o74feeGC5nAM5IgX0LyjRzCLXsiEmdC57KOaCpI7yhzDjXpye374oTdZJulv/tVeA1ymLIKQM5rfyeoqnxSOMsgGsvoM60WoYQIDAQAB', } : undefined), }; From 794729c2bd53f5b18d139d53581de3cddc411a02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bego=C3=B1a=20=C3=81lvarez=20de=20la=20Cruz?= Date: Mon, 23 Sep 2024 16:17:21 +0200 Subject: [PATCH 05/11] chore: remove identity permission from manifest (#2801) --- apps/wallet/src/manifest/manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/wallet/src/manifest/manifest.json b/apps/wallet/src/manifest/manifest.json index a3bd5bf8ec2..f43d531e439 100644 --- a/apps/wallet/src/manifest/manifest.json +++ b/apps/wallet/src/manifest/manifest.json @@ -6,7 +6,7 @@ "background": { "service_worker": "background.js" }, - "permissions": ["storage", "tabs", "alarms", "unlimitedStorage", "identity"], + "permissions": ["storage", "tabs", "alarms", "unlimitedStorage"], "action": { "default_popup": "ui.html?type=popup" }, From edf4cf15c368c98bd77cb5d01c00def402e5c939 Mon Sep 17 00:00:00 2001 From: Dr-Electron Date: Mon, 23 Sep 2024 21:06:07 +0200 Subject: [PATCH 06/11] feat(docs): Add reference doc for importing code with examples (#2381) --- .../developer/cryptography/on-chain/ecvrf.mdx | 15 +---- .../cryptography/on-chain/groth16.mdx | 18 +---- .../cryptography/on-chain/hashing.mdx | 46 +------------ .../developer/evm-to-move/creating-nft.mdx | 67 +------------------ .../developer/evm-to-move/creating-token.mdx | 31 +-------- .../developer/getting-started/build-test.mdx | 18 ++--- .../getting-started/create-a-module.mdx | 59 +++------------- .../getting-started/create-a-package.mdx | 53 ++------------- .../contribute/import-code-docs.mdx | 48 +++++++++++++ docs/content/sidebars/references.js | 1 + docs/examples/move/cryptography/Move.toml | 10 +++ .../move/cryptography/sources/ecvrf.move | 13 ++++ .../move/cryptography/sources/goth16.move | 16 +++++ .../cryptography/sources/hashing_iota.move | 18 +++++ .../cryptography/sources/hashing_std.move | 18 +++++ docs/examples/move/evm-to-move/Move.toml | 10 +++ .../evm-to-move/sources/coin_manager.move | 35 ++++++++++ .../move/evm-to-move/sources/nft.move | 65 ++++++++++++++++++ .../move/evm-to-move/sources/token.move | 24 +++++++ examples/move/first_package/Move.toml | 30 ++++++++- .../{example.move => first_package.move} | 22 +++++- 21 files changed, 335 insertions(+), 282 deletions(-) create mode 100644 docs/content/references/contribute/import-code-docs.mdx create mode 100644 docs/examples/move/cryptography/Move.toml create mode 100644 docs/examples/move/cryptography/sources/ecvrf.move create mode 100644 docs/examples/move/cryptography/sources/goth16.move create mode 100644 docs/examples/move/cryptography/sources/hashing_iota.move create mode 100644 docs/examples/move/cryptography/sources/hashing_std.move create mode 100644 docs/examples/move/evm-to-move/Move.toml create mode 100644 docs/examples/move/evm-to-move/sources/coin_manager.move create mode 100644 docs/examples/move/evm-to-move/sources/nft.move create mode 100644 docs/examples/move/evm-to-move/sources/token.move rename examples/move/first_package/sources/{example.move => first_package.move} (86%) diff --git a/docs/content/developer/cryptography/on-chain/ecvrf.mdx b/docs/content/developer/cryptography/on-chain/ecvrf.mdx index 308dedaf339..9c11bbaf24d 100644 --- a/docs/content/developer/cryptography/on-chain/ecvrf.mdx +++ b/docs/content/developer/cryptography/on-chain/ecvrf.mdx @@ -46,20 +46,7 @@ Output: 2b7e45821d80567761e8bb3fc519efe5ad80cdb4423227289f960319bbcf6eea1aef30c0 You can verify the proof and output in a smart contract using `iota::ecvrf::ecvrf_verify` from the IOTA Move framework: -```move -module math::ecvrf_test { - use iota::ecvrf; - use iota::event; - - /// Event on whether the output is verified - public struct VerifiedEvent has copy, drop { - is_verified: bool, - } - - public fun verify_ecvrf_output(output: vector, alpha_string: vector, public_key: vector, proof: vector) { - event::emit(VerifiedEvent {is_verified: ecvrf::ecvrf_verify(&output, &alpha_string, &public_key, &proof)}); - } -} +```move file=/docs/examples/move/cryptography/sources/ecvrf.move ``` You can also use the CLI tool for verification: diff --git a/docs/content/developer/cryptography/on-chain/groth16.mdx b/docs/content/developer/cryptography/on-chain/groth16.mdx index caa0a19bc7b..11e70a203ea 100644 --- a/docs/content/developer/cryptography/on-chain/groth16.mdx +++ b/docs/content/developer/cryptography/on-chain/groth16.mdx @@ -104,21 +104,5 @@ proof.c.serialize_compressed(&mut proof_points_bytes).unwrap(); The following example smart contract prepares a verification key and verifies the corresponding proof. This example uses the BN254 elliptic curve construction, which is given as the first parameter to the `prepare_verifying_key` and `verify_groth16_proof` functions. You can use the `bls12381` function instead for BLS12-381 construction. -```rust -module test::groth16_test { - use iota::groth16; - use iota::event; - - /// Event on whether the proof is verified - struct VerifiedEvent has copy, drop { - is_verified: bool, - } - - public fun verify_proof(vk: vector, public_inputs_bytes: vector, proof_points_bytes: vector) { - let pvk = groth16::prepare_verifying_key(&groth16::bn254(), &vk); - let public_inputs = groth16::public_proof_inputs_from_bytes(public_inputs_bytes); - let proof_points = groth16::proof_points_from_bytes(proof_points_bytes); - event::emit(VerifiedEvent {is_verified: groth16::verify_groth16_proof(&groth16::bn254(), &pvk, &public_inputs, &proof_points)}); - } -} +```move file=/docs/examples/move/cryptography/sources/goth16.move ``` diff --git a/docs/content/developer/cryptography/on-chain/hashing.mdx b/docs/content/developer/cryptography/on-chain/hashing.mdx index ed63b7d95eb..51b22f1cef7 100644 --- a/docs/content/developer/cryptography/on-chain/hashing.mdx +++ b/docs/content/developer/cryptography/on-chain/hashing.mdx @@ -16,52 +16,10 @@ The IOTA Move API supports the following cryptographic hash functions: The SHA2-256 and SHA3-256 hash functions are available in the Move Standard Library in the `std::hash` module. The following example shows how to use the SHA2-256 hash function in a smart contract: -```move -module test::hashing_std { - use std::hash; - use iota::object::{Self, UID}; - use iota::tx_context::TxContext; - use iota::transfer; - - /// Object that holds the output hash value. - public struct Output has key, store { - id: UID, - value: vector - } - - public fun hash_data(data: vector, recipient: address, ctx: &mut TxContext) { - let hashed = Output { - id: object::new(ctx), - value: hash::sha2_256(data), - }; - // Transfer an output data object holding the hashed data to the recipient. - transfer::public_transfer(hashed, recipient) - } -} +```move file=/docs/examples/move/cryptography/sources/hashing_std.move ``` The Keccak256 and Blake2b-256 hash functions are available through the `iota::hash` module in the IOTA Move Library. An example of how to use the Keccak256 hash function in a smart contract is shown below. Notice that here, the input to the hash function is given as a reference. This is the case for both Keccak256 and Blake2b-256. -```move -module test::hashing_iota { - use iota::hash; - use iota::object::{Self, UID}; - use iota::tx_context::TxContext; - use iota::transfer; - - /// Object that holds the output hash value. - public struct Output has key, store { - id: UID, - value: vector - } - - public fun hash_data(data: vector, recipient: address, ctx: &mut TxContext) { - let hashed = Output { - id: object::new(ctx), - value: hash::keccak256(&data), - }; - // Transfer an output data object holding the hashed data to the recipient. - transfer::public_transfer(hashed, recipient) - } -} +```move file=/docs/examples/move/cryptography/sources/hashing_iota.move ``` diff --git a/docs/content/developer/evm-to-move/creating-nft.mdx b/docs/content/developer/evm-to-move/creating-nft.mdx index c0dd39c9fca..0ce4713f47d 100644 --- a/docs/content/developer/evm-to-move/creating-nft.mdx +++ b/docs/content/developer/evm-to-move/creating-nft.mdx @@ -41,72 +41,7 @@ A lot of logic here is abstracted away, but every bit of logic can be overwritte IOTA Move is based on objects instead of a global storage like EVM. Objects in IOTA Move can be owned, non-fungible, and unique - the exact properties of an NFT! This makes creating NFTs in IOTA Move very trivial, given that everything is already an NFT by default. An example of a very simplified NFT in IOTA Move: -```move title="examples/Examplenft.move" -module example::examplenft { - use std::string; - use iota::event; - - /// An example NFT that can be minted by anybody - public struct ExampleNFT has key, store { - id: UID, - /// Name for the token - name: string::String, - } - - // ===== Events ===== - - public struct NFTMinted has copy, drop { - // The Object ID of the NFT - object_id: ID, - // The creator of the NFT - creator: address, - // The name of the NFT - name: string::String, - } - - // ===== Public view functions ===== - - /// Get the NFT's `name` - public fun name(nft: &ExampleNFT): &string::String { - &nft.name - } - - // ===== Entrypoints ===== - - #[allow(lint(self_transfer))] - /// Anyone can mint a new NFT on this one - public fun mint_to_sender( - name: vector, - ctx: &mut TxContext - ) { - let sender = tx_context::sender(ctx); - let nft = ExampleNFT { - id: object::new(ctx), - name: string::utf8(name) - }; - - event::emit(NFTMinted { - object_id: object::id(&nft), - creator: sender, - name: nft.name, - }); - - transfer::public_transfer(nft, sender); - } - - /// Transfer `nft` to `recipient` - public fun transfer( - nft: ExampleNFT, recipient: address, _: &mut TxContext - ) { - transfer::public_transfer(nft, recipient) - } - - /// Permanently delete `nft` - public fun burn(nft: ExampleNFT, _: &mut TxContext) { - let ExampleNFT { id, name: _} = nft; - object::delete(id) - } -} +```move file=/docs/examples/move/evm-to-move/sources/nft.move ``` This is just a simplified NFT that anyone can mint, with just a name in it as metadata. It can freely be transferred and burned, and the metadata can be directly accessed through the object from another contract. Given that this is just a normal object being created, there's little to add to this code example. It's straightforward if you know the basics of working with objects in IOTA. diff --git a/docs/content/developer/evm-to-move/creating-token.mdx b/docs/content/developer/evm-to-move/creating-token.mdx index f8597fd1903..10cbc9d4a19 100644 --- a/docs/content/developer/evm-to-move/creating-token.mdx +++ b/docs/content/developer/evm-to-move/creating-token.mdx @@ -34,33 +34,7 @@ IOTA Move takes a radically different approach regarding tokens in terms of owne The initial creation of `Coin` takes place by minting these coins. This is usually done in a smart contract (module) in IOTA Move and looks like this: -```move title="examples/Exampletoken.move" -module examples::exampletoken { - use iota::coin; - use iota::transfer; - use iota::tx_context::{Self, TxContext}; - - /// One-Time-Witness of kind: `Coin` - public struct EXAMPLETOKEN has drop {} - - fun init(witness: EXAMPLETOKEN, ctx: &mut TxContext) { - let (treasurycap, metadata) = coin::create_currency( - witness, - 6, // decimals - b"EXAMPLE", // symbol - b"Example Coin", // name - b"Just an example", // description - option::none(), // icon URL - ctx - ); - - // transfer the `TreasuryCap` to the sender, admin capabilities - transfer::public_transfer(treasurycap, tx_context::sender(ctx)); - - // metadata is typically frozen after creation - transfer::public_freeze_object(metadata); - } -} +```move file=/docs/examples/move/evm-to-move/sources/token.move ``` There's a lot to unpack here; let's look at it piece by piece. In IOTA Move, there is no 'compiler version' defined within the module itself, like in Solidity. @@ -69,8 +43,7 @@ A `module` is defined (`exampletoken`) as part of the `examples` package (module After the aliases, we see an empty struct defined: -```move -public struct EXAMPLETOKEN has drop {} +```move file=/docs/examples/move/evm-to-move/sources/token.move#L5 ``` This is the definition of the so-called [One-Time-Witness](../iota-101/move-overview/one-time-witness.mdx). Together with the `init` function definition, this ensures that this `Coin` will only be created once and never more on this chain. diff --git a/docs/content/developer/getting-started/build-test.mdx b/docs/content/developer/getting-started/build-test.mdx index 1da979c9e3f..ca5a1acf8da 100644 --- a/docs/content/developer/getting-started/build-test.mdx +++ b/docs/content/developer/getting-started/build-test.mdx @@ -11,7 +11,7 @@ Once you have [created a package](create-a-package.mdx) and [added a module](cre ## Building your package -You can use the `iota move build` command to build Move packages in the working directory, `my_first_package` in this case. +You can use the `iota move build` command to build Move packages in the working directory, `first_package` in this case. ```shell iota move build @@ -25,7 +25,7 @@ If your build is successful, the IOTA client will return the following: UPDATING GIT DEPENDENCY https://github.com/iotaledger/iota.git INCLUDING DEPENDENCY IOTA INCLUDING DEPENDENCY MoveStdlib -BUILDING my_first_package +BUILDING first_package ``` ## Test a Package @@ -34,7 +34,7 @@ You can use the Move testing framework to write unit tests for your IOTA package ### Test Syntax -You should add unit tests in their corresponding [module file](create-a-module.mdx). In Move, test functions are identified by the following: +You should add unit tests in their corresponding [test file](create-a-module.mdx). In Move, test functions are identified by the following: * They are [`public`](create-a-module.mdx#public-functions) functions. * They have no parameters. @@ -51,14 +51,14 @@ If you haven't added any tests, you should see the following output. ```shell INCLUDING DEPENDENCY Iota INCLUDING DEPENDENCY MoveStdlib -BUILDING my_first_package +BUILDING first_package Running Move unit tests Test result: OK. Total tests: 0; passed: 0; failed: 0 ``` ### Add Tests -You can add your first unit test by copying the following public test function and adding it to the end of `my_first_module`, within the module definition. +You can add your first unit test by copying the following public test function and adding it to `first_package_tests` file, within the `tests` directory. ```move #[test] @@ -120,13 +120,7 @@ The compilation error provides all the necessary information to help you [debug] Move has many features to ensure your code is safe. In this case, the `Sword` struct represents a game asset that digitally mimics a real-world item. Much like a real sword, it cannot simply disappear. Since the `Sword` struct doesn't have the [`drop`](create-a-module.mdx#drop) ability, it has to be consumed before the function returns. However, since the `sword` mimics a real-world item, you don't want to allow it to disappear. -Instead, you can fix the compilation error by adequately disposing of the `sword`. Add the following line to the beginning of the `test_sword_create` function to import the [`Transfer`](../../references/framework/iota-framework/transfer.mdx) module: - -```move -use iota::transfer; -``` - -Now, you can add the following after the function's `!assert` call to transfer the `sword` to a freshly created dummy address: +Instead, you can fix the compilation error by adequately disposing of the `sword`. Add the following after the function's `!assert` call to transfer the `sword` to a freshly created dummy address: ```move // Create a dummy address and transfer the sword. diff --git a/docs/content/developer/getting-started/create-a-module.mdx b/docs/content/developer/getting-started/create-a-module.mdx index 6b3bbd3a453..9303c9fb4f8 100644 --- a/docs/content/developer/getting-started/create-a-module.mdx +++ b/docs/content/developer/getting-started/create-a-module.mdx @@ -5,7 +5,14 @@ tags: [move, getting-started] # Create a Move Module -A [package](create-a-package.mdx)'s utility is defined by its modules. A module contains the logic for your package. You can create any number of modules per package. To add a module, create a `.move` file in the `sources` directory. For this guide, create a file called `my_module.move` and add the following content: +A [package](create-a-package.mdx)'s utility is defined by its modules. A module contains the logic for your package. You can create any number of modules per package. To add a module, create a `.move` file in the `sources` directory. For this guide, create a file called `first_package.move` and add the following content: + +```move +module first_package::my_module { +} +``` + +And now let's add some code: :::tip Comments in `.move` files @@ -14,57 +21,11 @@ In `.move` files, use double slashes (`//`) to denote a comment. ::: -```move -module my_first_package::my_module { - - // Imports - use iota::object::{Self, UID}; - use iota::transfer; - use iota::tx_context::{Self, TxContext}; - - // Struct definitions - struct Sword has key, store { - id: UID, - magic: u64, - strength: u64, - } - - struct Forge has key, store { - id: UID, - swords_created: u64, - } - - // Module initializer to be executed when this module is published - fun init(ctx: &mut TxContext) { - let admin = Forge { - id: object::new(ctx), - swords_created: 0, - }; - // Transfer the forge object to the module/package publisher - transfer::public_transfer(admin, tx_context::sender(ctx)); - } - - // Accessors required to read the struct attributes - public fun magic(self: &Sword): u64 { - self.magic - } - - public fun strength(self: &Sword): u64 { - self.strength - } - - public fun swords_created(self: &Forge): u64 { - self.swords_created - } - - // Public/entry functions - - // Private functions -} +```move file=/examples/move/first_package/sources/first_package.move#L7-L41 ``` ## Module Name -The first line of the module defines the module's name and the package it belongs to. In this case, `my_module` belongs to [`my_first_package`](create-a-package.mdx). +The first line of the module defines the module's name and the package it belongs to. In this case, `my_module` belongs to [`first_package`](create-a-package.mdx). ## Imports diff --git a/docs/content/developer/getting-started/create-a-package.mdx b/docs/content/developer/getting-started/create-a-package.mdx index 653e2ce44af..9a7001e47fc 100644 --- a/docs/content/developer/getting-started/create-a-package.mdx +++ b/docs/content/developer/getting-started/create-a-package.mdx @@ -14,10 +14,10 @@ issuing [transactions](../iota-101/transactions/transactions.mdx). Use the following command to create a standard package: ```shell -iota move new my_first_package +iota move new first_package ``` -The command will create and populate the `my_first_package` directory with a skeleton for an IOTA Move project, +The command will create and populate the `first_package` directory with a skeleton for an IOTA Move project, consisting of the following files and directories: ## `Move.toml` @@ -28,43 +28,7 @@ The `Move.toml` file is the package's manifest. It describes the package and its In `.toml` files, use the hash mark (`#`) to denote a comment. ::: -```toml title="my_first_package/Move.toml" -[package] -name = "my_first_package" -edition = "2024.beta" # edition -# license = "" # e.g., "MIT", "GPL", "Apache 2.0" -# authors = ["..."] # e.g., ["Joe Smith (joesmith@noemail.com)", "John Snow (johnsnow@noemail.com)"] - -[dependencies] -Iota = { git = "https://github.com/iotaledger/iota.git", subdir = "crates/iota-framework/packages/iota-framework", rev = "framework/testnet" } - -# For remote import, use the `{ git = "...", subdir = "...", rev = "..." }`. -# Revision can be a branch, a tag, and a commit hash. -# MyRemotePackage = { git = "https://some.remote/host.git", subdir = "remote/path", rev = "main" } - -# For local dependencies use `local = path`. Path is relative to the package root -# Iota = { local = "../path/to/iota/crates/iota-framework/packages/iota-framework" } - -# To resolve a version conflict and force a specific version for dependency -# override use `override = true` -# Override = { local = "../conflicting/version", override = true } - -[addresses] -my_first_package = "0x0" - -# Named addresses will be accessible in Move as `@name`. They're also exported: -# for example, `std = "0x1"` is exported by the Standard Library. -# alice = "0xA11CE" - -[dev-dependencies] -# The dev-dependencies section allows overriding dependencies for `--test` and -# `--dev` modes. You can introduce test-only dependencies here. -# Local = { local = "../path/to/dev-build" } - -[dev-addresses] -# The dev-addresses section allows overwriting named addresses for the `--test` -# and `--dev` modes. -# alice = "0xB0B" +```toml file=/examples/move/first_package/Move.toml ``` :::tip Using a local version of IOTA @@ -87,12 +51,7 @@ of the metadata. The `[dependencies]` section specifies the dependencies of the project. The dependency specification can be a git repository URL or a path to the local directory. -```rust -# git repository -Iota = { git = "https://github.com/iotaledger/iota.git", subdir = "crates/iota-framework/packages/iota-framework", rev = "framework/testnet" } - -# local directory -MyPackage = { local = "../my-package" } +```toml file=/examples/move/first_package/Move.toml#L10-L15 ``` Packages also import addresses from other packages. For example, the `Iota` dependency adds the `std` and `iota` addresses @@ -104,9 +63,7 @@ If you have two dependencies that use different versions of the same package, yo the `[dependencies]` section. To do so, add the `override` field to the dependency. The version specified in the `[dependencies]` section will be used instead of the one specified in the dependency itself. -```rust -[dependencies] -Iota = { override = true, git = "https://github.com/iotaledger/iota.git", subdir = "crates/iota-framework/packages/iota-framework", rev = "framework/testnet" } +```toml file=/examples/move/first_package/Move.toml#L17-L19 ``` ### Dev-dependencies diff --git a/docs/content/references/contribute/import-code-docs.mdx b/docs/content/references/contribute/import-code-docs.mdx new file mode 100644 index 00000000000..53e02675e11 --- /dev/null +++ b/docs/content/references/contribute/import-code-docs.mdx @@ -0,0 +1,48 @@ +--- +description: Import code documentation from this or any other repository. +tags: [reference] +--- + +# Import Code for Documentation + +We import code snippets directly from the source code to ensure the documentation is always up-to-date and correct. +To achieve this, we use two tools to either [import code from the IOTA repo](https://www.npmjs.com/package/remark-code-import) or [any other repository](https://www.npmjs.com/package/@saucelabs/theme-github-codeblock). + +:::info + +These tools only allow the import of complete files or specific lines from a file. So, if the code changes, make sure to update the lines. + +::: + +## Local Code Import + +We use the [`remark-code-import`](https://www.npmjs.com/package/remark-code-import) package to reference the code from the IOTA repo. + +:::note CI/CD + +If you import local code, ensure it is part of a CI/CD workflow so the code gets tested for correctness. + +::: + +### Usage + +Use it like a standard code block, specifying a path to the file you want to import. You can use `rootDir` as a base path to the repository. + +```` +```rust file=/some-path/to-rust-file.rs +``` +```` + +## Remote Code Import + +We use the [`@saucelabs/theme-github-codeblock`](https://www.npmjs.com/package/@saucelabs/theme-github-codeblock) package to reference code from any other repository. + +### Usage + +Create a code block with the keyword `reference` and add the GitHub link (with specific line numbers) to the file you want to import. + +```` +```rust reference +https://github.com/some-repo/with-a-great-project/blob/some-branch/some-path/to-rust-file.rs#L7-L41 +``` +```` \ No newline at end of file diff --git a/docs/content/sidebars/references.js b/docs/content/sidebars/references.js index dd1d40015fd..31d0622f7e4 100644 --- a/docs/content/sidebars/references.js +++ b/docs/content/sidebars/references.js @@ -355,6 +355,7 @@ const references = [ 'references/contribute/contribution-process', 'references/contribute/code-of-conduct', 'references/contribute/style-guide', + 'references/contribute/import-code-docs' ], }, ]; diff --git a/docs/examples/move/cryptography/Move.toml b/docs/examples/move/cryptography/Move.toml new file mode 100644 index 00000000000..bb123539023 --- /dev/null +++ b/docs/examples/move/cryptography/Move.toml @@ -0,0 +1,10 @@ +[package] +name = "cryptography" +edition = "2024.beta" + +[dependencies] +Iota = { local = "../../../../crates/iota-framework/packages/iota-framework" } +Stardust = { local = "../../../../crates/iota-framework/packages/stardust" } + +[addresses] +example = "0x0" diff --git a/docs/examples/move/cryptography/sources/ecvrf.move b/docs/examples/move/cryptography/sources/ecvrf.move new file mode 100644 index 00000000000..cc46ff5676a --- /dev/null +++ b/docs/examples/move/cryptography/sources/ecvrf.move @@ -0,0 +1,13 @@ +module example::ecvrf { + use iota::ecvrf; + use iota::event; + + /// Event on whether the output is verified + public struct VerifiedEvent has copy, drop { + is_verified: bool, + } + + public fun verify_ecvrf_output(output: vector, alpha_string: vector, public_key: vector, proof: vector) { + event::emit(VerifiedEvent {is_verified: ecvrf::ecvrf_verify(&output, &alpha_string, &public_key, &proof)}); + } +} \ No newline at end of file diff --git a/docs/examples/move/cryptography/sources/goth16.move b/docs/examples/move/cryptography/sources/goth16.move new file mode 100644 index 00000000000..71fa9a30d73 --- /dev/null +++ b/docs/examples/move/cryptography/sources/goth16.move @@ -0,0 +1,16 @@ +module example::groth16 { + use iota::groth16; + use iota::event; + + /// Event on whether the proof is verified + public struct VerifiedEvent has copy, drop { + is_verified: bool, + } + + public fun verify_proof(vk: vector, public_inputs_bytes: vector, proof_points_bytes: vector) { + let pvk = groth16::prepare_verifying_key(&groth16::bn254(), &vk); + let public_inputs = groth16::public_proof_inputs_from_bytes(public_inputs_bytes); + let proof_points = groth16::proof_points_from_bytes(proof_points_bytes); + event::emit(VerifiedEvent {is_verified: groth16::verify_groth16_proof(&groth16::bn254(), &pvk, &public_inputs, &proof_points)}); + } +} \ No newline at end of file diff --git a/docs/examples/move/cryptography/sources/hashing_iota.move b/docs/examples/move/cryptography/sources/hashing_iota.move new file mode 100644 index 00000000000..aa414a78815 --- /dev/null +++ b/docs/examples/move/cryptography/sources/hashing_iota.move @@ -0,0 +1,18 @@ +module example::hashing_iota { + use iota::hash; + + /// Object that holds the output hash value. + public struct Output has key, store { + id: UID, + value: vector + } + + public fun hash_data(data: vector, recipient: address, ctx: &mut TxContext) { + let hashed = Output { + id: object::new(ctx), + value: hash::keccak256(&data), + }; + // Transfer an output data object holding the hashed data to the recipient. + transfer::public_transfer(hashed, recipient) + } +} \ No newline at end of file diff --git a/docs/examples/move/cryptography/sources/hashing_std.move b/docs/examples/move/cryptography/sources/hashing_std.move new file mode 100644 index 00000000000..1e510a5ecb7 --- /dev/null +++ b/docs/examples/move/cryptography/sources/hashing_std.move @@ -0,0 +1,18 @@ +module example::hashing_std { + use std::hash; + + /// Object that holds the output hash value. + public struct Output has key, store { + id: UID, + value: vector + } + + public fun hash_data(data: vector, recipient: address, ctx: &mut TxContext) { + let hashed = Output { + id: object::new(ctx), + value: hash::sha2_256(data), + }; + // Transfer an output data object holding the hashed data to the recipient. + transfer::public_transfer(hashed, recipient) + } +} \ No newline at end of file diff --git a/docs/examples/move/evm-to-move/Move.toml b/docs/examples/move/evm-to-move/Move.toml new file mode 100644 index 00000000000..23a76788d6a --- /dev/null +++ b/docs/examples/move/evm-to-move/Move.toml @@ -0,0 +1,10 @@ +[package] +name = "evm-to-move" +edition = "2024.beta" + +[dependencies] +Iota = { local = "../../../../crates/iota-framework/packages/iota-framework" } +Stardust = { local = "../../../../crates/iota-framework/packages/stardust" } + +[addresses] +example = "0x0" diff --git a/docs/examples/move/evm-to-move/sources/coin_manager.move b/docs/examples/move/evm-to-move/sources/coin_manager.move new file mode 100644 index 00000000000..8a11504e05d --- /dev/null +++ b/docs/examples/move/evm-to-move/sources/coin_manager.move @@ -0,0 +1,35 @@ +module example::token { + use iota::coin; + use iota::coin_manager; + + /// One-Time-Witness of kind: `Coin` + public struct TOKEN has drop {} + + #[allow(lint(share_owned))] + fun init(witness: TOKEN, ctx: &mut TxContext) { + let (treasurycap, metadata) = coin::create_currency( + witness, + 6, // decimals + b"EXAMPLE", // symbol + b"Example Coin", // name + b"Just an example", // description + option::none(), // icon URL + ctx + ); + + // Creating the Manager, transferring ownership of the `TreasuryCap` to it + let (newtreasurycap, metacap, mut manager) = coin_manager::new(treasurycap, metadata, ctx); + + // Limiting the maximum supply to `100` + newtreasurycap.enforce_maximum_supply(&mut manager, 100); + + // Returning a new `CoinManagerTreasuryCap` to the creator of the `Coin` + transfer::public_transfer(newtreasurycap, ctx.sender()); + + // Returning a new `CoinManagerMetadataCap` to the creator of the `Coin` + transfer::public_transfer(metacap, ctx.sender()); + + // Publicly sharing the `CoinManager` object for convenient usage by anyone interested + transfer::public_share_object(manager); + } +} \ No newline at end of file diff --git a/docs/examples/move/evm-to-move/sources/nft.move b/docs/examples/move/evm-to-move/sources/nft.move new file mode 100644 index 00000000000..89a7272002f --- /dev/null +++ b/docs/examples/move/evm-to-move/sources/nft.move @@ -0,0 +1,65 @@ +module example::examplenft { + use std::string; + use iota::event; + + /// An example NFT that can be minted by anybody + public struct ExampleNFT has key, store { + id: UID, + /// Name for the token + name: string::String, + } + + // ===== Events ===== + + public struct NFTMinted has copy, drop { + // The Object ID of the NFT + object_id: ID, + // The creator of the NFT + creator: address, + // The name of the NFT + name: string::String, + } + + // ===== Public view functions ===== + + /// Get the NFT's `name` + public fun name(nft: &ExampleNFT): &string::String { + &nft.name + } + + // ===== Entrypoints ===== + + #[allow(lint(self_transfer))] + /// Anyone can mint a new NFT on this one + public fun mint_to_sender( + name: vector, + ctx: &mut TxContext + ) { + let sender = tx_context::sender(ctx); + let nft = ExampleNFT { + id: object::new(ctx), + name: string::utf8(name) + }; + + event::emit(NFTMinted { + object_id: object::id(&nft), + creator: sender, + name: nft.name, + }); + + transfer::public_transfer(nft, sender); + } + + /// Transfer `nft` to `recipient` + public fun transfer( + nft: ExampleNFT, recipient: address, _: &mut TxContext + ) { + transfer::public_transfer(nft, recipient) + } + + /// Permanently delete `nft` + public fun burn(nft: ExampleNFT, _: &mut TxContext) { + let ExampleNFT { id, name: _} = nft; + object::delete(id) + } +} \ No newline at end of file diff --git a/docs/examples/move/evm-to-move/sources/token.move b/docs/examples/move/evm-to-move/sources/token.move new file mode 100644 index 00000000000..5e0b6979d57 --- /dev/null +++ b/docs/examples/move/evm-to-move/sources/token.move @@ -0,0 +1,24 @@ +module example::exampletoken { + use iota::coin; + + /// One-Time-Witness of kind: `Coin` + public struct EXAMPLETOKEN has drop {} + + fun init(witness: EXAMPLETOKEN, ctx: &mut TxContext) { + let (treasurycap, metadata) = coin::create_currency( + witness, + 6, // decimals + b"EXAMPLE", // symbol + b"Example Coin", // name + b"Just an example", // description + option::none(), // icon URL + ctx + ); + + // transfer the `TreasuryCap` to the sender, admin capabilities + transfer::public_transfer(treasurycap, tx_context::sender(ctx)); + + // metadata is typically frozen after creation + transfer::public_freeze_object(metadata); + } +} \ No newline at end of file diff --git a/examples/move/first_package/Move.toml b/examples/move/first_package/Move.toml index 24f267c9634..9003fc5d467 100644 --- a/examples/move/first_package/Move.toml +++ b/examples/move/first_package/Move.toml @@ -1,10 +1,36 @@ [package] name = "first_package" -version = "0.0.1" -edition = "2024.beta" +edition = "2024.beta" # edition = "legacy" to use legacy (pre-2024) Move +# license = "" # e.g., "MIT", "GPL", "Apache 2.0" +# authors = ["..."] # e.g., ["Joe Smith (joesmith@noemail.com)", "John Snow (johnsnow@noemail.com)"] [dependencies] Iota = { local = "../../../crates/iota-framework/packages/iota-framework" } +# For remote import, use the `{ git = "...", subdir = "...", rev = "..." }`. +# Revision can be a branch, a tag, and a commit hash. +# MyRemotePackage = { git = "https://some.remote/host.git", subdir = "remote/path", rev = "main" } + +# For local dependencies use `local = path`. Path is relative to the package root +# Local = { local = "../path/to" } + +# To resolve a version conflict and force a specific version for dependency +# override use `override = true` +# Override = { local = "../conflicting/version", override = true } + [addresses] first_package = "0x0" + +# Named addresses will be accessible in Move as `@name`. They're also exported: +# for example, `std = "0x1"` is exported by the Standard Library. +# alice = "0xA11CE" + +[dev-dependencies] +# The dev-dependencies section allows overriding dependencies for `--test` and +# `--dev` modes. You can introduce test-only dependencies here. +# Local = { local = "../path/to/dev-build" } + +[dev-addresses] +# The dev-addresses section allows overwriting named addresses for the `--test` +# and `--dev` modes. +# alice = "0xB0B" diff --git a/examples/move/first_package/sources/example.move b/examples/move/first_package/sources/first_package.move similarity index 86% rename from examples/move/first_package/sources/example.move rename to examples/move/first_package/sources/first_package.move index a9f369a44a0..eb431da5c84 100644 --- a/examples/move/first_package/sources/example.move +++ b/examples/move/first_package/sources/first_package.move @@ -2,7 +2,7 @@ // Modifications Copyright (c) 2024 IOTA Stiftung // SPDX-License-Identifier: Apache-2.0 -module first_package::example { +module first_package::my_module { public struct Sword has key, store { id: UID, @@ -62,6 +62,26 @@ module first_package::example { #[test_only] const ALICE: address = @0xA; #[test_only] const BOB: address = @0xB; + #[test] + public fun test_sword() { + // Create a dummy TxContext for testing. + let mut ctx = tx_context::dummy(); + + // Create a sword. + let sword = Sword { + id: object::new(&mut ctx), + magic: 42, + strength: 7, + }; + + // Check if accessor functions return correct values. + assert!(magic(&sword) == 42 && strength(&sword) == 7, 1) + + // Create a dummy address and transfer the sword. + let dummy_address = @0xCAFE; + transfer::transfer(sword, dummy_address); + } + #[test] public fun test_module_init() { let mut ts = ts::begin(@0x0); From 5e48fbdebf728fe1a2759fe5df1dbaf39dcad65e Mon Sep 17 00:00:00 2001 From: Samuel Rufinatscha Date: Tue, 24 Sep 2024 17:02:52 +0200 Subject: [PATCH 07/11] fix(iota-graphql-rpc): Transform stored transaction for genesis (#2836) * fix: Stored transaction from genesis objects * fix: Remove &mut --- crates/iota-graphql-rpc/src/types/transaction_block.rs | 6 +++++- crates/iota-indexer/src/indexer_reader.rs | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/crates/iota-graphql-rpc/src/types/transaction_block.rs b/crates/iota-graphql-rpc/src/types/transaction_block.rs index 512a3389bfc..271a429204f 100644 --- a/crates/iota-graphql-rpc/src/types/transaction_block.rs +++ b/crates/iota-graphql-rpc/src/types/transaction_block.rs @@ -442,7 +442,11 @@ impl TransactionBlock { // Defer to the provided checkpoint_viewed_at, but if it is not provided, use // the current available range. This sets a consistent upper bound for // the nested queries. - for stored in results { + for mut stored in results { + if stored.is_genesis() { + stored = stored.set_genesis_large_object_as_inner_data(db.inner.get_pool())?; + } + let cursor = stored.cursor(checkpoint_viewed_at).encode_cursor(); let inner = TransactionBlockInner::try_from(stored)?; let transaction = TransactionBlock { diff --git a/crates/iota-indexer/src/indexer_reader.rs b/crates/iota-indexer/src/indexer_reader.rs index a9e541cc0a4..bcef95c8d7f 100644 --- a/crates/iota-indexer/src/indexer_reader.rs +++ b/crates/iota-indexer/src/indexer_reader.rs @@ -100,6 +100,10 @@ impl IndexerReader { }) } + pub fn get_pool(&self) -> &crate::db::PgConnectionPool { + &self.pool + } + fn get_connection(&self) -> Result { self.pool.get().map_err(|e| { IndexerError::PgPoolConnectionError(format!( From a810d8b53178e0a365800a752d9c397c86e2e797 Mon Sep 17 00:00:00 2001 From: "Eugene P." Date: Wed, 25 Sep 2024 10:41:00 +0300 Subject: [PATCH 08/11] fix(wallet): update isMainAccount function. (#2814) Signed-off-by: Eugene Panteleymonchuk --- .../src/background/accounts/isMainAccount.ts | 26 +++++++++---------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/apps/wallet/src/background/accounts/isMainAccount.ts b/apps/wallet/src/background/accounts/isMainAccount.ts index f329358f40b..0e385c52cf0 100644 --- a/apps/wallet/src/background/accounts/isMainAccount.ts +++ b/apps/wallet/src/background/accounts/isMainAccount.ts @@ -8,21 +8,19 @@ import { parseDerivationPath } from '_src/background/account-sources/bip44Path'; import type { SerializedUIAccount } from '_src/background/accounts/Account'; export function isMainAccount(account: SerializedUIAccount | null) { - { - if (!account) { - return false; - } + if (!account) { + return false; + } - if ( - isLedgerAccountSerializedUI(account) || - isMnemonicSerializedUiAccount(account) || - isSeedSerializedUiAccount(account) - ) { - const { addressIndex, changeIndex, accountIndex } = parseDerivationPath( - account.derivationPath, - ); + if ( + isLedgerAccountSerializedUI(account) || + isMnemonicSerializedUiAccount(account) || + isSeedSerializedUiAccount(account) + ) { + const { addressIndex, changeIndex, accountIndex } = parseDerivationPath( + account.derivationPath, + ); - return addressIndex === 0 && changeIndex === 0 && accountIndex === 0; - } + return addressIndex === 0 && changeIndex === 0 && accountIndex === 0; } } From 872ba396f5d7d9da42591a6b874ac2df147623bf Mon Sep 17 00:00:00 2001 From: Mario Date: Wed, 25 Sep 2024 11:43:04 +0200 Subject: [PATCH 09/11] fix(tooling-ci): Use turbo@2 in the packages diff command (#2848) --- .github/actions/turbo-diffs/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/turbo-diffs/action.yml b/.github/actions/turbo-diffs/action.yml index 516f1e549c9..9f4056f39cb 100644 --- a/.github/actions/turbo-diffs/action.yml +++ b/.github/actions/turbo-diffs/action.yml @@ -17,7 +17,7 @@ runs: - id: changes name: Detect changes shell: bash - run: echo "packages=$(pnpm --silent dlx turbo@1 run build --filter="...[origin/develop]" --dry=json | jq -c ".packages")" >> $GITHUB_OUTPUT + run: echo "packages=$(pnpm --silent dlx turbo@2 run build --filter="...[origin/develop]" --dry=json | jq -c ".packages")" >> $GITHUB_OUTPUT - name: Print changes for easy debugging shell: bash run: echo ${{ steps.changes.outputs.packages }} From 86af63a0d52000ebf4d79d91f86653e5baeef30a Mon Sep 17 00:00:00 2001 From: Marc Espin Date: Wed, 25 Sep 2024 11:47:14 +0200 Subject: [PATCH 10/11] feat(wallet): Add RC Release workflow (#2847) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat(wallet): Add RC Release workflow * refactor: dprint fmt * refactor: Remove unnecessary permission * refactor: Remove turbo cache * Update turbo.json * Update .github/workflows/apps-wallet-rc.build.yml Co-authored-by: Begoña Álvarez de la Cruz * refactor: Use RC env vars * refactor: Rename RC env vars --------- Co-authored-by: Begoña Álvarez de la Cruz --- .github/workflows/apps-wallet-rc.build.yml | 47 +++++++++++++++++++ .../configs/webpack/webpack.config.common.ts | 4 +- turbo.json | 14 ++++++ 3 files changed, 63 insertions(+), 2 deletions(-) create mode 100644 .github/workflows/apps-wallet-rc.build.yml diff --git a/.github/workflows/apps-wallet-rc.build.yml b/.github/workflows/apps-wallet-rc.build.yml new file mode 100644 index 00000000000..4c623b6ccb7 --- /dev/null +++ b/.github/workflows/apps-wallet-rc.build.yml @@ -0,0 +1,47 @@ +name: Build Wallet App (RC) + +on: + workflow_dispatch: + inputs: + iota_branch: + description: "IOTA repo release branch to build artifacts from" + type: string + required: true + rc_version: + description: "The RC numeric version (X.Y.Z.RC)" + type: number + required: true + +env: + DEFAULT_NETWORK: ${{ secrets.WALLET_RC_DEFAULT_NETWORK }} + IOTA_NETWORKS: ${{ secrets.WALLET_RC_IOTA_NETWORKS }} + APPS_BACKEND: ${{ secrets.WALLET_RC_APPS_BACKEND }} + RC_VERSION: "${{ github.event.inputs.rc_version }}" + WALLET_RC: "true" + +jobs: + wallet-rc-build: + permissions: + contents: read + runs-on: [self-hosted] + steps: + - name: Checking out ${{ env.iota_branch }} + uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # pin@v3 + with: + ref: ${{ env.iota_branch }} + - uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2 # pin@v4.0.0 + - name: Install Nodejs + uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # pin@v4.0.2 + with: + node-version: "20" + cache: "pnpm" + - name: Install dependencies + run: pnpm install --frozen-lockfile + - name: Build Wallet + run: pnpm wallet build:rc + - name: Upload artifacts + uses: actions/upload-artifact@v4 + with: + name: ${{ env.artifact_name }} + path: | + ./apps/wallet/dist diff --git a/apps/wallet/configs/webpack/webpack.config.common.ts b/apps/wallet/configs/webpack/webpack.config.common.ts index 3645f4e838a..bfe06d71863 100644 --- a/apps/wallet/configs/webpack/webpack.config.common.ts +++ b/apps/wallet/configs/webpack/webpack.config.common.ts @@ -41,10 +41,10 @@ function generateVersion(n: number | undefined) { const sha = gitRevSync.short(); const packageVersion = packageJson.version; const version = n !== undefined ? `${packageVersion}.${n}` : packageVersion; - const improved_version = n !== undefined ? `${packageVersion}-rc.${n}` : packageVersion; + const version_name = n !== undefined ? `${packageVersion}-rc.${n}` : packageVersion; return { version, - version_name: `${improved_version} (${sha})`, + version_name: `${version_name} (${sha})`, }; } diff --git a/turbo.json b/turbo.json index a7fefbe13e4..81d6773f367 100644 --- a/turbo.json +++ b/turbo.json @@ -64,6 +64,20 @@ "!.next/cache/**", "pkg/**" ] + }, + "build:rc": { + "dependsOn": [ + "^build" + ], + "outputs": [ + "build/**", + "dist/**", + "storybook-static/**", + ".next/**", + "!.next/cache/**", + "pkg/**" + ] } + } } From 065513f48226154d9d83bb89d7890e854565171f Mon Sep 17 00:00:00 2001 From: evavirseda Date: Wed, 25 Sep 2024 12:26:50 +0200 Subject: [PATCH 11/11] feat(sdk): rebrand dapp-kit components (#2783) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: refine button and modal * feat: refine styles * feat: style dropwdown * feat: update text * feat: add missing style * fix format * fix format * feat: refine styles * feat: add iota wallet logo * fix: remove console.log * chore: add changeset --------- Co-authored-by: Begoña Alvarez Co-authored-by: Branko Bosnic --- .changeset/gold-bobcats-check.md | 5 + .../wallet-dashboard/app/dashboard/layout.tsx | 37 ++- apps/wallet-dashboard/app/globals.css | 22 +- apps/wallet-dashboard/tailwind.config.ts | 1 + .../dapp-interface/WalletStandardInterface.ts | 2 +- .../src/components/AccountDropdownMenu.css.ts | 28 ++- .../src/components/AccountDropdownMenu.tsx | 11 +- sdk/dapp-kit/src/components/ConnectButton.tsx | 5 +- .../src/components/WalletProvider.tsx | 15 +- .../connect-modal/ConnectModal.css.ts | 75 ++---- .../components/connect-modal/ConnectModal.tsx | 117 ++------- .../views/ConnectionStatus.css.ts | 36 --- .../connect-modal/views/ConnectionStatus.tsx | 55 ----- .../connect-modal/views/GetTheWallet.css.ts | 38 +++ .../connect-modal/views/GetTheWallet.tsx | 25 ++ .../connect-modal/views/GettingStarted.css.ts | 26 -- .../connect-modal/views/GettingStarted.tsx | 40 --- .../connect-modal/views/WalletConnect.css.ts | 55 +++++ .../connect-modal/views/WalletConnect.tsx | 79 ++++++ .../connect-modal/views/WhatIsAWallet.css.ts | 20 -- .../connect-modal/views/WhatIsAWallet.tsx | 24 -- .../components/connect-modal/views/index.ts | 5 + .../wallet-list/WalletList.css.ts | 6 +- .../connect-modal/wallet-list/WalletList.tsx | 36 +-- .../wallet-list/WalletListItem.css.ts | 20 +- .../wallet-list/WalletListItem.tsx | 21 +- .../src/components/icons/ArrowRightIcon.tsx | 23 ++ .../components/icons/ArrowTopRightIcon.tsx | 23 ++ .../src/components/icons/BackIcon.tsx | 18 -- .../src/components/icons/IotaIcon.tsx | 228 +++++++++++++++++- .../src/components/styling/StyleMarker.css.ts | 15 ++ sdk/dapp-kit/src/components/ui/Button.css.ts | 8 +- .../src/components/ui/IconButton.css.ts | 3 - sdk/dapp-kit/src/components/ui/Text.css.ts | 2 +- sdk/dapp-kit/src/constants/walletDefaults.ts | 5 + sdk/dapp-kit/src/index.ts | 1 + sdk/dapp-kit/src/themes/darkTheme.ts | 69 ++++++ sdk/dapp-kit/src/themes/lightTheme.ts | 53 ++-- sdk/dapp-kit/src/themes/themeContract.ts | 17 +- .../test/components/ConnectButton.test.tsx | 2 +- 40 files changed, 748 insertions(+), 523 deletions(-) create mode 100644 .changeset/gold-bobcats-check.md delete mode 100644 sdk/dapp-kit/src/components/connect-modal/views/ConnectionStatus.css.ts delete mode 100644 sdk/dapp-kit/src/components/connect-modal/views/ConnectionStatus.tsx create mode 100644 sdk/dapp-kit/src/components/connect-modal/views/GetTheWallet.css.ts create mode 100644 sdk/dapp-kit/src/components/connect-modal/views/GetTheWallet.tsx delete mode 100644 sdk/dapp-kit/src/components/connect-modal/views/GettingStarted.css.ts delete mode 100644 sdk/dapp-kit/src/components/connect-modal/views/GettingStarted.tsx create mode 100644 sdk/dapp-kit/src/components/connect-modal/views/WalletConnect.css.ts create mode 100644 sdk/dapp-kit/src/components/connect-modal/views/WalletConnect.tsx delete mode 100644 sdk/dapp-kit/src/components/connect-modal/views/WhatIsAWallet.css.ts delete mode 100644 sdk/dapp-kit/src/components/connect-modal/views/WhatIsAWallet.tsx create mode 100644 sdk/dapp-kit/src/components/connect-modal/views/index.ts create mode 100644 sdk/dapp-kit/src/components/icons/ArrowRightIcon.tsx create mode 100644 sdk/dapp-kit/src/components/icons/ArrowTopRightIcon.tsx delete mode 100644 sdk/dapp-kit/src/components/icons/BackIcon.tsx create mode 100644 sdk/dapp-kit/src/themes/darkTheme.ts diff --git a/.changeset/gold-bobcats-check.md b/.changeset/gold-bobcats-check.md new file mode 100644 index 00000000000..99e18ec0a8a --- /dev/null +++ b/.changeset/gold-bobcats-check.md @@ -0,0 +1,5 @@ +--- +'@iota/dapp-kit': minor +--- + +Rebrand diff --git a/apps/wallet-dashboard/app/dashboard/layout.tsx b/apps/wallet-dashboard/app/dashboard/layout.tsx index 7cd36c639ce..ac56873f2b4 100644 --- a/apps/wallet-dashboard/app/dashboard/layout.tsx +++ b/apps/wallet-dashboard/app/dashboard/layout.tsx @@ -2,31 +2,42 @@ // SPDX-License-Identifier: Apache-2.0 'use client'; -import { Notifications, RouteLink } from '@/components/index'; -import React, { type PropsWithChildren } from 'react'; +import { Button, Notifications, RouteLink } from '@/components/index'; +import React, { useState, type PropsWithChildren } from 'react'; import { ConnectButton } from '@iota/dapp-kit'; +const routes = [ + { title: 'Home', path: '/dashboard/home' }, + { title: 'Assets', path: '/dashboard/assets' }, + { title: 'Staking', path: '/dashboard/staking' }, + { title: 'Apps', path: '/dashboard/apps' }, + { title: 'Activity', path: '/dashboard/activity' }, + { title: 'Migrations', path: '/dashboard/migrations' }, + { title: 'Vesting', path: '/dashboard/vesting' }, +]; + function DashboardLayout({ children }: PropsWithChildren): JSX.Element { - const routes = [ - { title: 'Home', path: '/dashboard/home' }, - { title: 'Assets', path: '/dashboard/assets' }, - { title: 'Staking', path: '/dashboard/staking' }, - { title: 'Apps', path: '/dashboard/apps' }, - { title: 'Activity', path: '/dashboard/activity' }, - { title: 'Migrations', path: '/dashboard/migrations' }, - { title: 'Vesting', path: '/dashboard/vesting' }, - ]; + const [isDarkMode, setIsDarkMode] = useState(false); + + const toggleDarkMode = () => { + setIsDarkMode(!isDarkMode); + if (isDarkMode) { + document.documentElement.classList.remove('dark'); + } else { + document.documentElement.classList.add('dark'); + } + }; // TODO: check if the wallet is connected and if not redirect to the welcome screen return ( <>
- - {routes.map((route) => { return ; })} + +
{children}
diff --git a/apps/wallet-dashboard/app/globals.css b/apps/wallet-dashboard/app/globals.css index c7e0f0b6ea9..f20990e2944 100644 --- a/apps/wallet-dashboard/app/globals.css +++ b/apps/wallet-dashboard/app/globals.css @@ -2,29 +2,11 @@ @tailwind components; @tailwind utilities; -:root { - --foreground-rgb: 0, 0, 0; - --background-start-rgb: 214, 219, 220; - --background-end-rgb: 255, 255, 255; -} - -@media (prefers-color-scheme: dark) { - :root { - --foreground-rgb: 255, 255, 255; - --background-start-rgb: 0, 0, 0; - --background-end-rgb: 0, 0, 0; - } -} - html, body { height: 100%; -} - -body { - color: rgb(var(--foreground-rgb)); - background: linear-gradient(to bottom, transparent, rgb(var(--background-end-rgb))) - rgb(var(--background-start-rgb)); + @apply bg-gray-100 dark:bg-gray-900; + @apply text-gray-900 dark:text-gray-100; } @layer utilities { diff --git a/apps/wallet-dashboard/tailwind.config.ts b/apps/wallet-dashboard/tailwind.config.ts index c3b8ec17293..ca8c6b84b6a 100644 --- a/apps/wallet-dashboard/tailwind.config.ts +++ b/apps/wallet-dashboard/tailwind.config.ts @@ -9,6 +9,7 @@ const config: Config = { './pages/**/*.{js,ts,jsx,tsx,mdx}', './components/**/*.{js,ts,jsx,tsx,mdx}', ], + darkMode: 'class', theme: { extend: { backgroundImage: { diff --git a/apps/wallet/src/dapp-interface/WalletStandardInterface.ts b/apps/wallet/src/dapp-interface/WalletStandardInterface.ts index 15bdeb5bbe2..a130383ad76 100644 --- a/apps/wallet/src/dapp-interface/WalletStandardInterface.ts +++ b/apps/wallet/src/dapp-interface/WalletStandardInterface.ts @@ -71,7 +71,7 @@ export class IotaWallet implements Wallet { } get icon() { - return 'data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNzIiIGhlaWdodD0iNzIiIHZpZXdCb3g9IjAgMCA3MiA3MiIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHJlY3Qgd2lkdGg9IjcyIiBoZWlnaHQ9IjcyIiByeD0iMTYiIGZpbGw9IiM2RkJDRjAiLz4KPHBhdGggZmlsbC1ydWxlPSJldmVub2RkIiBjbGlwLXJ1bGU9ImV2ZW5vZGQiIGQ9Ik0yMC40MjEzIDUyLjc4MzhDMjMuNjQ5NiA1OC4zNzYgMjkuNDMyMSA2MS43MTQyIDM1Ljg4ODggNjEuNzE0MkM0Mi4zNDU1IDYxLjcxNDIgNDguMTI3IDU4LjM3NiA1MS4zNTY0IDUyLjc4MzhDNTQuNTg0OCA0Ny4xOTI2IDU0LjU4NDggNDAuNTE2MyA1MS4zNTY0IDM0LjkyNEwzNy43NTI0IDExLjM2MTVDMzYuOTI0MSA5LjkyNzAxIDM0Ljg1MzUgOS45MjcwMSAzNC4wMjUzIDExLjM2MTVMMjAuNDIxMyAzNC45MjRDMTcuMTkyOSA0MC41MTUyIDE3LjE5MjkgNDcuMTkxNSAyMC40MjEzIDUyLjc4MzhaTTMyLjA1NjYgMjIuNTcxM0wzNC45NTcxIDE3LjU0NzRDMzUuMzcxMiAxNi44MzAxIDM2LjQwNjUgMTYuODMwMSAzNi44MjA2IDE3LjU0NzRMNDcuOTc5MSAzNi44NzQ4QzUwLjAyOTEgNDAuNDI1NCA1MC40MTM5IDQ0LjUzNSA0OS4xMzM1IDQ4LjI5NTRDNDkuMDAwMiA0Ny42ODE5IDQ4LjgxMzggNDcuMDU0MiA0OC41NjI2IDQ2LjQyMDFDNDcuMDIxMyA0Mi41MzA0IDQzLjUzNjMgMzkuNTI4OSAzOC4yMDIzIDM3LjQ5ODJDMzQuNTM1MSAzNi4xMDcxIDMyLjE5NDMgMzQuMDYxMyAzMS4yNDMxIDMxLjQxNzFDMzAuMDE4IDI4LjAwODkgMzEuMjk3NiAyNC4yOTI0IDMyLjA1NjYgMjIuNTcxM1pNMjcuMTEwNyAzMS4xMzc5TDIzLjc5ODYgMzYuODc0OEMyMS4yNzQ4IDQxLjI0NTkgMjEuMjc0OCA0Ni40NjQxIDIzLjc5ODYgNTAuODM1M0MyNi4zMjIzIDU1LjIwNjQgMzAuODQxMyA1Ny44MTUgMzUuODg4OCA1Ny44MTVDMzkuMjQxMyA1Ny44MTUgNDIuMzYxNSA1Ni42NjMzIDQ0LjgxODQgNTQuNjA4OEM0NS4xMzg4IDUzLjgwMjEgNDYuMTMxIDUwLjg0OTIgNDQuOTA1MiA0Ny44MDU4QzQzLjc3MyA0NC45OTU0IDQxLjA0ODIgNDIuNzUxOSAzNi44MDYxIDQxLjEzNkMzMi4wMTEgMzkuMzE3MSAyOC44OTU4IDM2LjQ3NzQgMjcuNTQ4NiAzMi42OTg0QzI3LjM2MzEgMzIuMTc4MSAyNy4yMTg5IDMxLjY1NjggMjcuMTEwNyAzMS4xMzc5WiIgZmlsbD0id2hpdGUiLz4KPC9zdmc+' as const; + return 'data:image/svg+xml;base64,<svg width="256" height="256" viewBox="0 0 256 256" fill="none" xmlns="http://www.w3.org/2000/svg">
<rect width="256" height="256" rx="128" fill="white"/>
<path d="M169.227 61.6295C169.227 66.3954 165.375 70.259 160.624 70.259C155.873 70.259 152.021 66.3954 152.021 61.6295C152.021 56.8635 155.873 53 160.624 53C165.375 53 169.227 56.8635 169.227 61.6295Z" fill="#171D26"/>
<path d="M178.899 183.531C178.899 188.296 175.047 192.16 170.296 192.16C165.544 192.16 161.693 188.296 161.693 183.531C161.693 178.765 165.544 174.901 170.296 174.901C175.047 174.901 178.899 178.765 178.899 183.531Z" fill="#171D26"/>
<path d="M163.083 91.831C167.07 91.831 170.302 88.5891 170.302 84.59C170.302 80.5909 167.07 77.349 163.083 77.349C159.097 77.349 155.865 80.5909 155.865 84.59C155.865 88.5891 159.097 91.831 163.083 91.831Z" fill="#171D26"/>
<path d="M189.5 87.366C189.5 91.3651 186.268 94.607 182.281 94.607C178.295 94.607 175.062 91.3651 175.062 87.366C175.062 83.3669 178.295 80.125 182.281 80.125C186.268 80.125 189.5 83.3669 189.5 87.366Z" fill="#171D26"/>
<path d="M160.626 110.186C164.021 110.186 166.774 107.426 166.774 104.02C166.774 100.615 164.021 97.8542 160.626 97.8542C157.231 97.8542 154.479 100.615 154.479 104.02C154.479 107.426 157.231 110.186 160.626 110.186Z" fill="#171D26"/>
<path d="M185.977 106.624C185.977 110.03 183.225 112.79 179.83 112.79C176.434 112.79 173.682 110.03 173.682 106.624C173.682 103.219 176.434 100.458 179.83 100.458C183.225 100.458 185.977 103.219 185.977 106.624Z" fill="#171D26"/>
<path d="M195.189 118.806C198.584 118.806 201.336 116.045 201.336 112.64C201.336 109.235 198.584 106.474 195.189 106.474C191.794 106.474 189.042 109.235 189.042 112.64C189.042 116.045 191.794 118.806 195.189 118.806Z" fill="#171D26"/>
<path d="M179.512 122.197C179.512 125.174 177.106 127.587 174.139 127.587C171.171 127.587 168.766 125.174 168.766 122.197C168.766 119.22 171.171 116.807 174.139 116.807C177.106 116.807 179.512 119.22 179.512 122.197Z" fill="#171D26"/>
<path d="M154.941 124.962C157.909 124.962 160.314 122.549 160.314 119.572C160.314 116.595 157.909 114.182 154.941 114.182C151.973 114.182 149.568 116.595 149.568 119.572C149.568 122.549 151.973 124.962 154.941 124.962Z" fill="#171D26"/>
<path d="M195.038 128.197C195.038 131.174 192.632 133.587 189.665 133.587C186.697 133.587 184.292 131.174 184.292 128.197C184.292 125.22 186.697 122.807 189.665 122.807C192.632 122.807 195.038 125.22 195.038 128.197Z" fill="#171D26"/>
<path d="M166.458 138.845C169.006 138.845 171.072 136.773 171.072 134.217C171.072 131.661 169.006 129.589 166.458 129.589C163.91 129.589 161.844 131.661 161.844 134.217C161.844 136.773 163.91 138.845 166.458 138.845Z" fill="#171D26"/>
<path d="M186.603 140.066C186.603 142.622 184.537 144.694 181.989 144.694C179.441 144.694 177.375 142.622 177.375 140.066C177.375 137.51 179.441 135.438 181.989 135.438C184.537 135.438 186.603 137.51 186.603 140.066Z" fill="#171D26"/>
<path d="M147.411 136.074C149.959 136.074 152.025 134.002 152.025 131.446C152.025 128.89 149.959 126.818 147.411 126.818C144.863 126.818 142.797 128.89 142.797 131.446C142.797 134.002 144.863 136.074 147.411 136.074Z" fill="#171D26"/>
<path d="M161.847 142.534C161.847 144.662 160.128 146.386 158.007 146.386C155.886 146.386 154.167 144.662 154.167 142.534C154.167 140.407 155.886 138.682 158.007 138.682C160.128 138.682 161.847 140.407 161.847 142.534Z" fill="#171D26"/>
<path d="M164.613 157.028C166.479 157.028 167.992 155.511 167.992 153.639C167.992 151.767 166.479 150.25 164.613 150.25C162.747 150.25 161.234 151.767 161.234 153.639C161.234 155.511 162.747 157.028 164.613 157.028Z" fill="#171D26"/>
<path d="M159.24 156.412C159.24 157.946 158.001 159.189 156.472 159.189C154.943 159.189 153.703 157.946 153.703 156.412C153.703 154.879 154.943 153.635 156.472 153.635C158.001 153.635 159.24 154.879 159.24 156.412Z" fill="#171D26"/>
<path d="M149.254 151.169C151.12 151.169 152.632 149.651 152.632 147.78C152.632 145.908 151.12 144.391 149.254 144.391C147.388 144.391 145.875 145.908 145.875 147.78C145.875 149.651 147.388 151.169 149.254 151.169Z" fill="#171D26"/>
<path d="M142.644 139.925C142.644 142.052 140.925 143.777 138.804 143.777C136.683 143.777 134.964 142.052 134.964 139.925C134.964 137.797 136.683 136.073 138.804 136.073C140.925 136.073 142.644 137.797 142.644 139.925Z" fill="#171D26"/>
<path d="M138.658 114.798C140.779 114.798 142.498 113.073 142.498 110.946C142.498 108.818 140.779 107.094 138.658 107.094C136.537 107.094 134.818 108.818 134.818 110.946C134.818 113.073 136.537 114.798 138.658 114.798Z" fill="#171D26"/>
<path d="M143.716 97.8474C143.716 99.7192 142.203 101.237 140.337 101.237C138.471 101.237 136.958 99.7192 136.958 97.8474C136.958 95.9757 138.471 94.4583 140.337 94.4583C142.203 94.4583 143.716 95.9757 143.716 97.8474Z" fill="#171D26"/>
<path d="M144.029 90.1477C145.558 90.1477 146.797 88.9044 146.797 87.3707C146.797 85.837 145.558 84.5938 144.029 84.5938C142.5 84.5938 141.26 85.837 141.26 87.3707C141.26 88.9044 142.5 90.1477 144.029 90.1477Z" fill="#171D26"/>
<path d="M140.961 81.5141C140.961 83.3858 139.448 84.9032 137.582 84.9032C135.716 84.9032 134.203 83.3858 134.203 81.5141C134.203 79.6423 135.716 78.125 137.582 78.125C139.448 78.125 140.961 79.6423 140.961 81.5141Z" fill="#171D26"/>
<path d="M173.382 152.256C175.503 152.256 177.222 150.531 177.222 148.404C177.222 146.277 175.503 144.552 173.382 144.552C171.261 144.552 169.542 146.277 169.542 148.404C169.542 150.531 171.261 152.256 173.382 152.256Z" fill="#171D26"/>
<path d="M132.659 76.5707C132.659 78.698 130.94 80.4226 128.819 80.4226C126.698 80.4226 124.979 78.698 124.979 76.5707C124.979 74.4433 126.698 72.7188 128.819 72.7188C130.94 72.7188 132.659 74.4433 132.659 76.5707Z" fill="#171D26"/>
<path d="M131.439 96.7611C133.56 96.7611 135.279 95.0366 135.279 92.9092C135.279 90.7819 133.56 89.0573 131.439 89.0573C129.318 89.0573 127.599 90.7819 127.599 92.9092C127.599 95.0366 129.318 96.7611 131.439 96.7611Z" fill="#171D26"/>
<path d="M131.749 107.706C131.749 110.263 129.683 112.335 127.135 112.335C124.587 112.335 122.521 110.263 122.521 107.706C122.521 105.15 124.587 103.078 127.135 103.078C129.683 103.078 131.749 105.15 131.749 107.706Z" fill="#171D26"/>
<path d="M113.144 112.337C116.112 112.337 118.517 109.924 118.517 106.947C118.517 103.97 116.112 101.557 113.144 101.557C110.177 101.557 107.771 103.97 107.771 106.947C107.771 109.924 110.177 112.337 113.144 112.337Z" fill="#171D26"/>
<path d="M103.008 109.869C103.008 113.275 100.256 116.035 96.8608 116.035C93.4657 116.035 90.7135 113.275 90.7135 109.869C90.7135 106.464 93.4657 103.703 96.8608 103.703C100.256 103.703 103.008 106.464 103.008 109.869Z" fill="#171D26"/>
<path d="M79.047 124.815C83.0339 124.815 86.2659 121.573 86.2659 117.574C86.2659 113.575 83.0339 110.333 79.047 110.333C75.0601 110.333 71.8281 113.575 71.8281 117.574C71.8281 121.573 75.0601 124.815 79.047 124.815Z" fill="#171D26"/>
<path d="M69.2063 130.984C69.2063 135.75 65.3545 139.613 60.6031 139.613C55.8518 139.613 52 135.75 52 130.984C52 126.218 55.8518 122.354 60.6031 122.354C65.3545 122.354 69.2063 126.218 69.2063 130.984Z" fill="#171D26"/>
<path d="M71.8283 106.779C75.8152 106.779 79.0472 103.537 79.0472 99.5379C79.0472 95.5388 75.8152 92.2969 71.8283 92.2969C67.8414 92.2969 64.6094 95.5388 64.6094 99.5379C64.6094 103.537 67.8414 106.779 71.8283 106.779Z" fill="#171D26"/>
<path d="M95.7892 91.8327C95.7892 95.2381 93.037 97.9987 89.642 97.9987C86.247 97.9987 83.4948 95.2381 83.4948 91.8327C83.4948 88.4273 86.247 85.6667 89.642 85.6667C93.037 85.6667 95.7892 88.4273 95.7892 91.8327Z" fill="#171D26"/>
<path d="M87.0379 81.6654C90.4329 81.6654 93.1851 78.9048 93.1851 75.4994C93.1851 72.094 90.4329 69.3333 87.0379 69.3333C83.6428 69.3333 80.8906 72.094 80.8906 75.4994C80.8906 78.9048 83.6428 81.6654 87.0379 81.6654Z" fill="#171D26"/>
<path d="M108.694 72.5772C108.694 75.5538 106.289 77.9669 103.321 77.9669C100.354 77.9669 97.9479 75.5538 97.9479 72.5772C97.9479 69.6005 100.354 67.1875 103.321 67.1875C106.289 67.1875 108.694 69.6005 108.694 72.5772Z" fill="#171D26"/>
<path d="M117.296 77.9753C119.845 77.9753 121.911 75.9031 121.911 73.347C121.911 70.7909 119.845 68.7188 117.296 68.7188C114.748 68.7188 112.682 70.7909 112.682 73.347C112.682 75.9031 114.748 77.9753 117.296 77.9753Z" fill="#171D26"/>
<path d="M124.515 89.6856C124.515 92.2417 122.449 94.3138 119.901 94.3138C117.352 94.3138 115.286 92.2417 115.286 89.6856C115.286 87.1294 117.352 85.0573 119.901 85.0573C122.449 85.0573 124.515 87.1294 124.515 89.6856Z" fill="#171D26"/>
<path d="M105.925 94.4513C108.893 94.4513 111.299 92.0382 111.299 89.0616C111.299 86.0849 108.893 83.6719 105.925 83.6719C102.958 83.6719 100.552 86.0849 100.552 89.0616C100.552 92.0382 102.958 94.4513 105.925 94.4513Z" fill="#171D26"/>
<path d="M93.4849 132.683C93.4849 134.217 92.2454 135.46 90.7164 135.46C89.1874 135.46 87.9479 134.217 87.9479 132.683C87.9479 131.15 89.1874 129.906 90.7164 129.906C92.2454 129.906 93.4849 131.15 93.4849 132.683Z" fill="#171D26"/>
<path d="M101.775 134.059C103.641 134.059 105.153 132.542 105.153 130.67C105.153 128.799 103.641 127.281 101.775 127.281C99.9085 127.281 98.3958 128.799 98.3958 130.67C98.3958 132.542 99.9085 134.059 101.775 134.059Z" fill="#171D26"/>
<path d="M117.758 125.586C117.758 127.714 116.039 129.438 113.918 129.438C111.797 129.438 110.078 127.714 110.078 125.586C110.078 123.459 111.797 121.734 113.918 121.734C116.039 121.734 117.758 123.459 117.758 125.586Z" fill="#171D26"/>
<path d="M116.838 141.772C119.386 141.772 121.452 139.7 121.452 137.144C121.452 134.588 119.386 132.516 116.838 132.516C114.29 132.516 112.224 134.588 112.224 137.144C112.224 139.7 114.29 141.772 116.838 141.772Z" fill="#171D26"/>
<path d="M105.925 140.847C105.925 142.974 104.206 144.699 102.085 144.699C99.9641 144.699 98.2448 142.974 98.2448 140.847C98.2448 138.719 99.9641 136.995 102.085 136.995C104.206 136.995 105.925 138.719 105.925 140.847Z" fill="#171D26"/>
<path d="M89.035 144.533C90.901 144.533 92.4137 143.016 92.4137 141.144C92.4137 139.273 90.901 137.755 89.035 137.755C87.169 137.755 85.6562 139.273 85.6562 141.144C85.6562 143.016 87.169 144.533 89.035 144.533Z" fill="#171D26"/>
<path d="M93.0241 151.326C93.0241 153.453 91.3048 155.178 89.1839 155.178C87.063 155.178 85.3438 153.453 85.3438 151.326C85.3438 149.199 87.063 147.474 89.1839 147.474C91.3048 147.474 93.0241 149.199 93.0241 151.326Z" fill="#171D26"/>
<path d="M104.854 157.184C107.402 157.184 109.468 155.111 109.468 152.555C109.468 149.999 107.402 147.927 104.854 147.927C102.305 147.927 100.24 149.999 100.24 152.555C100.24 155.111 102.305 157.184 104.854 157.184Z" fill="#171D26"/>
<path d="M128.507 149.78C128.507 152.757 126.101 155.17 123.134 155.17C120.166 155.17 117.76 152.757 117.76 149.78C117.76 146.804 120.166 144.391 123.134 144.391C126.101 144.391 128.507 146.804 128.507 149.78Z" fill="#171D26"/>
<path d="M133.892 168.587C137.287 168.587 140.039 165.827 140.039 162.421C140.039 159.016 137.287 156.255 133.892 156.255C130.497 156.255 127.745 159.016 127.745 162.421C127.745 165.827 130.497 168.587 133.892 168.587Z" fill="#171D26"/>
<path d="M116.674 165.03C116.674 168.007 114.268 170.42 111.3 170.42C108.333 170.42 105.927 168.007 105.927 165.03C105.927 162.054 108.333 159.641 111.3 159.641C114.268 159.641 116.674 162.054 116.674 165.03Z" fill="#171D26"/>
<path d="M98.5555 180.91C101.523 180.91 103.929 178.497 103.929 175.52C103.929 172.543 101.523 170.13 98.5555 170.13C95.588 170.13 93.1823 172.543 93.1823 175.52C93.1823 178.497 95.588 180.91 98.5555 180.91Z" fill="#171D26"/>
<path d="M115.3 188.307C115.3 191.712 112.547 194.473 109.152 194.473C105.757 194.473 103.005 191.712 103.005 188.307C103.005 184.901 105.757 182.141 109.152 182.141C112.547 182.141 115.3 184.901 115.3 188.307Z" fill="#171D26"/>
<path d="M137.422 196.94C141.409 196.94 144.641 193.698 144.641 189.699C144.641 185.7 141.409 182.458 137.422 182.458C133.435 182.458 130.203 185.7 130.203 189.699C130.203 193.698 133.435 196.94 137.422 196.94Z" fill="#171D26"/>
<path d="M128.06 177.833C128.06 181.238 125.308 183.999 121.913 183.999C118.518 183.999 115.766 181.238 115.766 177.833C115.766 174.427 118.518 171.667 121.913 171.667C125.308 171.667 128.06 174.427 128.06 177.833Z" fill="#171D26"/>
<path d="M149.255 181.529C153.242 181.529 156.474 178.287 156.474 174.288C156.474 170.289 153.242 167.047 149.255 167.047C145.268 167.047 142.036 170.289 142.036 174.288C142.036 178.287 145.268 181.529 149.255 181.529Z" fill="#171D26"/>
<path d="M96.7127 163.035C96.7127 165.591 94.6468 167.663 92.0985 167.663C89.5502 167.663 87.4844 165.591 87.4844 163.035C87.4844 160.478 89.5502 158.406 92.0985 158.406C94.6468 158.406 96.7127 160.478 96.7127 163.035Z" fill="#171D26"/>
</svg>
' as const; } get chains() { diff --git a/sdk/dapp-kit/src/components/AccountDropdownMenu.css.ts b/sdk/dapp-kit/src/components/AccountDropdownMenu.css.ts index ef0b38e5e9f..936061114ae 100644 --- a/sdk/dapp-kit/src/components/AccountDropdownMenu.css.ts +++ b/sdk/dapp-kit/src/components/AccountDropdownMenu.css.ts @@ -3,40 +3,46 @@ // SPDX-License-Identifier: Apache-2.0 import { style } from '@vanilla-extract/css'; - import { themeVars } from '../themes/themeContract.js'; export const connectedAccount = style({ - gap: 8, + gap: themeVars.spacing.xsmall, }); export const menuContainer = style({ zIndex: 999999999, }); +export const icon = style({ + color: themeVars.colors.body, +}); + export const menuContent = style({ display: 'flex', flexDirection: 'column', width: 180, maxHeight: 200, - marginTop: 4, - padding: 8, - gap: 8, + marginTop: themeVars.spacing.xsmall, + gap: themeVars.spacing.xxsmall, borderRadius: themeVars.radii.large, backgroundColor: themeVars.backgroundColors.dropdownMenu, + padding: themeVars.spacing.xxsmall, }); export const menuItem = style({ - padding: 8, userSelect: 'none', outline: 'none', display: 'flex', alignItems: 'center', - borderRadius: themeVars.radii.large, - selectors: { - '&[data-highlighted]': { - backgroundColor: themeVars.backgroundColors.primaryButton, - }, + borderRadius: themeVars.radii.medium, + fontSize: themeVars.fontSizes.medium, + fontWeight: themeVars.fontWeights.normal, + letterSpacing: themeVars.typography.letterSpacing, + lineHeight: themeVars.typography.lineHeight, + padding: themeVars.spacing.small, + ':hover': { + backgroundColor: themeVars.backgroundColors.primaryButtonHover, + cursor: 'pointer', }, }); diff --git a/sdk/dapp-kit/src/components/AccountDropdownMenu.tsx b/sdk/dapp-kit/src/components/AccountDropdownMenu.tsx index af5b23924e8..ecf04df5fbc 100644 --- a/sdk/dapp-kit/src/components/AccountDropdownMenu.tsx +++ b/sdk/dapp-kit/src/components/AccountDropdownMenu.tsx @@ -6,7 +6,6 @@ import { formatAddress } from '@iota/iota-sdk/utils'; import type { WalletAccount } from '@iota/wallet-standard'; import * as DropdownMenu from '@radix-ui/react-dropdown-menu'; import clsx from 'clsx'; - import { useAccounts } from '../hooks/wallet/useAccounts.js'; import { useDisconnectWallet } from '../hooks/wallet/useDisconnectWallet.js'; import { useSwitchAccount } from '../hooks/wallet/useSwitchAccount.js'; @@ -29,11 +28,9 @@ export function AccountDropdownMenu({ currentAccount }: AccountDropdownMenuProps - @@ -74,7 +71,7 @@ export function AccountDropdownMenuItem({ className={clsx(styles.menuItem, styles.switchAccountMenuItem)} onSelect={() => switchAccount({ account })} > - {account.label ?? formatAddress(account.address)} + {account.label ?? formatAddress(account.address)} {active ? : null} ); diff --git a/sdk/dapp-kit/src/components/ConnectButton.tsx b/sdk/dapp-kit/src/components/ConnectButton.tsx index 58016b4b43b..1d808f818c7 100644 --- a/sdk/dapp-kit/src/components/ConnectButton.tsx +++ b/sdk/dapp-kit/src/components/ConnectButton.tsx @@ -14,10 +14,7 @@ type ConnectButtonProps = { connectText?: ReactNode; } & ButtonHTMLAttributes; -export function ConnectButton({ - connectText = 'Connect Wallet', - ...buttonProps -}: ConnectButtonProps) { +export function ConnectButton({ connectText = 'Connect', ...buttonProps }: ConnectButtonProps) { const currentAccount = useCurrentAccount(); return currentAccount ? ( diff --git a/sdk/dapp-kit/src/components/WalletProvider.tsx b/sdk/dapp-kit/src/components/WalletProvider.tsx index 0dae6322522..e9cbfaca974 100644 --- a/sdk/dapp-kit/src/components/WalletProvider.tsx +++ b/sdk/dapp-kit/src/components/WalletProvider.tsx @@ -19,11 +19,22 @@ import { useUnsafeBurnerWallet } from '../hooks/wallet/useUnsafeBurnerWallet.js' import { useWalletPropertiesChanged } from '../hooks/wallet/useWalletPropertiesChanged.js'; import { useWalletsChanged } from '../hooks/wallet/useWalletsChanged.js'; import { lightTheme } from '../themes/lightTheme.js'; -import type { Theme } from '../themes/themeContract.js'; +import type { DynamicTheme, Theme } from '../themes/themeContract.js'; import { createInMemoryStore } from '../utils/stateStorage.js'; import { getRegisteredWallets } from '../utils/walletUtils.js'; import { createWalletStore } from '../walletStore.js'; import { InjectedThemeStyles } from './styling/InjectedThemeStyles.js'; +import { darkTheme } from '../themes/darkTheme.js'; + +const themeWithSelectorAndMediaQuery: DynamicTheme[] = [ + { + selector: '.dark', + variables: darkTheme, + }, + { + variables: lightTheme, + }, +]; export type WalletProviderProps = { /** A list of wallets that are sorted to the top of the wallet list, if they are available to connect to. By default, wallets are sorted by the order they are loaded in. */ @@ -59,7 +70,7 @@ export function WalletProvider({ storageKey = DEFAULT_STORAGE_KEY, enableUnsafeBurner = false, autoConnect = false, - theme = lightTheme, + theme = themeWithSelectorAndMediaQuery, children, }: WalletProviderProps) { const storeRef = useRef( diff --git a/sdk/dapp-kit/src/components/connect-modal/ConnectModal.css.ts b/sdk/dapp-kit/src/components/connect-modal/ConnectModal.css.ts index 99473feeb19..aa508ff559d 100644 --- a/sdk/dapp-kit/src/components/connect-modal/ConnectModal.css.ts +++ b/sdk/dapp-kit/src/components/connect-modal/ConnectModal.css.ts @@ -15,7 +15,16 @@ export const overlay = style({ }); export const title = style({ - paddingLeft: 8, + color: themeVars.colors.body, + fontSize: themeVars.fontSizes.xlarge, + fontWeight: themeVars.fontWeights.medium, + margin: 0, +}); + +export const separator = style({ + height: 1, + backgroundColor: themeVars.backgroundColors.dropdownMenuSeparator, + width: '100%', }); export const content = style({ @@ -23,20 +32,18 @@ export const content = style({ borderRadius: themeVars.radii.xlarge, color: themeVars.colors.body, position: 'fixed', - bottom: 16, - left: 16, - right: 16, + top: 0, + left: '50%', display: 'flex', flexDirection: 'column', - justifyContent: 'space-between', overflow: 'hidden', minHeight: '50vh', maxHeight: '85vh', - maxWidth: 700, + width: '330px', + transform: 'translate(-50%, 100%)', '@media': { 'screen and (min-width: 768px)': { flexDirection: 'row', - width: '100%', top: '50%', left: '50%', transform: 'translate(-50%, -50%)', @@ -44,31 +51,6 @@ export const content = style({ }, }); -export const whatIsAWalletButton = style({ - backgroundColor: themeVars.backgroundColors.modalSecondary, - padding: 16, - '@media': { - 'screen and (min-width: 768px)': { - display: 'none', - }, - }, -}); - -export const viewContainer = style({ - display: 'none', - padding: 20, - flexGrow: 1, - '@media': { - 'screen and (min-width: 768px)': { - display: 'flex', - }, - }, -}); - -export const selectedViewContainer = style({ - display: 'flex', -}); - export const backButtonContainer = style({ position: 'absolute', top: 20, @@ -89,9 +71,10 @@ export const closeButtonContainer = style({ export const walletListContent = style({ display: 'flex', flexDirection: 'column', + width: '100%', flexGrow: 1, - gap: 24, - padding: 20, + gap: themeVars.spacing.medium, + padding: themeVars.spacing.medium, backgroundColor: themeVars.backgroundColors.modalPrimary, '@media': { 'screen and (min-width: 768px)': { @@ -99,27 +82,3 @@ export const walletListContent = style({ }, }, }); - -export const walletListContainer = style({ - display: 'flex', - justifyContent: 'space-between', - flexDirection: 'column', - flexGrow: 1, - '@media': { - 'screen and (min-width: 768px)': { - flexDirection: 'row', - flexBasis: 240, - flexGrow: 0, - flexShrink: 0, - }, - }, -}); - -export const walletListContainerWithViewSelected = style({ - display: 'none', - '@media': { - 'screen and (min-width: 768px)': { - display: 'flex', - }, - }, -}); diff --git a/sdk/dapp-kit/src/components/connect-modal/ConnectModal.tsx b/sdk/dapp-kit/src/components/connect-modal/ConnectModal.tsx index a26c6701ecb..542e0bf5edb 100644 --- a/sdk/dapp-kit/src/components/connect-modal/ConnectModal.tsx +++ b/sdk/dapp-kit/src/components/connect-modal/ConnectModal.tsx @@ -2,26 +2,17 @@ // Modifications Copyright (c) 2024 IOTA Stiftung // SPDX-License-Identifier: Apache-2.0 -import type { WalletWithRequiredFeatures } from '@iota/wallet-standard'; import * as Dialog from '@radix-ui/react-dialog'; -import clsx from 'clsx'; import { useState } from 'react'; import type { ReactNode } from 'react'; - -import { useConnectWallet } from '../../hooks/wallet/useConnectWallet.js'; -import { getWalletUniqueIdentifier } from '../../utils/walletUtils.js'; -import { BackIcon } from '../icons/BackIcon.js'; import { CloseIcon } from '../icons/CloseIcon.js'; import { StyleMarker } from '../styling/StyleMarker.js'; import { Heading } from '../ui/Heading.js'; import { IconButton } from '../ui/IconButton.js'; import * as styles from './ConnectModal.css.js'; -import { ConnectionStatus } from './views/ConnectionStatus.js'; -import { GettingStarted } from './views/GettingStarted.js'; -import { WhatIsAWallet } from './views/WhatIsAWallet.js'; -import { WalletList } from './wallet-list/WalletList.js'; - -type ConnectModalView = 'getting-started' | 'what-is-a-wallet' | 'connection-status'; +import { useWallets } from '../../hooks/wallet/useWallets.js'; +import { WalletConnectListView } from './views/WalletConnect.js'; +import { GetTheWalletView } from './views/GetTheWallet.js'; type ControlledModalProps = { /** The controlled open state of the dialog. */ @@ -48,55 +39,14 @@ type ConnectModalProps = { } & (ControlledModalProps | UncontrolledModalProps); export function ConnectModal({ trigger, open, defaultOpen, onOpenChange }: ConnectModalProps) { + const wallets = useWallets(); const [isModalOpen, setModalOpen] = useState(open ?? defaultOpen); - const [currentView, setCurrentView] = useState(); - const [selectedWallet, setSelectedWallet] = useState(); - const { mutate, isError } = useConnectWallet(); - - const resetSelection = () => { - setSelectedWallet(undefined); - setCurrentView(undefined); - }; const handleOpenChange = (open: boolean) => { - if (!open) { - resetSelection(); - } setModalOpen(open); onOpenChange?.(open); }; - const connectWallet = (wallet: WalletWithRequiredFeatures) => { - setCurrentView('connection-status'); - mutate( - { wallet }, - { - onSuccess: () => handleOpenChange(false), - }, - ); - }; - - let modalContent: ReactNode | undefined; - switch (currentView) { - case 'what-is-a-wallet': - modalContent = ; - break; - case 'getting-started': - modalContent = ; - break; - case 'connection-status': - modalContent = ( - - ); - break; - default: - modalContent = ; - } - return ( {trigger} @@ -104,54 +54,19 @@ export function ConnectModal({ trigger, open, defaultOpen, onOpenChange }: Conne -
-
- - Connect a Wallet - - setCurrentView('getting-started')} - onSelect={(wallet) => { - if ( - getWalletUniqueIdentifier(selectedWallet) !== - getWalletUniqueIdentifier(wallet) - ) { - setSelectedWallet(wallet); - connectWallet(wallet); - } - }} +
+ + Connect a Wallet + +
+ {wallets?.length ? ( + -
- -
-
-
- resetSelection()} - > - - -
- {modalContent} + ) : ( + + )}
diff --git a/sdk/dapp-kit/src/components/connect-modal/views/ConnectionStatus.css.ts b/sdk/dapp-kit/src/components/connect-modal/views/ConnectionStatus.css.ts deleted file mode 100644 index 9bb2cb87622..00000000000 --- a/sdk/dapp-kit/src/components/connect-modal/views/ConnectionStatus.css.ts +++ /dev/null @@ -1,36 +0,0 @@ -// Copyright (c) Mysten Labs, Inc. -// Modifications Copyright (c) 2024 IOTA Stiftung -// SPDX-License-Identifier: Apache-2.0 - -import { style } from '@vanilla-extract/css'; - -import { themeVars } from '../../../themes/themeContract.js'; - -export const container = style({ - display: 'flex', - flexDirection: 'column', - justifyContent: 'center', - alignItems: 'center', - width: '100%', -}); - -export const walletIcon = style({ - objectFit: 'cover', - width: 72, - height: 72, - borderRadius: themeVars.radii.large, -}); - -export const title = style({ - marginTop: 12, -}); - -export const connectionStatus = style({ - marginTop: 4, -}); - -export const retryButtonContainer = style({ - position: 'absolute', - bottom: 20, - right: 20, -}); diff --git a/sdk/dapp-kit/src/components/connect-modal/views/ConnectionStatus.tsx b/sdk/dapp-kit/src/components/connect-modal/views/ConnectionStatus.tsx deleted file mode 100644 index 282ed37348e..00000000000 --- a/sdk/dapp-kit/src/components/connect-modal/views/ConnectionStatus.tsx +++ /dev/null @@ -1,55 +0,0 @@ -// Copyright (c) Mysten Labs, Inc. -// Modifications Copyright (c) 2024 IOTA Stiftung -// SPDX-License-Identifier: Apache-2.0 - -import type { WalletWithRequiredFeatures } from '@iota/wallet-standard'; - -import { Button } from '../../ui/Button.js'; -import { Heading } from '../../ui/Heading.js'; -import { Text } from '../../ui/Text.js'; -import * as styles from './ConnectionStatus.css.js'; - -type ConnectionStatusProps = { - selectedWallet: WalletWithRequiredFeatures; - hadConnectionError: boolean; - onRetryConnection: (selectedWallet: WalletWithRequiredFeatures) => void; -}; - -export function ConnectionStatus({ - selectedWallet, - hadConnectionError, - onRetryConnection, -}: ConnectionStatusProps) { - return ( -
- {`${selectedWallet.name} -
- - Opening {selectedWallet.name} - -
-
- {hadConnectionError ? ( - Connection failed - ) : ( - Confirm connection in the wallet... - )} -
- {hadConnectionError ? ( -
- -
- ) : null} -
- ); -} diff --git a/sdk/dapp-kit/src/components/connect-modal/views/GetTheWallet.css.ts b/sdk/dapp-kit/src/components/connect-modal/views/GetTheWallet.css.ts new file mode 100644 index 00000000000..fc06498d12f --- /dev/null +++ b/sdk/dapp-kit/src/components/connect-modal/views/GetTheWallet.css.ts @@ -0,0 +1,38 @@ +// Copyright (c) 2024 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +import { style } from '@vanilla-extract/css'; +import { themeVars } from '../../../themes/themeContract.js'; + +export const container = style({ + display: 'flex', + flexDirection: 'column', + alignItems: 'center', + justifyContent: 'center', + padding: themeVars.spacing.medium, + height: '100%', + gap: themeVars.spacing.xlarge, +}); + +export const content = style({ + display: 'flex', + flexDirection: 'column', + alignItems: 'center', + gap: themeVars.spacing.medium, +}); + +export const text = style({ + fontSize: themeVars.fontSizes.medium, + textAlign: 'center', + color: themeVars.colors.body, +}); + +export const button = style({ + display: 'flex', + alignItems: 'center', + gap: themeVars.spacing.xsmall, +}); + +export const icon = style({ + color: themeVars.colors.body, +}); diff --git a/sdk/dapp-kit/src/components/connect-modal/views/GetTheWallet.tsx b/sdk/dapp-kit/src/components/connect-modal/views/GetTheWallet.tsx new file mode 100644 index 00000000000..0c765a2b740 --- /dev/null +++ b/sdk/dapp-kit/src/components/connect-modal/views/GetTheWallet.tsx @@ -0,0 +1,25 @@ +// Copyright (c) 2024 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +import { WALLET_DOWNLOAD_URL } from '../../../constants/walletDefaults.js'; +import { ArrowTopRightIcon } from '../../icons/ArrowTopRightIcon.js'; +import { IotaIcon } from '../../icons/IotaIcon.js'; +import { Button } from '../../ui/Button.js'; +import * as styles from './GetTheWallet.css.js'; + +export function GetTheWalletView() { + return ( +
+
+ +

Don't have a wallet yet?

+
+ + + +
+ ); +} diff --git a/sdk/dapp-kit/src/components/connect-modal/views/GettingStarted.css.ts b/sdk/dapp-kit/src/components/connect-modal/views/GettingStarted.css.ts deleted file mode 100644 index a76855c904d..00000000000 --- a/sdk/dapp-kit/src/components/connect-modal/views/GettingStarted.css.ts +++ /dev/null @@ -1,26 +0,0 @@ -// Copyright (c) Mysten Labs, Inc. -// Modifications Copyright (c) 2024 IOTA Stiftung -// SPDX-License-Identifier: Apache-2.0 - -import { style } from '@vanilla-extract/css'; - -export const container = style({ - display: 'flex', - flexDirection: 'column', - alignItems: 'center', -}); - -export const content = style({ - display: 'flex', - flexDirection: 'column', - justifyContent: 'center', - flexGrow: 1, - gap: 20, - padding: 40, -}); - -export const installButtonContainer = style({ - position: 'absolute', - bottom: 20, - right: 20, -}); diff --git a/sdk/dapp-kit/src/components/connect-modal/views/GettingStarted.tsx b/sdk/dapp-kit/src/components/connect-modal/views/GettingStarted.tsx deleted file mode 100644 index 12ab3cb4930..00000000000 --- a/sdk/dapp-kit/src/components/connect-modal/views/GettingStarted.tsx +++ /dev/null @@ -1,40 +0,0 @@ -// Copyright (c) Mysten Labs, Inc. -// Modifications Copyright (c) 2024 IOTA Stiftung -// SPDX-License-Identifier: Apache-2.0 - -import { Button } from '../../ui/Button.js'; -import { Heading } from '../../ui/Heading.js'; -import { InfoSection } from '../InfoSection.js'; -import * as styles from './GettingStarted.css.js'; - -export function GettingStarted() { - return ( -
- Get Started with Iota -
- - We recommend pinning Iota Wallet to your taskbar for quicker access. - - - Be sure to back up your wallet using a secure method. Never share your secret - phrase with anyone. - - - Once you set up your wallet, refresh this window browser to load up the - extension. - - -
-
- ); -} diff --git a/sdk/dapp-kit/src/components/connect-modal/views/WalletConnect.css.ts b/sdk/dapp-kit/src/components/connect-modal/views/WalletConnect.css.ts new file mode 100644 index 00000000000..6e7fd4a2a85 --- /dev/null +++ b/sdk/dapp-kit/src/components/connect-modal/views/WalletConnect.css.ts @@ -0,0 +1,55 @@ +// Copyright (c) Mysten Labs, Inc. +// Modifications Copyright (c) 2024 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +import { style } from '@vanilla-extract/css'; +import { themeVars } from '../../../themes/themeContract.js'; + +export const walletConnectContainer = style({ + height: '100%', + width: '100%', + overflow: 'auto', +}); + +export const walletConnectFooter = style({ + display: 'flex', + flexDirection: 'column', + gap: themeVars.spacing.small, +}); + +export const errorContainer = style({ + display: 'flex', + width: '100%', + flexDirection: 'row', + alignItems: 'center', + justifyContent: 'space-between', + gap: themeVars.spacing.small, +}); + +export const errorMessage = style({ + fontSize: themeVars.fontSizes.small, + color: themeVars.colors.bodyDanger, +}); + +export const successContainer = style({ + display: 'flex', + flexDirection: 'column', + alignItems: 'flex-start', + gap: themeVars.spacing.small, +}); + +export const openingText = style({ + fontSize: themeVars.fontSizes.small, + color: themeVars.colors.bodyMuted, +}); + +export const confirmText = style({ + fontSize: themeVars.fontSizes.medium, + color: themeVars.colors.body, +}); + +export const separator = style({ + height: 1, + backgroundColor: themeVars.backgroundColors.dropdownMenuSeparator, + width: '100%', +}); diff --git a/sdk/dapp-kit/src/components/connect-modal/views/WalletConnect.tsx b/sdk/dapp-kit/src/components/connect-modal/views/WalletConnect.tsx new file mode 100644 index 00000000000..2074a6905e7 --- /dev/null +++ b/sdk/dapp-kit/src/components/connect-modal/views/WalletConnect.tsx @@ -0,0 +1,79 @@ +// Copyright (c) 2024 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +import type { WalletWithRequiredFeatures } from '@iota/wallet-standard'; +import { useState } from 'react'; +import { getWalletUniqueIdentifier } from '../../../utils/walletUtils.js'; +import { useConnectWallet } from '../../../hooks/wallet/useConnectWallet.js'; +import { WalletList } from '../wallet-list/WalletList.js'; +import * as styles from './WalletConnect.css.js'; +import { Button } from '../../ui/Button.js'; + +interface WalletConnectListViewProps { + wallets: WalletWithRequiredFeatures[]; + onOpenChange: (isOpen: boolean) => void; +} +export function WalletConnectListView({ wallets, onOpenChange }: WalletConnectListViewProps) { + const [selectedWallet, setSelectedWallet] = useState(); + const { mutate, isError } = useConnectWallet(); + function handleSelectWallet(wallet: WalletWithRequiredFeatures) { + if (getWalletUniqueIdentifier(selectedWallet) !== getWalletUniqueIdentifier(wallet)) { + setSelectedWallet(wallet); + connectWallet(wallet); + } + } + function resetSelection() { + setSelectedWallet(undefined); + } + + function handleOpenChange(open: boolean) { + if (!open) { + resetSelection(); + } + onOpenChange(open); + } + + function connectWallet(wallet: WalletWithRequiredFeatures) { + mutate( + { wallet }, + { + onSuccess: () => handleOpenChange(false), + }, + ); + } + return ( + <> +
+ +
+ {selectedWallet && ( +
+ {isError ? ( +
+

Connection failed

+ +
+ ) : ( +
+

Opening {selectedWallet.name}...

+
+

+ Please confirm the connection in your wallet +

+
+ )} +
+ )} + + ); +} diff --git a/sdk/dapp-kit/src/components/connect-modal/views/WhatIsAWallet.css.ts b/sdk/dapp-kit/src/components/connect-modal/views/WhatIsAWallet.css.ts deleted file mode 100644 index 36c9a667384..00000000000 --- a/sdk/dapp-kit/src/components/connect-modal/views/WhatIsAWallet.css.ts +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright (c) Mysten Labs, Inc. -// Modifications Copyright (c) 2024 IOTA Stiftung -// SPDX-License-Identifier: Apache-2.0 - -import { style } from '@vanilla-extract/css'; - -export const container = style({ - display: 'flex', - flexDirection: 'column', - alignItems: 'center', -}); - -export const content = style({ - display: 'flex', - flexDirection: 'column', - justifyContent: 'center', - flexGrow: 1, - gap: 20, - padding: 40, -}); diff --git a/sdk/dapp-kit/src/components/connect-modal/views/WhatIsAWallet.tsx b/sdk/dapp-kit/src/components/connect-modal/views/WhatIsAWallet.tsx deleted file mode 100644 index 4e9c710dec5..00000000000 --- a/sdk/dapp-kit/src/components/connect-modal/views/WhatIsAWallet.tsx +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright (c) Mysten Labs, Inc. -// Modifications Copyright (c) 2024 IOTA Stiftung -// SPDX-License-Identifier: Apache-2.0 - -import { Heading } from '../../ui/Heading.js'; -import { InfoSection } from '../InfoSection.js'; -import * as styles from './WhatIsAWallet.css.js'; - -export function WhatIsAWallet() { - return ( -
- What is a Wallet -
- - No need to create new accounts and passwords for every website. Just connect - your wallet and get going. - - - Send, receive, store, and display your digital assets like NFTs & coins. - -
-
- ); -} diff --git a/sdk/dapp-kit/src/components/connect-modal/views/index.ts b/sdk/dapp-kit/src/components/connect-modal/views/index.ts new file mode 100644 index 00000000000..f1e517673dc --- /dev/null +++ b/sdk/dapp-kit/src/components/connect-modal/views/index.ts @@ -0,0 +1,5 @@ +// Copyright (c) 2024 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +export * from './WalletConnect.js'; +export * from './GetTheWallet.js'; diff --git a/sdk/dapp-kit/src/components/connect-modal/wallet-list/WalletList.css.ts b/sdk/dapp-kit/src/components/connect-modal/wallet-list/WalletList.css.ts index c22d8ba24ef..8152bb51bd5 100644 --- a/sdk/dapp-kit/src/components/connect-modal/wallet-list/WalletList.css.ts +++ b/sdk/dapp-kit/src/components/connect-modal/wallet-list/WalletList.css.ts @@ -3,9 +3,13 @@ // SPDX-License-Identifier: Apache-2.0 import { style } from '@vanilla-extract/css'; +import { themeVars } from '../../../themes/themeContract.js'; export const container = style({ display: 'flex', flexDirection: 'column', - gap: 4, + gap: themeVars.spacing.xsmall, + height: '100%', + width: '100%', + maxHeight: '330px', }); diff --git a/sdk/dapp-kit/src/components/connect-modal/wallet-list/WalletList.tsx b/sdk/dapp-kit/src/components/connect-modal/wallet-list/WalletList.tsx index 88381c782e8..bc228bf1b31 100644 --- a/sdk/dapp-kit/src/components/connect-modal/wallet-list/WalletList.tsx +++ b/sdk/dapp-kit/src/components/connect-modal/wallet-list/WalletList.tsx @@ -3,41 +3,27 @@ // SPDX-License-Identifier: Apache-2.0 import type { WalletWithRequiredFeatures } from '@iota/wallet-standard'; - -import { useWallets } from '../../../hooks/wallet/useWallets.js'; import { getWalletUniqueIdentifier } from '../../../utils/walletUtils.js'; -import { IotaIcon } from '../../icons/IotaIcon.js'; import * as styles from './WalletList.css.js'; import { WalletListItem } from './WalletListItem.js'; -type WalletListProps = { +interface WalletListProps { selectedWalletName?: string; - onPlaceholderClick: () => void; onSelect: (wallet: WalletWithRequiredFeatures) => void; -}; - -export function WalletList({ selectedWalletName, onPlaceholderClick, onSelect }: WalletListProps) { - const wallets = useWallets(); + wallets: WalletWithRequiredFeatures[]; +} +export function WalletList({ selectedWalletName, onSelect, wallets }: WalletListProps) { return (
    - {wallets.length > 0 ? ( - wallets.map((wallet) => ( - onSelect(wallet)} - /> - )) - ) : ( + {wallets.map((wallet) => ( } - onClick={onPlaceholderClick} - isSelected + key={getWalletUniqueIdentifier(wallet)} + name={wallet.name} + icon={wallet.icon} + isSelected={getWalletUniqueIdentifier(wallet) === selectedWalletName} + onClick={() => onSelect(wallet)} /> - )} + ))}
); } diff --git a/sdk/dapp-kit/src/components/connect-modal/wallet-list/WalletListItem.css.ts b/sdk/dapp-kit/src/components/connect-modal/wallet-list/WalletListItem.css.ts index c6ce82f9972..3554aa2c57e 100644 --- a/sdk/dapp-kit/src/components/connect-modal/wallet-list/WalletListItem.css.ts +++ b/sdk/dapp-kit/src/components/connect-modal/wallet-list/WalletListItem.css.ts @@ -3,28 +3,36 @@ // SPDX-License-Identifier: Apache-2.0 import { style } from '@vanilla-extract/css'; - import { themeVars } from '../../../themes/themeContract.js'; export const container = style({ display: 'flex', + width: '100%', }); export const walletItem = style({ display: 'flex', alignItems: 'center', + justifyContent: 'space-between', + width: '100%', flexGrow: 1, - padding: 8, - gap: 8, + padding: themeVars.spacing.medium, borderRadius: themeVars.radii.large, ':hover': { - backgroundColor: themeVars.backgroundColors.walletItemHover, + backgroundColor: themeVars.backgroundColors.primaryButtonHover, }, }); export const selectedWalletItem = style({ - backgroundColor: themeVars.backgroundColors.walletItemSelected, - boxShadow: '0px 2px 6px rgba(0, 0, 0, 0.05)', + border: `1px solid ${themeVars.borderColors.outlineButton}`, + borderRadius: themeVars.radii.large, +}); + +export const walletName = style({ + display: 'flex', + alignItems: 'center', + flexDirection: 'row', + gap: themeVars.spacing.small, }); export const walletIcon = style({ diff --git a/sdk/dapp-kit/src/components/connect-modal/wallet-list/WalletListItem.tsx b/sdk/dapp-kit/src/components/connect-modal/wallet-list/WalletListItem.tsx index fb9dde09bb5..1822ca336ab 100644 --- a/sdk/dapp-kit/src/components/connect-modal/wallet-list/WalletListItem.tsx +++ b/sdk/dapp-kit/src/components/connect-modal/wallet-list/WalletListItem.tsx @@ -4,9 +4,9 @@ import { clsx } from 'clsx'; import type { ReactNode } from 'react'; - import { Heading } from '../../ui/Heading.js'; import * as styles from './WalletListItem.css.js'; +import { ArrowRightIcon } from '../../icons/ArrowRightIcon.js'; type WalletListItemProps = { name: string; @@ -23,14 +23,17 @@ export function WalletListItem({ name, icon, onClick, isSelected = false }: Wall type="button" onClick={onClick} > - {typeof icon === 'string' ? ( - {`${name} - ) : ( - icon - )} - -
{name}
-
+
+ {typeof icon === 'string' ? ( + {`${name} + ) : ( + icon + )} + +
{name}
+
+
+ ); diff --git a/sdk/dapp-kit/src/components/icons/ArrowRightIcon.tsx b/sdk/dapp-kit/src/components/icons/ArrowRightIcon.tsx new file mode 100644 index 00000000000..a7af8029f47 --- /dev/null +++ b/sdk/dapp-kit/src/components/icons/ArrowRightIcon.tsx @@ -0,0 +1,23 @@ +// Copyright (c) Mysten Labs, Inc. +// Modifications Copyright (c) 2024 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +import type { ComponentProps } from 'react'; + +export function ArrowRightIcon(props: ComponentProps<'svg'>) { + return ( + + + + ); +} diff --git a/sdk/dapp-kit/src/components/icons/ArrowTopRightIcon.tsx b/sdk/dapp-kit/src/components/icons/ArrowTopRightIcon.tsx new file mode 100644 index 00000000000..8b60ddc0ab9 --- /dev/null +++ b/sdk/dapp-kit/src/components/icons/ArrowTopRightIcon.tsx @@ -0,0 +1,23 @@ +// Copyright (c) Mysten Labs, Inc. +// Modifications Copyright (c) 2024 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +import type { ComponentProps } from 'react'; + +export function ArrowTopRightIcon(props: ComponentProps<'svg'>) { + return ( + + + + ); +} diff --git a/sdk/dapp-kit/src/components/icons/BackIcon.tsx b/sdk/dapp-kit/src/components/icons/BackIcon.tsx deleted file mode 100644 index 32bf963b04d..00000000000 --- a/sdk/dapp-kit/src/components/icons/BackIcon.tsx +++ /dev/null @@ -1,18 +0,0 @@ -// Copyright (c) Mysten Labs, Inc. -// Modifications Copyright (c) 2024 IOTA Stiftung -// SPDX-License-Identifier: Apache-2.0 - -import type { ComponentProps } from 'react'; - -// FIXME: Replace this with a 10x10 icon to match the CheckIcon, or alternatively make the CheckIcon bigger -// Right now, the icons don't align on mobile :( -export function BackIcon(props: ComponentProps<'svg'>) { - return ( - - - - ); -} diff --git a/sdk/dapp-kit/src/components/icons/IotaIcon.tsx b/sdk/dapp-kit/src/components/icons/IotaIcon.tsx index 205cd3fc9f8..3bc4b326464 100644 --- a/sdk/dapp-kit/src/components/icons/IotaIcon.tsx +++ b/sdk/dapp-kit/src/components/icons/IotaIcon.tsx @@ -6,13 +6,229 @@ import type { ComponentProps } from 'react'; export function IotaIcon(props: ComponentProps<'svg'>) { return ( - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ); diff --git a/sdk/dapp-kit/src/components/styling/StyleMarker.css.ts b/sdk/dapp-kit/src/components/styling/StyleMarker.css.ts index deb0993cf8a..001595fdae9 100644 --- a/sdk/dapp-kit/src/components/styling/StyleMarker.css.ts +++ b/sdk/dapp-kit/src/components/styling/StyleMarker.css.ts @@ -47,3 +47,18 @@ globalStyle(':where(h1, h2, h3, h4, h5, h6)', { fontWeight: 'inherit', margin: 0, }); + +globalStyle('::-webkit-scrollbar', { + width: '14px', +}); + +globalStyle('::-webkit-scrollbar-track', { + borderRadius: themeVars.radii.xlarge, + backgroundColor: 'transparent', +}); + +globalStyle('::-webkit-scrollbar-thumb', { + boxShadow: `inset 0 0 10px 10px ${themeVars.backgroundColors.scrollThumb}`, + borderRadius: themeVars.radii.xlarge, + border: '4px solid transparent', +}); diff --git a/sdk/dapp-kit/src/components/ui/Button.css.ts b/sdk/dapp-kit/src/components/ui/Button.css.ts index 794c8f13ea4..07c43671f4d 100644 --- a/sdk/dapp-kit/src/components/ui/Button.css.ts +++ b/sdk/dapp-kit/src/components/ui/Button.css.ts @@ -4,7 +4,6 @@ import type { RecipeVariants } from '@vanilla-extract/recipes'; import { recipe } from '@vanilla-extract/recipes'; - import { themeVars } from '../../themes/themeContract.js'; export const buttonVariants = recipe({ @@ -22,7 +21,6 @@ export const buttonVariants = recipe({ primary: { backgroundColor: themeVars.backgroundColors.primaryButton, color: themeVars.colors.primaryButton, - boxShadow: themeVars.shadows.primaryButton, ':hover': { backgroundColor: themeVars.backgroundColors.primaryButtonHover, }, @@ -31,15 +29,15 @@ export const buttonVariants = recipe({ borderWidth: 1, borderStyle: 'solid', borderColor: themeVars.borderColors.outlineButton, - color: themeVars.colors.outlineButton, + color: themeVars.colors.primaryButton, ':hover': { backgroundColor: themeVars.backgroundColors.outlineButtonHover, }, }, }, size: { - md: { borderRadius: themeVars.radii.medium, padding: '8px 16px' }, - lg: { borderRadius: themeVars.radii.large, padding: '16px 24px ' }, + md: { borderRadius: themeVars.radii.full, padding: '8px 16px' }, + lg: { borderRadius: themeVars.radii.full, padding: '16px 24px ' }, }, }, defaultVariants: { diff --git a/sdk/dapp-kit/src/components/ui/IconButton.css.ts b/sdk/dapp-kit/src/components/ui/IconButton.css.ts index b5e4f510cf0..9d507bf7c50 100644 --- a/sdk/dapp-kit/src/components/ui/IconButton.css.ts +++ b/sdk/dapp-kit/src/components/ui/IconButton.css.ts @@ -11,7 +11,4 @@ export const container = style({ padding: 8, color: themeVars.colors.iconButton, backgroundColor: themeVars.backgroundColors.iconButton, - ':hover': { - backgroundColor: themeVars.backgroundColors.iconButtonHover, - }, }); diff --git a/sdk/dapp-kit/src/components/ui/Text.css.ts b/sdk/dapp-kit/src/components/ui/Text.css.ts index c3044d3f99f..089c71d488f 100644 --- a/sdk/dapp-kit/src/components/ui/Text.css.ts +++ b/sdk/dapp-kit/src/components/ui/Text.css.ts @@ -4,7 +4,6 @@ import type { RecipeVariants } from '@vanilla-extract/recipes'; import { recipe } from '@vanilla-extract/recipes'; - import { themeVars } from '../../themes/themeContract.js'; export const textVariants = recipe({ @@ -20,6 +19,7 @@ export const textVariants = recipe({ bold: { fontWeight: themeVars.fontWeights.bold }, }, color: { + body: { color: themeVars.colors.body }, muted: { color: themeVars.colors.bodyMuted }, danger: { color: themeVars.colors.bodyDanger }, }, diff --git a/sdk/dapp-kit/src/constants/walletDefaults.ts b/sdk/dapp-kit/src/constants/walletDefaults.ts index be739763898..94338c7ddf4 100644 --- a/sdk/dapp-kit/src/constants/walletDefaults.ts +++ b/sdk/dapp-kit/src/constants/walletDefaults.ts @@ -18,3 +18,8 @@ export const DEFAULT_REQUIRED_FEATURES: (keyof WalletWithRequiredFeatures['featu ]; export const DEFAULT_PREFERRED_WALLETS = [IOTA_WALLET_NAME]; + +const WALLET_CHROME_EXTENSION_ID = 'TODO'; + +export const WALLET_DOWNLOAD_URL = + 'https://chromewebstore.google.com/detail/' + WALLET_CHROME_EXTENSION_ID; diff --git a/sdk/dapp-kit/src/index.ts b/sdk/dapp-kit/src/index.ts index 0868413591e..a267488a395 100644 --- a/sdk/dapp-kit/src/index.ts +++ b/sdk/dapp-kit/src/index.ts @@ -23,6 +23,7 @@ export * from './hooks/wallet/useSignPersonalMessage.js'; export * from './hooks/wallet/useSignTransactionBlock.js'; export * from './hooks/wallet/useSwitchAccount.js'; export * from './hooks/wallet/useWallets.js'; +export * from './themes/darkTheme.js'; export * from './themes/lightTheme.js'; export * from './types.js'; diff --git a/sdk/dapp-kit/src/themes/darkTheme.ts b/sdk/dapp-kit/src/themes/darkTheme.ts new file mode 100644 index 00000000000..e12870b478a --- /dev/null +++ b/sdk/dapp-kit/src/themes/darkTheme.ts @@ -0,0 +1,69 @@ +// Copyright (c) Mysten Labs, Inc. +// Modifications Copyright (c) 2024 IOTA Stiftung +// SPDX-License-Identifier: Apache-2.0 + +import type { ThemeVars } from './themeContract.js'; + +export const darkTheme: ThemeVars = { + blurs: { + modalOverlay: 'blur(12px)', + }, + backgroundColors: { + primaryButton: '#253041', + primaryButtonHover: '#313D50', + outlineButtonHover: '#313D50', + modalOverlay: 'rgba(0, 47, 109, 0.72)', + modalPrimary: '#0f141c', + modalSecondary: '#171d26', + iconButton: 'transparent', + dropdownMenu: '#0f141c', + dropdownMenuSeparator: '#bed8ff14', + walletItemSelected: '#171D26', + walletItemHover: 'rgba(190, 216, 255, 0.12)', + scrollThumb: '#3c4656', + }, + borderColors: { + outlineButton: '#8892A1', + }, + colors: { + primaryButton: '#E3EAF6', + outlineButtonHover: '#171D26', + iconButton: '#E3EAF6', + body: '#E3EAF6', + bodyMuted: '#8892A1', + bodyDanger: '#FFB0BE', + }, + radii: { + small: '6px', + medium: '8px', + large: '12px', + xlarge: '16px', + full: '120px', + }, + fontWeights: { + normal: '400', + medium: '500', + bold: '600', + }, + fontSizes: { + small: '14px', + medium: '16px', + large: '18px', + xlarge: '20px', + }, + typography: { + fontFamily: + 'ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"', + fontStyle: 'normal', + lineHeight: '24px', + letterSpacing: '0.1px', + }, + spacing: { + xxsmall: '4px', + xsmall: '8px', + small: '12px', + medium: '16px', + large: '24px', + xlarge: '32px', + }, +}; diff --git a/sdk/dapp-kit/src/themes/lightTheme.ts b/sdk/dapp-kit/src/themes/lightTheme.ts index c95918bff2e..2b238f47270 100644 --- a/sdk/dapp-kit/src/themes/lightTheme.ts +++ b/sdk/dapp-kit/src/themes/lightTheme.ts @@ -6,42 +6,39 @@ import type { ThemeVars } from './themeContract.js'; export const lightTheme: ThemeVars = { blurs: { - modalOverlay: 'blur(0)', + modalOverlay: 'blur(12px)', }, backgroundColors: { - primaryButton: '#F6F7F9', - primaryButtonHover: '#F0F2F5', - outlineButtonHover: '#F4F4F5', - modalOverlay: 'rgba(24 36 53 / 20%)', - modalPrimary: 'white', - modalSecondary: '#F7F8F8', + primaryButton: '#DDE4F0', + primaryButtonHover: '#002F6D14', + outlineButtonHover: '#002F6D14', + modalOverlay: 'rgba(0, 47, 109, 0.72)', + modalPrimary: '#ffffff', + modalSecondary: '#e3eaf6', iconButton: 'transparent', - iconButtonHover: '#F0F1F2', dropdownMenu: '#FFFFFF', - dropdownMenuSeparator: '#F3F6F8', - walletItemSelected: 'white', - walletItemHover: '#3C424226', + dropdownMenuSeparator: '#002f6d14', + walletItemSelected: '#EFF4FA', + walletItemHover: 'rgba(0, 103, 238, 0.12)', + scrollThumb: '#cad4e2', }, borderColors: { - outlineButton: '#E4E4E7', + outlineButton: '#6E7787', }, colors: { - primaryButton: '#373737', - outlineButton: '#373737', - iconButton: '#000000', - body: '#182435', - bodyMuted: '#767A81', - bodyDanger: '#FF794B', + primaryButton: '#171D26', + outlineButtonHover: '#E3EAF6', + iconButton: '#171D26', + body: '#171D26', + bodyMuted: '#545E6E', + bodyDanger: '#B51431', }, radii: { small: '6px', medium: '8px', large: '12px', xlarge: '16px', - }, - shadows: { - primaryButton: '0px 4px 12px rgba(0, 0, 0, 0.1)', - walletItemSelected: '0px 2px 6px rgba(0, 0, 0, 0.05)', + full: '120px', }, fontWeights: { normal: '400', @@ -58,7 +55,15 @@ export const lightTheme: ThemeVars = { fontFamily: 'ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"', fontStyle: 'normal', - lineHeight: '1.3', - letterSpacing: '1', + lineHeight: '24px', + letterSpacing: '0.1px', + }, + spacing: { + xxsmall: '4px', + xsmall: '8px', + small: '12px', + medium: '16px', + large: '24px', + xlarge: '32px', }, }; diff --git a/sdk/dapp-kit/src/themes/themeContract.ts b/sdk/dapp-kit/src/themes/themeContract.ts index 56595f8fc56..3c3a0a28ebc 100644 --- a/sdk/dapp-kit/src/themes/themeContract.ts +++ b/sdk/dapp-kit/src/themes/themeContract.ts @@ -18,16 +18,16 @@ const themeContractValues = { modalPrimary: '', modalSecondary: '', iconButton: '', - iconButtonHover: '', dropdownMenu: '', dropdownMenuSeparator: '', + scrollThumb: '', }, borderColors: { outlineButton: '', }, colors: { primaryButton: '', - outlineButton: '', + outlineButtonHover: '', body: '', bodyMuted: '', bodyDanger: '', @@ -38,10 +38,7 @@ const themeContractValues = { medium: '', large: '', xlarge: '', - }, - shadows: { - primaryButton: '', - walletItemSelected: '', + full: '', }, fontWeights: { normal: '', @@ -60,6 +57,14 @@ const themeContractValues = { lineHeight: '', letterSpacing: '', }, + spacing: { + xxsmall: '', + xsmall: '', + small: '', + medium: '', + large: '', + xlarge: '', + }, }; export type ThemeVars = typeof themeContractValues; diff --git a/sdk/dapp-kit/test/components/ConnectButton.test.tsx b/sdk/dapp-kit/test/components/ConnectButton.test.tsx index c1e9ff508bc..d3f172b912b 100644 --- a/sdk/dapp-kit/test/components/ConnectButton.test.tsx +++ b/sdk/dapp-kit/test/components/ConnectButton.test.tsx @@ -14,7 +14,7 @@ describe('ConnectButton', () => { render(, { wrapper }); - const connectButtonEl = screen.getByRole('button', { name: 'Connect Wallet' }); + const connectButtonEl = screen.getByRole('button', { name: 'Connect' }); expect(connectButtonEl).toBeInTheDocument(); const user = userEvent.setup();