Fixed deposit contract deployment
This commit is contained in:
parent
7fa7c8ee53
commit
abbe4075fa
|
@ -39,9 +39,6 @@ type
|
|||
contract(Deposit):
|
||||
proc drain()
|
||||
|
||||
proc getTransactionReceipt(web3: Web3, tx: TxHash): Future[ReceiptObject] {.async.} =
|
||||
result = await web3.provider.eth_getTransactionReceipt(tx)
|
||||
|
||||
proc deployContract*(web3: Web3, code: string): Future[Address] {.async.} =
|
||||
var code = code
|
||||
if code[1] notin {'x', 'X'}:
|
||||
|
@ -53,7 +50,7 @@ proc deployContract*(web3: Web3, code: string): Future[Address] {.async.} =
|
|||
gasPrice: 1.some)
|
||||
|
||||
let r = await web3.send(tr)
|
||||
let receipt = await web3.getTransactionReceipt(r)
|
||||
let receipt = await web3.getMinedTransactionReceipt(r)
|
||||
result = receipt.contractAddress.get
|
||||
|
||||
proc sendEth(web3: Web3, to: string, valueEth: int): Future[TxHash] =
|
||||
|
|
|
@ -55,8 +55,10 @@ DOCKER_BEACON_NODE="docker run -v $DEPOSITS_DIR_ABS:/deposits_dir -v $NETWORK_DI
|
|||
make deposit_contract
|
||||
|
||||
if [ "$ETH1_PRIVATE_KEY" != "" ]; then
|
||||
echo "Deploying deposit contract..."
|
||||
DEPOSIT_CONTRACT_ADDRESS=$(./build/deposit_contract deploy $WEB3_URL_ARG --private-key=$ETH1_PRIVATE_KEY)
|
||||
DEPOSIT_CONTRACT_ADDRESS_ARG="--deposit-contract=$DEPOSIT_CONTRACT_ADDRESS"
|
||||
echo "Done: $DEPOSIT_CONTRACT_ADDRESS"
|
||||
fi
|
||||
|
||||
cd docker
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit ecd2fb45a63f105c026fa9a8515daf288a57c13d
|
||||
Subproject commit 37fc46111489bc521731b59f52f42b6327fa7829
|
Loading…
Reference in New Issue