Skip to content

Commit

Permalink
Merge branch 'master' into mraszyk/pic
Browse files Browse the repository at this point in the history
  • Loading branch information
mraszyk committed Dec 4, 2024
2 parents d48ddb9 + 4e02cd4 commit 48ecdae
Show file tree
Hide file tree
Showing 139 changed files with 7,884 additions and 12,277 deletions.
7 changes: 3 additions & 4 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
/motoko/encrypted-notes-dapp-vetkd/ @dfinity/crypto-team
/motoko/encrypted-notes-dapp/ @dfinity/crypto-team
/motoko/hello_cycles/ @dfinity/languages
/motoko/ic-pos/ @dfinity/div-Crypto
/motoko/ic-pos/ @dfinity/growth
/motoko/icrc2-swap/ @dfinity/div-Crypto
/motoko/internet_identity_integration/ @dfinity/gix
/motoko/life/ @dfinity/languages
Expand All @@ -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.2} DFXVM_INIT_YES=true bash install-dfx.sh
DFX_VERSION=${DFX_VERSION:=0.24.3} 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.2} DFXVM_INIT_YES=true bash install-dfx.sh
DFX_VERSION=${DFX_VERSION:=0.24.3} 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 --clean --pocketic
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.

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
17 changes: 0 additions & 17 deletions motoko/ic-pos/.eslintrc.cjs

This file was deleted.

2 changes: 2 additions & 0 deletions motoko/ic-pos/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,5 @@ yarn-error.log*

# misc
scratch/
canister_ids.json

15 changes: 15 additions & 0 deletions motoko/ic-pos/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,20 @@
# Changelog

## [0.4.0] - 2024-11-25

### Changed
- Major front-end overhaul, upgrading many libraries and components.
- Removed recoil for state management, now using Tanstack Router and Tanstack Query.
- Removed old axios based fetching, replacing with Tanstack Query.
- Replacing custom actor and session implementations with `ic-use-actor` and `ic-use-internet-identity`
- Upgraded Vite to new version.
- Upgraded eslint rules and version
- Cleaned up and refactored project setup, routes, and components.
- Upgrading to newer versions of the icrc canisters.

### Fixed
- User sessions now survive page reloads.

## [0.3.0] - 2022-09-10

### Added
Expand Down
Loading

0 comments on commit 48ecdae

Please sign in to comment.