Merge branch 'master' into mraszyk/pic

dfinity · Oct 3, 2024 · 5782cca · 5782cca
2 parents a0b21e2 + 8c12efe
commit 5782cca
Show file tree

Hide file tree

Showing 14 changed files with 644 additions and 817 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -19,7 +19,6 @@
 /motoko/encrypted-notes-dapp-vetkd/ @dfinity/crypto-team
 /motoko/encrypted-notes-dapp/ @dfinity/crypto-team
 /motoko/hello_cycles/ @dfinity/languages
-/motoko/http_counter/ @dfinity/networking
 /motoko/ic-pos/ @dfinity/div-Crypto
 /motoko/icrc2-swap/ @dfinity/div-Crypto
 /motoko/internet_identity_integration/ @dfinity/gix

diff --git a/.github/workflows/motoko-http_counter-example.yaml b/.github/workflows/motoko-http_counter-example.yaml
diff --git a/.github/workflows/rust-nft-wallet-example.yml b/.github/workflows/rust-nft-wallet-example.yml
@@ -27,7 +27,7 @@ jobs:
       - name: Rust NFT Wallet Darwin
         run: |
           pushd rust/nft-wallet
-          dfx start --background --clean --pocketic --host 127.0.0.1:8000
+          dfx start --background --clean --pocketic --host 127.0.0.1:4943
           bash ./deploy.sh
           dfx canister call nftwallet owned_nfts
           popd
@@ -44,7 +44,7 @@ jobs:
       - name: Rust NFT Wallet Linux
         run: |
           pushd rust/nft-wallet
-          dfx start --background --clean --pocketic --host 127.0.0.1:8000
+          dfx start --background --clean --pocketic --host 127.0.0.1:4943
           bash ./deploy.sh
           dfx canister call nftwallet owned_nfts
           popd
diff --git a/motoko/http_counter/Makefile b/motoko/http_counter/Makefile
diff --git a/motoko/http_counter/README.md b/motoko/http_counter/README.md
diff --git a/motoko/http_counter/dfx.json b/motoko/http_counter/dfx.json
diff --git a/motoko/http_counter/src/main.mo b/motoko/http_counter/src/main.mo
diff --git a/motoko/ic-pos/package-lock.json b/motoko/ic-pos/package-lock.json
diff --git a/motoko/ic-pos/package.json b/motoko/ic-pos/package.json
@@ -82,7 +82,7 @@
     "tailwindcss": "^3.3.2",
     "tailwindcss-animate": "^1.0.6",
     "typescript": "^5.0.2",
-    "vite": "^4.5.3",
+    "vite": "^4.5.5",
     "vite-plugin-svgr": "^3.2.0"
   }
 }
diff --git a/motoko/send_http_get/src/send_http_get_backend/main.mo b/motoko/send_http_get/src/send_http_get_backend/main.mo
@@ -64,7 +64,7 @@ actor {
     let ONE_MINUTE : Nat64 = 60;
     let start_timestamp : Types.Timestamp = 1682978460; //May 1, 2023 22:01:00 GMT
     let end_timestamp : Types.Timestamp = 1682978520;//May 1, 2023 22:02:00 GMT
-    let host : Text = "api.pro.coinbase.com";
+    let host : Text = "api.exchange.coinbase.com";
     let url = "https://" # host # "/products/ICP-USD/candles?start=" # Nat64.toText(start_timestamp) # "&end=" # Nat64.toText(start_timestamp) # "&granularity=" # Nat64.toText(ONE_MINUTE);
 
     // 2.2 prepare headers for the system http_request call

diff --git a/rust/send_http_get/src/send_http_get_backend/src/lib.rs b/rust/send_http_get/src/send_http_get_backend/src/lib.rs
@@ -25,7 +25,7 @@ async fn get_icp_usd_exchange() -> String {
     type Timestamp = u64;
     let start_timestamp: Timestamp = 1682978460; //May 1, 2023 22:01:00 GMT
     let seconds_of_time: u64 = 60; //we start with 60 seconds
-    let host = "api.pro.coinbase.com";
+    let host = "api.exchange.coinbase.com";
     let url = format!(
         "https://{}/products/ICP-USD/candles?start={}&end={}&granularity={}",
         host,
@@ -168,4 +168,4 @@ fn transform(raw: TransformArgs) -> HttpResponse {
         ic_cdk::api::print(format!("Received an error from coinbase: err = {:?}", raw));
     }
     res
-}
+}