Merge pull request #491 from nervosnetwork/rc/v0.36.0

ckb-js · Sep 21, 2020 · 8a34900 · 8a34900
2 parents 1e430b6 + ca96f47
commit 8a34900
Show file tree

Hide file tree

Showing 28 changed files with 1,272 additions and 219 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,29 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.36.0](https://github.com/nervosnetwork/ckb-sdk-js/compare/v0.35.0...v0.36.0) (2020-09-21)
+
+
+### Code Refactoring
+
+* **utils:** remove redundant default options in the address module ([d74caac](https://github.com/nervosnetwork/ckb-sdk-js/commit/d74caac7121c8d1fc81ca1e8479200a9897c1726))
+
+
+### Features
+
+* **core:** parse scripts from addresses on generating transactions ([#488](https://github.com/nervosnetwork/ckb-sdk-js/issues/488)) ([9536f08](https://github.com/nervosnetwork/ckb-sdk-js/commit/9536f0811c0531599e0ee56e01802878f9b1f165))
+* **utils:** add system scripts ([567f15a](https://github.com/nervosnetwork/ckb-sdk-js/commit/567f15aea993ce5797bcecaadeeae27c3baf4aed))
+* **utils:** add the utils#addressToScript ([a78340a](https://github.com/nervosnetwork/ckb-sdk-js/commit/a78340a496f37f0239f5115ef886e2dbd1a9974e))
+
+
+### BREAKING CHANGES
+
+* **utils:** Remove the utils#defaultAddressOptions
+
+
+
+
+
 # [0.35.0](https://github.com/nervosnetwork/ckb-sdk-js/compare/v0.34.0...v0.35.0) (2020-08-24)
 
 

diff --git a/README.md b/README.md
@@ -147,7 +147,7 @@ After that you can use the `ckb` object to generate addresses, send requests, et
 
 ## Basic RPC
 
-Please see [Basic RPC](https://github.com/nervosnetwork/ckb-sdk-js/blob/develop/packages/ckb-sdk-rpc/src/Base.ts#L156)
+Please see [Basic RPC](https://github.com/nervosnetwork/ckb-sdk-js/blob/develop/packages/ckb-sdk-rpc/src/Base/index.ts#L23)
 
 ## Batch Request
 

diff --git a/lerna.json b/lerna.json
@@ -4,5 +4,5 @@
   ],
   "npmClient": "yarn",
   "useWorkspaces": true,
-  "version": "0.35.0"
+  "version": "0.36.0"
 }
diff --git a/packages/ckb-sdk-core/CHANGELOG.md b/packages/ckb-sdk-core/CHANGELOG.md
@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.36.0](https://github.com/nervosnetwork/ckb-sdk-js/compare/v0.35.0...v0.36.0) (2020-09-21)
+
+
+### Features
+
+* **core:** parse scripts from addresses on generating transactions ([#488](https://github.com/nervosnetwork/ckb-sdk-js/issues/488)) ([9536f08](https://github.com/nervosnetwork/ckb-sdk-js/commit/9536f0811c0531599e0ee56e01802878f9b1f165))
+
+
+
+
+
 # [0.35.0](https://github.com/nervosnetwork/ckb-sdk-js/compare/v0.34.0...v0.35.0) (2020-08-24)
 
 **Note:** Version bump only for package @nervosnetwork/ckb-sdk-core

diff --git a/packages/ckb-sdk-core/__tests__/fixtures.json b/packages/ckb-sdk-core/__tests__/fixtures.json
@@ -6,7 +6,8 @@
       "outPoint": {
         "txHash": "0x84dcb061adebff4ef93d57c975ba9058a9be939d79ea12ee68003f6492448890",
         "index": "0x0"
-      }
+      },
+      "depType": "depGroup"
     },
     "daoDep": {
       "hashType": "type",
@@ -15,7 +16,8 @@
       "outPoint": {
         "txHash": "0x15fb8111fc78fa36da6af96c45ac4714cc9a33974fdae13cc524b29e1a488c7f",
         "index": "0x2"
-      }
+      },
+      "depType": "depGroup"
     }
   },
   "signTransaction": {
@@ -360,10 +362,10 @@
     }
   },
   "generateRawTransaction": {
-    "testnet": {
+    "simple": {
       "params": {
         "fromAddress": "ckt1qyqw975zuu9svtyxgjuq44lv7mspte0n2tmqa703cd",
-        "toAddress": "ckt1qyqdm0tlp845spzscxc76tyxjcjgm6gudqpq4h77wx",
+        "toAddress": "ckt1q2n9dutjk669cfznq7httfar0gtk7qp0du3wjfvzck9l0w3k9eqhvdkr98kkxrtvuag8z2j8w4pkw2k6k4l5czshhac",
         "capacity": 783602013670,
         "safeMode": true,
         "isMainnet": false,
@@ -525,7 +527,269 @@
           "outPoint": {
             "txHash": "0x6347ee7ce5fc6828133590558b867097b895149a66e51cf353c361f7128e2091",
             "index": "0x0"
+          },
+          "depType": "depGroup"
+        }
+      },
+      "expected": {
+        "cellDeps": [
+          {
+            "depType": "depGroup",
+            "outPoint": {
+              "index": "0x0",
+              "txHash": "0x6347ee7ce5fc6828133590558b867097b895149a66e51cf353c361f7128e2091"
+            }
+          }
+        ],
+        "headerDeps": [],
+        "inputs": [
+          {
+            "previousOutput": {
+              "index": "0x1",
+              "txHash": "0x9160bef8b6a9e388a99184bfd8bea0e7795b487c77fe784120fb2bc3fb25d1b2"
+            },
+            "since": "0x0"
+          },
+          {
+            "previousOutput": {
+              "index": "0x2",
+              "txHash": "0x9160bef8b6a9e388a99184bfd8bea0e7795b487c77fe784120fb2bc3fb25d1b2"
+            },
+            "since": "0x0"
+          },
+          {
+            "previousOutput": {
+              "index": "0x3",
+              "txHash": "0x9160bef8b6a9e388a99184bfd8bea0e7795b487c77fe784120fb2bc3fb25d1b2"
+            },
+            "since": "0x0"
+          },
+          {
+            "previousOutput": {
+              "index": "0x4",
+              "txHash": "0x9160bef8b6a9e388a99184bfd8bea0e7795b487c77fe784120fb2bc3fb25d1b2"
+            },
+            "since": "0x0"
+          },
+          {
+            "previousOutput": {
+              "index": "0x5",
+              "txHash": "0x9160bef8b6a9e388a99184bfd8bea0e7795b487c77fe784120fb2bc3fb25d1b2"
+            },
+            "since": "0x0"
+          },
+          {
+            "previousOutput": {
+              "index": "0x6",
+              "txHash": "0x9160bef8b6a9e388a99184bfd8bea0e7795b487c77fe784120fb2bc3fb25d1b2"
+            },
+            "since": "0x0"
           }
+        ],
+        "outputs": [
+          {
+            "capacity": "0xb67251d5e6",
+            "lock": {
+              "args": "0x36c329ed630d6ce750712a477543672adab57f4c",
+              "codeHash": "0xa656f172b6b45c245307aeb5a7a37a176f002f6f22e92582c58bf7ba362e4176",
+              "hashType": "data"
+            }
+          },
+          {
+            "capacity": "0x88cb4e12e",
+            "lock": {
+              "args": "0xe2fa82e70b062c8644b80ad7ecf6e015e5f352f6",
+              "codeHash": "0x9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8",
+              "hashType": "type"
+            }
+          }
+        ],
+        "outputsData": ["0x", "0x"],
+        "version": "0x0",
+        "witnesses": []
+      }
+    },
+    "complex": {
+      "params": {
+        "fromAddresses": ["ckt1qyqw975zuu9svtyxgjuq44lv7mspte0n2tmqa703cd"],
+        "receivePairs": [
+          {
+            "address": "ckt1q2n9dutjk669cfznq7httfar0gtk7qp0du3wjfvzck9l0w3k9eqhvdkr98kkxrtvuag8z2j8w4pkw2k6k4l5czshhac",
+            "capacity": 783602013670,
+            "type": {
+              "args": "0xe2fa82e70b062c8644b80ad7ecf6e015e5f352f6",
+              "codeHash": "0x9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8",
+              "hashType": "type"
+            }
+          }
+        ],
+        "safeMode": true,
+        "isMainnet": false,
+        "cells": [
+          [
+            "0x641238cd95b9f5e6224da1963a0bcaa2e972dc87e56eb1ded9a35dcebbc37ff4",
+            [
+              {
+                "blockHash": "0x355cd43b6b517be40ce69278b7c6d2017546e2d46557d59e31adff20646c845e",
+                "lock": {
+                  "codeHash": "0x1892ea40d82b53c678ff88312450bbb17e164d7a3e0a90941aa58839f56f8df2",
+                  "hashType": "type",
+                  "args": "0xe2fa82e70b062c8644b80ad7ecf6e015e5f352f6"
+                },
+                "outPoint": {
+                  "txHash": "0x9160bef8b6a9e388a99184bfd8bea0e7795b487c77fe784120fb2bc3fb25d1b2",
+                  "index": "0x0"
+                },
+                "capacity": "0x1fd52bc92e",
+                "dataHash": "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+                "status": "live"
+              },
+              {
+                "blockHash": "0x355cd43b6b517be40ce69278b7c6d2017546e2d46557d59e31adff20646c845e",
+                "lock": {
+                  "codeHash": "0x1892ea40d82b53c678ff88312450bbb17e164d7a3e0a90941aa58839f56f8df2",
+                  "hashType": "type",
+                  "args": "0xe2fa82e70b062c8644b80ad7ecf6e015e5f352f6"
+                },
+                "outPoint": {
+                  "txHash": "0x9160bef8b6a9e388a99184bfd8bea0e7795b487c77fe784120fb2bc3fb25d1b2",
+                  "index": "0x1"
+                },
+                "capacity": "0x1fd52bc92e",
+                "dataHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+                "status": "live"
+              },
+              {
+                "blockHash": "0x355cd43b6b517be40ce69278b7c6d2017546e2d46557d59e31adff20646c845e",
+                "lock": {
+                  "codeHash": "0x1892ea40d82b53c678ff88312450bbb17e164d7a3e0a90941aa58839f56f8df2",
+                  "hashType": "type",
+                  "args": "0xe2fa82e70b062c8644b80ad7ecf6e015e5f352f6"
+                },
+                "outPoint": {
+                  "txHash": "0x9160bef8b6a9e388a99184bfd8bea0e7795b487c77fe784120fb2bc3fb25d1b2",
+                  "index": "0x2"
+                },
+                "capacity": "0x1fd52bc92e",
+                "dataHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+                "status": "live"
+              },
+              {
+                "blockHash": "0x355cd43b6b517be40ce69278b7c6d2017546e2d46557d59e31adff20646c845e",
+                "lock": {
+                  "codeHash": "0x1892ea40d82b53c678ff88312450bbb17e164d7a3e0a90941aa58839f56f8df2",
+                  "hashType": "type",
+                  "args": "0xe2fa82e70b062c8644b80ad7ecf6e015e5f352f6"
+                },
+                "outPoint": {
+                  "txHash": "0x9160bef8b6a9e388a99184bfd8bea0e7795b487c77fe784120fb2bc3fb25d1b2",
+                  "index": "0x3"
+                },
+                "capacity": "0x1fd52bc92e",
+                "dataHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+                "status": "live"
+              },
+              {
+                "blockHash": "0x355cd43b6b517be40ce69278b7c6d2017546e2d46557d59e31adff20646c845e",
+                "lock": {
+                  "codeHash": "0x1892ea40d82b53c678ff88312450bbb17e164d7a3e0a90941aa58839f56f8df2",
+                  "hashType": "type",
+                  "args": "0xe2fa82e70b062c8644b80ad7ecf6e015e5f352f6"
+                },
+                "outPoint": {
+                  "txHash": "0x9160bef8b6a9e388a99184bfd8bea0e7795b487c77fe784120fb2bc3fb25d1b2",
+                  "index": "0x4"
+                },
+                "capacity": "0x1fd52bc92e",
+                "dataHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+                "status": "live"
+              },
+              {
+                "blockHash": "0x355cd43b6b517be40ce69278b7c6d2017546e2d46557d59e31adff20646c845e",
+                "lock": {
+                  "codeHash": "0x1892ea40d82b53c678ff88312450bbb17e164d7a3e0a90941aa58839f56f8df2",
+                  "hashType": "type",
+                  "args": "0xe2fa82e70b062c8644b80ad7ecf6e015e5f352f6"
+                },
+                "outPoint": {
+                  "txHash": "0x9160bef8b6a9e388a99184bfd8bea0e7795b487c77fe784120fb2bc3fb25d1b2",
+                  "index": "0x5"
+                },
+                "capacity": "0x1fd52bc92e",
+                "dataHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+                "status": "live"
+              },
+              {
+                "blockHash": "0x355cd43b6b517be40ce69278b7c6d2017546e2d46557d59e31adff20646c845e",
+                "lock": {
+                  "codeHash": "0x1892ea40d82b53c678ff88312450bbb17e164d7a3e0a90941aa58839f56f8df2",
+                  "hashType": "type",
+                  "args": "0xe2fa82e70b062c8644b80ad7ecf6e015e5f352f6"
+                },
+                "outPoint": {
+                  "txHash": "0x9160bef8b6a9e388a99184bfd8bea0e7795b487c77fe784120fb2bc3fb25d1b2",
+                  "index": "0x6"
+                },
+                "capacity": "0x1fd52bc92e",
+                "dataHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+                "status": "live"
+              },
+              {
+                "blockHash": "0x355cd43b6b517be40ce69278b7c6d2017546e2d46557d59e31adff20646c845e",
+                "lock": {
+                  "codeHash": "0x1892ea40d82b53c678ff88312450bbb17e164d7a3e0a90941aa58839f56f8df2",
+                  "hashType": "type",
+                  "args": "0xe2fa82e70b062c8644b80ad7ecf6e015e5f352f6"
+                },
+                "outPoint": {
+                  "txHash": "0x9160bef8b6a9e388a99184bfd8bea0e7795b487c77fe784120fb2bc3fb25d1b2",
+                  "index": "0x7"
+                },
+                "capacity": "0x1fd52bc92e",
+                "dataHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+                "status": "live"
+              },
+              {
+                "blockHash": "0x355cd43b6b517be40ce69278b7c6d2017546e2d46557d59e31adff20646c845e",
+                "lock": {
+                  "codeHash": "0x1892ea40d82b53c678ff88312450bbb17e164d7a3e0a90941aa58839f56f8df2",
+                  "hashType": "type",
+                  "args": "0xe2fa82e70b062c8644b80ad7ecf6e015e5f352f6"
+                },
+                "outPoint": {
+                  "txHash": "0x9160bef8b6a9e388a99184bfd8bea0e7795b487c77fe784120fb2bc3fb25d1b2",
+                  "index": "0x8"
+                },
+                "capacity": "0x1fd52bc92e",
+                "dataHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+                "status": "live"
+              },
+              {
+                "blockHash": "0x355cd43b6b517be40ce69278b7c6d2017546e2d46557d59e31adff20646c845e",
+                "lock": {
+                  "codeHash": "0x1892ea40d82b53c678ff88312450bbb17e164d7a3e0a90941aa58839f56f8df2",
+                  "hashType": "type",
+                  "args": "0xe2fa82e70b062c8644b80ad7ecf6e015e5f352f6"
+                },
+                "outPoint": {
+                  "txHash": "0x9160bef8b6a9e388a99184bfd8bea0e7795b487c77fe784120fb2bc3fb25d1b2",
+                  "index": "0x9"
+                },
+                "capacity": "0x1fd52bc92e",
+                "dataHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+                "status": "live"
+              }
+            ]
+          ]
+        ],
+        "deps": {
+          "hashType": "type",
+          "codeHash": "0x1892ea40d82b53c678ff88312450bbb17e164d7a3e0a90941aa58839f56f8df2",
+          "outPoint": {
+            "txHash": "0x6347ee7ce5fc6828133590558b867097b895149a66e51cf353c361f7128e2091",
+            "index": "0x0"
+          },
+          "depType": "depGroup"
         }
       },
       "expected": {
@@ -587,16 +851,21 @@
           {
             "capacity": "0xb67251d5e6",
             "lock": {
-              "args": "0xddbd7f09eb480450c1b1ed2c8696248de91c6802",
-              "codeHash": "0x1892ea40d82b53c678ff88312450bbb17e164d7a3e0a90941aa58839f56f8df2",
+              "args": "0x36c329ed630d6ce750712a477543672adab57f4c",
+              "codeHash": "0xa656f172b6b45c245307aeb5a7a37a176f002f6f22e92582c58bf7ba362e4176",
+              "hashType": "data"
+            },
+            "type": {
+              "args": "0xe2fa82e70b062c8644b80ad7ecf6e015e5f352f6",
+              "codeHash": "0x9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8",
               "hashType": "type"
             }
           },
           {
             "capacity": "0x88cb4e12e",
             "lock": {
               "args": "0xe2fa82e70b062c8644b80ad7ecf6e015e5f352f6",
-              "codeHash": "0x1892ea40d82b53c678ff88312450bbb17e164d7a3e0a90941aa58839f56f8df2",
+              "codeHash": "0x9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8",
               "hashType": "type"
             }
           }