Skip to content

Commit 4c36b87

Browse files
committed
Merge remote-tracking branch 'origin/master' into chore-ic-pos-upgrade
2 parents 22c5b2b + 0610e6b commit 4c36b87

File tree

45 files changed

+773
-4597
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+773
-4597
lines changed

.github/CODEOWNERS

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
/motoko/pub-sub/ @dfinity/growth
2929
/motoko/query_stats/ @dfinity/sdk
3030
/motoko/random_maze/ @dfinity/languages
31-
/motoko/send_http_get/ @dfinity/networking
32-
/motoko/send_http_post/ @dfinity/networking
31+
/motoko/send_http_get/ @dfinity/growth
32+
/motoko/send_http_post/ @dfinity/growth
3333
/motoko/superheroes/ @dfinity/growth
3434
/motoko/threshold-ecdsa/ @dfinity/crypto-team
3535
/motoko/threshold-schnorr/ @dfinity/crypto-team
@@ -69,7 +69,6 @@
6969
/rust/send_http_post/ @dfinity/growth
7070
/rust/simd/ @dfinity/execution
7171
/rust/threshold-ecdsa/ @dfinity/crypto-team
72-
/rust/threshold-mock/ @dfinity/crypto-team
7372
/rust/threshold-schnorr/ @dfinity/crypto-team
7473
/rust/token_transfer/ @dfinity/growth
7574
/rust/token_transfer_from/ @dfinity/growth

.github/workflows/provision-darwin.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ rm node.pkg
1818

1919
# Install DFINITY SDK.
2020
curl --location --output install-dfx.sh "https://raw.githubusercontent.com/dfinity/sdk/master/public/install-dfxvm.sh"
21-
DFX_VERSION=${DFX_VERSION:=0.24.1} DFXVM_INIT_YES=true bash install-dfx.sh
21+
DFX_VERSION=${DFX_VERSION:=0.24.2} DFXVM_INIT_YES=true bash install-dfx.sh
2222
rm install-dfx.sh
2323
echo "$HOME/Library/Application Support/org.dfinity.dfx/bin" >> $GITHUB_PATH
2424
source "$HOME/Library/Application Support/org.dfinity.dfx/env"

.github/workflows/provision-linux.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ rm install-node.sh
1313

1414
# Install DFINITY SDK.
1515
wget --output-document install-dfx.sh "https://raw.githubusercontent.com/dfinity/sdk/master/public/install-dfxvm.sh"
16-
DFX_VERSION=${DFX_VERSION:=0.24.1} DFXVM_INIT_YES=true bash install-dfx.sh
16+
DFX_VERSION=${DFX_VERSION:=0.24.2} DFXVM_INIT_YES=true bash install-dfx.sh
1717
rm install-dfx.sh
1818
echo "$HOME/.local/share/dfx/bin" >> $GITHUB_PATH
1919
source "$HOME/.local/share/dfx/env"

.github/workflows/rust-parallel-calls-example.yml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,3 +42,26 @@ jobs:
4242
dfx start --background
4343
make test
4444
popd
45+
rust-parallel-calls-pocket-ic-linux:
46+
runs-on: ubuntu-latest
47+
steps:
48+
- name: Checkout repository
49+
uses: actions/checkout@v2
50+
with:
51+
submodules: recursive
52+
- name: Provision Linux
53+
run: bash .github/workflows/provision-linux.sh
54+
- name: Install PocketIC server
55+
uses: dfinity/pocketic@main
56+
- name: Test parallel calls with PocketIC
57+
run: |
58+
pushd rust/parallel_calls
59+
cargo build --release --target wasm32-unknown-unknown -p callee
60+
cargo build --release --target wasm32-unknown-unknown -p caller
61+
export CALLER_WASM=$(cargo build --target wasm32-unknown-unknown -p caller --message-format=json \
62+
| jq -r 'select(.reason == "compiler-artifact") | .filenames[] | select(endswith(".wasm"))')
63+
export CALLEE_WASM=$(cargo build --target wasm32-unknown-unknown -p callee --message-format=json \
64+
| jq -r 'select(.reason == "compiler-artifact") | .filenames[] | select(endswith(".wasm"))')
65+
cargo run
66+
popd
67+

.github/workflows/rust-threshold-mock-example.yml

Lines changed: 0 additions & 66 deletions
This file was deleted.

.github/workflows/update-ic-commit.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,13 @@ jobs:
1111
ic-update:
1212
runs-on: ubuntu-latest
1313
steps:
14+
- name: Create GitHub App Token
15+
uses: actions/create-github-app-token@v1
16+
id: app-token
17+
with:
18+
app-id: ${{ vars.PR_AUTOMATION_BOT_PUBLIC_APP_ID }}
19+
private-key: ${{ secrets.PR_AUTOMATION_BOT_PUBLIC_PRIVATE_KEY }}
20+
1421
- uses: actions/checkout@v4
1522

1623
# First, check if there is a newer version and update the file referencing the version
@@ -68,7 +75,7 @@ jobs:
6875
if: ${{ steps.update.outputs.updated == '1' }}
6976
uses: peter-evans/create-pull-request@v6
7077
with:
71-
token: ${{ secrets.GIX_CREATE_PR_PAT }}
78+
token: ${{ steps.app-token.outputs.token }}
7279
base: master
7380
add-paths: ./.ic-commit
7481
commit-message: Update commit of IC artifacts

motoko/basic_bitcoin/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ curl -fsSL cli.mops.one/install.sh | sh
5050

5151
### Acquire cycles to deploy
5252

53-
Deploying to the Internet Computer requires [cycles](https://internetcomputer.org/docs/current/developer-docs/setup/cycles) (the equivalent of "gas" in other blockchains). You can get free cycles from the [cycles faucet](https://internetcomputer.org/docs/current/developer-docs/setup/cycles/cycles-faucet.md).
53+
Deploying to the Internet Computer requires [cycles](https://internetcomputer.org/docs/current/developer-docs/getting-started/tokens-and-cycles) (the equivalent of "gas" on other blockchains).
5454

5555
### Deploy the smart contract to the Internet Computer
5656

@@ -211,7 +211,7 @@ reflected in your current balance.
211211
In this tutorial, you were able to:
212212

213213
* Deploy a canister smart contract on the ICP blockchain that can receive & send Bitcoin.
214-
* Use a cycles faucet to deploy the canister to ICP blockchain on the mainnet for free.
214+
* Acquire cycles to deploy the canister to the ICP mainnet.
215215
* Connect the canister to the Bitcoin testnet.
216216
* Send the canister some testnet BTC.
217217
* Check the testnet BTC balance of the canister.

motoko/send_http_get/src/send_http_get_backend/Types.mo

Lines changed: 0 additions & 71 deletions
This file was deleted.

0 commit comments

Comments
 (0)