feat: Update to ic-ref-0.14 (#36)

Co-authored-by: Eric Swanson <[email protected]>

Author: Akhilesh Singhania

.github/workflows/examples.yml

@@ -13,7 +13,7 @@ jobs:
           - build: linux-stable
             os: ubuntu-latest
             rust: 1.45.1
-            dfx: 0.6.10
+            dfx: 0.6.15
 
     steps:
       - uses: actions/checkout@v2
@@ -39,7 +39,7 @@ jobs:
           yes | sh -ci "$(curl -fsSL https://sdk.dfinity.org/install.sh)"
 
       - name: Setup BATS
-        uses: mig4/[email protected].1
+        uses: mig4/[email protected].2
         with:
           bats-version: 1.2.1
 

examples/asset_storage/tests/basic.bats

@@ -2,7 +2,9 @@
 setup() {
   cd examples/asset_storage
   # Make sure the directory is clean.
-  dfx start --clean --background
+  dfx start --clean --background --host "127.0.0.1:0"
+  local webserver_port=$(cat .dfx/webserver-port)
+  cat <<<$(jq .networks.local.bind=\"127.0.0.1:${webserver_port}\" dfx.json) >dfx.json
 
   run dfx identity new alice
   run dfx identity new bob

examples/counter/tests/basic.bats

@@ -2,7 +2,9 @@
 setup() {
   cd examples/counter
   # Make sure the directory is clean.
-  dfx start --clean --background
+  dfx start --clean --background --host "127.0.0.1:0"
+  local webserver_port=$(cat .dfx/webserver-port)
+  cat <<<$(jq .networks.local.bind=\"127.0.0.1:${webserver_port}\" dfx.json) >dfx.json
 }
 
 # executed after each test

src/ic-cdk/src/api.rs

@@ -48,7 +48,6 @@ pub fn id() -> Principal {
 }
 
 /// Get the amount of funds available in the canister.
-pub fn canister_balance(unit: call::funds::Unit) -> i64 {
-    let bytes = unit.to_bytes();
-    unsafe { ic0::canister_balance(bytes.as_ptr() as i32, bytes.len() as i32) }
+pub fn canister_balance() -> i64 {
+    unsafe { ic0::canister_cycle_balance() }
 }

src/ic-cdk/src/api/call.rs

@@ -119,12 +119,9 @@ pub fn call_raw(
         );
 
         ic0::call_data_append(args_raw.as_ptr() as i32, args_raw.len() as i32);
-
         if payment > 0 {
-            let bytes = vec![0u8];
-            ic0::call_funds_add(bytes.as_ptr() as i32, bytes.len() as i32, payment as i64);
+            ic0::call_cycles_add(payment as i64);
         }
-
         ic0::call_perform()
     };
 
@@ -204,42 +201,16 @@ pub fn reply<T: ArgumentEncoder>(reply: T) {
     }
 }
 
-/// Economics.
-///
-/// # Warning
-/// This section will be moved and breaking changes significantly before Mercury.
-/// The APIs behind it will stay the same, so deployed canisters will keep working.
-pub mod funds {
-    use super::ic0;
-
-    pub enum Unit {
-        Cycle,
-        IcpToken,
-    }
-
-    impl Unit {
-        pub fn to_bytes(&self) -> Vec<u8> {
-            match self {
-                Unit::Cycle => vec![0],
-                Unit::IcpToken => vec![1],
-            }
-        }
-    }
-
-    pub fn available(unit: Unit) -> i64 {
-        let bytes = unit.to_bytes();
-        unsafe { ic0::msg_funds_available(bytes.as_ptr() as i32, bytes.len() as i32) }
-    }
+pub fn msg_cycles_available() -> i64 {
+    unsafe { ic0::msg_cycles_available() }
+}
 
-    pub fn refunded(unit: Unit) -> i64 {
-        let bytes = unit.to_bytes();
-        unsafe { ic0::msg_funds_refunded(bytes.as_ptr() as i32, bytes.len() as i32) }
-    }
+pub fn msg_cycles_refunded() -> i64 {
+    unsafe { ic0::msg_cycles_refunded() }
+}
 
-    pub fn accept(unit: Unit, amount: i64) {
-        let bytes = unit.to_bytes();
-        unsafe { ic0::msg_funds_accept(bytes.as_ptr() as i32, bytes.len() as i32, amount) }
-    }
+pub fn msg_cycles_accept(max_amount: i64) -> i64 {
+    unsafe { ic0::msg_cycles_accept(max_amount) }
 }
 
 pub(crate) unsafe fn arg_data_raw() -> Vec<u8> {

src/ic-cdk/src/api/ic0.rs

@@ -58,10 +58,10 @@ macro_rules! ic0_module {
 // This is a private module that can only be used internally in this file.
 // Copy-paste the spec section of the API here.
 ic0_module! {
-    ic0.msg_arg_data_size : () -> i32;                                          // I U Q Ry Lb
-    ic0.msg_arg_data_copy : (dst : i32, offset : i32, size : i32) -> ();        // I U Q Ry Lb
-    ic0.msg_caller_size : () -> (i32);                                          // I G U Q Lb
-    ic0.msg_caller_copy : (dst : i32, offset: i32, size : i32) -> ();           // I G U Q Lb
+    ic0.msg_arg_data_size : () -> i32;                                          // I U Q Ry
+    ic0.msg_arg_data_copy : (dst : i32, offset : i32, size : i32) -> ();        // I U Q Ry
+    ic0.msg_caller_size : () -> i32;                                            // I G U Q
+    ic0.msg_caller_copy : (dst : i32, offset: i32, size : i32) -> ();           // I G U Q
     ic0.msg_reject_code : () -> i32;                                            // Ry Rt
     ic0.msg_reject_msg_size : () -> i32;                                        // Rt
     ic0.msg_reject_msg_copy : (dst : i32, offset : i32, size : i32) -> ();      // Rt
@@ -70,45 +70,39 @@ ic0_module! {
     ic0.msg_reply : () -> ();                                                   // U Q Ry Rt
     ic0.msg_reject : (src : i32, size : i32) -> ();                             // U Q Ry Rt
 
-    ic0.msg_funds_available : ( unit_src : i32, unit_size : i32 ) -> i64;       // U Rt Ry Lb
-    ic0.msg_funds_refunded : ( unit_src : i32, unit_size : i32 ) -> i64;        // Rt Ry
-    ic0.msg_funds_accept :                                                      // U Rt Ry
-      ( unit_src : i32, unit_size : i32, amount : i64 ) -> ();
+    ic0.msg_cycles_available : () -> i64;                                       // U Rt Ry
+    ic0.msg_cycles_refunded : () -> i64;                                        // Rt Ry
+    ic0.msg_cycles_accept : ( max_amount : i64 ) -> ( amount : i64 );           // U Rt Ry
 
-    ic0.canister_self_size : () -> (i32);                                       // *
+    ic0.canister_self_size : () -> i32;                                         // *
     ic0.canister_self_copy : (dst : i32, offset : i32, size : i32) -> ();       // *
-    ic0.canister_balance : ( unit_src : i32, unit_size : i32 ) -> i64;           // *
-
-    ic0.ingress_rate_bucket_size : () -> i32;                                   // Ll
-    ic0.ingress_rate_bucket_copy : (dst : i32, offset : i32, size : i32) -> (); // Ll
-    ic0.return_ingress_bucket :
-      ( bucket_src : i32,
-        bucket_size : i32,
-        cost : i64
-      ) -> ();                                                                  // Lb
-    ic0.return_ingress_limit_per_second : (limit : i64) -> ();                  // Ll
+    ic0.canister_cycle_balance : () -> i64;                                     // *
+    ic0.canister_status : () -> i32;                                            // *
 
     ic0.call_new :                                                              // U Ry Rt
-      ( callee_src  : i32,
-        callee_size : i32,
-        name_src : i32,
-        name_size : i32,
-        reply_fun : i32,
-        reply_env : i32,
-        reject_fun : i32,
-        reject_env : i32
-      ) -> ();
-    ic0.call_on_cleanup : (fun : i32, env : i32) -> ();                         // U Ry Rt
+    ( callee_src  : i32,
+      callee_size : i32,
+      name_src : i32,
+      name_size : i32,
+      reply_fun : i32,
+      reply_env : i32,
+      reject_fun : i32,
+      reject_env : i32
+    ) -> ();
     ic0.call_data_append : (src : i32, size : i32) -> ();                       // U Ry Rt
-    ic0.call_funds_add :                                                        // U Ry Rt
-      (unit_src : i32, unit_size : i32,  amount : i64) -> ();
+    ic0.call_cycles_add : ( amount : i64 ) -> ();                               // U Ry Rt
     ic0.call_perform : () -> ( err_code : i32 );                                // U Ry Rt
 
     ic0.stable_size : () -> (page_count : i32);                                 // *
     ic0.stable_grow : (new_pages : i32) -> (old_page_count : i32);              // *
     ic0.stable_write : (offset : i32, src : i32, size : i32) -> ();             // *
     ic0.stable_read : (dst : i32, offset : i32, size : i32) -> ();              // *
 
+    ic0.certified_data_set : (src: i32, size: i32) -> ();                        // I G U Ry Rt
+    ic0.data_certificate_present : () -> i32;                                    // Q
+    ic0.data_certificate_size : () -> i32;                                       // Q
+    ic0.data_certificate_copy : (dst: i32, offset: i32, size: i32) -> ();        // Q
+
     ic0.time : () -> (timestamp : i64);                                         // *
 
     ic0.debug_print : (src : i32, size : i32) -> ();                            // * s