Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into vm-language/feat/s…
Browse files Browse the repository at this point in the history
…tandards-docs-updates
  • Loading branch information
PhilippGackstatter committed Aug 13, 2024
2 parents 2f9e15c + fc4678f commit 333b9ea
Show file tree
Hide file tree
Showing 581 changed files with 1,792 additions and 1,885 deletions.
2 changes: 2 additions & 0 deletions .changeset/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,10 @@
"iota-wallet",
"iota-explorer",
"wallet-dashboard",
"apps-backend",
"@iota/core",
"@iota/ui",
"@iota/apps-ui-kit",
"sponsored-transactions",
"kiosk-demo",
"kiosk-cli"
Expand Down
85 changes: 0 additions & 85 deletions .github/actions/ts-e2e/action.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/cargo-llvm-cov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ jobs:
steps:
- uses: technote-space/workflow-conclusion-action@45ce8e0eb155657ab8ccf346ade734257fd196a5 # Pin v4.1.1

- name: Checkout iota repo main branch
- name: Checkout iota repo develop branch
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # Pin v3.0.3

- name: Get iota commit
Expand Down
23 changes: 2 additions & 21 deletions .github/workflows/changesets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,36 +5,17 @@ on:
workflow_dispatch:
push:
branches:
- main
- develop

concurrency: ${{ github.workflow }}-${{ github.ref }}

jobs:
release:
runs-on: self-hosted
steps:
- name: Dispatch Changesets To Operations
uses: peter-evans/repository-dispatch@ff45666b9427631e3450c54a1bcbee4d9ff4d7c0 # [email protected]
with:
repository: iotaledger/iota-operations
token: ${{ secrets.CHANGESETS_DEPLOY_DISPATCH }}
event-type: changesets
client-payload: '{"ref": "${{ github.ref }}", "sha": "${{ github.sha }}"}'

version:
runs-on: self-hosted
steps:
- name: Generate token
id: generate_token
uses: tibdex/github-app-token@3beb63f4bd073e61482598c45c71c1019b59b73a # pin@v1
with:
app_id: ${{ secrets.APP_ID }}
private_key: ${{ secrets.APP_PRIVATE_KEY }}

- name: checkout code repository
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # Pin v4.1.1
with:
token: ${{ steps.generate_token.outputs.token }}
fetch-depth: 0
- uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2 # [email protected]
- name: Install Nodejs
Expand All @@ -51,4 +32,4 @@ jobs:
# https://github.com/changesets/action#with-version-script
version: pnpm changeset-version
env:
GITHUB_TOKEN: ${{ steps.generate_token.outputs.token }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
82 changes: 3 additions & 79 deletions .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
outputs:
isWallet: ${{ (steps.turbo.outputs.packages && contains(fromJson(steps.turbo.outputs.packages), 'iota-wallet')) }}
isExplorer: ${{ (steps.turbo.outputs.packages && contains(fromJson(steps.turbo.outputs.packages), 'iota-explorer')) }}
isTypescriptSDK: ${{ (steps.turbo.outputs.packages && contains(fromJson(steps.turbo.outputs.packages), '@iota/iota.js')) }}
isTypescriptSDK: ${{ (steps.turbo.outputs.packages && contains(fromJson(steps.turbo.outputs.packages), '@iota/iota-sdk')) }}
isGraphQlTransport: ${{ (steps.turbo.outputs.packages && contains(fromJson(steps.turbo.outputs.packages), '@iota/graphql-transport')) }}
isRust: ${{ steps.diff.outputs.isRust }}
steps:
Expand All @@ -25,7 +25,7 @@ jobs:
uses: "./.github/actions/diffs"
id: diff

# Run e2e test against localnet built on the main branch
# Run e2e test against localnet built on the develop branch
localnet:
name: Localnet
needs: diff
Expand All @@ -48,8 +48,6 @@ jobs:
- 5432:5432
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # Pin v4.1.1
# Disabled for now as it makes test runs take longer
# - uses: bmwill/rust-cache@v1 # Fork of 'Swatinem/rust-cache' which allows caching additional paths
- uses: pnpm/action-setup@fe02b34f77f8bc703788d5817da081398fad5dd2 # [email protected]
- run: cargo build --bin iota-test-validator --bin iota --profile dev
- name: Install Nodejs
Expand All @@ -69,7 +67,7 @@ jobs:
- name: Run TS SDK e2e tests
if: ${{ needs.diff.outputs.isTypescriptSDK == 'true' || needs.diff.outputs.isRust == 'true'}}
run: pnpm dlx concurrently --kill-others --success command-1 "$E2E_RUN_LOCAL_NET_CMD" 'pnpm --filter @iota/iota.js test:e2e'
run: pnpm dlx concurrently --kill-others --success command-1 "$E2E_RUN_LOCAL_NET_CMD" 'pnpm --filter @iota/iota-sdk test:e2e'

- name: Run RPC/GraphQL compatibility e2e tests
if: ${{ needs.diff.outputs.isGraphQlTransport == 'true' || needs.diff.outputs.isRust == 'true'}}
Expand All @@ -89,77 +87,3 @@ jobs:
name: playwright-report-explorer
path: apps/explorer/playwright-report/
retention-days: 30

- name: Run Local net
run: cargo run --bin iota-test-validator -- --epoch-duration-ms 10000 &
- name: Build Wallet
# need to run Wallet e2e when its upstream(TS SDK and Rust) or itself is changed
if: ${{ needs.diff.outputs.isWallet == 'true' || needs.diff.outputs.isRust == 'true' || needs.diff.outputs.isTypescriptSDK == 'true'}}
run: pnpm wallet build
- name: Run Wallet e2e tests
if: ${{ needs.diff.outputs.isWallet == 'true' || needs.diff.outputs.isRust == 'true' || needs.diff.outputs.isTypescriptSDK == 'true'}}
run: xvfb-run --auto-servernum --server-args="-screen 0 1280x960x24" -- pnpm --filter iota-wallet playwright test
- uses: actions/upload-artifact@v3
if: always()
with:
name: playwright-report-wallet
path: apps/wallet/playwright-report/
retention-days: 30

# Run e2e test against localnet built on the devnet branch for backward compatibility check
local_devnet_branch:
name: Local Network Built on devnet branch
needs: diff
# TODO: add wallet e2e to the `if` condition when available
if: needs.diff.outputs.isExplorer == 'true' || needs.diff.outputs.isTypescriptSDK == 'true'
runs-on: self-hosted
services:
postgres:
image: postgres
env:
POSTGRES_USER: postgres
POSTGRES_PASSWORD: postgrespw
POSTGRES_DB: iota_indexer_v2
POSTGRES_HOST_AUTH_METHOD: trust
options: >-
--health-cmd pg_isready
--health-interval 10s
--health-timeout 5s
--health-retries 5
ports:
- 5432:5432
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # Pin v4.1.1
- name: Run E2E Test Runner with devnet branch
uses: "./.github/actions/ts-e2e"
with:
ref: devnet

# Run e2e test against localnet built on the Testnet branch for backward compatibility check
local_testnet_branch:
name: Local Network Built on testnet branch
needs: diff
# TODO: add wallet e2e to the `if` condition when available
if: needs.diff.outputs.isExplorer == 'true' || needs.diff.outputs.isTypescriptSDK == 'true'
runs-on: self-hosted
services:
postgres:
image: postgres
env:
POSTGRES_USER: postgres
POSTGRES_PASSWORD: postgrespw
POSTGRES_DB: iota_indexer_v2
POSTGRES_HOST_AUTH_METHOD: trust
options: >-
--health-cmd pg_isready
--health-interval 10s
--health-timeout 5s
--health-retries 5
ports:
- 5432:5432
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # Pin v4.1.1
- name: Run E2E Test Runner with testnet branch
uses: "./.github/actions/ts-e2e"
with:
ref: testnet
2 changes: 1 addition & 1 deletion .github/workflows/release-notes-monitor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
runs-on: self-hosted

steps:
- name: Checkout iota repo main branch
- name: Checkout iota repo develop branch
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # Pin v4.1.1
with:
fetch-depth: 0
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/simulator-nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ jobs:
steps:
- uses: technote-space/workflow-conclusion-action@45ce8e0eb155657ab8ccf346ade734257fd196a5 # Pin v4.1.1

- name: Checkout iota repo main branch
- name: Checkout iota repo develop branch
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # Pin v4.1.1

- name: Get iota commit
Expand Down
2 changes: 1 addition & 1 deletion apps/apps-backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"lint": "eslint --max-warnings=0 \"{src,apps,libs,test}/**/*.ts\""
},
"dependencies": {
"@iota/iota.js": "workspace:*",
"@iota/iota-sdk": "workspace:*",
"@nestjs/cache-manager": "^2.2.2",
"@nestjs/common": "^10.0.0",
"@nestjs/config": "^3.2.2",
Expand Down
2 changes: 1 addition & 1 deletion apps/apps-backend/src/features/features.mock.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) 2024 IOTA Stiftung
// SPDX-License-Identifier: Apache-2.0

import { getDefaultNetwork, Network } from '@iota/iota.js/client';
import { getDefaultNetwork, Network } from '@iota/iota-sdk/client';

const walletDapps = [
{
Expand Down
2 changes: 1 addition & 1 deletion apps/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"@growthbook/growthbook-react": "^1.0.0",
"@hookform/resolvers": "^3.1.1",
"@iota/dapp-kit": "workspace:*",
"@iota/iota.js": "workspace:*",
"@iota/iota-sdk": "workspace:*",
"@iota/kiosk": "workspace:*",
"@sentry/react": "^7.59.2",
"@tanstack/react-query": "^5.0.0",
Expand Down
2 changes: 1 addition & 1 deletion apps/core/src/api/SentryHttpTransport.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Modifications Copyright (c) 2024 IOTA Stiftung
// SPDX-License-Identifier: Apache-2.0

import { IotaHTTPTransport } from '@iota/iota.js/client';
import { IotaHTTPTransport } from '@iota/iota-sdk/client';
import * as Sentry from '@sentry/react';

const IGNORED_METHODS = ['iotax_resolveNameServiceNames', 'iotax_resolveNameServiceAddresses'];
Expand Down
2 changes: 1 addition & 1 deletion apps/core/src/constants/recognizedPackages.constants.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Copyright (c) 2024 IOTA Stiftung
// SPDX-License-Identifier: Apache-2.0

import { IOTA_FRAMEWORK_ADDRESS, IOTA_SYSTEM_ADDRESS } from '@iota/iota.js/utils';
import { IOTA_FRAMEWORK_ADDRESS, IOTA_SYSTEM_ADDRESS } from '@iota/iota-sdk/utils';

export const DEFAULT_RECOGNIZED_PACKAGES = [IOTA_FRAMEWORK_ADDRESS, IOTA_SYSTEM_ADDRESS];
2 changes: 1 addition & 1 deletion apps/core/src/hooks/stake/useGetDelegatedStake.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// SPDX-License-Identifier: Apache-2.0

import { useIotaClient } from '@iota/dapp-kit';
import type { DelegatedStake } from '@iota/iota.js/client';
import type { DelegatedStake } from '@iota/iota-sdk/client';
import { useQuery, type UseQueryOptions } from '@tanstack/react-query';

type UseGetDelegatedStakesOptions = {
Expand Down
2 changes: 1 addition & 1 deletion apps/core/src/hooks/useAppsBackend.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Modifications Copyright (c) 2024 IOTA Stiftung
// SPDX-License-Identifier: Apache-2.0

import { getAppsBackend } from '@iota/iota.js/client';
import { getAppsBackend } from '@iota/iota-sdk/client';
import { useCallback } from 'react';

export function useAppsBackend() {
Expand Down
2 changes: 1 addition & 1 deletion apps/core/src/hooks/useBalance.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// SPDX-License-Identifier: Apache-2.0

import { useIotaClientQuery } from '@iota/dapp-kit';
import { IOTA_TYPE_ARG } from '@iota/iota.js/utils';
import { IOTA_TYPE_ARG } from '@iota/iota-sdk/utils';

const DEFAULT_REFETCH_INTERVAL = 1000;
const DEFAULT_STALE_TIME = 5000;
Expand Down
2 changes: 1 addition & 1 deletion apps/core/src/hooks/useExtendedTransactionSummary.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

import { useTransactionSummary } from './';
import { useCurrentAccount, useIotaClient } from '@iota/dapp-kit';
import { IotaTransactionBlockResponse } from '@iota/iota.js/client';
import { IotaTransactionBlockResponse } from '@iota/iota-sdk/client';
import { useQuery } from '@tanstack/react-query';

export function useExtendedTransactionSummary(
Expand Down
4 changes: 2 additions & 2 deletions apps/core/src/hooks/useFormatCoin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
// SPDX-License-Identifier: Apache-2.0

import { useIotaClient } from '@iota/dapp-kit';
import { CoinMetadata } from '@iota/iota.js/client';
import { IOTA_TYPE_ARG } from '@iota/iota.js/utils';
import { CoinMetadata } from '@iota/iota-sdk/client';
import { IOTA_TYPE_ARG } from '@iota/iota-sdk/utils';
import { useQuery, type UseQueryResult } from '@tanstack/react-query';
import BigNumber from 'bignumber.js';
import { useMemo } from 'react';
Expand Down
2 changes: 1 addition & 1 deletion apps/core/src/hooks/useGetAllCoins.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// SPDX-License-Identifier: Apache-2.0

import { useIotaClient } from '@iota/dapp-kit';
import type { CoinStruct, PaginatedCoins } from '@iota/iota.js/client';
import type { CoinStruct, PaginatedCoins } from '@iota/iota-sdk/client';
import { useQuery } from '@tanstack/react-query';

const MAX_COINS_PER_REQUEST = 100;
Expand Down
2 changes: 1 addition & 1 deletion apps/core/src/hooks/useGetAllTimelockedObjects.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// SPDX-License-Identifier: Apache-2.0

import { useIotaClient } from '@iota/dapp-kit';
import { IotaObjectData, type IotaObjectDataFilter } from '@iota/iota.js/client';
import { IotaObjectData, type IotaObjectDataFilter } from '@iota/iota-sdk/client';
import { useQuery } from '@tanstack/react-query';
import { TIMELOCK_TYPE } from '../constants';

Expand Down
2 changes: 1 addition & 1 deletion apps/core/src/hooks/useGetCoins.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// SPDX-License-Identifier: Apache-2.0

import { useIotaClient } from '@iota/dapp-kit';
import { PaginatedCoins } from '@iota/iota.js/client';
import { PaginatedCoins } from '@iota/iota-sdk/client';
import { useInfiniteQuery } from '@tanstack/react-query';

const MAX_COINS_PER_REQUEST = 10;
Expand Down
Loading

0 comments on commit 333b9ea

Please sign in to comment.