Skip to content
This repository was archived by the owner on Dec 5, 2021. It is now read-only.

Fix nonce issue #568

Merged
CAPtheorem merged 2 commits into from
Oct 6, 2021
Merged

Fix nonce issue #568

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a772947
Fix nonce issue
boyuan-chen Oct 6, 2021
9ba62e2
Avoid submitting again
boyuan-chen Oct 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions packages/message-relayer/src/service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,15 +257,6 @@ export class MessageRelayerService extends BaseService<MessageRelayerOptions> {
console.log('Buffer timeout: flushing')
}

const receipt = await this._relayMultiMessageToL1(
this.state.messageBuffer.reduce((acc, cur) => {
acc.push(cur.payload)
return acc
}, [])
)

console.log('Receipt:', receipt)

/* parse this to make sure that the mesaage was actually relayed */
// clear out buffer only if the messages are relayed to L1 successfully
if (
Expand All @@ -281,6 +272,14 @@ export class MessageRelayerService extends BaseService<MessageRelayerOptions> {
this.state.messageBuffer = []
this.state.timeOfLastPendingRelay = false
} else {
const receipt = await this._relayMultiMessageToL1(
this.state.messageBuffer.reduce((acc, cur) => {
acc.push(cur.payload)
return acc
}, [])
)

console.log('Receipt:', receipt)
// add the time interval between two tx
this.state.timeOfLastPendingRelay = Date.now()
}
Expand Down Expand Up @@ -772,11 +771,12 @@ export class MessageRelayerService extends BaseService<MessageRelayerOptions> {
private async _relayMultiMessageToL1(
messages: Array<BatchMessage>
): Promise<any> {

const sendTxAndWaitForReceipt = async (gasPrice): Promise<any> => {
// Generate the transaction we will repeatedly submit
const nonce = await this.options.l1Wallet.getTransactionCount()
const txResponse = await this.state.OVM_L1MultiMessageRelayer.connect(
this.options.l1Wallet
).batchRelayMessages(messages, { gasPrice })
).batchRelayMessages(messages, { gasPrice, nonce })
const tx = await this.options.l1Wallet.provider.waitForTransaction(
txResponse.hash,
this.options.numConfirmations
Expand Down
21 changes: 11 additions & 10 deletions packages/omgx/message-relayer-fast/src/service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,15 +261,6 @@ export class MessageRelayerService extends BaseService<MessageRelayerOptions> {
console.log('Buffer timeout: flushing')
}

const receipt = await this._relayMultiMessageToL1(
this.state.messageBuffer.reduce((acc, cur) => {
acc.push(cur.payload)
return acc
}, [])
)

console.log('Receipt:', receipt)

/* parse this to make sure that the mesaage was actually relayed */
// clear out buffer only if the messages are relayed to L1 successfully
if (
Expand All @@ -285,6 +276,14 @@ export class MessageRelayerService extends BaseService<MessageRelayerOptions> {
this.state.messageBuffer = []
this.state.timeOfLastPendingRelay = false
} else {
const receipt = await this._relayMultiMessageToL1(
this.state.messageBuffer.reduce((acc, cur) => {
acc.push(cur.payload)
return acc
}, [])
)

console.log('Receipt:', receipt)
// add the time interval between two tx
this.state.timeOfLastPendingRelay = Date.now()
}
Expand Down Expand Up @@ -767,9 +766,11 @@ export class MessageRelayerService extends BaseService<MessageRelayerOptions> {
): Promise<any> {

const sendTxAndWaitForReceipt = async (gasPrice): Promise<any> => {
// Generate the transaction we will repeatedly submit
const nonce = await this.options.l1Wallet.getTransactionCount()
const txResponse = await this.state.OVM_L1MultiMessageRelayerFast.connect(
this.options.l1Wallet
).batchRelayMessages(messages, { gasPrice })
).batchRelayMessages(messages, { gasPrice, nonce })
const tx = await this.options.l1Wallet.provider.waitForTransaction(
txResponse.hash,
this.options.numConfirmations
Expand Down