Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into chore-ic-pos-upgrade
Browse files Browse the repository at this point in the history
  • Loading branch information
kristoferlund committed Nov 28, 2024
2 parents 22c5b2b + 0610e6b commit 4c36b87
Show file tree
Hide file tree
Showing 45 changed files with 773 additions and 4,597 deletions.
5 changes: 2 additions & 3 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
/motoko/pub-sub/ @dfinity/growth
/motoko/query_stats/ @dfinity/sdk
/motoko/random_maze/ @dfinity/languages
/motoko/send_http_get/ @dfinity/networking
/motoko/send_http_post/ @dfinity/networking
/motoko/send_http_get/ @dfinity/growth
/motoko/send_http_post/ @dfinity/growth
/motoko/superheroes/ @dfinity/growth
/motoko/threshold-ecdsa/ @dfinity/crypto-team
/motoko/threshold-schnorr/ @dfinity/crypto-team
Expand Down Expand Up @@ -69,7 +69,6 @@
/rust/send_http_post/ @dfinity/growth
/rust/simd/ @dfinity/execution
/rust/threshold-ecdsa/ @dfinity/crypto-team
/rust/threshold-mock/ @dfinity/crypto-team
/rust/threshold-schnorr/ @dfinity/crypto-team
/rust/token_transfer/ @dfinity/growth
/rust/token_transfer_from/ @dfinity/growth
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/provision-darwin.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ rm node.pkg

# Install DFINITY SDK.
curl --location --output install-dfx.sh "https://raw.githubusercontent.com/dfinity/sdk/master/public/install-dfxvm.sh"
DFX_VERSION=${DFX_VERSION:=0.24.1} DFXVM_INIT_YES=true bash install-dfx.sh
DFX_VERSION=${DFX_VERSION:=0.24.2} DFXVM_INIT_YES=true bash install-dfx.sh
rm install-dfx.sh
echo "$HOME/Library/Application Support/org.dfinity.dfx/bin" >> $GITHUB_PATH
source "$HOME/Library/Application Support/org.dfinity.dfx/env"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/provision-linux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ rm install-node.sh

# Install DFINITY SDK.
wget --output-document install-dfx.sh "https://raw.githubusercontent.com/dfinity/sdk/master/public/install-dfxvm.sh"
DFX_VERSION=${DFX_VERSION:=0.24.1} DFXVM_INIT_YES=true bash install-dfx.sh
DFX_VERSION=${DFX_VERSION:=0.24.2} DFXVM_INIT_YES=true bash install-dfx.sh
rm install-dfx.sh
echo "$HOME/.local/share/dfx/bin" >> $GITHUB_PATH
source "$HOME/.local/share/dfx/env"
Expand Down
23 changes: 23 additions & 0 deletions .github/workflows/rust-parallel-calls-example.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,3 +42,26 @@ jobs:
dfx start --background
make test
popd
rust-parallel-calls-pocket-ic-linux:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v2
with:
submodules: recursive
- name: Provision Linux
run: bash .github/workflows/provision-linux.sh
- name: Install PocketIC server
uses: dfinity/pocketic@main
- name: Test parallel calls with PocketIC
run: |
pushd rust/parallel_calls
cargo build --release --target wasm32-unknown-unknown -p callee
cargo build --release --target wasm32-unknown-unknown -p caller
export CALLER_WASM=$(cargo build --target wasm32-unknown-unknown -p caller --message-format=json \
| jq -r 'select(.reason == "compiler-artifact") | .filenames[] | select(endswith(".wasm"))')
export CALLEE_WASM=$(cargo build --target wasm32-unknown-unknown -p callee --message-format=json \
| jq -r 'select(.reason == "compiler-artifact") | .filenames[] | select(endswith(".wasm"))')
cargo run
popd
66 changes: 0 additions & 66 deletions .github/workflows/rust-threshold-mock-example.yml

This file was deleted.

9 changes: 8 additions & 1 deletion .github/workflows/update-ic-commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,13 @@ jobs:
ic-update:
runs-on: ubuntu-latest
steps:
- name: Create GitHub App Token
uses: actions/create-github-app-token@v1
id: app-token
with:
app-id: ${{ vars.PR_AUTOMATION_BOT_PUBLIC_APP_ID }}
private-key: ${{ secrets.PR_AUTOMATION_BOT_PUBLIC_PRIVATE_KEY }}

- uses: actions/checkout@v4

# First, check if there is a newer version and update the file referencing the version
Expand Down Expand Up @@ -68,7 +75,7 @@ jobs:
if: ${{ steps.update.outputs.updated == '1' }}
uses: peter-evans/create-pull-request@v6
with:
token: ${{ secrets.GIX_CREATE_PR_PAT }}
token: ${{ steps.app-token.outputs.token }}
base: master
add-paths: ./.ic-commit
commit-message: Update commit of IC artifacts
Expand Down
4 changes: 2 additions & 2 deletions motoko/basic_bitcoin/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ curl -fsSL cli.mops.one/install.sh | sh

### Acquire cycles to deploy

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).
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).

### Deploy the smart contract to the Internet Computer

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

* Deploy a canister smart contract on the ICP blockchain that can receive & send Bitcoin.
* Use a cycles faucet to deploy the canister to ICP blockchain on the mainnet for free.
* Acquire cycles to deploy the canister to the ICP mainnet.
* Connect the canister to the Bitcoin testnet.
* Send the canister some testnet BTC.
* Check the testnet BTC balance of the canister.
Expand Down
71 changes: 0 additions & 71 deletions motoko/send_http_get/src/send_http_get_backend/Types.mo

This file was deleted.

Loading

0 comments on commit 4c36b87

Please sign in to comment.