@@ -3,42 +3,44 @@ const BridgeTx = require("./BridgeTx");
33const BridgeMethod = require ( "./BridgeMethod" ) ;
44const BridgeEvent = require ( "./BridgeEvent" ) ;
55const utils = require ( "./utils" ) ;
6+ const { ethers} = require ( 'ethers' ) ;
7+ const { formatBigIntForJson} = require ( "./utils" ) ;
68
79class BridgeTransactionParser {
810
9- constructor ( web3Client ) {
10- if ( ! web3Client ) {
11- throw new Error ( `web3Client is required` ) ;
11+ constructor ( rskClient ) {
12+ if ( ! rskClient ) {
13+ throw new Error ( `rskClient is required` ) ;
1214 }
13- this . web3Client = web3Client ;
14- this . bridge = new web3Client . eth . Contract ( Bridge . abi , Bridge . address ) ;
15- this . jsonInterfaceMap = this . bridge . _jsonInterface . reduce ( ( map , item ) => {
16- map [ item . signature ] = item ;
17- return map ;
18- } , { } ) ;
15+ this . rskClient = rskClient ;
16+ this . bridge = new ethers . Contract ( Bridge . address , Bridge . abi , rskClient ) ;
1917 }
2018
2119 getBridgeTransactionByTxHash = async ( transactionHash ) => {
2220 utils . verifyHashOrBlockNumber ( transactionHash ) ;
23-
21+
2422 let transaction ;
25- const txReceipt = await this . web3Client . eth . getTransactionReceipt ( transactionHash ) ;
23+ const txReceipt = await this . rskClient . getTransactionReceipt (
24+ transactionHash ) ;
2625 if ( txReceipt ?. to === Bridge . address ) {
27- const tx = await this . web3Client . eth . getTransaction ( txReceipt . transactionHash ) ;
26+ const tx = await this . rskClient . getTransaction (
27+ txReceipt . hash ) ;
2828 transaction = await this . createBridgeTx ( tx , txReceipt ) ;
2929 }
30-
30+
3131 return transaction ;
3232 }
3333
3434 getBridgeTransactionsInThisBlock = async ( blockHashOrBlockNumber ) => {
3535 utils . verifyHashOrBlockNumber ( blockHashOrBlockNumber ) ;
36-
37- const block = await this . web3Client . eth . getBlock ( blockHashOrBlockNumber ) ;
36+
37+ // block in number should be parsed as a Number in order to call the getBlock method
38+ const blockTag = this . #parseBlockTag( blockHashOrBlockNumber ) ;
39+ const block = await this . rskClient . getBlock ( blockTag ) ;
3840 if ( ! block ) {
3941 throw new Error ( `Block ${ blockHashOrBlockNumber } ) ;
4042 }
41-
43+
4244 const bridgeTxs = [ ] ;
4345 for ( let txHash of block . transactions ) {
4446 const transaction = await this . getBridgeTransactionByTxHash ( txHash ) ;
@@ -48,83 +50,107 @@ class BridgeTransactionParser {
4850 }
4951 return bridgeTxs ;
5052 }
51-
52- getBridgeTransactionsSinceThisBlock = async ( startingBlockHashOrBlockNumber , blocksToSearch ) => {
53+
54+ #parseBlockTag = ( blockHashOrBlockNumber ) => {
55+ return typeof blockHashOrBlockNumber === 'string' && blockHashOrBlockNumber . indexOf ( '0x' ) === 0 ?
56+ blockHashOrBlockNumber : Number ( blockHashOrBlockNumber ) ;
57+ }
58+
59+ getBridgeTransactionsSinceThisBlock = async ( startingBlockHashOrBlockNumber ,
60+ blocksToSearch ) => {
5361 utils . verifyHashOrBlockNumber ( startingBlockHashOrBlockNumber ) ;
54-
55- if ( isNaN ( blocksToSearch ) || blocksToSearch > 100 || blocksToSearch <= 0 ) {
56- throw new Error ( 'blocksToSearch must be greater than 0 or less than 100' ) ;
62+
63+ if ( isNaN ( blocksToSearch ) || blocksToSearch > 100 || blocksToSearch
64+ <= 0 ) {
65+ throw new Error (
66+ 'blocksToSearch must be greater than 0 or less than 100' ) ;
5767 }
58-
59- const startingBlockNumber = typeof startingBlockHashOrBlockNumber === 'string' && startingBlockHashOrBlockNumber . indexOf ( '0x' ) === 0 ?
60- ( await this . web3Client . eth . getBlock ( startingBlockHashOrBlockNumber ) ) . number : startingBlockHashOrBlockNumber ;
68+
69+ const startingBlockTag = this . #parseBlockTag( startingBlockHashOrBlockNumber ) ;
70+ const startingBlock = await this . rskClient . getBlock (
71+ startingBlockTag ) ;
72+ const startingBlockNumber = startingBlock . number ;
6173
6274 const bridgeTxs = [ ] ;
6375 for ( let i = 0 ; i < blocksToSearch ; i ++ ) {
6476 const blockNumber = parseInt ( startingBlockNumber ) + i ;
65- const blockBridgeTxs = await this . getBridgeTransactionsInThisBlock ( blockNumber ) ;
77+ const blockBridgeTxs = await this . getBridgeTransactionsInThisBlock (
78+ blockNumber ) ;
6679 if ( blockBridgeTxs . length ) {
6780 bridgeTxs . push ( ...blockBridgeTxs ) ;
6881 }
6982 }
7083 return bridgeTxs ;
71-
7284 }
73-
85+
7486 decodeBridgeTransaction = async ( bridgeTx , bridgeTxReceipt ) => {
75- if ( bridgeTx . hash !== bridgeTxReceipt . transactionHash ) {
76- throw new Error ( `Given bridgeTx(${ bridgeTx . hash } ${ bridgeTxReceipt . transactionHash } ) ;
87+ if ( bridgeTx . hash !== bridgeTxReceipt . hash ) {
88+ throw new Error (
89+ `Given bridgeTx(${ bridgeTx . hash } ${ bridgeTxReceipt . hash } ) ;
7790 }
7891 if ( bridgeTxReceipt . to !== Bridge . address ) {
79- throw new Error ( `Given bridgeTxReceipt is not a bridge transaction` ) ;
92+ throw new Error (
93+ `Given bridgeTxReceipt is not a bridge transaction` ) ;
8094 }
81-
95+
8296 return this . createBridgeTx ( bridgeTx , bridgeTxReceipt ) ;
8397 }
84-
98+
8599 decodeBridgeMethodParameters = ( methodName , data ) => {
86100 const abi = Bridge . abi . find ( m => m . name === methodName ) ;
87101 if ( ! abi ) {
88102 throw new Error ( `${ methodName } ) ;
89103 }
90-
91- const argumentsData = data . substring ( 10 ) ; // Remove the signature bits from the data
92- const dataDecoded = this . web3Client . eth . abi . decodeParameters ( abi . inputs , argumentsData ) ;
93-
104+
105+ const functionFragment = this . bridge . interface . getFunction ( methodName ) ;
106+ const dataDecoded = this . bridge . interface . decodeFunctionData ( functionFragment ,
107+ data ) ;
108+
94109 // TODO: the parsing of the arguments is not tested
95110 const args = { } ;
96111 for ( let input of abi . inputs ) {
97112 args [ input . name ] = dataDecoded [ input . name ] ;
98113 }
99114 return args ;
100115 }
101-
116+
102117 createBridgeTx = async ( tx , txReceipt ) => {
103- const txData = tx . input ;
104- const method = this . jsonInterfaceMap [ txData . substring ( 0 , 10 ) ] ;
118+ const txData = tx . data ;
119+ const functionSignature = txData . substring ( 0 , 10 ) ;
120+ const method = this . bridge . interface . getFunction ( functionSignature ) ;
105121 const events = this . decodeLogs ( txReceipt ) ;
106- const block = await this . web3Client . eth . getBlock ( txReceipt . blockNumber ) ;
107-
122+ const block = await this . rskClient . getBlock ( txReceipt . blockNumber ) ;
123+
108124 let bridgeMethod = '' ;
109125 if ( method ) {
110- const args = await this . decodeBridgeMethodParameters ( method . name , txData ) ;
111- bridgeMethod = new BridgeMethod ( method . name , method . signature , args ) ;
126+ const args = await this . decodeBridgeMethodParameters ( method . name ,
127+ txData ) ;
128+ bridgeMethod = new BridgeMethod ( method . name , functionSignature ,
129+ args ) ;
112130 }
113- return new BridgeTx (
114- txReceipt . transactionHash ,
115- bridgeMethod ,
116- events ,
117- txReceipt . from ,
131+ let bridgeTx = new BridgeTx (
132+ txReceipt . hash ,
133+ bridgeMethod ,
134+ events ,
135+ txReceipt . from ,
118136 txReceipt . blockNumber ,
119137 block . timestamp
120138 ) ;
139+
140+ // Format any BigInt values in the bridgeTx
141+ return formatBigIntForJson ( bridgeTx ) ;
121142 } ;
122-
143+
123144 decodeLogs = ( txReceipt ) => {
124145 const events = [ ] ;
125146 for ( let log of txReceipt . logs ) {
126- const abiElement = this . jsonInterfaceMap [ log . topics [ 0 ] ] ;
127- if ( ! abiElement ) {
147+ if ( log . topics . length === 0 ) {
148+ continue ;
149+ }
150+
151+ const eventSignature = log . topics [ 0 ] ;
152+ const abiElement = this . bridge . interface . getEvent ( eventSignature )
153+ if ( ! abiElement ) {
128154 continue ;
129155 }
130156 const event = this . decodeLog ( log , abiElement ) ;
@@ -134,22 +160,16 @@ class BridgeTransactionParser {
134160 }
135161
136162 decodeLog = ( log , abiElement ) => {
163+ const parsedLog = this . bridge . interface . parseLog ( log ) ;
164+
137165 const args = { } ;
138- const dataDecoded = this . web3Client . eth . abi . decodeParameters ( abiElement . inputs . filter ( i => ! i . indexed ) , log . data ) ;
139- let topicIndex = 1 ;
140- for ( let input of abiElement . inputs ) {
141- let value ;
142- if ( input . indexed ) {
143- value = this . web3Client . eth . abi . decodeParameter ( input . type , log . topics [ topicIndex ] ) ;
144- topicIndex ++ ;
145- } else {
146- value = dataDecoded [ input . name ] ;
147- }
148- args [ input . name ] = value ;
166+ for ( let i = 0 ; i < abiElement . inputs . length ; i ++ ) {
167+ const input = abiElement . inputs [ i ] ;
168+ args [ input . name ] = parsedLog . args [ i ] ;
149169 }
150- return new BridgeEvent ( abiElement . name , abiElement . signature , args ) ;
151- }
152170
171+ return new BridgeEvent ( abiElement . name , log . topics [ 0 ] , args ) ;
172+ }
153173}
154174
155175module . exports = BridgeTransactionParser ;
0 commit comments