Skip to content

Commit

Permalink
Merge remote-tracking branch 'refs/remotes/origin/master' into dfx-0.…
Browse files Browse the repository at this point in the history
…20.0

# Conflicts:
#	submodules/internetidentity
#	submodules/motoko
#	submodules/response-verfication
  • Loading branch information
Jason I committed May 7, 2024
2 parents 53b3ada + 3272681 commit 762ef37
Show file tree
Hide file tree
Showing 8 changed files with 144 additions and 81 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ keywords: [intermediate, tutorial, frontend]

import { MarkdownChipRow } from "/src/components/Chip/MarkdownChipRow";

# Customizing the default frontend canister
# Customizing the default frontend

<MarkdownChipRow labels={["Intermediate", "Tutorial"]} />

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ import { MarkdownChipRow } from "/src/components/Chip/MarkdownChipRow";

Dapps deployed on ICP often utilize a frontend interface to facilitate user interaction with the application. Application frontends include the user interface, webpage, dashboard, or other assets that are displayed in the web browser.

Frontend canisters are also referred to as 'asset canisters', since they are defined as `"type": "asset"` in the `dfx.json` file for a project.

Frontends can exist in the following forms:

- A frontend canister that communicates with backend canister(s) to provide a full-stack dapp. You can learn more by viewing the [default frontend canister](custom-frontend.mdx) and learn how to customize it.
Expand All @@ -18,8 +20,6 @@ Frontends can exist in the following forms:

- A frontend canister that doesn't communicate with any backend canisters and only provides web assets such as a website. [Learn more about serving static assets](serving-static-assets).

Frontend canisters are also referred to as asset canisters in the context of ICP.

## Resources

- [Customize the default frontend canister](./custom-frontend.mdx).
Expand Down
209 changes: 134 additions & 75 deletions docs/references/asset-canister.mdx

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ import { MarkdownChipRow } from "/src/components/Chip/MarkdownChipRow";

<MarkdownChipRow labels={["Intermediate", "Tutorial"]} />

<iframe width="560" height="315" src="https://www.youtube.com/embed/gEyfbFMyhwc?si=2Tmy6FZj-IQ9xU5c" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share" referrerpolicy="strict-origin-when-cross-origin" allowfullscreen></iframe>

## Overview

In the past, blockchain networks were only able to communicate with external servers through blockchain oracles, or third-party entities that relayed calls from the blockchain to an external server, then routed the response back to the blockchain. This is because blockchains are a form of replicated state machine, where each replica must perform the same computations within the same state to make the same transitions each round. Since doing computations with results from an external source may lead to a state divergence, tools like oracles have been used in the past. However, on the Internet Computer, canisters can communicate directly with external servers or other blockchains through **HTTPS outcalls**.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ import { MarkdownChipRow } from "/src/components/Chip/MarkdownChipRow";

<MarkdownChipRow labels={["Intermediate", "Tutorial"]} />

<iframe width="560" height="315" src="https://www.youtube.com/embed/OztLHEilyuc?si=pEXWrE4fGyMsSBOH" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share" referrerpolicy="strict-origin-when-cross-origin" allowfullscreen></iframe>

## Overview

In a previous module, [2.2: Advanced canister calls](/docs/current/tutorials/developer-journey/level-2/2.2-advanced-canister-calls), you briefly touched on certified variables. In this guide, you'll dive deeper into certified data and take a look at an example that displays how to use certified data.
Expand Down
2 changes: 1 addition & 1 deletion submodules/internetidentity
Submodule internetidentity updated 85 files
+1 −1 .didc-release
+27 −5 .github/workflows/canister-tests.yml
+1 −1 .ic-commit
+1 −1 .node-version
+5 −4 Cargo.lock
+1 −0 Cargo.toml
+2 −2 README.md
+13 −0 allowed_breaking_change.patch
+1 −1 demos/test-app/package.json
+9 −7 demos/using-dev-build/README.md
+382 −986 demos/using-dev-build/package-lock.json
+4 −4 demos/using-dev-build/package.json
+2 −0 demos/using-dev-build/specs/auth.e2e.ts
+40 −142 demos/using-dev-build/test.ts
+2 −1 demos/using-dev-build/tsconfig.json
+1 −1 demos/vc_issuer/package.json
+1 −1 dfx.json
+1,206 −311 package-lock.json
+8 −8 package.json
+1 −1 rust-toolchain.toml
+1 −0 scripts/update-dapps
+1 −1 src/archive/Cargo.toml
+5 −2 src/archive/tests/tests.rs
+1 −0 src/frontend/assets/icons/Optigames_logo.svg
+ src/frontend/assets/icons/ReCheck_logo.png
+ src/frontend/assets/icons/icpanda-dao_logo.webp
+ src/frontend/assets/icons/icpex_logo.png
+ src/frontend/assets/icons/icto_logo.png
+ src/frontend/assets/icons/personal_dao_logo.png
+ src/frontend/assets/icons/vfans_logo.png
+ src/frontend/assets/icons/yuku_logo.png
+5 −4 src/frontend/generated/internet_identity_idl.js
+3 −3 src/frontend/generated/internet_identity_types.d.ts
+ src/frontend/src/assets/identityCardBackground.png
+3 −27 src/frontend/src/components/identityCard.ts
+48 −0 src/frontend/src/flows/dappsExplorer/dapps.json
+9 −11 src/frontend/src/flows/manage/index.ts
+6 −8 src/frontend/src/flows/register/finish.ts
+0 −1 src/frontend/src/flows/verifiableCredentials/abortedCredentials.json
+0 −2 src/frontend/src/flows/verifiableCredentials/abortedCredentials.ts
+2 −2 src/frontend/src/flows/verifiableCredentials/allowCredentials.ts
+6 −0 src/frontend/src/test-e2e/constants.ts
+12 −0 src/frontend/src/test-e2e/verifiableCredentials/alternativeOrigins.test.ts
+4 −0 src/frontend/src/test-e2e/verifiableCredentials/index.test.ts
+19 −0 src/frontend/src/test-e2e/verifiableCredentials/utils.ts
+8 −0 src/frontend/src/test-e2e/views.ts
+7 −1 src/frontend/src/utils/iiConnection.ts
+17 −0 src/frontend/src/utils/preLoadImage.ts
+7 −0 src/frontend/src/utils/utils.ts
+11 −1 src/frontend/src/utils/webAuthn.ts
+1 −0 src/internet_identity/Cargo.toml
+11 −8 src/internet_identity/internet_identity.did
+1 −0 src/internet_identity/src/activity_stats.rs
+4 −4 src/internet_identity/src/activity_stats/activity_counter/domain_active_anchor_counter.rs
+441 −0 src/internet_identity/src/activity_stats/event_stats.rs
+360 −0 src/internet_identity/src/activity_stats/event_stats/event_aggregations.rs
+215 −0 src/internet_identity/src/activity_stats/event_stats/event_aggregations/tests.rs
+660 −0 src/internet_identity/src/activity_stats/event_stats/tests.rs
+21 −38 src/internet_identity/src/delegation.rs
+50 −6 src/internet_identity/src/http/metrics.rs
+18 −9 src/internet_identity/src/ii_domain.rs
+30 −16 src/internet_identity/src/main.rs
+21 −9 src/internet_identity/src/state.rs
+33 −12 src/internet_identity/src/storage.rs
+20 −8 src/internet_identity/src/storage/storable_persistent_state.rs
+222 −0 src/internet_identity/tests/integration/aggregation_stats.rs
+12 −9 src/internet_identity/tests/integration/anchor_management/last_usage_timestamp.rs
+188 −340 src/internet_identity/tests/integration/archive_integration.rs
+195 −13 src/internet_identity/tests/integration/http.rs
+0 −151 src/internet_identity/tests/integration/latest_delegation_origins.rs
+1 −1 src/internet_identity/tests/integration/main.rs
+10 −2 src/internet_identity/tests/integration/rollback.rs
+8 −2 src/internet_identity/tests/integration/upgrade.rs
+13 −7 src/internet_identity/tests/integration/v2_api/identity_info.rs
+4 −3 src/internet_identity_interface/src/internet_identity/types.rs
+0 −8 src/showcase/src/backgrounds.ts
+4 −1 src/showcase/src/pages/displayManage.astro
+4 −1 src/showcase/src/pages/displayManageSingle.astro
+4 −1 src/showcase/src/pages/displayManageTempKey.astro
+4 −1 src/showcase/src/pages/displayUserNumber.astro
+4 −1 src/showcase/src/pages/displayUserNumberTempKey.astro
+22 −1 src/sig-verifier-js/README.md
+1 −2 src/sig-verifier-js/package.json
+1 −2 src/vc_util_js/package.json
+1 −1 src/vite-plugins/package.json
2 changes: 1 addition & 1 deletion submodules/motoko
Submodule motoko updated 91 files
+1 −1 .github/workflows/release.yml
+2 −2 .github/workflows/test.yml
+3 −3 .mergify.yml
+2 −2 Changelog.md
+2 −2 README.md
+1 −1 design/StableMemory.md
+1 −1 doc/Makefile
+0 −0 doc/attic/about-this-guide.md
+0 −0 doc/attic/advanced-discussion.md
+0 −0 doc/attic/extrastuff.md
+28 −28 doc/attic/overview.md
+2 −2 doc/docusaurus/docusaurus.config.js
+11,153 −16,166 doc/docusaurus/package-lock.json
+4 −4 doc/docusaurus/package.json
+0 −77 doc/md/actor-classes.md
+0 −306 doc/md/actors-async.md
+0 −24 doc/md/base-intro.md
+1 −1 doc/md/base/Array.md
+16 −16 doc/md/base/Float.md
+16 −2 doc/md/base/Region.md
+18 −0 doc/md/base/Result.md
+10 −11 doc/md/base/Trie.md
+5 −0 doc/md/base/TrieMap.md
+4 −0 doc/md/base/TrieSet.md
+5 −0 doc/md/base/_category_.yml
+0 −505 doc/md/basic-concepts.md
+5 −0 doc/md/canister-maintenance/_category_.yml
+187 −0 doc/md/canister-maintenance/compatibility.md
+108 −0 doc/md/canister-maintenance/cycles.md
+61 −0 doc/md/canister-maintenance/optimization.md
+156 −0 doc/md/canister-maintenance/upgrades.md
+0 −253 doc/md/compatibility.md
+0 −120 doc/md/cycles.md
+0 −142 doc/md/errors.md
+4 −0 doc/md/getting-started/_category_.yml
+201 −0 doc/md/getting-started/basic-concepts.md
+53 −0 doc/md/getting-started/dev-env.md
+129 −0 doc/md/getting-started/motoko-introduction.md
+106 −0 doc/md/getting-started/quickstart.md
+0 −14 doc/md/heartbeats.md
+0 −348 doc/md/local-objects-classes.md
+0 −119 doc/md/message-inspection.md
+83 −0 doc/md/migration-guides/0.11.0-migration-guide.md
+4 −0 doc/md/migration-guides/_category_.yml
+11 −0 doc/md/migration-guides/overview.md
+0 −91 doc/md/motoko-introduction.md
+0 −93 doc/md/motoko.md
+0 −231 doc/md/mutable-state.md
+0 −75 doc/md/pattern-matching.md
+0 −46 doc/md/pipes.md
+4 −0 doc/md/reference/_category_.yml
+12 −6 doc/md/reference/compiler-ref.md
+76 −0 doc/md/reference/generating-docs.md
+672 −659 doc/md/reference/language-manual.md
+1 −1 doc/md/reference/motoko-grammar.md
+34 −34 doc/md/reference/style.md
+4 −0 doc/md/stable-memory/_category_.yml
+25 −18 doc/md/stable-memory/stable-regions.md
+99 −0 doc/md/stable-memory/stablememory.md
+0 −82 doc/md/stablememory.md
+0 −26 doc/md/timers.md
+0 −169 doc/md/upgrades.md
+4 −0 doc/md/writing-motoko/_category_.yml
+86 −0 doc/md/writing-motoko/actor-classes.md
+153 −0 doc/md/writing-motoko/actors-async.md
+63 −0 doc/md/writing-motoko/arguments.md
+88 −0 doc/md/writing-motoko/async-data.md
+19 −13 doc/md/writing-motoko/caller-id.md
+27 −0 doc/md/writing-motoko/candid-ui.md
+39 −38 doc/md/writing-motoko/control-flow.md
+136 −0 doc/md/writing-motoko/errors.md
+22 −0 doc/md/writing-motoko/heartbeats.md
+48 −0 doc/md/writing-motoko/incomplete-code.md
+81 −0 doc/md/writing-motoko/integers.md
+73 −0 doc/md/writing-motoko/intercanister-calls.md
+273 −0 doc/md/writing-motoko/local-objects-classes.md
+121 −0 doc/md/writing-motoko/message-inspection.md
+28 −0 doc/md/writing-motoko/message-restrictions.md
+40 −30 doc/md/writing-motoko/modules-and-imports.md
+219 −0 doc/md/writing-motoko/mutable-state.md
+95 −0 doc/md/writing-motoko/object-subtyping.md
+105 −0 doc/md/writing-motoko/pattern-matching.md
+44 −0 doc/md/writing-motoko/pipes.md
+95 −0 doc/md/writing-motoko/query-functions.md
+21 −17 doc/md/writing-motoko/sharing.md
+17 −0 doc/md/writing-motoko/static-types.md
+26 −10 doc/md/writing-motoko/structural-equality.md
+36 −0 doc/md/writing-motoko/timers.md
+94 −0 doc/md/writing-motoko/writing-intro.md
+3 −3 nix/sources.json
+1 −1 src/viper/README.md
2 changes: 1 addition & 1 deletion submodules/response-verfication
Submodule response-verfication updated 46 files
+3 −0 .github/workflows/build-and-test.yml
+8 −0 CHANGELOG.md
+73 −3 Cargo.lock
+4 −0 Cargo.toml
+3 −0 examples/http-certification/assets/.gitignore
+279 −0 examples/http-certification/assets/README.md
+18 −0 examples/http-certification/assets/dfx.json
+22 −0 examples/http-certification/assets/src/backend/Cargo.toml
+19 −0 examples/http-certification/assets/src/backend/backend.did
+178 −0 examples/http-certification/assets/src/backend/src/lib.rs
+16 −0 examples/http-certification/assets/src/frontend/index.html
+18 −0 examples/http-certification/assets/src/frontend/package.json
+33 −0 examples/http-certification/assets/src/frontend/src/App.module.css
+27 −0 examples/http-certification/assets/src/frontend/src/App.tsx
+ examples/http-certification/assets/src/frontend/src/assets/favicon.ico
+13 −0 examples/http-certification/assets/src/frontend/src/index.css
+15 −0 examples/http-certification/assets/src/frontend/src/index.tsx
+1 −0 examples/http-certification/assets/src/frontend/src/logo.svg
+15 −0 examples/http-certification/assets/src/frontend/tsconfig.json
+37 −0 examples/http-certification/assets/src/frontend/vite.config.ts
+3 −2 examples/http-certification/custom-assets/README.md
+1 −1 examples/http-certification/custom-assets/dfx.json
+1 −1 examples/http-certification/custom-assets/src/frontend/package.json
+24 −0 packages/ic-asset-certification/Cargo.toml
+202 −0 packages/ic-asset-certification/LICENSE
+436 −0 packages/ic-asset-certification/README.md
+89 −0 packages/ic-asset-certification/src/asset.rs
+437 −0 packages/ic-asset-certification/src/asset_config.rs
+90 −0 packages/ic-asset-certification/src/asset_response.rs
+947 −0 packages/ic-asset-certification/src/asset_router.rs
+21 −0 packages/ic-asset-certification/src/error.rs
+451 −0 packages/ic-asset-certification/src/lib.rs
+3 −3 packages/ic-certification/src/hash_tree/mod.rs
+4 −4 packages/ic-http-certification-tests/tests/v2_response_verification_happy_path.rs
+7 −7 packages/ic-http-certification-tests/tests/v2_response_verification_sad_path.rs
+4 −4 packages/ic-http-certification/README.md
+18 −18 packages/ic-http-certification/src/cel/cel_types.rs
+4 −4 packages/ic-http-certification/src/cel/create_cel_expr.rs
+1 −1 packages/ic-http-certification/src/hash/mod.rs
+13 −13 packages/ic-http-certification/src/lib.rs
+12 −12 packages/ic-http-certification/src/tree/certification.rs
+49 −3 packages/ic-http-certification/src/tree/certification_tree.rs
+4 −4 packages/ic-http-certification/src/tree/certification_tree_entry.rs
+1 −1 packages/ic-http-certification/src/tree/mod.rs
+19 −0 pnpm-lock.yaml
+1 −0 pnpm-workspace.yaml

0 comments on commit 762ef37

Please sign in to comment.