Skip to content

Commit

Permalink
Merge branch 'develop' into dev-tools/remove-keytool-loadKeypair
Browse files Browse the repository at this point in the history
  • Loading branch information
thibault-martinez authored Oct 29, 2024
2 parents 11d09e1 + a7391ce commit 028fe0e
Show file tree
Hide file tree
Showing 498 changed files with 7,323 additions and 20,869 deletions.
1 change: 0 additions & 1 deletion .changeset/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
"iota-wallet",
"iota-explorer",
"wallet-dashboard",
"@iota/apps-ui-kit",
"apps-backend",
"@iota/core",
"@iota/apps-ui-kit",
Expand Down
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ vercel.json @iotaledger/boxfish @iotaledger/tooling
# Scripts
/scripts/dependency_graphs/ @muXxer
/scripts/cargo_sort/ @muXxer
/scripts/generate_files/ @muXxer
/scripts/codesearch/ @muXxer
/scripts/slipstream/ @muXxer

Expand Down
1 change: 0 additions & 1 deletion .github/ISSUE_TEMPLATE/release.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ title: '[Task(*)]: release version x.y.z'
- [ ] Edit `crates/iota-open-rpc/spec/openrpc.json`
- [ ] Update `sdk/typescript/src/version.ts` (`pnpm sdk build`)
- [ ] Update `Cargo.lock` (`cargo check`)
- [ ] Update `crates/iota-framework/packages/deepbook/Move.lock`
- [ ] Update `crates/iota-framework/packages/iota-framework/Move.lock`
- [ ] Update `crates/iota-framework/packages/iota-system/Move.lock`
- [ ] Update `crates/iota-framework/packages/move-stdlib/Move.lock`
Expand Down
45 changes: 45 additions & 0 deletions .github/workflows/_ledgernano.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
name: Ledgernano End-to-end Tests

on: workflow_call

concurrency:
group: ledgernano-${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

jobs:
ledgernano:
name: Ledgernano
runs-on: self-hosted
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # Pin v4.1.1
- uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2 # [email protected]

- name: Install Nodejs
uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # [email protected]
with:
node-version: "20"
cache: "pnpm"

- name: Install dependencies
run: pnpm install --frozen-lockfile

- name: Install ledgernano dependencies
run: |
sudo apt-get install -y qemu-user-static
sudo apt-get install -y libxcb-xinerama0
sudo pip install speculos --break-system-packages
- name: Download ledgernano bin
run: |
sudo apt-get install -y gh
echo ${{ secrets.LEDGER_APP_TOKEN }} | gh auth login --with-token
gh release list --repo https://github.com/iotaledger/ledger-app-iota
gh release download --repo https://github.com/iotaledger/ledger-app-iota -p nanos.tar.gz untagged-a706a550379839d8db15
tar -xvf nanos.tar.gz
mv nanos/iota sdk/ledgerjs-hw-app-iota/tests/iota
- name: Start speculos simulator
run: speculos --api-port 5000 --display headless ./sdk/ledgerjs-hw-app-iota/tests/iota &

- name: Run TS SDK ledgernano tests
run: pnpm --filter @iota/ledgerjs-hw-app-iota test
3 changes: 1 addition & 2 deletions .github/workflows/_rust_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,7 @@ jobs:
check-unused-deps:
name: Check Unused Dependencies (${{ matrix.flags }})
# Temporarily disabled until the nightly build bug is resolved
if: (!cancelled() && false)
if: (!cancelled())
strategy:
matrix:
flags: ["--all-features", "--no-default-features"]
Expand Down
9 changes: 2 additions & 7 deletions .github/workflows/_turborepo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,6 @@ jobs:
- name: (debug-before) Check SDK dist folder
continue-on-error: true
run: tree ./sdk/typescript/dist
- name: (debug) Lint
continue-on-error: true
run: pnpm turbo lint
- name: (debug-after) Check SDK dist folder
continue-on-error: true
run: tree ./sdk/typescript/dist
- name: Lint
run: pnpm turbo lint
- name: Install wasm-pack for mbf package
Expand All @@ -73,7 +67,8 @@ jobs:
- name: Build
run: pnpm turbo build
- name: Test
run: pnpm turbo test
# @iota/ledgerjs-hw-app-iota is tested separately
run: pnpm turbo test --filter '!@iota/ledgerjs-hw-app-iota'
# Pack wallet extension and upload it as an artifact for easy developer use:
- name: Wallet Extension Has Changes?
id: wallet-diff
Expand Down
16 changes: 11 additions & 5 deletions .github/workflows/_vercel_deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,15 @@ on:
shouldDeployPreview:
type: boolean
required: true
isDevelop:
type: boolean
required: true
githubRef:
type: string
required: true

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
group: ${{ github.workflow }}-${{ inputs.githubRef }}
cancel-in-progress: true

jobs:
Expand All @@ -37,7 +43,7 @@ jobs:

explorer-prod:
name: Vercel Explorer Production
if: github.ref_name == 'develop' && inputs.isExplorer
if: inputs.isDevelop
uses: ./.github/workflows/apps-explorer.deploy.yml
secrets: inherit
with:
Expand All @@ -53,7 +59,7 @@ jobs:

ui-kit-prod:
name: Vercel UI Kit Preview
if: github.ref_name == 'develop' && inputs.isAppsUiKit
if: inputs.isDevelop
uses: ./.github/workflows/apps-ui-kit.deploy.yml
secrets: inherit
with:
Expand All @@ -69,7 +75,7 @@ jobs:

wallet-dashboard-prod:
name: Vercel Wallet Dashboard Production
if: github.ref_name == 'develop' && inputs.isWalletDashboard
if: inputs.isDevelop
uses: ./.github/workflows/apps-wallet-dashboard.deploy.yml
secrets: inherit
with:
Expand All @@ -85,7 +91,7 @@ jobs:

apps-backend-prod:
name: Vercel apps-backend Production
if: github.ref_name == 'develop' && inputs.isAppsBackend
if: inputs.isDevelop
uses: ./.github/workflows/apps-backend.deploy.yml
secrets: inherit
with:
Expand Down
13 changes: 13 additions & 0 deletions .github/workflows/hierarchy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ jobs:
isAppsUiKit: ${{ (steps.turbo.outputs.packages && contains(fromJson(steps.turbo.outputs.packages), '@iota/apps-ui-kit')) }}
isWalletDashboard: ${{ (steps.turbo.outputs.packages && contains(fromJson(steps.turbo.outputs.packages), 'wallet-dashboard')) }}
isGraphQlTransport: ${{ (steps.turbo.outputs.packages && contains(fromJson(steps.turbo.outputs.packages), '@iota/graphql-transport')) }}
isLedgerjs: ${{ (steps.turbo.outputs.packages && contains(fromJson(steps.turbo.outputs.packages), '@iota/ledgerjs-hw-app-iota')) }}
steps:
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # pin@v4
- name: Detect Changes (turbo)
Expand Down Expand Up @@ -164,3 +165,15 @@ jobs:
isAppsBackend: ${{ needs.diff.outputs.isAppsBackend == 'true' }}
isAppsUiKit: ${{ needs.diff.outputs.isAppsUiKit == 'true' }}
isWalletDashboard: ${{ needs.diff.outputs.isWalletDashboard == 'true' }}
isDevelop: ${{ github.ref_name == 'develop' }}
githubRef: ${{ github.event.pull_request.number || github.ref }}

ledgernano:
if: (!cancelled() && !failure()) && needs.diff.outputs.isLedgerjs == 'true' && github.event.pull_request.draft == false
needs:
- diff
- dprint-format
- license-check
- typos
uses: ./.github/workflows/_ledgernano.yml
secrets: inherit
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ Move.lock
!crates/iota-framework/packages/move-stdlib/Move.lock
!crates/iota-framework/packages/iota-framework/Move.lock
!crates/iota-framework/packages/iota-system/Move.lock
!crates/iota-framework/packages/deepbook/Move.lock
!crates/iota-framework/packages/stardust/Move.lock
!crates/iota-framework/packages/timelock/Move.lock
.trace
Expand Down
20 changes: 11 additions & 9 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 10 additions & 8 deletions apps/explorer/src/components/IotaTokenCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@
// Modifications Copyright (c) 2024 IOTA Stiftung
// SPDX-License-Identifier: Apache-2.0

import { Panel } from '@iota/apps-ui-kit';
import { COIN_GECKO_IOTA_URL, useIotaCoinData } from '@iota/core';
import { IotaLogoMark } from '@iota/ui-icons';
import { ButtonOrLink, Card } from '~/components/ui';
import { ButtonOrLink, ImageIconSize } from '~/components/ui';
import { CoinIcon } from './owned-coins';
import { IOTA_TYPE_ARG } from '@iota/iota-sdk/utils';

export function IotaTokenCard(): JSX.Element {
const { data } = useIotaCoinData();
Expand All @@ -19,12 +21,12 @@ export function IotaTokenCard(): JSX.Element {

return (
<ButtonOrLink href={COIN_GECKO_IOTA_URL}>
<Card growOnHover bg="white/80" spacing="lg" height="full">
<div className="flex items-center gap-2">
<div className="flex h-8 w-8 shrink-0 items-center justify-center rounded-full bg-primary-30">
<IotaLogoMark className="h-5 w-5 text-white" />
<Panel>
<div className="flex items-center gap-xs p-md--rs">
<div className="flex h-10 w-10 shrink-0 items-center justify-center rounded-full border border-shader-neutral-light-8 text-neutral-10">
<CoinIcon coinType={IOTA_TYPE_ARG} size={ImageIconSize.Small} />
</div>
<div className="flex w-full flex-col gap-0.5">
<div className="flex w-full flex-col gap-xxxs">
<span className="font-inter text-title-lg text-neutral-10 dark:text-neutral-92">
1 IOTA = {formattedPrice}
</span>
Expand All @@ -33,7 +35,7 @@ export function IotaTokenCard(): JSX.Element {
</span>
</div>
</div>
</Card>
</Panel>
</ButtonOrLink>
);
}
41 changes: 19 additions & 22 deletions apps/explorer/src/components/activity/EpochsActivityTable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
// Modifications Copyright (c) 2024 IOTA Stiftung
// SPDX-License-Identifier: Apache-2.0

import { InfoBox, InfoBoxStyle, InfoBoxType, Select } from '@iota/apps-ui-kit';
import { InfoBox, InfoBoxStyle, InfoBoxType, Select, SelectSize } from '@iota/apps-ui-kit';
import { useIotaClientQuery, useIotaClient, useIotaClientInfiniteQuery } from '@iota/dapp-kit';
import { Warning } from '@iota/ui-icons';
import { useQuery } from '@tanstack/react-query';
import { useState } from 'react';

import { PlaceholderTable, TableCard, useCursorPagination } from '~/components/ui';
import { PAGE_SIZES_RANGE_20_60 } from '~/lib/constants';
import { generateEpochsTableColumns } from '~/lib/ui';
import { numberSuffix } from '~/lib/utils';

Expand Down Expand Up @@ -71,29 +71,26 @@ export function EpochsActivityTable({
data={data.data}
columns={tableColumns}
totalLabel={count ? `${numberSuffix(Number(count))} Total` : '-'}
viewAll={!disablePagination ? '/recent?tab=epochs' : undefined}
viewAll="/recent?tab=epochs"
paginationOptions={!disablePagination ? pagination : undefined}
pageSizeSelector={
!disablePagination && (
<Select
value={limit.toString()}
options={PAGE_SIZES_RANGE_20_60.map((size) => ({
label: `${size} / page`,
id: size.toString(),
}))}
size={SelectSize.Small}
onValueChange={(e) => {
setLimit(Number(e));
pagination.onFirst();
}}
/>
)
}
/>
)}

<div className="flex justify-between">
<div className="flex items-center space-x-3">
{!disablePagination && (
<Select
value={limit.toString()}
options={[
{ id: '20', label: '20 Per Page' },
{ id: '40', label: '40 Per Page' },
{ id: '60', label: '60 Per Page' },
]}
onValueChange={(e) => {
setLimit(Number(e));
pagination.onFirst();
}}
/>
)}
</div>
</div>
</div>
);
}
Loading

0 comments on commit 028fe0e

Please sign in to comment.