feat(type): CellOutput and Epoch structures change

Remove the data field from CellOutput and remove the epochReward field from Epoch BREAKING CHANGE: CellOutput and Epoch structures change
ckb-js · Aug 19, 2019 · 8346ae4 · 8346ae4
1 parent c1ac58f
commit 8346ae4
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 75 deletions.
diff --git a/packages/ckb-sdk-core/__tests__/successFixtures.json b/packages/ckb-sdk-core/__tests__/successFixtures.json
@@ -3,21 +3,15 @@
     "emptyInfo": {
       "codeHash": "",
       "outPoint": {
-        "blockHash": "",
-        "cell": {
-          "txHash": "",
-          "index": "0"
-        }
+        "txHash": "",
+        "index": "0"
       }
     },
     "target": {
       "codeHash": "54811ce986d5c3e57eaafab22cdd080e32209e39590e204a99b32935f835a13c",
       "outPoint": {
-        "blockHash": "0efcf4221871200e064e5c48969909ccfb04686395db5f733b0da15361c5ac04",
-        "cell": {
-          "txHash": "d0608a90cc3fd5bec9807263d3c7c93fad48a1afa0e44b38a664fbe79d4a1400",
-          "index": "1"
-        }
+        "txHash": "d0608a90cc3fd5bec9807263d3c7c93fad48a1afa0e44b38a664fbe79d4a1400",
+        "index": "1"
       }
     }
   },
@@ -44,31 +38,24 @@
   "signTransaction": {
     "privateKey": "0xe79f3207ea4980b7fed79956d5934249ceac4751a4fae01a0f7c4a96884bc4e3",
     "transaction": {
-      "deps": [
+      "cellDeps": [
         {
-          "cell": {
-            "txHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "index": "4294967295"
-          },
-          "blockHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
+          "txHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+          "index": "4294967295"
         }
       ],
       "inputs": [
         {
           "previousOutput": {
-            "cell": {
-              "txHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
-              "index": "4294967295"
-            },
-            "blockHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
+            "txHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "index": "4294967295"
           },
           "since": "0"
         }
       ],
       "outputs": [
         {
           "capacity": "5000000000000",
-          "data": "0x",
           "lock": {
             "args": [],
             "codeHash": "0x0000000000000000000000000000000000000000000000000000000000000001",
@@ -77,11 +64,12 @@
           "type": null
         }
       ],
+      "outputData": ["0x"],
       "version": "0",
       "witnesses": [{ "data": [] }]
     },
     "target": {
-      "deps": [
+      "cellDeps": [
         {
           "cell": {
             "txHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
@@ -93,19 +81,15 @@
       "inputs": [
         {
           "previousOutput": {
-            "cell": {
-              "txHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
-              "index": "4294967295"
-            },
-            "blockHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
+            "txHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "index": "4294967295"
           },
           "since": "0"
         }
       ],
       "outputs": [
         {
           "capacity": "5000000000000",
-          "data": "0x",
           "lock": {
             "args": [],
             "codeHash": "0x0000000000000000000000000000000000000000000000000000000000000001",
@@ -114,6 +98,7 @@
           "type": null
         }
       ],
+      "outputsData": ["0x"],
       "version": "0",
       "witnesses": [
         {

diff --git a/packages/ckb-sdk-core/examples/sendTransaction.js b/packages/ckb-sdk-core/examples/sendTransaction.js
@@ -142,7 +142,6 @@ const bootstrap = async () => {
         codeHash: SYSTEM_ENCRYPTION_CODE_HASH,
         args: [targetIdentifier],
       },
-      data: '0x',
     }
 
     /**
@@ -154,7 +153,6 @@ const bootstrap = async () => {
         codeHash: SYSTEM_ENCRYPTION_CODE_HASH,
         args: [`0x${myAddressObj.identifier}`],
       },
-      data: '0x',
     }
 
     const unspentCells = await loadCells()
@@ -199,8 +197,8 @@ const bootstrap = async () => {
         ...targetOutput,
         capacity: targetOutput.capacity.toString(),
       }, ]
-      
-    const outputsData = outputs.map(output => output.data)
+
+    const outputsData = outputs.map(output => "0x")
 
     const tx = {
       version: '0',
@@ -210,10 +208,7 @@ const bootstrap = async () => {
       }, ],
       headerDeps: [],
       inputs,
-      outputs: outputs.map(output => ({
-        data,
-        ...rest
-      }) => rest),
+      outputs,
       witnesses: [{
         data: [],
       }, ],

diff --git a/packages/ckb-sdk-core/src/index.ts b/packages/ckb-sdk-core/src/index.ts
@@ -77,11 +77,10 @@ class Core {
     if (!block) throw new Error('Cannot load the genesis block')
     const cellTx = block.transactions[0]
     if (!cellTx) throw new Error('Cannot load the transaction which has the system cell')
-    const cell = cellTx.outputs[1]
-    if (!cell) throw new Error('Cannot load the system cell')
+    if (!cellTx.outputsData || !cellTx.outputsData[0]) throw new Error('The code data is not found')
 
     const s = this.utils.blake2b(32, null, null, this.utils.PERSONAL)
-    s.update(this.utils.hexToBytes(cell.data.replace(/^0x/, '')))
+    s.update(this.utils.hexToBytes(cellTx.outputsData[0].replace(/^0x/, '')))
     const codeHash = s.digest('hex')
     const outPoint = {
       blockHash: block.header.hash.replace(/^0x/, ''),

diff --git a/packages/ckb-sdk-rpc/__tests__/formatters/params.json b/packages/ckb-sdk-rpc/__tests__/formatters/params.json
@@ -224,7 +224,7 @@
             }
           ],
           "version": "0",
-          "outputsData": []
+          "outputsData": ["0x"]
         },
         "target": {
           "cell_deps": [
@@ -263,7 +263,7 @@
             }
           ],
           "version": "0",
-          "outputs_data": []
+          "outputs_data": ["0x"]
         }
       }
     ],

diff --git a/packages/ckb-sdk-rpc/__tests__/formatters/result.json b/packages/ckb-sdk-rpc/__tests__/formatters/result.json
@@ -60,7 +60,6 @@
       {
         "source": {
           "capacity": "5000000000000",
-          "data": "0x",
           "lock": {
             "args": [],
             "code_hash": "0x0000000000000000000000000000000000000000000000000000000000000001",
@@ -74,7 +73,6 @@
         },
         "target": {
           "capacity": "5000000000000",
-          "data": "0x",
           "lock": {
             "args": [],
             "codeHash": "0x0000000000000000000000000000000000000000000000000000000000000001",
@@ -90,7 +88,6 @@
       {
         "source": {
           "capacity": "5000000000000",
-          "data": "0x",
           "lock": {
             "args": [],
             "code_hash": "0x0000000000000000000000000000000000000000000000000000000000000001",
@@ -100,7 +97,6 @@
         },
         "target": {
           "capacity": "5000000000000",
-          "data": "0x",
           "lock": {
             "args": [],
             "codeHash": "0x0000000000000000000000000000000000000000000000000000000000000001",
@@ -198,7 +194,6 @@
           "outputs": [
             {
               "capacity": "5000000000000",
-              "data": "0x",
               "lock": {
                 "args": [],
                 "code_hash": "0x0000000000000000000000000000000000000000000000000000000000000001",
@@ -227,7 +222,7 @@
           "outputs": [
             {
               "capacity": "5000000000000",
-              "data": "0x",
+
               "lock": {
                 "args": [],
                 "codeHash": "0x0000000000000000000000000000000000000000000000000000000000000001",
@@ -355,7 +350,7 @@
               "outputs": [
                 {
                   "capacity": "5000000000000",
-                  "data": "0x",
+
                   "lock": {
                     "args": [],
                     "code_hash": "0x0000000000000000000000000000000000000000000000000000000000000001",
@@ -366,7 +361,7 @@
               ],
               "version": "0",
               "witnesses": [],
-              "outputs_data": []
+              "outputs_data": ["0x"]
             }
           ],
           "uncles": []
@@ -409,7 +404,7 @@
               "outputs": [
                 {
                   "capacity": "5000000000000",
-                  "data": "0x",
+
                   "lock": {
                     "args": [],
                     "codeHash": "0x0000000000000000000000000000000000000000000000000000000000000001",
@@ -420,7 +415,7 @@
               ],
               "version": "0",
               "witnesses": [],
-              "outputsData": []
+              "outputsData": ["0x"]
             }
           ],
           "uncles": []
@@ -669,7 +664,7 @@
       {
         "source": {
           "capacity": "5000000000000",
-          "data": "0x",
+
           "lock": {
             "args": [],
             "code_hash": "0x0000000000000000000000000000000000000000000000000000000000000001",
@@ -683,7 +678,7 @@
         },
         "target": {
           "capacity": "5000000000000",
-          "data": "0x",
+
           "lock": {
             "args": [],
             "codeHash": "0x0000000000000000000000000000000000000000000000000000000000000001",
@@ -706,7 +701,7 @@
         "source": {
           "cell": {
             "capacity": "5000000000000",
-            "data": "0x",
+
             "lock": {
               "args": [],
               "code_hash": "0x0000000000000000000000000000000000000000000000000000000000000001",
@@ -719,7 +714,7 @@
         "target": {
           "cell": {
             "capacity": "5000000000000",
-            "data": "0x",
+
             "lock": {
               "args": [],
               "codeHash": "0x0000000000000000000000000000000000000000000000000000000000000001",
@@ -774,7 +769,7 @@
         "source": [
           {
             "capacity": "5000000000000",
-            "data": "0x",
+
             "lock": {
               "args": [],
               "code_hash": "0x0000000000000000000000000000000000000000000000000000000000000001",
@@ -786,7 +781,7 @@
         "target": [
           {
             "capacity": "5000000000000",
-            "data": "0x",
+
             "lock": {
               "args": [],
               "codeHash": "0x0000000000000000000000000000000000000000000000000000000000000001",
@@ -904,7 +899,6 @@
             "outputs": [
               {
                 "capacity": "5000000000000",
-                "data": "0x",
                 "lock": {
                   "args": [],
                   "code_hash": "0x0000000000000000000000000000000000000000000000000000000000000001",
@@ -915,7 +909,7 @@
             ],
             "version": "0",
             "witnesses": [],
-            "outputs_data": []
+            "outputs_data": ["0x"]
           },
           "tx_status": {
             "status": "committed",
@@ -939,7 +933,6 @@
             "outputs": [
               {
                 "capacity": "5000000000000",
-                "data": "0x",
                 "lock": {
                   "args": [],
                   "codeHash": "0x0000000000000000000000000000000000000000000000000000000000000001",
@@ -950,7 +943,7 @@
             ],
             "version": "0",
             "witnesses": [],
-            "outputsData": []
+            "outputsData": ["0x"]
           },
           "txStatus": {
             "status": "committed",
@@ -966,14 +959,12 @@
       },
       {
         "source": {
-          "epoch_reward": "125000000000000",
           "difficulty": "0x100",
           "length": "1000",
           "number": "0",
           "start_number": "0"
         },
         "target": {
-          "epochReward": "125000000000000",
           "difficulty": "0x100",
           "length": "1000",
           "number": "0",
@@ -1053,7 +1044,6 @@
           {
             "cell_output": {
               "capacity": "50000000000000",
-              "data": "0x",
               "lock": {
                 "args": [],
                 "code_hash": "0x28e83a1277d48add8e72fadaa9248559e1b632bab2bd60b27955ebc4c03800a5"
@@ -1069,7 +1059,6 @@
           {
             "cell_output": {
               "capacity": "50000000000000",
-              "data": "0x",
               "lock": {
                 "args": [],
                 "code_hash": "0x28e83a1277d48add8e72fadaa9248559e1b632bab2bd60b27955ebc4c03800a5"
@@ -1087,7 +1076,6 @@
           {
             "cellOutput": {
               "capacity": "50000000000000",
-              "data": "0x",
               "lock": {
                 "args": [],
                 "codeHash": "0x28e83a1277d48add8e72fadaa9248559e1b632bab2bd60b27955ebc4c03800a5"
@@ -1103,7 +1091,7 @@
           {
             "cellOutput": {
               "capacity": "50000000000000",
-              "data": "0x",
+
               "lock": {
                 "args": [],
                 "codeHash": "0x28e83a1277d48add8e72fadaa9248559e1b632bab2bd60b27955ebc4c03800a5"