support relaychain (#35)

AcalaNetwork · Nov 1, 2022 · 3c78693 · 3c78693
1 parent 8f1d8c0
commit 3c78693
Show file tree

Hide file tree

Showing 11 changed files with 94 additions and 68 deletions.
diff --git a/e2e/__snapshots__/author.test.ts.snap b/e2e/__snapshots__/author.test.ts.snap
@@ -22,7 +22,7 @@ exports[`author rpc > works 1`] = `
       "events": [],
       "internalError": undefined,
       "status": {
-        "finalized": "0x81a904a5358a1f36535e91fa1a386f333ec6d5e73840585a48111c1f276ce861",
+        "finalized": "0xeefde1ec4bb9834c9282bdaa2034a1f603ef931b70c25caaa5a97f1fb2720fd5",
       },
       "txHash": "0x379a84a326f2abe840fc3b54db762da86f60c31b20f7d81d15cc5ffb7dc995be",
       "txIndex": 1,
@@ -44,7 +44,7 @@ exports[`author rpc > works 2`] = `
           {
             "preRuntime": [
               "0x61757261",
-              "0x",
+              "0xe1cf470800000000",
             ],
           },
           {
@@ -106,7 +106,7 @@ exports[`author rpc > works 5`] = `
       "status": {
         "ready": null,
       },
-      "txHash": "0xa35243e8a3b5950431848f6809a6ddb36611f6a10d9fe44a4a984f9925a086c1",
+      "txHash": "0x7a50dcf54f3f69a233ef03fd835b26b414c2892ccc0aad4f5b1a7b7407dbb16b",
       "txIndex": undefined,
     },
   ],
@@ -117,9 +117,9 @@ exports[`author rpc > works 5`] = `
       "events": [],
       "internalError": undefined,
       "status": {
-        "finalized": "0xbc271d06d6f55f5bcbcb3be21fa162901e7d5fd7c8c8fe14bb9a3a9c36e6e1ee",
+        "finalized": "0x0a88e86168da4aa27a33f9273b34bba3dbef86bd7b246e831333c83a8d38f975",
       },
-      "txHash": "0xa35243e8a3b5950431848f6809a6ddb36611f6a10d9fe44a4a984f9925a086c1",
+      "txHash": "0x7a50dcf54f3f69a233ef03fd835b26b414c2892ccc0aad4f5b1a7b7407dbb16b",
       "txIndex": 1,
     },
   ],
@@ -131,15 +131,15 @@ exports[`author rpc > works 6`] = `
   "block": {
     "extrinsics": [
       "0x280401000b40c030268401",
-      "0x3102840088dc3417d5058ec4b4503e0c12ea1a0a89be200fe98922423d4334014fa6b0ee00c836c58f39683b5add00e3f1de76f90cc90e0e13fc07e4b6e4125570c8a5c7ac53a2a0ce11cc83afe966525cb1ebc81d2dd6d2f6f8517ad4fb712f706f1fc40c140104000a0000d17c2d7823ebf260fd138f2d7e27d114c0145d968b5ff5006125f2414fadae692103",
+      "0x3102840088dc3417d5058ec4b4503e0c12ea1a0a89be200fe98922423d4334014fa6b0ee00ac0122165c15db54e67d09a8f7aa0651c39c80bc775483f15a06dab12f7214019d6ae60ef92f4218819d4ddd2e2726bf500e82e405de7306aecbd6959701ef08140104000a0000d17c2d7823ebf260fd138f2d7e27d114c0145d968b5ff5006125f2414fadae692103",
     ],
     "header": {
       "digest": {
         "logs": [
           {
             "preRuntime": [
               "0x61757261",
-              "0x",
+              "0xe3cf470800000000",
             ],
           },
           {
@@ -152,7 +152,7 @@ exports[`author rpc > works 6`] = `
       },
       "extrinsicsRoot": "0x0000000000000000000000000000000000000000000000000000000000000000",
       "number": 189522,
-      "parentHash": "0x81a904a5358a1f36535e91fa1a386f333ec6d5e73840585a48111c1f276ce861",
+      "parentHash": "0xeefde1ec4bb9834c9282bdaa2034a1f603ef931b70c25caaa5a97f1fb2720fd5",
       "stateRoot": "0x0000000000000000000000000000000000000000000000000000000000000000",
     },
   },
@@ -201,7 +201,7 @@ exports[`author rpc > works 9`] = `
       "status": {
         "ready": null,
       },
-      "txHash": "0x8a9822cf31018457f8a6d8ac5c641f433dcdf250c97955d1ef761500019ee4d7",
+      "txHash": "0xd56f14739289e8b4e93b208fbb16076d682139e4b09304a811d7d065318412d1",
       "txIndex": undefined,
     },
   ],
@@ -212,9 +212,9 @@ exports[`author rpc > works 9`] = `
       "events": [],
       "internalError": undefined,
       "status": {
-        "finalized": "0xe9256f36e500bd6569a4a57a276aeb8db824372e90766bae513c17923c858b30",
+        "finalized": "0xeaf40e1042a99e9c20fa0b03d0806ce738885597e5ef204dbdf6f325ad905c9e",
       },
-      "txHash": "0x8a9822cf31018457f8a6d8ac5c641f433dcdf250c97955d1ef761500019ee4d7",
+      "txHash": "0xd56f14739289e8b4e93b208fbb16076d682139e4b09304a811d7d065318412d1",
       "txIndex": 1,
     },
   ],
@@ -226,15 +226,15 @@ exports[`author rpc > works 10`] = `
   "block": {
     "extrinsics": [
       "0x280401000b600e31268401",
-      "0x3102840088dc3417d5058ec4b4503e0c12ea1a0a89be200fe98922423d4334014fa6b0ee0053c7d8fa717ad584e223ef83f062ce6ff59de7df0e9f9c09298887fcb5c64f45ca8a1cd7165610b6a15ecbee55777e9f067dd6762b0936eb6d6b3bee3e242604240104000a0000d17c2d7823ebf260fd138f2d7e27d114c0145d968b5ff5006125f2414fadae69b104",
+      "0x3102840088dc3417d5058ec4b4503e0c12ea1a0a89be200fe98922423d4334014fa6b0ee00382223470912adf1cd1cdeb094097acc7fc4a8688ae9e1f251efefa6ba671314c85561f4cfe45e329ae4a3979f1a9b9ef21473757945fa471edbdc75865eb40b240104000a0000d17c2d7823ebf260fd138f2d7e27d114c0145d968b5ff5006125f2414fadae69b104",
     ],
     "header": {
       "digest": {
         "logs": [
           {
             "preRuntime": [
               "0x61757261",
-              "0x",
+              "0xe5cf470800000000",
             ],
           },
           {
@@ -247,7 +247,7 @@ exports[`author rpc > works 10`] = `
       },
       "extrinsicsRoot": "0x0000000000000000000000000000000000000000000000000000000000000000",
       "number": 189523,
-      "parentHash": "0xbc271d06d6f55f5bcbcb3be21fa162901e7d5fd7c8c8fe14bb9a3a9c36e6e1ee",
+      "parentHash": "0x0a88e86168da4aa27a33f9273b34bba3dbef86bd7b246e831333c83a8d38f975",
       "stateRoot": "0x0000000000000000000000000000000000000000000000000000000000000000",
     },
   },

diff --git a/e2e/__snapshots__/chain.test.ts.snap b/e2e/__snapshots__/chain.test.ts.snap
@@ -207,9 +207,9 @@ exports[`chain rpc > getXXX 8`] = `
 }
 `;
 
-exports[`chain rpc > getXXX 9`] = `"0x81a904a5358a1f36535e91fa1a386f333ec6d5e73840585a48111c1f276ce861"`;
+exports[`chain rpc > getXXX 9`] = `"0xeefde1ec4bb9834c9282bdaa2034a1f603ef931b70c25caaa5a97f1fb2720fd5"`;
 
-exports[`chain rpc > getXXX 10`] = `"0x81a904a5358a1f36535e91fa1a386f333ec6d5e73840585a48111c1f276ce861"`;
+exports[`chain rpc > getXXX 10`] = `"0xeefde1ec4bb9834c9282bdaa2034a1f603ef931b70c25caaa5a97f1fb2720fd5"`;
 
 exports[`chain rpc > getXXX 11`] = `
 {
@@ -218,7 +218,7 @@ exports[`chain rpc > getXXX 11`] = `
       {
         "preRuntime": [
           "0x61757261",
-          "0x",
+          "0xe1cf470800000000",
         ],
       },
       {
@@ -248,7 +248,7 @@ exports[`chain rpc > getXXX 12`] = `
           {
             "preRuntime": [
               "0x61757261",
-              "0x",
+              "0xe1cf470800000000",
             ],
           },
           {
@@ -298,7 +298,7 @@ exports[`chain rpc > subscribeNewHeads 1`] = `
 ]
 `;
 
-exports[`chain rpc > subscribeNewHeads 2`] = `"0x81a904a5358a1f36535e91fa1a386f333ec6d5e73840585a48111c1f276ce861"`;
+exports[`chain rpc > subscribeNewHeads 2`] = `"0xeefde1ec4bb9834c9282bdaa2034a1f603ef931b70c25caaa5a97f1fb2720fd5"`;
 
 exports[`chain rpc > subscribeNewHeads 3`] = `
 [
@@ -309,7 +309,7 @@ exports[`chain rpc > subscribeNewHeads 3`] = `
           {
             "preRuntime": [
               "0x61757261",
-              "0x",
+              "0xe1cf470800000000",
             ],
           },
           {
@@ -329,4 +329,4 @@ exports[`chain rpc > subscribeNewHeads 3`] = `
 ]
 `;
 
-exports[`chain rpc > subscribeNewHeads 4`] = `"0xbc271d06d6f55f5bcbcb3be21fa162901e7d5fd7c8c8fe14bb9a3a9c36e6e1ee"`;
+exports[`chain rpc > subscribeNewHeads 4`] = `"0x0a88e86168da4aa27a33f9273b34bba3dbef86bd7b246e831333c83a8d38f975"`;
diff --git a/e2e/storage.test.ts b/e2e/storage.test.ts
@@ -70,7 +70,7 @@ describe('storage', () => {
     callback.mockClear()
 
     expect(await dev.newBlock()).toMatchInlineSnapshot(
-      '"0x81a904a5358a1f36535e91fa1a386f333ec6d5e73840585a48111c1f276ce861"'
+      '"0xeefde1ec4bb9834c9282bdaa2034a1f603ef931b70c25caaa5a97f1fb2720fd5"'
     )
 
     await next()
@@ -81,7 +81,7 @@ describe('storage', () => {
     unsub()
 
     expect(await dev.newBlock()).toMatchInlineSnapshot(
-      '"0xbc271d06d6f55f5bcbcb3be21fa162901e7d5fd7c8c8fe14bb9a3a9c36e6e1ee"'
+      '"0x0a88e86168da4aa27a33f9273b34bba3dbef86bd7b246e831333c83a8d38f975"'
     )
 
     await delay(100)

diff --git a/executor/Cargo.lock b/executor/Cargo.lock
diff --git a/executor/src/lib.rs b/executor/src/lib.rs
@@ -28,5 +28,7 @@ pub async fn start(task_id: u32, ws_url: &str) -> Result<(), JsValue> {
 
 async fn run_task(client: &Client, task_id: u32) -> Result<(), jsonrpsee::core::Error> {
     let task = client.get_task(task_id).await?;
-    task.run(task_id, &client).await
+    task.run(task_id, &client).await?;
+
+	Ok(())
 }
diff --git a/executor/src/main.rs b/executor/src/main.rs
@@ -27,9 +27,9 @@ async fn real_main() -> Result<(), jsonrpsee::core::Error> {
 
     let task = client.get_task(task_id).await?;
 
-    task.run(task_id, &client).await?;
+    let res = task.run(task_id, &client).await?;
 
-    println!("Done");
+    println!("Done {:?}", res);
 
     Ok(())
 }
diff --git a/executor/src/runner_api.rs b/executor/src/runner_api.rs
@@ -44,7 +44,7 @@ pub trait RpcApi {
     fn get_task(&self, task_id: u32) -> Result<Task, RpcError>;
 
     #[method(name = "exec_taskResult")]
-    fn task_result(&self, task_id: u32, resp: TaskResponse) -> Result<(), RpcError>;
+    fn task_result(&self, task_id: u32, resp: &TaskResponse) -> Result<(), RpcError>;
 }
 
 pub async fn client(url: &str) -> Result<Client, RpcError> {

diff --git a/executor/src/task.rs b/executor/src/task.rs
@@ -42,15 +42,15 @@ pub enum TaskResponse {
 }
 
 impl Task {
-    pub async fn run(&self, task_id: u32, client: &Client) -> Result<(), jsonrpsee::core::Error> {
+    pub async fn run(&self, task_id: u32, client: &Client) -> Result<TaskResponse, jsonrpsee::core::Error> {
         let resp = match self.kind {
             TaskKind::Call => self.call(task_id, client).await,
             TaskKind::RuntimeVersion => self.runtime_version(task_id, client).await,
         }?;
 
-        client.task_result(task_id, resp).await?;
+        client.task_result(task_id, &resp).await?;
 
-        Ok(())
+        Ok(resp)
     }
 
     async fn call(

diff --git a/src/blockchain/inherents.ts b/src/blockchain/inherents.ts
@@ -3,7 +3,8 @@ import { ApiPromise } from '@polkadot/api'
 import { Block } from './block'
 
 export interface InherentProvider {
-  createInherents(api: ApiPromise, parent: Block): Promise<string[]>
+  createInherents(api: ApiPromise, timestamp: number, parent: Block): Promise<string[]>
+  getTimestamp(): number
 }
 
 export class SetTimestamp implements InherentProvider {
@@ -13,7 +14,11 @@ export class SetTimestamp implements InherentProvider {
     this.#getTimestamp = getTimestamp
   }
 
-  async createInherents(api: ApiPromise, _parent: Block): Promise<string[]> {
-    return [api.tx.timestamp.set(this.#getTimestamp()).toHex()]
+  async createInherents(api: ApiPromise, timestamp: number, _parent: Block): Promise<string[]> {
+    return [api.tx.timestamp.set(timestamp).toHex()]
+  }
+
+  getTimestamp(): number {
+    return this.#getTimestamp()
   }
 }