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

Commit 45feecf

Browse files
CAPtheoremCAPtheorem
authored
Merge branch 'develop' into Enable-BRIDGE-ALL-L2--L1-for-ETH
2 parents 178c811 + 33c33ca commit 45feecf

9 files changed

Lines changed: 470 additions & 247 deletions

File tree

‎packages/batch-submitter/src/batch-submitter/tx-batch-submitter.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ export class TransactionBatchSubmitter extends BatchSubmitter {
8080
)
8181
this.disableQueueBatchAppend = disableQueueBatchAppend
8282
this.autoFixBatchOptions = autoFixBatchOptions
83-
this.gasThresholdInGwei = 500
83+
this.gasThresholdInGwei = gasThresholdInGwei
8484
this.transactionSubmitter = transactionSubmitter
8585
}
8686

‎packages/contracts/contracts/optimistic-ethereum/OVM/bridge/messaging/OVM_L1CrossDomainMessenger.sol‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ contract OVM_L1CrossDomainMessenger is
7070
mapping (bytes32 => bool) public blockedMessages;
7171
mapping (bytes32 => bool) public relayedMessages;
7272
mapping (bytes32 => bool) public successfulMessages;
73+
mapping (bytes32 => bool) public failedMessages;
7374

7475
address internal xDomainMsgSender = DEFAULT_XDOMAIN_SENDER;
7576

@@ -278,6 +279,7 @@ contract OVM_L1CrossDomainMessenger is
278279
successfulMessages[xDomainCalldataHash] = true;
279280
emit RelayedMessage(xDomainCalldataHash);
280281
} else {
282+
failedMessages[xDomainCalldataHash] = true;
281283
emit FailedRelayedMessage(xDomainCalldataHash);
282284
}
283285

‎packages/message-relayer/src/exec/run.ts‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,10 +79,8 @@ const main = async () => {
7979
'from-l2-transaction-index',
8080
parseInt(env.FROM_L2_TRANSACTION_INDEX, 10) || 0
8181
)
82-
const FILTER_ENDPOINT = config.str(
83-
'filter-endpoint',
84-
env.FILTER_ENDPOINT
85-
) || ''
82+
const FILTER_ENDPOINT =
83+
config.str('filter-endpoint', env.FILTER_ENDPOINT) || ''
8684
const FILTER_POLLING_INTERVAL = config.uint(
8785
'filter-polling-interval',
8886
parseInt(env.FILTER_POLLING_INTERVAL, 10) || 60000
@@ -101,7 +99,7 @@ const main = async () => {
10199
)
102100
const NUM_CONFIRMATIONS = config.uint(
103101
'num-confirmations',
104-
parseInt(env.NUM_CONFIRMATIONS, 10) || 0
102+
parseInt(env.NUM_CONFIRMATIONS, 10) || 0
105103
)
106104

107105
if (!ADDRESS_MANAGER_ADDRESS) {

0 commit comments

Comments
 (0)