substrate module @ pba3

syllabus/4-Substrate/4.3-WASM-Meta-Protocol-Slides.md

@@ -36,7 +36,6 @@ Recall that the boundary for this division is the **state transition**
 
 note:
 
-
 > It is only a matter of time until every blockchain is doing the same thing.
 
 ---v
@@ -224,11 +223,8 @@ https://paritytech.github.io/substrate/master/sp_runtime/generic/index.html
 
 ---v
 
-
-
 <img style="width: 1200px;" src="../../assets/img/4-Substrate/dev-4-3-block-opaqueu.svg" />
 
-
 ---v
 
 ### Example #2: Block Import
@@ -259,9 +255,6 @@ struct RuntimeBlock {
 
 </pba-cols>
 
-
-
-
 ---v
 
 ### Example #2: Block Import
@@ -299,7 +292,6 @@ implement in order to be called a "blockchain runtime".
 
 - Previous slides used the term "transactions" in a simplified way. Let's correct it.
 
-
 ---v
 
 ### Detour: Extrinsic
@@ -436,18 +428,39 @@ database::store_state(block.header.hash, state)
 
 ## Example #3: Block Authoring
 
+<<<<<<< HEAD
 
 ---v
 
 ### Example #3: Block Authoring
 
 
+||||||| 6332a9c
+
+=======
+>>>>>>> b7dc5cd06fd96d376016fbb48ab91f4050969612
 <img style="width: 1200px;" src="../../assets/img/4-Substrate/dev-4-3-author-pool.svg" />
+<<<<<<< HEAD
+<div class="fragment current-visible" style="border: 1px solid red; width: 200px; height: 100px; position: fixed; left: 470px; bottom: 200px; background: #140526"></div>
+<div class="fragment" style="border: 1px solid red; width: 200px; height: 75px; position: fixed; left: 470px; bottom: 200px; background: #140526"></div>
+<div class="fragment" style="border: 1px solid red; width: 200px; height: 50px; position: fixed; left: 470px; bottom: 200px; background: #140526"></div>
+<div class="fragment" style="border: 1px solid red; width: 200px; height: 25px; position: fixed; left: 470px; bottom: 200px; background: #140526"></div>
+
+||||||| 6332a9c
 <div class="fragment current-visible" style="border: 1px solid red; width: 200px; height: 100px; position: fixed; left: 470px; bottom: 200px; background: #140526"></div>
 <div class="fragment" style="border: 1px solid red; width: 200px; height: 75px; position: fixed; left: 470px; bottom: 200px; background: #140526"></div>
 <div class="fragment" style="border: 1px solid red; width: 200px; height: 50px; position: fixed; left: 470px; bottom: 200px; background: #140526"></div>
 <div class="fragment" style="border: 1px solid red; width: 200px; height: 25px; position: fixed; left: 470px; bottom: 200px; background: #140526"></div>
 
+
+
+=======
+<div class="fragment fade-out" style="border: 1px solid red; width: 200px; height: 100px; position: fixed; left: 470px; bottom: 200px; background: #140526"></div>
+<div class="fragment fade-out" style="border: 1px solid red; width: 200px; height: 75px; position: fixed; left: 470px; bottom: 200px; background: #140526"></div>
+<div class="fragment fade-out" style="border: 1px solid red; width: 200px; height: 50px; position: fixed; left: 470px; bottom: 200px; background: #140526"></div>
+<div class="fragment fade-out" style="border: 1px solid red; width: 200px; height: 25px; position: fixed; left: 470px; bottom: 200px; background: #140526"></div>
+
+>>>>>>> b7dc5cd06fd96d376016fbb48ab91f4050969612
 Notes:
 
 The point being, eventually the pool builds a list of "ready transactions".
@@ -646,14 +659,33 @@ because it is dynamically typed, but if needed, it could.
 
 $$STF = F(block_{N}, state_{N}) > state_{N+1}$$
 
-*Anything that is part of the STF is opaque to the client, but it can change forklessly!*
-
+_Anything that is part of the STF is opaque to the client, but it can change forklessly!_
 
+<<<<<<< HEAD
 - <!-- .element: class="fragment" --> The `F` itself (your Wasm blob)? It can change!
 - <!-- .element: class="fragment" --> Extrinsic format? It can change!
 - <!-- .element: class="fragment" --> State format? It can change!
 
 
+||||||| 6332a9c
+- The `F` itself (your Wasm blob)? It can change!
+<!-- .element: class="fragment" -->
+- Extrinsic format? It can change!
+<!-- .element: class="fragment" -->
+- State format? It can change!
+<!-- .element: class="fragment" -->
+
+
+
+=======
+- The `F` itself (your Wasm blob)? It can change!
+<!-- .element: class="fragment" -->
+- Extrinsic format? It can change!
+<!-- .element: class="fragment" -->
+- State format? It can change!
+<!-- .element: class="fragment" -->
+
+>>>>>>> b7dc5cd06fd96d376016fbb48ab91f4050969612
 Notes:
 
 In essence, all components of the STF must be opaque to the client. `Vec<u8>`.