Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
N
nebula
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
exchain
nebula
Commits
f8f00eee
Unverified
Commit
f8f00eee
authored
Jan 28, 2022
by
smartcontracts
Committed by
GitHub
Jan 28, 2022
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #2089 from ethereum-optimism/sc/sdk-withdraw-eth
feat(sdk): implement withdrawETH
parents
734e3ff8
7d0f4976
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
79 additions
and
3 deletions
+79
-3
cross-chain-messenger.ts
packages/sdk/src/cross-chain-messenger.ts
+13
-3
MockBridge.sol
packages/sdk/test/contracts/MockBridge.sol
+19
-0
cross-chain-messenger.spec.ts
packages/sdk/test/cross-chain-messenger.spec.ts
+47
-0
No files found.
packages/sdk/src/cross-chain-messenger.ts
View file @
f8f00eee
...
@@ -4,6 +4,7 @@ import {
...
@@ -4,6 +4,7 @@ import {
TransactionRequest
,
TransactionRequest
,
TransactionResponse
,
TransactionResponse
,
}
from
'
@ethersproject/abstract-provider
'
}
from
'
@ethersproject/abstract-provider
'
import
{
predeploys
}
from
'
@eth-optimism/contracts
'
import
{
import
{
CrossChainMessageRequest
,
CrossChainMessageRequest
,
...
@@ -85,7 +86,9 @@ export class CrossChainMessenger implements ICrossChainMessenger {
...
@@ -85,7 +86,9 @@ export class CrossChainMessenger implements ICrossChainMessenger {
amount
:
NumberLike
,
amount
:
NumberLike
,
overrides
?:
Overrides
overrides
?:
Overrides
):
Promise
<
TransactionResponse
>
{
):
Promise
<
TransactionResponse
>
{
throw
new
Error
(
'
Not implemented
'
)
return
this
.
l2Signer
.
sendTransaction
(
await
this
.
populateTransaction
.
withdrawETH
(
amount
,
overrides
)
)
}
}
populateTransaction
=
{
populateTransaction
=
{
...
@@ -163,7 +166,13 @@ export class CrossChainMessenger implements ICrossChainMessenger {
...
@@ -163,7 +166,13 @@ export class CrossChainMessenger implements ICrossChainMessenger {
amount
:
NumberLike
,
amount
:
NumberLike
,
overrides
?:
Overrides
overrides
?:
Overrides
):
Promise
<
TransactionRequest
>
=>
{
):
Promise
<
TransactionRequest
>
=>
{
throw
new
Error
(
'
Not implemented
'
)
return
this
.
provider
.
contracts
.
l2
.
L2StandardBridge
.
populateTransaction
.
withdraw
(
predeploys
.
OVM_ETH
,
amount
,
0
,
// No need to supply gas here
'
0x
'
,
// No data,
overrides
||
{}
)
},
},
}
}
...
@@ -212,7 +221,8 @@ export class CrossChainMessenger implements ICrossChainMessenger {
...
@@ -212,7 +221,8 @@ export class CrossChainMessenger implements ICrossChainMessenger {
amount
:
NumberLike
,
amount
:
NumberLike
,
overrides
?:
Overrides
overrides
?:
Overrides
):
Promise
<
BigNumber
>
=>
{
):
Promise
<
BigNumber
>
=>
{
throw
new
Error
(
'
Not implemented
'
)
const
tx
=
await
this
.
populateTransaction
.
withdrawETH
(
amount
,
overrides
)
return
this
.
provider
.
l2Provider
.
estimateGas
(
tx
)
},
},
}
}
}
}
packages/sdk/test/contracts/MockBridge.sol
View file @
f8f00eee
...
@@ -132,4 +132,23 @@ contract MockBridge {
...
@@ -132,4 +132,23 @@ contract MockBridge {
_data
_data
);
);
}
}
function withdraw(
address _l2Token,
uint256 _amount,
uint32 _l1Gas,
bytes calldata _data
)
public
payable
{
emit WithdrawalInitiated(
address(0),
_l2Token,
msg.sender,
msg.sender,
_amount,
_data
);
}
}
}
packages/sdk/test/cross-chain-messenger.spec.ts
View file @
f8f00eee
import
{
Contract
}
from
'
ethers
'
import
{
Contract
}
from
'
ethers
'
import
{
ethers
}
from
'
hardhat
'
import
{
ethers
}
from
'
hardhat
'
import
{
predeploys
}
from
'
@eth-optimism/contracts
'
import
{
expect
}
from
'
./setup
'
import
{
expect
}
from
'
./setup
'
import
{
import
{
...
@@ -255,4 +256,50 @@ describe('CrossChainMessenger', () => {
...
@@ -255,4 +256,50 @@ describe('CrossChainMessenger', () => {
)
)
})
})
})
})
describe
(
'
withdrawETH
'
,
()
=>
{
let
l2Messenger
:
Contract
let
l2Bridge
:
Contract
let
provider
:
CrossChainProvider
let
messenger
:
CrossChainMessenger
beforeEach
(
async
()
=>
{
l2Messenger
=
(
await
(
await
ethers
.
getContractFactory
(
'
MockMessenger
'
)
).
deploy
())
as
any
l2Bridge
=
(
await
(
await
ethers
.
getContractFactory
(
'
MockBridge
'
)
).
deploy
(
l2Messenger
.
address
))
as
any
provider
=
new
CrossChainProvider
({
l1Provider
:
ethers
.
provider
,
l2Provider
:
ethers
.
provider
,
l1ChainId
:
31337
,
contracts
:
{
l2
:
{
L2CrossDomainMessenger
:
l2Messenger
.
address
,
L2StandardBridge
:
l2Bridge
.
address
,
},
},
})
messenger
=
new
CrossChainMessenger
({
provider
,
l1Signer
,
l2Signer
,
})
})
it
(
'
should trigger the deposit ETH function with the given amount
'
,
async
()
=>
{
await
expect
(
messenger
.
withdrawETH
(
100000
))
.
to
.
emit
(
l2Bridge
,
'
WithdrawalInitiated
'
)
.
withArgs
(
ethers
.
constants
.
AddressZero
,
predeploys
.
OVM_ETH
,
await
l2Signer
.
getAddress
(),
await
l2Signer
.
getAddress
(),
100000
,
'
0x
'
)
})
})
})
})
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment