Merge pull request #25 from TradeTrust/fix/stability-mainnet-unable-t…

…o-deploy-contracts fix: unable to deploy contracts on stability mainnet
TradeTrust · Mar 26, 2024 · 6dfd805 · 6dfd805
2 parents 1047258 + b7b0cd5
commit 6dfd805
Show file tree

Hide file tree

Showing 19 changed files with 119 additions and 222 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -75,7 +75,7 @@
     "@tradetrust-tt/token-registry": "^4.9.0",
     "@tradetrust-tt/tradetrust": "^6.9.1",
     "@tradetrust-tt/tradetrust-config": "^1.14.1",
-    "@tradetrust-tt/tt-verify": "^8.8.5",
+    "@tradetrust-tt/tt-verify": "^8.9.1",
     "ajv": "^8.4.0",
     "ajv-formats": "^2.1.0",
     "chalk": "^4.1.2",

diff --git a/src/common/networks.ts b/src/common/networks.ts
@@ -38,10 +38,6 @@ const jsonRpcProvider =
   () =>
     new providers.JsonRpcProvider(url);
 
-const getStabilityApiKey = (): string => {
-  return process.env.STABILITY_API_KEY ?? "";
-};
-
 export const supportedNetwork: {
   [key in NetworkCmdName]: SupportedNetwork;
 } = {
@@ -119,7 +115,7 @@ export const supportedNetwork: {
   },
   [NetworkCmdName.Stability]: {
     explorer: "https://stability.blockscout.com",
-    provider: jsonRpcProvider(`https://gtn.stabilityprotocol.com/zgt/${getStabilityApiKey()}`),
+    provider: jsonRpcProvider(`https://gtn.stabilityprotocol.com/zgt/tradeTrust`),
     networkId: 101010,
     networkName: NetworkCmdName.Stability,
     currency: "FREE",

diff --git a/src/implementations/deploy/document-store/document-store.ts b/src/implementations/deploy/document-store/document-store.ts
@@ -30,7 +30,7 @@ export const deployDocumentStore = async ({
 
   let transaction: DocumentStore;
   if (canEstimateGasPrice(network)) {
-    const gasFees = await getGasFees({ provider: wallet.provider, network, ...rest });
+    const gasFees = await getGasFees({ provider: wallet.provider, ...rest });
     trace(`Gas maxFeePerGas: ${gasFees.maxFeePerGas}`);
     trace(`Gas maxPriorityFeePerGas: ${gasFees.maxPriorityFeePerGas}`);
     signale.await(`Sending transaction to pool`);

diff --git a/src/implementations/deploy/token-registry/token-registry.ts b/src/implementations/deploy/token-registry/token-registry.ts
@@ -73,7 +73,7 @@ export const deployTokenRegistry = async ({
   let gasFees;
 
   if (canEstimateGasPrice(network)) {
-    gasFees = await getGasFees({ provider: wallet.provider, network, ...rest });
+    gasFees = await getGasFees({ provider: wallet.provider, ...rest });
     trace(`Gas maxFeePerGas: ${gasFees.maxFeePerGas}`);
     trace(`Gas maxPriorityFeePerGas: ${gasFees.maxPriorityFeePerGas}`);
   }

diff --git a/src/implementations/document-store/grant-role.ts b/src/implementations/document-store/grant-role.ts
@@ -28,7 +28,7 @@ export const grantDocumentStoreRole = async ({
     });
     process.exit(0);
   }
-  const gasFees = await getGasFees({ provider: wallet.provider, network, ...rest });
+  const gasFees = await getGasFees({ provider: wallet.provider, ...rest });
   trace(`Gas maxFeePerGas: ${gasFees.maxFeePerGas}`);
   trace(`Gas maxPriorityFeePerGas: ${gasFees.maxPriorityFeePerGas}`);
   await documentStore.callStatic.grantRole(roleString, account);

diff --git a/src/implementations/document-store/issue.ts b/src/implementations/document-store/issue.ts
@@ -25,7 +25,7 @@ export const issueToDocumentStore = async ({
     });
     process.exit(0);
   }
-  const gasFees = await getGasFees({ provider: wallet.provider, network, ...rest });
+  const gasFees = await getGasFees({ provider: wallet.provider, ...rest });
   trace(`Gas maxFeePerGas: ${gasFees.maxFeePerGas}`);
   trace(`Gas maxPriorityFeePerGas: ${gasFees.maxPriorityFeePerGas}`);
   await documentStore.callStatic.issue(hash);

diff --git a/src/implementations/document-store/revoke-role.ts b/src/implementations/document-store/revoke-role.ts
@@ -28,7 +28,7 @@ export const revokeDocumentStoreRole = async ({
     });
     process.exit(0);
   }
-  const gasFees = await getGasFees({ provider: wallet.provider, network, ...rest });
+  const gasFees = await getGasFees({ provider: wallet.provider, ...rest });
   trace(`Gas maxFeePerGas: ${gasFees.maxFeePerGas}`);
   trace(`Gas maxPriorityFeePerGas: ${gasFees.maxPriorityFeePerGas}`);
   await documentStore.callStatic.revokeRole(roleString, account);

diff --git a/src/implementations/document-store/revoke.ts b/src/implementations/document-store/revoke.ts
@@ -24,7 +24,7 @@ export const revokeToDocumentStore = async ({
     });
     process.exit(0);
   }
-  const gasFees = await getGasFees({ provider: wallet.provider, network, ...rest });
+  const gasFees = await getGasFees({ provider: wallet.provider, ...rest });
   trace(`Gas maxFeePerGas: ${gasFees.maxFeePerGas}`);
   trace(`Gas maxPriorityFeePerGas: ${gasFees.maxPriorityFeePerGas}`);
   await documentStore.callStatic.revoke(hash);

diff --git a/src/implementations/document-store/transfer-ownership.ts b/src/implementations/document-store/transfer-ownership.ts
@@ -35,7 +35,7 @@ export const transferDocumentStoreOwnership = async ({
     });
     process.exit(0);
   }
-  const gasFees = await getGasFees({ provider: wallet.provider, network, ...rest });
+  const gasFees = await getGasFees({ provider: wallet.provider, ...rest });
   trace(`Gas maxFeePerGas: ${gasFees.maxFeePerGas}`);
   trace(`Gas maxPriorityFeePerGas: ${gasFees.maxPriorityFeePerGas}`);
   signale.await(`Sending transaction to pool`);

diff --git a/src/implementations/title-escrow/acceptSurrendered.ts b/src/implementations/title-escrow/acceptSurrendered.ts
@@ -28,7 +28,7 @@ export const acceptSurrendered = async ({
   }
   let transaction;
   if (canEstimateGasPrice(network)) {
-    const gasFees = await getGasFees({ network, provider: wallet.provider, ...rest });
+    const gasFees = await getGasFees({ provider: wallet.provider, ...rest });
     trace(`Gas maxFeePerGas: ${gasFees.maxFeePerGas}`);
     trace(`Gas maxPriorityFeePerGas: ${gasFees.maxPriorityFeePerGas}`);
     await tokenRegistryInstance.callStatic.burn(tokenId);

diff --git a/src/implementations/title-escrow/endorseNominatedBeneficiary.ts b/src/implementations/title-escrow/endorseNominatedBeneficiary.ts
@@ -34,7 +34,7 @@ export const endorseNominatedBeneficiary = async ({
   }
   let transaction;
   if (canEstimateGasPrice(network)) {
-    const gasFees = await getGasFees({ provider: wallet.provider, network, ...rest });
+    const gasFees = await getGasFees({ provider: wallet.provider, ...rest });
     trace(`Gas maxFeePerGas: ${gasFees.maxFeePerGas}`);
     trace(`Gas maxPriorityFeePerGas: ${gasFees.maxPriorityFeePerGas}`);
     await titleEscrow.callStatic.transferBeneficiary(nominatedBeneficiary);

diff --git a/src/implementations/title-escrow/nominateBeneficiary.ts b/src/implementations/title-escrow/nominateBeneficiary.ts
@@ -31,7 +31,7 @@ export const nominateBeneficiary = async ({
   }
   let transaction;
   if (canEstimateGasPrice(network)) {
-    const gasFees = await getGasFees({ provider: wallet.provider, network, ...rest });
+    const gasFees = await getGasFees({ provider: wallet.provider, ...rest });
     trace(`Gas maxFeePerGas: ${gasFees.maxFeePerGas}`);
     trace(`Gas maxPriorityFeePerGas: ${gasFees.maxPriorityFeePerGas}`);
     await titleEscrow.callStatic.nominate(newBeneficiary);

diff --git a/src/implementations/title-escrow/rejectSurrendered.ts b/src/implementations/title-escrow/rejectSurrendered.ts
@@ -27,7 +27,7 @@ export const rejectSurrendered = async ({
   }
   let transaction;
   if (canEstimateGasPrice(network)) {
-    const gasFees = await getGasFees({ provider: wallet.provider, network, ...rest });
+    const gasFees = await getGasFees({ provider: wallet.provider, ...rest });
     trace(`Gas maxFeePerGas: ${gasFees.maxFeePerGas}`);
     trace(`Gas maxPriorityFeePerGas: ${gasFees.maxPriorityFeePerGas}`);
     await tokenRegistryInstance.callStatic.restore(tokenId);

diff --git a/src/implementations/title-escrow/surrenderDocument.ts b/src/implementations/title-escrow/surrenderDocument.ts
@@ -28,7 +28,7 @@ export const surrenderDocument = async ({
   let transaction;
 
   if (canEstimateGasPrice(network)) {
-    const gasFees = await getGasFees({ provider: wallet.provider, network, ...rest });
+    const gasFees = await getGasFees({ provider: wallet.provider, ...rest });
     trace(`Gas maxFeePerGas: ${gasFees.maxFeePerGas}`);
     trace(`Gas maxPriorityFeePerGas: ${gasFees.maxPriorityFeePerGas}`);
     await titleEscrow.callStatic.surrender();

diff --git a/src/implementations/title-escrow/transferHolder.ts b/src/implementations/title-escrow/transferHolder.ts
@@ -29,7 +29,7 @@ export const transferHolder = async ({
   }
   let transaction;
   if (canEstimateGasPrice(network)) {
-    const gasFees = await getGasFees({ provider: wallet.provider, network, ...rest });
+    const gasFees = await getGasFees({ provider: wallet.provider, ...rest });
     trace(`Gas maxFeePerGas: ${gasFees.maxFeePerGas}`);
     trace(`Gas maxPriorityFeePerGas: ${gasFees.maxPriorityFeePerGas}`);
     await titleEscrow.callStatic.transferHolder(to);

diff --git a/src/implementations/title-escrow/transferOwners.ts b/src/implementations/title-escrow/transferOwners.ts
@@ -31,7 +31,7 @@ export const transferOwners = async ({
   }
   let transaction;
   if (canEstimateGasPrice(network)) {
-    const gasFees = await getGasFees({ provider: wallet.provider, network, ...rest });
+    const gasFees = await getGasFees({ provider: wallet.provider, ...rest });
     trace(`Gas maxFeePerGas: ${gasFees.maxFeePerGas}`);
     trace(`Gas maxPriorityFeePerGas: ${gasFees.maxPriorityFeePerGas}`);
     await titleEscrow.callStatic.transferOwners(newOwner, newHolder);

diff --git a/src/implementations/token-registry/issue.ts b/src/implementations/token-registry/issue.ts
@@ -30,7 +30,7 @@ export const issueToTokenRegistry = async ({
 
   let transaction;
   if (canEstimateGasPrice(network)) {
-    const gasFees = await getGasFees({ provider: wallet.provider, network, ...rest });
+    const gasFees = await getGasFees({ provider: wallet.provider, ...rest });
     trace(`Gas maxFeePerGas: ${gasFees.maxFeePerGas}`);
     trace(`Gas maxPriorityFeePerGas: ${gasFees.maxPriorityFeePerGas}`);
     await tokenRegistry.callStatic.mint(beneficiary, holder, tokenId);

diff --git a/src/utils.ts b/src/utils.ts
@@ -57,22 +57,11 @@ export const scaleBigNumber = (wei: BigNumber | null | undefined, multiplier: nu
 
 interface GetGasFeesArgs extends GasPriceScale {
   provider: Provider;
-  network: string;
 }
 
-export const getGasFees = async ({
-  provider,
-  maxPriorityFeePerGasScale,
-  network,
-}: GetGasFeesArgs): Promise<Overrides> => {
+export const getGasFees = async ({ provider, maxPriorityFeePerGasScale }: GetGasFeesArgs): Promise<Overrides> => {
   const feeData = await getFeeData(provider);
   const { maxFeePerGas, maxPriorityFeePerGas } = feeData;
-  if (network === NetworkCmdName.StabilityTestnet) {
-    return {
-      maxFeePerGas: 0,
-      maxPriorityFeePerGas: 0,
-    };
-  }
   return {
     maxPriorityFeePerGas: scaleBigNumber(maxPriorityFeePerGas, maxPriorityFeePerGasScale),
     maxFeePerGas: calculateMaxFee(maxFeePerGas, maxPriorityFeePerGas, maxPriorityFeePerGasScale),
@@ -122,7 +111,8 @@ export const displayTransactionPrice = async (
   if (
     network === NetworkCmdName.XDC ||
     network === NetworkCmdName.XDCApothem ||
-    network === NetworkCmdName.StabilityTestnet
+    network === NetworkCmdName.StabilityTestnet ||
+    network === NetworkCmdName.Stability
   ) {
     return;
   }