Port to Testnet Babbage (#44)

* Bump `linera-protocol` to `testnet_babbage`

* `client`: port to `testnet_babbage`

* `examples/hosted-fungible`: port to `testnet_babbage`

* `examples/hosted-counter`: port to `testnet_babbage`

* `client`: bump to version `0.14` to match `linera-protocol`

Author: Twey

client/Cargo.lock

@@ -1,6 +1,6 @@
 {
     "name": "@linera/client",
-    "version": "0.0.3",
+    "version": "0.14.0",
     "description": "Web client for the Linera blockchain",
     "main": "dist/linera_web.js",
     "types": "dist/linera_web.d.ts",

client/package.json

@@ -9,10 +9,10 @@ This module defines the client API for the Web extension.
 use std::{collections::HashMap, future::Future, sync::Arc};
 
 use futures::{lock::Mutex as AsyncMutex, stream::StreamExt};
-use linera_base::identifiers::ApplicationId;
+use linera_base::identifiers::{AccountOwner, ApplicationId};
 use linera_client::{
     chain_listener::{ChainListener, ChainListenerConfig, ClientContext as _},
-    client_options::ClientOptions,
+    client_options::ClientContextOptions,
     wallet::Wallet,
 };
 use linera_core::{
@@ -33,8 +33,8 @@ type JsResult<T> = Result<T, JsError>;
 
 async fn get_storage() -> Result<WebStorage, <linera_views::memory::MemoryStore as WithError>::Error>
 {
-    linera_storage::DbStorage::initialize(
-        linera_views::memory::MemoryStoreConfig::new(1),
+    linera_storage::DbStorage::maybe_create_and_connect(
+        &linera_views::memory::MemoryStoreConfig::new(1),
         "linera",
         Some(linera_execution::WasmRuntime::Wasmer),
     )
@@ -47,15 +47,11 @@ type ChainClient =
     linera_core::client::ChainClient<linera_rpc::node_provider::NodeProvider, WebStorage>;
 
 // TODO(#13): get from user
-pub const OPTIONS: ClientOptions = ClientOptions {
+pub const OPTIONS: ClientContextOptions = ClientContextOptions {
     send_timeout: std::time::Duration::from_millis(4000),
     recv_timeout: std::time::Duration::from_millis(4000),
     max_pending_message_bundles: 10,
-    wasm_runtime: Some(linera_execution::WasmRuntime::Wasmer),
-    max_concurrent_queries: None,
     max_loaded_chains: nonzero_lit::usize!(40),
-    max_stream_queries: 10,
-    cache_size: 1000,
     retry_delay: std::time::Duration::from_millis(1000),
     max_retries: 10,
     wait_for_outgoing_messages: false,
@@ -68,10 +64,7 @@ pub const OPTIONS: ClientOptions = ClientOptions {
     // TODO(linera-protocol#2944): separate these out from the
     // `ClientOptions` struct, since they apply only to the CLI/native
     // client
-    tokio_threads: Some(1),
-    command: linera_client::client_options::ClientCommand::Keygen,
     wallet_state_path: None,
-    storage_config: None,
     with_wallet: None,
 };
 
@@ -107,12 +100,15 @@ impl JsFaucet {
     /// - if we fail to get the list of current validators from the faucet
     /// - if we fail to claim the chain from the faucet
     /// - if we fail to persist the new chain or keypair to the wallet
+    ///
+    /// # Panics
+    /// If an error occurs in the chain listener task.
     #[wasm_bindgen(js_name = claimChain)]
     pub async fn claim_chain(&self, client: &mut Client) -> JsResult<String> {
         use linera_client::persistent::LocalPersistExt as _;
         let mut context = client.client_context.lock().await;
         let key_pair = context.wallet.generate_key_pair();
-        let owner: linera_base::identifiers::Owner = key_pair.public().into();
+        let owner: AccountOwner = key_pair.public().into();
         tracing::info!(
             "Requesting a new chain for owner {} using the faucet at address {}",
             owner,
@@ -203,7 +199,7 @@ pub struct Frontend(Client);
 
 #[derive(serde::Deserialize)]
 struct TransferParams {
-    donor: Option<linera_base::identifiers::Owner>,
+    donor: Option<AccountOwner>,
     amount: u64,
     recipient: linera_base::identifiers::Account,
 }
@@ -228,14 +224,18 @@ impl Client {
             OPTIONS,
             wallet,
         )));
-        ChainListener::new(ChainListenerConfig::default())
-            .run(client_context.clone(), storage)
-            .await;
+        ChainListener::new(
+            ChainListenerConfig::default(),
+            client_context.clone(),
+            storage,
+        )
+        .run()
+        .await;
         log::info!("Linera Web client successfully initialized");
         Ok(Self { client_context })
     }
 
-    /// Set a callback to be called when a notification is received
+    /// Sets a callback to be called when a notification is received
     /// from the network.
     ///
     /// # Panics
@@ -301,6 +301,15 @@ impl Client {
         result
     }
 
+    /// Transfers funds from one account to another.
+    ///
+    /// `options` should be an options object of the form `{ donor,
+    /// recipient, amount }`; omitting `donor` will cause the funds to
+    /// come from the chain balance.
+    ///
+    /// # Errors
+    /// - if the options object is of the wrong form
+    /// - if the transfer fails
     #[wasm_bindgen]
     pub async fn transfer(&self, options: wasm_bindgen::JsValue) -> JsResult<()> {
         let params: TransferParams = serde_wasm_bindgen::from_value(options)?;
@@ -309,7 +318,7 @@ impl Client {
         let _hash = self
             .apply_client_command(&chain_client, || {
                 chain_client.transfer(
-                    params.donor,
+                    params.donor.unwrap_or(AccountOwner::CHAIN),
                     linera_base::data_types::Amount::from_tokens(params.amount.into()),
                     linera_execution::system::Recipient::Account(params.recipient),
                 )
@@ -319,6 +328,10 @@ impl Client {
         Ok(())
     }
 
+    /// Gets the identity of the default chain.
+    ///
+    /// # Errors
+    /// If the chain couldn't be established.
     pub async fn identity(&self) -> JsResult<JsValue> {
         Ok(serde_wasm_bindgen::to_value(
             &self.default_chain_client().await?.identity().await?,

client/src/lib.rs

@@ -58,11 +58,11 @@ <h2>Chain history for <code id="chain-id" class="hex">requesting chain…</code>
     <script type="module">
       import * as linera from '@linera/client';
 
-      const COUNTER_APP_ID = 'a2b93d1da68bc052f5b8650b5484103244ab9662c3a2e7112c71acc825f8f76e1073f4e0775a9212fff735f4fa30c228334a44d098e81a828839ef22f927f461ee44e4b2c6372d9d235c7beecaa08697cbb9d62685c409d70f3374b00d4abd7c00';
+      const COUNTER_APP_ID = '2b1a0df8868206a4b7d6c2fdda911e4355d6c0115b896d4947ef8e535ee3c6b8';
 
       async function run() {
           await linera.default();
-          const faucet = await new linera.Faucet('https://faucet.mini-net.linera.net');
+          const faucet = await new linera.Faucet('https://faucet.testnet-babbage.linera.net');
           const wallet = await faucet.createWallet();
           const client = await new linera.Client(wallet);
           document.getElementById('chain-id').innerText = await faucet.claimChain(client);

examples/hosted-counter/index.html

@@ -141,7 +141,7 @@ <h2>Chain history for <code id="chain-id" class="hex">requesting a new microchai
     <script type="module">
       import * as linera from '@linera/client';
 
-      const NATIVE_FUNGIBLE_APP_ID = '58299de6f0c2e9bddcee29aff497c7d47c728ec3b3ded01a4d45948a10a56221e7b40ec580a96e033c2f03c3464872d5a001e16506320a13b1264f153d64e3c9c398d551aeef7a38d0f5e26f315e63bb2357b7ed14901a3a580826a4199488ea00';
+      const FUNGIBLE_APP_ID = '465e465b050db5034fd8a51df46b9a7cf02a8a6414cc2b94b102e912208d4a4b';
 
       const gql = (query, variables = {}) => JSON.stringify({ query, variables });
 
@@ -157,8 +157,11 @@ <h2>Chain history for <code id="chain-id" class="hex">requesting a new microchai
 
       async function updateBalance(application) {
           const response = JSON.parse(await application.query(gql(`query { tickerSymbol, accounts { entries { key value } } }`)));
+          console.debug('application response:', response);
           document.querySelector('#ticker-symbol').textContent = response.data.tickerSymbol;
-          document.querySelector('#balance').textContent = (+response.data.accounts.entries[0].value).toFixed(2);
+
+          if (response?.data?.accounts?.entries?.[0])
+              document.querySelector('#balance').textContent = (+response.data.accounts.entries[0].value).toFixed(2);
       }
 
       async function transfer(application, donor, amount, recipient) {
@@ -169,7 +172,7 @@ <h2>Chain history for <code id="chain-id" class="hex">requesting a new microchai
 
           let errors = [];
           try {
-              const match = recipient.match(/^([0-9a-f]{64})@([0-9a-f]{64})$/);
+              const match = recipient.match(/^(0x[0-9a-f]{64})@([0-9a-f]{64})$/);
               if (!match) throw new Error('Invalid recipient address: expected `owner@chain_id`');
 
               const query = gql(`mutation(
@@ -181,7 +184,7 @@ <h2>Chain history for <code id="chain-id" class="hex">requesting a new microchai
               }`, {
                   donor,
                   amount,
-                  recipient: { owner: `User:${match[1]}`, chainId: match[2] },
+                  recipient: { owner: match[1], chainId: match[2] },
               });
 
               errors = JSON.parse(await application.query(query)).errors || [];
@@ -203,7 +206,7 @@ <h2>Chain history for <code id="chain-id" class="hex">requesting a new microchai
               event.preventDefault();
               transfer(
                   application,
-                  `User:${me}`,
+                  me,
                   event.target.elements.amount.value,
                   event.target.elements.recipient.value,
               );
@@ -215,13 +218,13 @@ <h2>Chain history for <code id="chain-id" class="hex">requesting a new microchai
           });
 
           await linera.default();
-          const faucet = await new linera.Faucet('https://faucet.mini-net.linera.net');
+          const faucet = await new linera.Faucet('https://faucet.testnet-babbage.linera.net');
           const wallet = await faucet.createWallet();
           const client = await new linera.Client(wallet);
           const chainId = await faucet.claimChain(client);
           document.querySelector('#chain-id').innerText = chainId;
 
-          const application = await client.frontend().application(NATIVE_FUNGIBLE_APP_ID);
+          const application = await client.frontend().application(FUNGIBLE_APP_ID);
 
           client.onNotification(notification => {
               let newBlock = notification.reason.NewBlock;
@@ -238,7 +241,7 @@ <h2>Chain history for <code id="chain-id" class="hex">requesting a new microchai
           await client.transfer({
               recipient: {
                   chain_id: chainId,
-                  owner: `User:${me}`,
+                  owner: me,
               },
               amount: 10,
           });