Skip to content

Commit 61bb194

Browse files
committed
Merge branch 'master' into severin/dfx-0.24.0-release
2 parents b1204b2 + 8c12efe commit 61bb194

File tree

14 files changed

+644
-817
lines changed

14 files changed

+644
-817
lines changed

.github/CODEOWNERS

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
/motoko/encrypted-notes-dapp-vetkd/ @dfinity/crypto-team
2020
/motoko/encrypted-notes-dapp/ @dfinity/crypto-team
2121
/motoko/hello_cycles/ @dfinity/languages
22-
/motoko/http_counter/ @dfinity/networking
2322
/motoko/ic-pos/ @dfinity/div-Crypto
2423
/motoko/icrc2-swap/ @dfinity/div-Crypto
2524
/motoko/internet_identity_integration/ @dfinity/gix

.github/workflows/motoko-http_counter-example.yaml

-40
This file was deleted.

.github/workflows/rust-nft-wallet-example.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
- name: Rust NFT Wallet Darwin
2828
run: |
2929
pushd rust/nft-wallet
30-
dfx start --background --host 127.0.0.1:8000
30+
dfx start --background --host 127.0.0.1:4943
3131
bash ./deploy.sh
3232
dfx canister call nftwallet owned_nfts
3333
popd
@@ -44,7 +44,7 @@ jobs:
4444
- name: Rust NFT Wallet Linux
4545
run: |
4646
pushd rust/nft-wallet
47-
dfx start --background --host 127.0.0.1:8000
47+
dfx start --background --host 127.0.0.1:4943
4848
bash ./deploy.sh
4949
dfx canister call nftwallet owned_nfts
5050
popd

motoko/http_counter/Makefile

-31
This file was deleted.

motoko/http_counter/README.md

-84
This file was deleted.

motoko/http_counter/dfx.json

-8
This file was deleted.

motoko/http_counter/src/main.mo

-149
This file was deleted.

motoko/ic-pos/package-lock.json

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

motoko/ic-pos/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
"tailwindcss": "^3.3.2",
8383
"tailwindcss-animate": "^1.0.6",
8484
"typescript": "^5.0.2",
85-
"vite": "^4.5.3",
85+
"vite": "^4.5.5",
8686
"vite-plugin-svgr": "^3.2.0"
8787
}
8888
}

motoko/send_http_get/src/send_http_get_backend/main.mo

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ actor {
6464
let ONE_MINUTE : Nat64 = 60;
6565
let start_timestamp : Types.Timestamp = 1682978460; //May 1, 2023 22:01:00 GMT
6666
let end_timestamp : Types.Timestamp = 1682978520;//May 1, 2023 22:02:00 GMT
67-
let host : Text = "api.pro.coinbase.com";
67+
let host : Text = "api.exchange.coinbase.com";
6868
let url = "https://" # host # "/products/ICP-USD/candles?start=" # Nat64.toText(start_timestamp) # "&end=" # Nat64.toText(start_timestamp) # "&granularity=" # Nat64.toText(ONE_MINUTE);
6969

7070
// 2.2 prepare headers for the system http_request call

rust/send_http_get/src/send_http_get_backend/src/lib.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ async fn get_icp_usd_exchange() -> String {
2525
type Timestamp = u64;
2626
let start_timestamp: Timestamp = 1682978460; //May 1, 2023 22:01:00 GMT
2727
let seconds_of_time: u64 = 60; //we start with 60 seconds
28-
let host = "api.pro.coinbase.com";
28+
let host = "api.exchange.coinbase.com";
2929
let url = format!(
3030
"https://{}/products/ICP-USD/candles?start={}&end={}&granularity={}",
3131
host,
@@ -168,4 +168,4 @@ fn transform(raw: TransformArgs) -> HttpResponse {
168168
ic_cdk::api::print(format!("Received an error from coinbase: err = {:?}", raw));
169169
}
170170
res
171-
}
171+
}

0 commit comments

Comments
 (0)