feat: support receiving cycles

ldclabs · Jul 17, 2024 · 0aae62a · 0aae62a
1 parent d18895a
commit 0aae62a
Show file tree

Hide file tree

Showing 10 changed files with 288 additions and 70 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -15,7 +15,7 @@ strip = true
 opt-level = 's'
 
 [workspace.package]
-version = "1.0.3"
+version = "1.1.0"
 edition = "2021"
 repository = "https://github.com/ldclabs/idempotent-proxy"
 keywords = ["idempotent", "reverse", "proxy", "icp"]

diff --git a/README.md b/README.md
@@ -22,9 +22,9 @@ This service can be used to proxy [HTTPS outcalls](https://internetcomputer.org/
 - Deployable with Docker or Cloudflare Worker
 - On-chain Idempotent Proxy service on the ICP
 
-## Packages
+## Libraries
 
-| Package                                                                                                            | Description                                                                             |
+| Library                                                                                                            | Description                                                                             |
 | :----------------------------------------------------------------------------------------------------------------- | :-------------------------------------------------------------------------------------- |
 | [idempotent-proxy-server](https://github.com/ldclabs/idempotent-proxy/tree/main/src/idempotent-proxy-server)       | Idempotent Proxy implemented in Rust.                                                   |
 | [idempotent-proxy-cf-worker](https://github.com/ldclabs/idempotent-proxy/tree/main/src/idempotent-proxy-cf-worker) | Idempotent Proxy implemented as Cloudflare Worker.                                      |

diff --git a/examples/eth-canister-lite/src/jsonrpc.rs b/examples/eth-canister-lite/src/jsonrpc.rs
@@ -130,14 +130,19 @@ impl EthereumRPC {
             transform: None,
         };
 
-        let (res,): (HttpResponse,) = ic_cdk::call(self.proxy, proxy_method, (request,))
-            .await
-            .map_err(|(code, msg)| {
-                format!(
-                    "failed to call {} on {:?}, code: {}, message: {}",
-                    proxy_method, &self.proxy, code as u32, msg
-                )
-            })?;
+        let (res,): (HttpResponse,) = ic_cdk::api::call::call_with_payment128(
+            self.proxy,
+            proxy_method,
+            (request,),
+            1_000_000_000, // max cycles, unspent cycles will be refunded
+        )
+        .await
+        .map_err(|(code, msg)| {
+            format!(
+                "failed to call {} on {:?}, code: {}, message: {}",
+                proxy_method, &self.proxy, code as u32, msg
+            )
+        })?;
 
         if res.status >= 200u64 && res.status < 300u64 {
             Ok(res.body)

diff --git a/src/idempotent-proxy-canister/README.md b/src/idempotent-proxy-canister/README.md
@@ -29,11 +29,22 @@ dfx deploy idempotent-proxy-canister --argument "(opt variant {Init =
   record {
     ecdsa_key_name = \"dfx_test_key\";
     proxy_token_refresh_interval = 3600;
+    subnet_size = 1;
+    service_fee = 10_000_000;
   }
 })"
 
 dfx canister call idempotent-proxy-canister get_state '()'
 
+# upgrade
+dfx deploy idempotent-proxy-canister --argument "(opt variant {Upgrade =
+  record {
+    proxy_token_refresh_interval = null;
+    subnet_size = opt 13;
+    service_fee = opt 100_000_000;
+  }
+})"
+
 # 3 same agents for testing
 dfx canister call idempotent-proxy-canister admin_set_agents '
   (vec {