Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: Updated to deploy the contract using a websocket provider. #2332

Merged
merged 7 commits into from
Apr 15, 2024
Merged

feat: Updated to deploy the contract using a websocket provider. #2332

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2ffadd4
feat: Updated to deploy the contract using a websocket provider.
ebadiere Apr 11, 2024
6fee74b
Update packages/ws-server/tests/acceptance/estimateGas.spec.ts
ebadiere Apr 11, 2024
7e452bc
Update packages/ws-server/tests/acceptance/estimateGas.spec.ts
ebadiere Apr 11, 2024
45c5b87
Merge branch 'main' into 2331-deploy-using-websocketProvider
ebadiere Apr 15, 2024
d22b263
feat: Merged and fixed to deploy using WebSocketProvider.
ebadiere Apr 15, 2024
bb13c41
fix: Removed .only
ebadiere Apr 15, 2024
05caa22
fix: Updated to wait for account to be propagated to the mirror node.
ebadiere Apr 15, 2024
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
30 changes: 23 additions & 7 deletions packages/ws-server/tests/acceptance/estimateGas.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@

// external resources
import { expect } from 'chai';
import { ethers, WebSocketProvider } from 'ethers';
import { TransactionReceipt } from '@hashgraph/sdk';
import { Contract, ethers, WebSocketProvider } from 'ethers';
// import { TransactionReceipt } from '@hashgraph/sdk';
quiet-node marked this conversation as resolved.
Show resolved Hide resolved
import { WsTestConstant, WsTestHelper } from '../helper';
import basicContractJson from '@hashgraph/json-rpc-server/tests/contracts/Basic.json';
import { AliasAccount } from '@hashgraph/json-rpc-server/tests/clients/servicesClient';
Expand All @@ -32,15 +32,22 @@ describe('@release @web-socket eth_estimateGas', async function () {
const BASIC_CONTRACT_PING_CALL_DATA = '0x5c36b186';

let accounts: AliasAccount[] = [],
basicContract: TransactionReceipt,
basicContract: Contract,
currentPrice: number,
expectedGas: number,
gasPriceDeviation: number,
ethersWsProvider: WebSocketProvider;
ethersWsProvider: WebSocketProvider,
requestId = 'eth_estimateGas';

before(async () => {
accounts[0] = await global.servicesNode.createAliasAccount(100, global.relay.provider);
basicContract = await global.servicesNode.deployContract(basicContractJson);
let result;
let mirrorAccount = await global.mirrorNode.get(`accounts?account.id=${accounts[0].accountId}`, requestId);
// Wait for the account to propagate the mirror node
while (mirrorAccount.accounts.length === 0) {
mirrorAccount = await global.mirrorNode.get(`accounts?account.id=${accounts[0].accountId}`, requestId);
await new Promise((resolve) => setTimeout(resolve, 2000));
}

currentPrice = await global.relay.gasPrice();
expectedGas = parseInt(PING_CALL_ESTIMATED_GAS, 16);
Expand All @@ -51,6 +58,15 @@ describe('@release @web-socket eth_estimateGas', async function () {

beforeEach(async () => {
ethersWsProvider = new ethers.WebSocketProvider(WsTestConstant.WS_RELAY_URL);
const wallet = new ethers.Wallet(accounts[0].wallet.privateKey, ethersWsProvider);
quiet-node marked this conversation as resolved.
Show resolved Hide resolved
const basicContractFactory = await new ethers.ContractFactory(
basicContractJson.abi,
basicContractJson.bytecode,
wallet,
quiet-node marked this conversation as resolved.
Show resolved Hide resolved
);

basicContract = (await basicContractFactory.deploy()) as Contract;
await basicContract.waitForDeployment();
});

afterEach(async () => {
Expand All @@ -64,7 +80,7 @@ describe('@release @web-socket eth_estimateGas', async function () {

it('@release should execute "eth_estimateGas" for contract call, using a websocket provider', async function () {
const estimatedGas = await ethersWsProvider.estimateGas({
to: `0x${basicContract.contractId?.toSolidityAddress()}`,
to: basicContract.target,
data: BASIC_CONTRACT_PING_CALL_DATA,
});

Expand All @@ -74,7 +90,7 @@ describe('@release @web-socket eth_estimateGas', async function () {
});

it('should return the code through a websocket', async () => {
const tx = { to: `0x${basicContract.contractId?.toSolidityAddress()}`, data: BASIC_CONTRACT_PING_CALL_DATA };
const tx = { to: basicContract.target, data: BASIC_CONTRACT_PING_CALL_DATA };
const response = await WsTestHelper.sendRequestToStandardWebSocket(METHOD_NAME, [tx]);
WsTestHelper.assertJsonRpcObject(response);
expect(Number(response.result)).to.be.lessThan(currentPrice * (1 + gasPriceDeviation));
Expand Down
Loading