Change ChainDescriptions into blobs

.github/workflows/rust.yml

@@ -64,7 +64,7 @@ jobs:
         cargo build --bin linera
         cargo run --bin linera -- resource-control-policy --block 0.0000001
         cargo run --bin linera -- resource-control-policy --block 0.000000
-        cargo run --bin linera -- faucet --amount 1000 --port 8079 a3edc33d8e951a1139333be8a4b56646b5598a8f51216e86592d881808972b07 &
+        cargo run --bin linera -- faucet --amount 1000 --port 8079 &
     - name: Run the remote-net tests
       run: |
         cargo test -p linera-service remote_net_grpc --features remote-net

CLI.md

@@ -720,12 +720,12 @@ Create an unassigned key pair
 
 Link an owner with a key pair in the wallet to a chain that was created for that owner
 
-**Usage:** `linera assign --owner <OWNER> --message-id <MESSAGE_ID>`
+**Usage:** `linera assign --owner <OWNER> --chain-id <CHAIN_ID>`
 
 ###### **Options:**
 
 * `--owner <OWNER>` — The owner to assign
-* `--message-id <MESSAGE_ID>` — The ID of the message that created the chain. (This uniquely describes the chain and where it was created.)
+* `--chain-id <CHAIN_ID>` — The ID of the chain
 
 
 

README.md

@@ -99,9 +99,9 @@ linera wallet init --faucet $FAUCET_URL
 INFO1=($(linera wallet request-chain --faucet $FAUCET_URL))
 INFO2=($(linera wallet request-chain --faucet $FAUCET_URL))
 CHAIN1="${INFO1[0]}"
-ACCOUNT1="${INFO1[3]}"
+ACCOUNT1="${INFO1[2]}"
 CHAIN2="${INFO2[0]}"
-ACCOUNT2="${INFO2[3]}"
+ACCOUNT2="${INFO2[2]}"
 
 # Show the different chains tracked by the wallet.
 linera wallet show

examples/Cargo.toml

@@ -2,15 +2,15 @@
 resolver = "2"
 members = [
     "amm",
-    "counter",
     "call-evm-counter",
+    "counter",
     "counter-no-graphql",
     "crowd-funding",
     "ethereum-tracker",
     "fungible",
     "gen-nft",
-    "how-to/perform-http-requests",
     "hex-game",
+    "how-to/perform-http-requests",
     "llm",
     "matching-engine",
     "meta-counter",

examples/amm/README.md

@@ -64,9 +64,9 @@ INFO_2=($(linera wallet request-chain --faucet $FAUCET_URL))
 CHAIN_AMM="${INFO_AMM[0]}"
 CHAIN_1="${INFO_1[0]}"
 CHAIN_2="${INFO_2[0]}"
-OWNER_AMM="${INFO_AMM[3]}"
-OWNER_1="${INFO_1[3]}"
-OWNER_2="${INFO_2[3]}"
+OWNER_AMM="${INFO_AMM[2]}"
+OWNER_1="${INFO_1[2]}"
+OWNER_2="${INFO_2[2]}"
 ```
 
 Now we have to publish and create the fungible applications. The flag `--wait-for-outgoing-messages` waits until a quorum of validators has confirmed that all sent cross-chain messages have been delivered.

examples/counter/README.md

@@ -49,7 +49,7 @@ linera wallet init --faucet $FAUCET_URL
 
 INFO_1=($(linera wallet request-chain --faucet $FAUCET_URL))
 CHAIN_1="${INFO_1[0]}"
-OWNER_1="${INFO_1[3]}"
+OWNER_1="${INFO_1[2]}"
 ```
 
 Now, compile the `counter` application WebAssembly binaries, publish and create an application instance.

examples/crowd-funding/README.md

@@ -77,8 +77,8 @@ INFO_1=($(linera --with-wallet 1 wallet request-chain --faucet $FAUCET_URL))
 INFO_2=($(linera --with-wallet 2 wallet request-chain --faucet $FAUCET_URL))
 CHAIN_1="${INFO_1[0]}"
 CHAIN_2="${INFO_2[0]}"
-OWNER_1="${INFO_1[3]}"
-OWNER_2="${INFO_2[3]}"
+OWNER_1="${INFO_1[2]}"
+OWNER_2="${INFO_2[2]}"
 ```
 
 Note that `linera --with-wallet 1` is equivalent to `linera --wallet "$LINERA_WALLET_1"

examples/fungible/README.md

@@ -64,10 +64,10 @@ linera wallet init --faucet $FAUCET_URL
 
 INFO_1=($(linera wallet request-chain --faucet $FAUCET_URL))
 CHAIN_1="${INFO_1[0]}"
-OWNER_1="${INFO_1[3]}"
+OWNER_1="${INFO_1[2]}"
 INFO_2=($(linera wallet request-chain --faucet $FAUCET_URL))
 CHAIN_2="${INFO_2[0]}"
-OWNER_2="${INFO_2[3]}"
+OWNER_2="${INFO_2[2]}"
 ```
 
 Now, compile the `fungible` application WebAssembly binaries, and publish them as an application

examples/gen-nft/README.md

@@ -61,8 +61,8 @@ INFO_1=($(linera wallet request-chain --faucet $FAUCET_URL))
 INFO_2=($(linera wallet request-chain --faucet $FAUCET_URL))
 CHAIN_1="${INFO_1[0]}"
 CHAIN_2="${INFO_2[0]}"
-OWNER_1="${INFO_1[3]}"
-OWNER_2="${INFO_2[3]}"
+OWNER_1="${INFO_1[2]}"
+OWNER_2="${INFO_2[2]}"
 ```
 
 Next, compile the `non-fungible` application WebAssembly binaries, and publish them as an application module:

examples/hex-game/Cargo.toml

@@ -6,6 +6,7 @@ edition = "2021"
 
 [dependencies]
 async-graphql.workspace = true
+bcs.workspace = true
 linera-sdk.workspace = true
 log.workspace = true
 serde.workspace = true

examples/hex-game/README.md

@@ -60,8 +60,8 @@ INFO_1=($(linera --with-wallet 1 wallet request-chain --faucet $FAUCET_URL))
 INFO_2=($(linera --with-wallet 2 wallet request-chain --faucet $FAUCET_URL))
 CHAIN_1="${INFO_1[0]}"
 CHAIN_2="${INFO_2[0]}"
-OWNER_1="${INFO_1[3]}"
-OWNER_2="${INFO_2[3]}"
+OWNER_1="${INFO_1[2]}"
+OWNER_2="${INFO_2[2]}"
 ```
 
 Note that `linera --with-wallet 1` or `linera -w1` is equivalent to `linera --wallet
@@ -123,25 +123,24 @@ query {
   gameChains {
     entry(key: "$OWNER_1") {
       value {
-        messageId chainId
+        chainId
       }
     }
   }
 }
 ```
 
-Set the `QUERY_RESULT` variable to have the result returned by the previous query, and `HEX_CHAIN` and `MESSAGE_ID` will be properly set for you.
-Alternatively you can set the variables to the `chainId` and `messageId` values, respectively, returned by the previous query yourself.
-Using the message ID, we can assign the new chain to the key in each wallet:
+Set the `QUERY_RESULT` variable to have the result returned by the previous query, and `HEX_CHAIN` will be properly set for you.
+Alternatively you can set the variable to the `chainId`, returned by the previous query yourself.
+Using the chain ID, we can assign the new chain to the key in each wallet:
 
 ```bash
 kill %% && sleep 1    # Kill the service so we can use CLI commands for wallet 0.
 
 HEX_CHAIN=$(echo "$QUERY_RESULT" | jq -r '.gameChains.entry.value[0].chainId')
-MESSAGE_ID=$(echo "$QUERY_RESULT" | jq -r '.gameChains.entry.value[0].messageId')
 
-linera -w1 assign --owner $OWNER_1 --message-id $MESSAGE_ID
-linera -w2 assign --owner $OWNER_2 --message-id $MESSAGE_ID
+linera -w1 assign --owner $OWNER_1 --chain-id $HEX_CHAIN
+linera -w2 assign --owner $OWNER_2 --chain-id $HEX_CHAIN
 
 linera -w1 service --port 8080 &
 linera -w2 service --port 8081 &

examples/hex-game/src/contract.rs

@@ -155,17 +155,14 @@ impl HexContract {
         );
         let app_id = self.runtime.application_id();
         let permissions = ApplicationPermissions::new_single(app_id.forget_abi());
-        let (message_id, chain_id) = self.runtime.open_chain(ownership, permissions, fee_budget);
+        let chain_id = self.runtime.open_chain(ownership, permissions, fee_budget);
         for owner in &players {
             self.state
                 .game_chains
                 .get_mut_or_default(owner)
                 .await
                 .unwrap()
-                .insert(GameChain {
-                    message_id,
-                    chain_id,
-                });
+                .insert(GameChain { chain_id });
         }
         self.runtime.send_message(
             chain_id,

examples/hex-game/src/state.rs

@@ -6,16 +6,14 @@ use std::collections::BTreeSet;
 use async_graphql::SimpleObject;
 use hex_game::{Board, Clock, Timeouts};
 use linera_sdk::{
-    linera_base_types::{AccountOwner, ChainId, MessageId},
+    linera_base_types::{AccountOwner, ChainId},
     views::{linera_views, MapView, RegisterView, RootView, ViewStorageContext},
 };
 use serde::{Deserialize, Serialize};
 
 /// The IDs of a temporary chain for a single game of Hex.
 #[derive(Clone, Eq, PartialEq, Ord, PartialOrd, Serialize, Deserialize, SimpleObject)]
 pub struct GameChain {
-    /// The ID of the `OpenChain` message that created the chain.
-    pub message_id: MessageId,
     /// The ID of the temporary game chain itself.
     pub chain_id: ChainId,
 }

examples/hex-game/tests/hex_game.rs

@@ -8,7 +8,7 @@
 use hex_game::{HexAbi, Operation, Timeouts};
 use linera_sdk::{
     linera_base_types::{
-        AccountSecretKey, Amount, ChainDescription, Secp256k1SecretKey, TimeDelta,
+        AccountSecretKey, Amount, BlobType, ChainDescription, Secp256k1SecretKey, TimeDelta,
     },
     test::{ActiveChain, QueryOutcome, TestValidator},
 };
@@ -34,8 +34,15 @@ async fn hex_game() {
         .await;
 
     let block = certificate.inner().block();
-    let message_id = block.message_id_for_operation(0, 0).unwrap();
-    let description = ChainDescription::Child(message_id);
+    let description = block
+        .created_blobs()
+        .into_iter()
+        .filter_map(|(blob_id, blob)| {
+            (blob_id.blob_type == BlobType::ChainDescription)
+                .then(|| bcs::from_bytes::<ChainDescription>(blob.content().bytes()).unwrap())
+        })
+        .next()
+        .unwrap();
     let mut chain = ActiveChain::new(key_pair1.copy(), description, validator);
 
     chain
@@ -108,8 +115,15 @@ async fn hex_game_clock() {
         .await;
 
     let block = certificate.inner().block();
-    let message_id = block.message_id_for_operation(0, 0).unwrap();
-    let description = ChainDescription::Child(message_id);
+    let description = block
+        .created_blobs()
+        .into_iter()
+        .filter_map(|(blob_id, blob)| {
+            (blob_id.blob_type == BlobType::ChainDescription)
+                .then(|| bcs::from_bytes::<ChainDescription>(blob.content().bytes()).unwrap())
+        })
+        .next()
+        .unwrap();
     let mut chain = ActiveChain::new(key_pair1.copy(), description, validator.clone());
 
     chain

examples/how-to/perform-http-requests/tests/http_requests.rs

@@ -22,7 +22,7 @@ async fn service_query_performs_http_request() -> anyhow::Result<()> {
     let port = http_server.port();
     let url = format!("http://localhost:{port}/");
 
-    let (validator, application_id, chain) =
+    let (mut validator, application_id, chain) =
         TestValidator::with_current_application::<Abi, _, _>(url, ()).await;
 
     validator
@@ -89,7 +89,7 @@ async fn service_sends_valid_http_response_to_contract() -> anyhow::Result<()> {
     let port = http_server.port();
     let url = format!("http://localhost:{port}/");
 
-    let (validator, application_id, chain) =
+    let (mut validator, application_id, chain) =
         TestValidator::with_current_application::<Abi, _, _>(url, ()).await;
 
     validator
@@ -119,7 +119,7 @@ async fn contract_rejects_invalid_http_response_from_service() {
     let port = http_server.port();
     let url = format!("http://localhost:{port}/");
 
-    let (validator, application_id, chain) =
+    let (mut validator, application_id, chain) =
         TestValidator::with_current_application::<Abi, _, _>(url.clone(), ()).await;
 
     validator
@@ -151,7 +151,7 @@ async fn contract_accepts_valid_http_response_it_obtains_by_itself() -> anyhow::
     let port = http_server.port();
     let url = format!("http://localhost:{port}/");
 
-    let (validator, application_id, chain) =
+    let (mut validator, application_id, chain) =
         TestValidator::with_current_application::<Abi, _, _>(url, ()).await;
 
     validator
@@ -181,7 +181,7 @@ async fn contract_rejects_invalid_http_response_it_obtains_by_itself() {
     let port = http_server.port();
     let url = format!("http://localhost:{port}/");
 
-    let (validator, application_id, chain) =
+    let (mut validator, application_id, chain) =
         TestValidator::with_current_application::<Abi, _, _>(url, ()).await;
 
     validator
@@ -214,7 +214,7 @@ async fn contract_accepts_valid_http_response_from_oracle() -> anyhow::Result<()
     let port = http_server.port();
     let url = format!("http://localhost:{port}/");
 
-    let (validator, application_id, chain) =
+    let (mut validator, application_id, chain) =
         TestValidator::with_current_application::<Abi, _, _>(url, ()).await;
 
     validator
@@ -245,7 +245,7 @@ async fn contract_rejects_invalid_http_response_from_oracle() {
     let port = http_server.port();
     let url = format!("http://localhost:{port}/");
 
-    let (validator, application_id, chain) =
+    let (mut validator, application_id, chain) =
         TestValidator::with_current_application::<Abi, _, _>(url, ()).await;
 
     validator

examples/matching-engine/README.md

@@ -75,9 +75,9 @@ INFO_3=($(linera wallet request-chain --faucet $FAUCET_URL))
 CHAIN_1="${INFO_1[0]}"
 CHAIN_2="${INFO_2[0]}"
 CHAIN_3="${INFO_3[0]}"
-OWNER_1="${INFO_1[3]}"
-OWNER_2="${INFO_2[3]}"
-OWNER_3="${INFO_3[3]}"
+OWNER_1="${INFO_1[2]}"
+OWNER_2="${INFO_2[2]}"
+OWNER_3="${INFO_3[2]}"
 ```
 
 Publish and create two `fungible` applications whose IDs will be used as a

examples/native-fungible/README.md

@@ -46,8 +46,8 @@ INFO_1=($(linera wallet request-chain --faucet $FAUCET_URL))
 INFO_2=($(linera wallet request-chain --faucet $FAUCET_URL))
 CHAIN_1="${INFO_1[0]}"
 CHAIN_2="${INFO_2[0]}"
-OWNER_1="${INFO_1[3]}"
-OWNER_2="${INFO_2[3]}"
+OWNER_1="${INFO_1[2]}"
+OWNER_2="${INFO_2[2]}"
 ```
 
 Compile the `native-fungible` application WebAssembly binaries, and publish them as an application

examples/native-fungible/tests/transfers.rs

@@ -9,7 +9,7 @@ use std::collections::{BTreeMap, HashMap};
 
 use fungible::{self, FungibleTokenAbi};
 use linera_sdk::{
-    linera_base_types::{Account, AccountOwner, Amount, ChainId, CryptoHash},
+    linera_base_types::{Account, AccountOwner, Amount, CryptoHash},
     test::{ActiveChain, Recipient, TestValidator},
 };
 
@@ -28,7 +28,7 @@ async fn chain_balance_transfers() {
     .await;
 
     let transfer_amount = Amount::ONE;
-    let funding_chain = validator.get_chain(&ChainId::root(0));
+    let funding_chain = validator.get_chain(&validator.admin_chain_id());
     let recipient = Recipient::chain(recipient_chain.id());
 
     let transfer_certificate = funding_chain
@@ -62,7 +62,7 @@ async fn transfer_to_owner() {
     .await;
 
     let transfer_amount = Amount::from_tokens(2);
-    let funding_chain = validator.get_chain(&ChainId::root(0));
+    let funding_chain = validator.get_chain(&validator.admin_chain_id());
     let owner = AccountOwner::from(CryptoHash::test_hash("owner"));
     let account = Account::new(recipient_chain.id(), owner);
     let recipient = Recipient::Account(account);
@@ -98,7 +98,7 @@ async fn transfer_to_multiple_owners() {
 
     let number_of_owners = 10;
     let transfer_amounts = (1..=number_of_owners).map(Amount::from_tokens);
-    let funding_chain = validator.get_chain(&ChainId::root(0));
+    let funding_chain = validator.get_chain(&validator.admin_chain_id());
 
     let account_owners = (1..=number_of_owners)
         .map(|index| AccountOwner::from(CryptoHash::test_hash(format!("owner{index}"))))
@@ -146,7 +146,7 @@ async fn emptied_account_disappears_from_queries() {
     .await;
 
     let transfer_amount = Amount::from_tokens(100);
-    let funding_chain = validator.get_chain(&ChainId::root(0));
+    let funding_chain = validator.get_chain(&validator.admin_chain_id());
 
     let owner = AccountOwner::from(recipient_chain.public_key());
     let recipient = Recipient::Account(Account::new(recipient_chain.id(), owner));

examples/non-fungible/README.md

@@ -61,8 +61,8 @@ INFO_1=($(linera wallet request-chain --faucet $FAUCET_URL))
 INFO_2=($(linera wallet request-chain --faucet $FAUCET_URL))
 CHAIN_1="${INFO_1[0]}"
 CHAIN_2="${INFO_2[0]}"
-OWNER_1="${INFO_1[3]}"
-OWNER_2="${INFO_2[3]}"
+OWNER_1="${INFO_1[2]}"
+OWNER_2="${INFO_2[2]}"
 ```
 
 ```bash