Skip to content

Commit

Permalink
Merge branch 'master' into pm/restore-deleted-asset
Browse files Browse the repository at this point in the history
  • Loading branch information
alexander-schlosser authored Feb 6, 2025
2 parents f2e88ed + c213f00 commit dee41ef
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 12 deletions.
4 changes: 2 additions & 2 deletions MAINTENANCE.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
cd portal/
git submodule update --init # if necessary
cd submodules/motoko
git checkout 0.7.6 #or whatever new tag you desire
git checkout 0.14.1 #or whatever new tag you desire
cd ../..
git add submodules/motoko # add the change to the submodule
```
Now replace `static/moc-interpreter-0.13.6.js` with `static/moc_interpreter-0.13.7.js`, downloaded from Motoko release page. It would be better if this wasn't checked in, but, for now, it is.
Replace `static/moc-interpreter-0.14.0.js` with `static/moc_interpreter-0.14.1.js` downloaded from the Motoko release page.

Edit `static/load_moc.ts` to use the correct version of the interpreter and base libs.

Expand Down
4 changes: 0 additions & 4 deletions docs/developer-docs/defi/exchange-rate-canister.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,6 @@ Each request to the XRC costs 1B cycles to submit the request, otherwise an `Exc

The remaining cycles are returned to the requesting canister. Note that at least 1M cycles are charged even in case of an error in order to mitigate the risk of a denial-of-service attack.

:::info
Note: The cycles cost of these requests are expected to be decreased in the next upgrade of the XRC.
:::

## Calling the XRC directly

To call the XRC directly, you can send a request such as one to get the BTC/USD rate, with the following command:
Expand Down
2 changes: 1 addition & 1 deletion docs/motoko/version.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Motoko Version

The release of Motoko documented here, currently 0.13.7, may be a few versions
The release of Motoko documented here, currently 0.14.0, may be a few versions
ahead of the Motoko compiler that is shipped with dfx.

You can, however, instruct `dfx` to use a newer version of Motoko than the one
Expand Down
6 changes: 3 additions & 3 deletions docs/references/ic-interface-spec.md
Original file line number Diff line number Diff line change
Expand Up @@ -1741,7 +1741,7 @@ There must be at most one call to `ic0.call_on_cleanup` between `ic0.call_new` a

The amount of cycles it moves is represented by a 128-bit value which can be obtained by combining the `amount_high` and `amount_low` parameters.

The cycles are deducted from the balance as shown by `ic0.canister_cycles_balance128` immediately, and moved back if the call cannot be performed (e.g. if `ic0.call_perform` signals an error, if the canister invokes `ic0.call_new`, or returns without calling `ic0.call_perform`).
The cycles are deducted from the balance as shown by `ic0.canister_cycle_balance128` immediately, and moved back if the call cannot be performed (e.g. if `ic0.call_perform` signals an error, if the canister invokes `ic0.call_new`, or returns without calling `ic0.call_perform`).

This system call may be called multiple times between `ic0.call_new` and `ic0.call_perform`.

Expand Down Expand Up @@ -1779,7 +1779,7 @@ This specification currently does not go into details about which actions cost h

:::note

This call traps if the current balance does not fit into a 64-bit value. Canisters that need to deal with larger cycles balances should use `ic0.canister_cycles_balance128` instead.
This call traps if the current balance does not fit into a 64-bit value. Canisters that need to deal with larger cycles balances should use `ic0.canister_cycle_balance128` instead.

:::

Expand Down Expand Up @@ -7247,7 +7247,7 @@ ic0.canister_cycle_balance<es>() : i64 =
return es.balance

I ∈ {i32, i64}
ic0.canister_cycles_balance128<es>(dst : I) =
ic0.canister_cycle_balance128<es>(dst : I) =
if es.context = s then Trap {cycles_used = es.cycles_used;}
let amount = es.balance
copy_cycles_to_canister<es>(dst, amount.to_little_endian_bytes())
Expand Down
2 changes: 1 addition & 1 deletion static/load_moc.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import ExecutionEnvironment from "@docusaurus/ExecutionEnvironment";

const MOC_VERSION = "0.13.7";
const MOC_VERSION = "0.14.0";

async function addPackage(name, repo, version, dir) {
const meta_url = `https://data.jsdelivr.com/v1/package/gh/${repo}@${version}/flat`;
Expand Down
1 change: 1 addition & 0 deletions static/moc-interpreter-0.14.0.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion submodules/motoko
Submodule motoko updated 279 files

0 comments on commit dee41ef

Please sign in to comment.