fix: fixed hbarLimiter test

Signed-off-by: Logan Nguyen <[email protected] Signed-off-by: Logan Nguyen <[email protected]>
hashgraph · Sep 3, 2024 · ec0904e · ec0904e
1 parent 615c686
commit ec0904e
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 31 deletions.
diff --git a/packages/relay/src/index.ts b/packages/relay/src/index.ts
@@ -136,7 +136,7 @@ export interface Eth {
 
  protocolVersion(requestId?: string): JsonRpcError;
 
- sendRawTransaction(transaction: string, requestId?: string): Promise<string | JsonRpcError>;
+ sendRawTransaction(transaction: string, requestId: string): Promise<string | JsonRpcError>;
 
  sendTransaction(requestId?: string): JsonRpcError;
 

diff --git a/packages/relay/src/lib/hbarlimiter/index.ts b/packages/relay/src/lib/hbarlimiter/index.ts
@@ -154,9 +154,6 @@ export default class HbarLimit {
  currentNetworkExchangeRateInCents,
  );
 
- console.log(`remainingBudget: ${this.remainingBudget}`);
- console.log(`totalFeeInTinyBar: ${totalFeeInTinyBar}`);
-
  if (this.remainingBudget - totalFeeInTinyBar < 0) {
  this.logger.trace(
  `${requestIdPrefix} HBAR preemtive rate limit incoming call - the total preemptive transaction fee exceeds the current remaining HBAR budget due to an excessively large callData size: remainingBudget=${this.remainingBudget}, total=${this.total}, resetTimestamp=${this.reset}, callDataSize=${callDataSize}, numFileCreateTxs=${numFileCreateTxs}, numFileAppendTxs=${numFileAppendTxs}, totalFeeInTinyBar=${totalFeeInTinyBar}, exchangeRateInCents=${currentNetworkExchangeRateInCents}`,

diff --git a/packages/relay/tests/lib/sdkClient.spec.ts b/packages/relay/tests/lib/sdkClient.spec.ts
@@ -2127,9 +2127,9 @@ describe('SdkClient', async function () {
  124, 18, 190, 114, 79, 189, 99, 27, 157, 117, 227, 107, 74, 255, 111, 74, 166, 7, 78, 25, 35, 131, 85, 47, 52,
  120, 20,
  ]);
- const fileCreateFee = Number(process.env.HOT_FIX_FILE_CREATE_FEE || 100000000); // 1 hbar
- const fileDeleteFee = Number(process.env.HOT_FIX_FILE_DELETE_FEE || 11000000); // 0.11 hbar
- const fileAppendFee = Number(process.env.HOT_FIX_FILE_APPEND_FEE || 120000000); // 1.2 hbar
+ const fileCreateFee = 100000000; // 1 hbar
+ const fileDeleteFee = 11000000; // 0.11 hbar
+ const fileAppendFee = 120000000; // 1.2 hbar
  const mockedExchangeRateIncents = 12;
  const mockedTransactionRecordFee = calculateTxRecordChargeAmount(mockedExchangeRateIncents);
  const defaultTransactionFee = 1000;
@@ -2271,7 +2271,13 @@ describe('SdkClient', async function () {
  .returns(true);
 
  try {
- await sdkClient.submitEthereumTransaction(transactionBuffer, mockedCallerName, requestId, randomAccountAddress);
+ await sdkClient.submitEthereumTransaction(
+ transactionBuffer,
+ mockedCallerName,
+ requestId,
+ randomAccountAddress,
+ mockedExchangeRateIncents,
+ );
  expect.fail(`Expected an error but nothing was thrown`);
  } catch (error: any) {
  expect(error.message).to.equal('HBAR Rate limit exceeded');
@@ -2324,7 +2330,13 @@ describe('SdkClient', async function () {
  .withArgs(mockedTransactionRecordFee)
  .exactly(fileAppendChunks + 2);
 
- await sdkClient.submitEthereumTransaction(transactionBuffer, mockedCallerName, requestId, randomAccountAddress);
+ await sdkClient.submitEthereumTransaction(
+ transactionBuffer,
+ mockedCallerName,
+ requestId,
+ randomAccountAddress,
+ mockedExchangeRateIncents,
+ );
 
  expect(queryStub.called).to.be.true;
  expect(transactionStub.called).to.be.true;

diff --git a/packages/server/tests/acceptance/hbarLimiter.spec.ts b/packages/server/tests/acceptance/hbarLimiter.spec.ts
@@ -241,28 +241,6 @@ describe('@hbarlimiter HBAR Limiter Acceptance Tests', function () {
  });
 
  describe('Rate Limit', () => {
- it('Should preemtively check the rate limit before submitting EthereumTransaction', async function () {
- const remainingHbarsBefore = Number(await metrics.get(testConstants.METRICS.REMAINING_HBAR_LIMIT));
-
- process.env.HBAR_RATE_LIMIT_PREEMTIVE_CHECK = 'true';
- process.env.HOT_FIX_FILE_APPEND_FEE = (remainingHbarsBefore - 100000000).toString();
-
- try {
- const largeContract = await Utils.deployContract(
- largeContractJson.abi,
- largeContractJson.bytecode,
- accounts[0].wallet,
- );
- await largeContract.waitForDeployment();
-
- expect(true).to.be.false;
- } catch (e) {
- expect(e.message).to.contain(predefined.HBAR_RATE_LIMIT_PREEMTIVE_EXCEEDED.message);
- }
-
- delete process.env.HBAR_RATE_LIMIT_PREEMTIVE_CHECK;
- });
-
  it('HBAR limiter is updated within acceptable tolerance range in relation to actual spent amount by the relay operator', async function () {
  const TOLERANCE = 0.02;
  const remainingHbarsBefore = Number(await metrics.get(testConstants.METRICS.REMAINING_HBAR_LIMIT));
@@ -288,6 +266,28 @@ describe('@hbarlimiter HBAR Limiter Acceptance Tests', function () {
  Assertions.expectWithinTolerance(amountPaidByOperator, totalOperatorFees, TOLERANCE);
  });
 
+ it('Should preemtively check the rate limit before submitting EthereumTransaction', async function () {
+ process.env.HBAR_RATE_LIMIT_PREEMTIVE_CHECK = 'true';
+ try {
+ for (let i = 0; i < 50; i++) {
+ const largeContract = await Utils.deployContract(
+ largeContractJson.abi,
+ largeContractJson.bytecode,
+ accounts[0].wallet,
+ );
+ await largeContract.waitForDeployment();
+ }
+ expect.fail('The rate limiter will throw HBAR_RATE_LIMIT_PREEMTIVE_EXCEEDED error');
+ } catch (e) {
+ console.log(`asdaksjdhuqwiyeiqwuyhdkajshdkajhsiduuqywe`);
+ console.log(e);
+
+ expect(e.message).to.contain(predefined.HBAR_RATE_LIMIT_PREEMTIVE_EXCEEDED.message);
+ }
+
+ delete process.env.HBAR_RATE_LIMIT_PREEMTIVE_CHECK;
+ });
+
  it('multiple deployments of large contracts should eventually exhaust the remaining hbar limit', async function () {
  const remainingHbarsBefore = Number(await metrics.get(testConstants.METRICS.REMAINING_HBAR_LIMIT));
  let lastRemainingHbars = remainingHbarsBefore;