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

Ensure acceptance tests run on previewnet/testnet #351

Merged
merged 7 commits into from
Jul 20, 2022
Merged

Ensure acceptance tests run on previewnet/testnet #351

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
dea766c
fix: ensure acceptance tests run against testnet
Ivo-Yankov Jul 19, 2022
150019c
Merge branch 'main' into 340-acceptance-tests-against-public-nets
Ivo-Yankov Jul 20, 2022
464bff8
nit: improve test case branching
Ivo-Yankov Jul 20, 2022
aed3d05
nit: optimize hbar usage
Ivo-Yankov Jul 20, 2022
286753a
test: add a hapi eth_feeHistory test
Ivo-Yankov Jul 20, 2022
8010039
docs: update chainId for previewnet in readme
Ivo-Yankov Jul 20, 2022
92c7735
test: fix eth_feeHistory assertion
Ivo-Yankov Jul 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/relay/tests/lib/mirrorNodeClient.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import pino from 'pino';
const logger = pino();

describe('MirrorNodeClient', async function () {
this.timeout(10000);
this.timeout(20000);

// mock axios
const instance = axios.create({
Expand All @@ -40,7 +40,7 @@ describe('MirrorNodeClient', async function () {
headers: {
'Content-Type': 'application/json'
},
timeout: 10 * 1000
timeout: 20 * 1000
});
const mock = new MockAdapter(instance);
const mirrorNodeInstance = new MirrorNodeClient(process.env.MIRROR_NODE_URL, logger.child({ name: `mirror-node` }), instance);
Expand Down
4 changes: 2 additions & 2 deletions packages/server/tests/acceptance/erc20.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ describe('ERC20 Acceptance Tests', async function () {

before(async () => {
accounts[0] = await servicesNode.createAliasAccount(30, relay.provider);
accounts[1] = await servicesNode.createAliasAccount(10, relay.provider);
accounts[2] = await servicesNode.createAliasAccount(10, relay.provider);
accounts[1] = await servicesNode.createAliasAccount(20, relay.provider);
Nana-EC marked this conversation as resolved.
Show resolved Hide resolved
accounts[2] = await servicesNode.createAliasAccount(20, relay.provider);

initialHolder = accounts[0].address;
recipient = accounts[1].address;
Expand Down
164 changes: 100 additions & 64 deletions packages/server/tests/acceptance/rpc.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,14 +67,15 @@ describe('RPC Server Acceptance Tests', function () {
const FEE_SCHEDULE_FILE_ID = "0.0.111";
const FEE_SCHEDULE_FILE_CONTENT_DEFAULT = "0a280a0a08541a061a04408888340a0a08061a061a0440889d2d0a0a08071a061a0440b0b63c120208011200"; // Eth gas = 853000
const FEE_SCHEDULE_FILE_CONTENT_UPDATED = "0a280a0a08541a061a0440a8953a0a0a08061a061a0440889d2d0a0a08071a061a0440b0b63c120208011200"; // Eth gas = 953000
const publicNetworks = ['previewnet', 'testnet', 'mainnet'];

describe('RPC Server Acceptance Tests', function () {
this.timeout(240 * 1000); // 240 seconds

this.beforeAll(async () => {
accounts[0] = await servicesNode.createAliasAccount();
accounts[1] = await servicesNode.createAliasAccount();
accounts[2] = await servicesNode.createAliasAccount(20);
accounts[0] = await servicesNode.createAliasAccount(20);
accounts[1] = await servicesNode.createAliasAccount(20);
accounts[2] = await servicesNode.createAliasAccount(50);
Nana-EC marked this conversation as resolved.
Show resolved Hide resolved
contractId = await accounts[0].client.createParentContract(parentContractJson);

const params = new ContractFunctionParameters().addUint256(1);
Expand Down Expand Up @@ -406,8 +407,10 @@ describe('RPC Server Acceptance Tests', function () {
const transaction = {
...default155TransactionData,
to: mirrorContract.evm_address,
nonce: await relay.getAccountNonce(accounts[2].address)
nonce: await relay.getAccountNonce(accounts[2].address),
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why was lack of gasPrice working before.
Please add to comments section of PR something to highlight this issue and solution

gasPrice: await relay.gasPrice()
};

const signedTx = await accounts[2].wallet.signTransaction(transaction);
const legacyTxHash = await relay.sendRawTransaction(signedTx);
// Since the transactionId is not available in this context
Expand All @@ -420,11 +423,15 @@ describe('RPC Server Acceptance Tests', function () {
});

it('should execute "eth_getTransactionReceipt" for hash of London transaction', async function () {
const gasPrice = await relay.gasPrice();
const transaction = {
...defaultLondonTransactionData,
to: mirrorContract.evm_address,
nonce: await relay.getAccountNonce(accounts[2].address)
nonce: await relay.getAccountNonce(accounts[2].address),
maxFeePerGas: gasPrice,
maxPriorityFeePerGas: gasPrice
};

const signedTx = await accounts[2].wallet.signTransaction(transaction);
const transactionHash = await relay.sendRawTransaction(signedTx);
// Since the transactionId is not available in this context
Expand Down Expand Up @@ -463,7 +470,8 @@ describe('RPC Server Acceptance Tests', function () {
const transaction = {
...default155TransactionData,
to: mirrorContract.evm_address,
nonce: await relay.getAccountNonce(accounts[2].address)
nonce: await relay.getAccountNonce(accounts[2].address),
gasPrice: await relay.gasPrice()
};
const signedTx = await accounts[2].wallet.signTransaction(transaction);
const transactionHash = await relay.sendRawTransaction(signedTx);
Expand All @@ -483,7 +491,8 @@ describe('RPC Server Acceptance Tests', function () {
...default155TransactionData,
to: mirrorContract.evm_address,
value: balanceInWeiBars,
nonce: await relay.getAccountNonce(accounts[2].address)
nonce: await relay.getAccountNonce(accounts[2].address),
gasPrice: await relay.gasPrice()
};
const signedTx = await accounts[2].wallet.signTransaction(transaction);
await relay.callFailing('eth_sendRawTransaction', [signedTx], predefined.INSUFFICIENT_ACCOUNT_BALANCE);
Expand All @@ -493,7 +502,8 @@ describe('RPC Server Acceptance Tests', function () {
const transaction = {
...defaultLegacyTransactionData,
to: mirrorContract.evm_address,
nonce: await relay.getAccountNonce(accounts[2].address)
nonce: await relay.getAccountNonce(accounts[2].address),
gasPrice: await relay.gasPrice()
};
const signedTx = await accounts[2].wallet.signTransaction(transaction);
await relay.callFailing('eth_sendRawTransaction', [signedTx], predefined.UNSUPPORTED_CHAIN_ID('0x0', CHAIN_ID));
Expand All @@ -515,7 +525,8 @@ describe('RPC Server Acceptance Tests', function () {
const transaction = {
...defaultLegacy2930TransactionData,
to: mirrorContract.evm_address,
nonce: await relay.getAccountNonce(accounts[2].address)
nonce: await relay.getAccountNonce(accounts[2].address),
gasPrice: await relay.gasPrice()
};
const signedTx = await accounts[2].wallet.signTransaction(transaction);
await relay.callFailing('eth_sendRawTransaction', [signedTx]);
Expand All @@ -538,7 +549,8 @@ describe('RPC Server Acceptance Tests', function () {
...defaultLegacy2930TransactionData,
value: balanceInWeiBars,
to: mirrorContract.evm_address,
nonce: await relay.getAccountNonce(accounts[2].address)
nonce: await relay.getAccountNonce(accounts[2].address),
gasPrice: await relay.gasPrice()
};
const signedTx = await accounts[2].wallet.signTransaction(transaction);
await relay.callFailing('eth_sendRawTransaction', [signedTx], predefined.INSUFFICIENT_ACCOUNT_BALANCE);
Expand All @@ -558,24 +570,30 @@ describe('RPC Server Acceptance Tests', function () {

it('should fail "eth_sendRawTransaction" for London transactions (with insufficient balance)', async function () {
const balanceInWeiBars = await servicesNode.getAccountBalanceInWeiBars(accounts[2].accountId);
const gasPrice = await relay.gasPrice();

const transaction = {
...defaultLondonTransactionData,
value: balanceInWeiBars,
to: mirrorContract.evm_address,
nonce: await relay.getAccountNonce(accounts[2].address)
nonce: await relay.getAccountNonce(accounts[2].address),
maxPriorityFeePerGas: gasPrice,
maxFeePerGas: gasPrice,
};
const signedTx = await accounts[2].wallet.signTransaction(transaction);
await relay.callFailing('eth_sendRawTransaction', [signedTx], predefined.INSUFFICIENT_ACCOUNT_BALANCE);
});

it('should execute "eth_sendRawTransaction" for London transactions', async function () {
const receiverInitialBalance = await relay.getBalance(mirrorContract.evm_address);
const gasPrice = await relay.gasPrice();

const transaction = {
...defaultLondonTransactionData,
to: mirrorContract.evm_address,
nonce: await relay.getAccountNonce(accounts[2].address)
nonce: await relay.getAccountNonce(accounts[2].address),
maxPriorityFeePerGas: gasPrice,
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Similar PR comments for this section as to why it works in local node but is an issue here

maxFeePerGas: gasPrice,
};
const signedTx = await accounts[2].wallet.signTransaction(transaction);
const transactionHash = await relay.call('eth_sendRawTransaction', [signedTx]);
Expand All @@ -589,12 +607,14 @@ describe('RPC Server Acceptance Tests', function () {
});

it('should execute "eth_sendRawTransaction" and deploy a large contract', async function() {
const gasPrice = await relay.gasPrice();

const transaction = {
type: 2,
chainId: Number(CHAIN_ID),
nonce: await relay.getAccountNonce(accounts[2].address),
maxPriorityFeePerGas: Assertions.defaultGasPrice,
maxFeePerGas: Assertions.defaultGasPrice,
maxPriorityFeePerGas: gasPrice,
maxFeePerGas: gasPrice,
gasLimit: defaultGasLimit,
data: '0x' + '00'.repeat(5121),
};
Expand Down Expand Up @@ -622,7 +642,7 @@ describe('RPC Server Acceptance Tests', function () {
Assertions.expectedError();
}
catch(e) {
Assertions.jsonRpcError(e, predefined.UNSUPPORTED_CHAIN_ID('0x3e7', '0x12a'));
Assertions.jsonRpcError(e, predefined.UNSUPPORTED_CHAIN_ID('0x3e7', CHAIN_ID));
}
});

Expand All @@ -631,8 +651,10 @@ describe('RPC Server Acceptance Tests', function () {
...default155TransactionData,
to: mirrorContract.evm_address,
nonce: await relay.getAccountNonce(accounts[2].address),
gasLimit: 100
gasLimit: 100,
gasPrice: await relay.gasPrice()
};

const signedTx = await accounts[2].wallet.signTransaction(transaction);
try {
await relay.sendRawTransaction(signedTx);
Expand All @@ -648,8 +670,10 @@ describe('RPC Server Acceptance Tests', function () {
...default155TransactionData,
to: mirrorContract.evm_address,
nonce: await relay.getAccountNonce(accounts[2].address),
gasLimit: 999999999
gasLimit: 999999999,
gasPrice: await relay.gasPrice()
};

const signedTx = await accounts[2].wallet.signTransaction(transaction);
try {
await relay.sendRawTransaction(signedTx);
Expand Down Expand Up @@ -785,7 +809,12 @@ describe('RPC Server Acceptance Tests', function () {
it('should call eth_gasPrice', async function () {
const res = await relay.call('eth_gasPrice', []);
expect(res).to.exist;
expect(res).to.equal(ethers.utils.hexValue(Assertions.defaultGasPrice));
if (process.env.LOCAL_NODE) {
expect(res).be.equal(ethers.utils.hexValue(Assertions.defaultGasPrice));
}
else {
expect(Number(res)).to.be.gt(0);
}
});

it('should execute "eth_getBalance" for newly created account with 10 HBAR', async function () {
Expand Down Expand Up @@ -1039,57 +1068,64 @@ describe('RPC Server Acceptance Tests', function () {
});
});

describe('Gas Price related RPC endpoints', () => {
let lastBlockBeforeUpdate;
let lastBlockAfterUpdate;
// Only run the following tests against a local node since they only work with the genesis account
if (process.env.LOCAL_NODE) {
Nana-EC marked this conversation as resolved.
Show resolved Hide resolved
describe('Gas Price related RPC endpoints', () => {
let lastBlockBeforeUpdate;
let lastBlockAfterUpdate;

before(async () => {
await servicesNode.updateFileContent(FEE_SCHEDULE_FILE_ID, FEE_SCHEDULE_FILE_CONTENT_DEFAULT);
await servicesNode.updateFileContent(EXCHANGE_RATE_FILE_ID, EXCHANGE_RATE_FILE_CONTENT_DEFAULT);
lastBlockBeforeUpdate = (await mirrorNode.get(`/blocks?limit=1&order=desc`)).blocks[0];
await new Promise(resolve => setTimeout(resolve, 4000));
await servicesNode.updateFileContent(FEE_SCHEDULE_FILE_ID, FEE_SCHEDULE_FILE_CONTENT_UPDATED);
await new Promise(resolve => setTimeout(resolve, 4000));
lastBlockAfterUpdate = (await mirrorNode.get(`/blocks?limit=1&order=desc`)).blocks[0];
});

it('should call eth_feeHistory with updated fees', async function () {
const blockCountNumber = lastBlockAfterUpdate.number - lastBlockBeforeUpdate.number;
const blockCountHex = ethers.utils.hexValue(blockCountNumber);
const datedGasPriceHex = ethers.utils.hexValue(Assertions.datedGasPrice);
const updatedGasPriceHex = ethers.utils.hexValue(Assertions.updatedGasPrice);
const newestBlockNumberHex = ethers.utils.hexValue(lastBlockAfterUpdate.number);
const oldestBlockNumberHex = ethers.utils.hexValue(lastBlockAfterUpdate.number - blockCountNumber + 1);

const res = await relay.call('eth_feeHistory', [blockCountHex, newestBlockNumberHex, [0]]);

Assertions.feeHistory(res, { resultCount: blockCountNumber, oldestBlock: oldestBlockNumberHex, chechReward: true });
before(async () => {
await servicesNode.updateFileContent(FEE_SCHEDULE_FILE_ID, FEE_SCHEDULE_FILE_CONTENT_DEFAULT);
await servicesNode.updateFileContent(EXCHANGE_RATE_FILE_ID, EXCHANGE_RATE_FILE_CONTENT_DEFAULT);
lastBlockBeforeUpdate = (await mirrorNode.get(`/blocks?limit=1&order=desc`)).blocks[0];
await new Promise(resolve => setTimeout(resolve, 4000));
await servicesNode.updateFileContent(FEE_SCHEDULE_FILE_ID, FEE_SCHEDULE_FILE_CONTENT_UPDATED);
await new Promise(resolve => setTimeout(resolve, 4000));
lastBlockAfterUpdate = (await mirrorNode.get(`/blocks?limit=1&order=desc`)).blocks[0];
});

it('should call eth_feeHistory with updated fees', async function () {
const blockCountNumber = lastBlockAfterUpdate.number - lastBlockBeforeUpdate.number;
const blockCountHex = ethers.utils.hexValue(blockCountNumber);
const datedGasPriceHex = ethers.utils.hexValue(Assertions.datedGasPrice);
const updatedGasPriceHex = ethers.utils.hexValue(Assertions.updatedGasPrice);
const newestBlockNumberHex = ethers.utils.hexValue(lastBlockAfterUpdate.number);
const oldestBlockNumberHex = ethers.utils.hexValue(lastBlockAfterUpdate.number - blockCountNumber + 1);

const res = await relay.call('eth_feeHistory', [blockCountHex, newestBlockNumberHex, [0]]);

Assertions.feeHistory(res, {
resultCount: blockCountNumber,
oldestBlock: oldestBlockNumberHex,
chechReward: true
});

expect(res.baseFeePerGas[0]).to.equal(datedGasPriceHex);
expect(res.baseFeePerGas[res.baseFeePerGas.length - 2]).to.equal(updatedGasPriceHex);
expect(res.baseFeePerGas[res.baseFeePerGas.length - 1]).to.equal(updatedGasPriceHex);
});
expect(res.baseFeePerGas[0]).to.equal(datedGasPriceHex);
expect(res.baseFeePerGas[res.baseFeePerGas.length - 2]).to.equal(updatedGasPriceHex);
expect(res.baseFeePerGas[res.baseFeePerGas.length - 1]).to.equal(updatedGasPriceHex);
});

it('should call eth_feeHistory with newest block > latest', async function () {
let latestBlock;
const newestBlockNumber = lastBlockAfterUpdate.number + 10;
const newestBlockNumberHex = ethers.utils.hexValue(newestBlockNumber);
try {
latestBlock = (await mirrorNode.get(`/blocks?limit=1&order=desc`)).blocks[0];
await relay.call('eth_feeHistory', ['0x1', newestBlockNumberHex, null]);
} catch (error) {
Assertions.jsonRpcError(error, predefined.REQUEST_BEYOND_HEAD_BLOCK(newestBlockNumber, latestBlock.number));
}
});
it('should call eth_feeHistory with newest block > latest', async function () {
let latestBlock;
const newestBlockNumber = lastBlockAfterUpdate.number + 10;
const newestBlockNumberHex = ethers.utils.hexValue(newestBlockNumber);
try {
latestBlock = (await mirrorNode.get(`/blocks?limit=1&order=desc`)).blocks[0];
await relay.call('eth_feeHistory', ['0x1', newestBlockNumberHex, null]);
} catch (error) {
Assertions.jsonRpcError(error, predefined.REQUEST_BEYOND_HEAD_BLOCK(newestBlockNumber, latestBlock.number));
}
});

it('should call eth_feeHistory with zero block count', async function () {
const res = await relay.call('eth_feeHistory', ['0x0', 'latest', null]);
it('should call eth_feeHistory with zero block count', async function () {
const res = await relay.call('eth_feeHistory', ['0x0', 'latest', null]);

expect(res.reward).to.not.exist;
expect(res.baseFeePerGas).to.not.exist;
expect(res.gasUsedRatio).to.equal(null);
expect(res.oldestBlock).to.equal('0x0');
expect(res.reward).to.not.exist;
expect(res.baseFeePerGas).to.not.exist;
expect(res.gasUsedRatio).to.equal(null);
expect(res.oldestBlock).to.equal('0x0');
});
});
});
}
});
});
6 changes: 6 additions & 0 deletions packages/server/tests/clients/relayClient.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,4 +107,10 @@ export default class RelayClient {
return this.provider.send('eth_sendRawTransaction', [signedTx]);
};

/**
* Returns the result of eth_gasPrice as a Number.
*/
async gasPrice(): Promise<number> {
return Number(await this.call('eth_gasPrice', []));
}
}