From ded9361d8a0c1448bc055d0f2150eec1d04d14ce Mon Sep 17 00:00:00 2001 From: Joseph Bagaric Date: Mon, 3 Dec 2018 17:09:23 +0100 Subject: [PATCH 1/2] Initial RSK support (testnet) --- lib/assets/rsk_testnet.json | 1 + 1 file changed, 1 insertion(+) create mode 100644 lib/assets/rsk_testnet.json diff --git a/lib/assets/rsk_testnet.json b/lib/assets/rsk_testnet.json new file mode 100644 index 0000000..d5bb060 --- /dev/null +++ b/lib/assets/rsk_testnet.json @@ -0,0 +1 @@ +{"baseScheduler":"0x7b326a8f1a57779f7cf256dc5e177f885e922b6c","blockScheduler":"0x690ecb0295b200c42e63ab999aca34f4f1e4fbad","claimLib":"0xb3b8f3eac92cde2002b8e3afec3db002f34f83dc","executionLib":"0x5b2c8c8cacfcbbcd34f99b319fd06ba139267910","iterTools":"0xa875c180c945cba0a530c5b4ca07a2d71f257721","mathLib":"0xef4284a01fcefac54a137d4f88711db6a6a091fe","paymentLib":"0xb2fa61311ae75e57ae79e765211e6aed253ffd2c","requestFactory":"0x4ab31c8b9b7a8adfeb4c7c04f94b973987c89fda","requestLib":"0xa1624f6f9ef442290667c3124529510eddecf2b9","requestMetaLib":"0xbe284334b697d3efb5ccdbd801377bfde63b9d1b","requestScheduleLib":"0xfd1a3e0f6775ca17d55f12b6d226f31e8cc4cd1f","safeMath":"0xa7d247330e3d3790af2aef84972b6cc3e6ba77cc","timestampScheduler":"0xc7fee134f358d5c46c456f4cfca01d3150c96d98","transactionRequestCore":"0xa48659eeb9a260b3413aa22e401f95b34a0de0dc","transactionRecorder":"0x5163b170b276c1a7dc33b0cc9f560b6d4c2781c1"} From b68bd890377048f5d8c26de55bc04b4a3ba0d95a Mon Sep 17 00:00:00 2001 From: Bagaric Date: Mon, 3 Dec 2018 17:34:07 +0100 Subject: [PATCH 2/2] Add RSK TestNet to Util --- lib/util.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/util.js b/lib/util.js index 66c0ad3..f5c3e0c 100644 --- a/lib/util.js +++ b/lib/util.js @@ -8,6 +8,8 @@ const NETWORK_ID = { MAINNET: '1', ROPSTEN: '3', RINKEBY: '4', + // RSK_MAINNET: '30', not enabled yet + RSK_TESTNET: '31', KOVAN: '42', DOCKER: '1001', DEVELOPMENT: '1002', @@ -17,7 +19,8 @@ const NETWORK_ID = { const REQUEST_FACTORY_STARTBLOCKS = { [NETWORK_ID.MAINNET]: 6204104, [NETWORK_ID.ROPSTEN]: 2594245, - [NETWORK_ID.KOVAN]: 5555500 + [NETWORK_ID.KOVAN]: 5555500, + [NETWORK_ID.RSK_TESTNET]: '0x21b0f' }; const calcEndowment = (callGas, callValue, gasPrice, fee, bounty) => { @@ -160,6 +163,8 @@ const getChainName = web3 => new Promise((resolve, reject) => { resolve("ropsten"); } else if (netID === NETWORK_ID.RINKEBY) { resolve("rinkeby"); + } else if (netID === NETWORK_ID.RSK_TESTNET) { + resolve("rsk_testnet"); } else if (netID === NETWORK_ID.KOVAN) { resolve("kovan"); } else if (netID === NETWORK_ID.DOCKER) {