Merge pull request #6 from near/rinkeby

Patch for rinkeby
Near-One · Sep 7, 2020 · 6fbd7ac · 6fbd7ac
2 parents ad63e2b + d9e5aff
commit 6fbd7ac
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/eth-on-near-client/index.js b/eth-on-near-client/index.js
@@ -22,6 +22,7 @@ const borshSchema = {
       ['hashes_gc_threshold', 'u64'],
       ['finalized_gc_threshold', 'u64'],
       ['num_confirmations', 'u64'],
+      ['trusted_signer', '?AccountId']
     ],
   },
   dagMerkleRootInput: {
@@ -61,6 +62,10 @@ const borshSchema = {
     kind: 'option',
     type: 'H256',
   },
+  '?AccountId': {
+    kind: 'option',
+    type: 'string',
+  }
 }
 
 class EthOnNearClientContract extends BorshContract {
@@ -116,13 +121,13 @@ class EthOnNearClientContract extends BorshContract {
 
   // Call initialization methods on the contract.
   // If validate_ethash is true will do ethash validation otherwise it won't.
-  async maybeInitialize(validate_ethash, robustWeb3) {
+  async maybeInitialize(validate_ethash, trusted_signer, robustWeb3) {
     await this.accessKeyInit()
     let initialized = false
     try {
       // @ts-ignore
       initialized = await this.initialized()
-    } catch (e) {}
+    } catch (e) { }
     if (!initialized) {
       console.log('EthOnNearClient is not initialized, initializing...')
       const last_block_number = await robustWeb3.getBlockNumber()
@@ -139,6 +144,7 @@ class EthOnNearClientContract extends BorshContract {
           hashes_gc_threshold: 40000,
           finalized_gc_threshold: 500,
           num_confirmations: 10,
+          trusted_signer,
         },
         new BN('300000000000000')
       )

diff --git a/eth2near-relay/index.js b/eth2near-relay/index.js
@@ -21,7 +21,8 @@ function execute(command, _callback) {
 }
 
 function web3BlockToRlp(blockData) {
-  blockData.difficulty = parseInt(blockData.difficulty, 10)
+  // difficulty is only used and make sense in PoW network
+  blockData.difficulty = parseInt(blockData.difficulty || '0', 10)
   blockData.totalDifficulty = parseInt(blockData.totalDifficulty, 10)
   blockData.uncleHash = blockData.sha3Uncles
   blockData.coinbase = blockData.miner

diff --git a/init/near-contracts.js b/init/near-contracts.js
@@ -41,6 +41,7 @@ class InitNearContracts {
     const nearNodeUrl = RainbowConfig.getParam('near-node-url')
     const nearNetworkId = RainbowConfig.getParam('near-network-id')
     const validateEthash = RainbowConfig.getParam('near-client-validate-ethash')
+    const trustedSigner = RainbowConfig.getParam('near-client-trusted-signer')
 
     const clientPk = nearlib.KeyPair.fromString(clientSk).getPublicKey()
     const proverPk = nearlib.KeyPair.fromString(proverSk).getPublicKey()
@@ -97,7 +98,7 @@ class InitNearContracts {
       clientAccount
     )
     const robustWeb3 = new RobustWeb3(RainbowConfig.getParam('eth-node-url'))
-    await clientContract.maybeInitialize(validateEthash === 'true', robustWeb3)
+    await clientContract.maybeInitialize(validateEthash === 'true', trustedSigner || null, robustWeb3)
     const proverContract = new EthOnNearProverContract(
       new nearlib.Account(near.connection, proverAccount),
       proverAccount

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "rainbow-bridge-lib",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "lib lib",
   "author": "Near Inc.",
   "repository": {