Skip to content

Commit

Permalink
Merge branch 'develop' into devx/fix-documentation-links
Browse files Browse the repository at this point in the history
  • Loading branch information
lucas-tortora authored Nov 12, 2024
2 parents 36d4be0 + af9a325 commit b172ee7
Show file tree
Hide file tree
Showing 196 changed files with 287 additions and 40,697 deletions.
2 changes: 1 addition & 1 deletion .changeset/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"commit": false,
"fixed": [],
"linked": [],
"access": "restricted",
"access": "public",
"baseBranch": "develop",
"updateInternalDependencies": "minor",
"privatePackages": false,
Expand Down
12 changes: 12 additions & 0 deletions .changeset/orange-beers-draw.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
---
'@iota/bcs': patch
'@iota/create-dapp': patch
'@iota/dapp-kit': patch
'@iota/graphql-transport': patch
'@iota/kiosk': patch
'@iota/ledgerjs-hw-app-iota': patch
'@iota/iota-sdk': patch
'@iota/wallet-standard': patch
---

First public release.
6 changes: 0 additions & 6 deletions .github/crates-filters.yml
Original file line number Diff line number Diff line change
Expand Up @@ -180,9 +180,3 @@ iota-move-natives-latest:
- "iota-execution/latest/iota-move-natives/**"
iota-verifier-latest:
- "iota-execution/latest/iota-verifier/**"
iota-adapter-v0:
- "iota-execution/v0/iota-adapter/**"
iota-move-natives-v0:
- "iota-execution/v0/iota-move-natives/**"
iota-verifier-v0:
- "iota-execution/v0/iota-verifier/**"
11 changes: 11 additions & 0 deletions .github/workflows/_e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ on:
isExplorer:
type: boolean
required: true
isAppsBackend:
type: boolean
required: true
isTypescriptSDK:
type: boolean
required: true
Expand Down Expand Up @@ -74,6 +77,14 @@ jobs:
if: inputs.isGraphQlTransport || inputs.isRust || inputs.isDevelop
run: pnpm dlx concurrently --kill-others --success command-1 "$E2E_RUN_LOCAL_NET_CMD" 'pnpm --filter @iota/graphql-transport test:e2e'

- name: Build apps-backend
if: inputs.isAppsBackend || inputs.isDevelop
run: pnpm --filter apps-backend build

- name: Run apps-backend e2e tests
if: inputs.isAppsBackend || inputs.isDevelop
run: pnpm --filter apps-backend test:e2e

- name: Build explorer
if: inputs.isTypescriptSDK || inputs.isExplorer || inputs.isRust || inputs.isDevelop
run: pnpm turbo --filter=iota-explorer build
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/apps_wallet_nightly_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
restore-keys: |
turbo-${{ runner.os }}-
- name: Build Wallet
run: pnpm wallet build
run: pnpm wallet build:nightly
- name: Upload artifacts
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # pin@v4
with:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/apps_wallet_prod_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ env:
DEFAULT_NETWORK: ${{ secrets.WALLET_PROD_DEFAULT_NETWORK }}
IOTA_NETWORKS: ${{ secrets.WALLET_PROD_IOTA_NETWORKS }}
APPS_BACKEND: ${{ secrets.WALLET_PROD_APPS_BACKEND }}
SENTRY_AUTH_TOKEN: ${{ secrets.TOOLING_SENTRY_AUTH_TOKEN }}

jobs:
wallet-prod-build:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/hierarchy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@ jobs:
isRust: ${{ needs.diff.outputs.isRust == 'true' }}
isWallet: ${{ needs.diff.outputs.isWallet == 'true' }}
isExplorer: ${{ needs.diff.outputs.isExplorer == 'true' }}
isAppsBackend: ${{ needs.diff.outputs.isAppsBackend == 'true' }}
isTypescriptSDK: ${{ needs.diff.outputs.isTypescriptSDK == 'true' }}
isGraphQlTransport: ${{ needs.diff.outputs.isGraphQlTransport == 'true' }}
isDevelop: ${{ github.ref_name == 'develop' }}
Expand Down
129 changes: 3 additions & 126 deletions Cargo.lock

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

8 changes: 0 additions & 8 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,6 @@ exclude = [
"external-crates/move/crates/move-vm-types",
"external-crates/move/crates/serializer-tests",
"external-crates/move/crates/test-generation",
"external-crates/move/move-execution/v0/crates/bytecode-verifier-tests",
"external-crates/move/move-execution/v0/crates/move-abstract-interpreter",
"external-crates/move/move-execution/v0/crates/move-bytecode-verifier",
"external-crates/move/move-execution/v0/crates/move-stdlib-natives",
"external-crates/move/move-execution/v0/crates/move-vm-runtime",
"sdk/move-bytecode-template",
]
members = [
Expand Down Expand Up @@ -162,9 +157,6 @@ members = [
"iota-execution/latest/iota-adapter",
"iota-execution/latest/iota-move-natives",
"iota-execution/latest/iota-verifier",
"iota-execution/v0/iota-adapter",
"iota-execution/v0/iota-move-natives",
"iota-execution/v0/iota-verifier",
]

[workspace.package]
Expand Down
13 changes: 13 additions & 0 deletions apps/apps-backend/jest-e2e.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"moduleFileExtensions": ["js", "json", "ts"],
"rootDir": "./",
"testRegex": ".e2e-spec.ts$",
"transform": {
"^.+\\.(t|j)s$": "ts-jest"
},
"testEnvironment": "node",
"moduleNameMapper": {
"^src/(.*)$": "<rootDir>/dist/$1",
"^@iota/core/(.*)$": "<rootDir>/dist/core/src/$1"
}
}
5 changes: 3 additions & 2 deletions apps/apps-backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@
"format": "prettier --write \"src/**/*.ts\"",
"dev": "nest start --watch",
"debug": "nest start --debug --watch",
"preview": "pnpm run build && node dist/main",
"lint": "eslint --max-warnings=0 \"{src,apps,libs,test}/**/*.ts\""
"preview": "pnpm run build && node dist/apps-backend/src/main",
"lint": "eslint --max-warnings=0 \"{src,apps,libs,test}/**/*.ts\"",
"test:e2e": "jest --config ./jest-e2e.json"
},
"dependencies": {
"@iota/core": "workspace:*",
Expand Down
2 changes: 2 additions & 0 deletions apps/apps-backend/src/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import { FeaturesModule } from './features/features.module';
import { MonitorNetworkModule } from './monitor-network/monitor-network.module';
import { PricesModule } from './prices/prices.module';
import { RestrictedModule } from './restricted/restricted.module';
import { HealthModule } from './health/health.module';

@Module({
imports: [
Expand All @@ -30,6 +31,7 @@ import { RestrictedModule } from './restricted/restricted.module';
ttl: 3600,
max: 100,
}),
HealthModule,
],
})
export class AppModule {}
12 changes: 12 additions & 0 deletions apps/apps-backend/src/health/health.controller.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
// Copyright (c) 2024 IOTA Stiftung
// SPDX-License-Identifier: Apache-2.0

import { Controller, Get } from '@nestjs/common';

@Controller('health')
export class HealthController {
@Get()
check() {
return { status: 'ok' };
}
}
10 changes: 10 additions & 0 deletions apps/apps-backend/src/health/health.module.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
// Copyright (c) 2024 IOTA Stiftung
// SPDX-License-Identifier: Apache-2.0

import { Module } from '@nestjs/common';
import { HealthController } from './health.controller';

@Module({
controllers: [HealthController],
})
export class HealthModule {}
Loading

0 comments on commit b172ee7

Please sign in to comment.