Skip to content

Commit

Permalink
Code formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
germartinez committed Jul 12, 2023
1 parent f1e83a3 commit d449298
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -233,10 +233,16 @@ export function getSimulateTxAccessorContractInstance(
let simulateTxAccessorContract
switch (safeVersion) {
case '1.4.1':
simulateTxAccessorContract = SimulateTxAccessor_V1_4_1.connect(contractAddress, signerOrProvider)
simulateTxAccessorContract = SimulateTxAccessor_V1_4_1.connect(
contractAddress,
signerOrProvider
)
return new SimulateTxAccessorContract_V1_4_1_Ethers(simulateTxAccessorContract)
case '1.3.0':
simulateTxAccessorContract = SimulateTxAccessor_V1_3_0.connect(contractAddress, signerOrProvider)
simulateTxAccessorContract = SimulateTxAccessor_V1_3_0.connect(
contractAddress,
signerOrProvider
)
return new SimulateTxAccessorContract_V1_3_0_Ethers(simulateTxAccessorContract)
default:
throw new Error('Invalid Safe version')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -207,9 +207,13 @@ export function getSimulateTxAccessorContractInstance(
): SimulateTxAccessorContract_V1_4_1_Web3 | SimulateTxAccessorContract_V1_3_0_Web3 {
switch (safeVersion) {
case '1.4.1':
return new SimulateTxAccessorContract_V1_4_1_Web3(simulateTxAccessorContract as SimulateTxAccessor_V1_4_1)
return new SimulateTxAccessorContract_V1_4_1_Web3(
simulateTxAccessorContract as SimulateTxAccessor_V1_4_1
)
case '1.3.0':
return new SimulateTxAccessorContract_V1_3_0_Web3(simulateTxAccessorContract as SimulateTxAccessor_V1_3_0)
return new SimulateTxAccessorContract_V1_3_0_Web3(
simulateTxAccessorContract as SimulateTxAccessor_V1_3_0
)
default:
throw new Error('Invalid Safe version')
}
Expand Down
11 changes: 8 additions & 3 deletions packages/protocol-kit/src/utils/transactions/gas.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
import { BigNumber } from '@ethersproject/bignumber'
import { ContractNetworksConfig } from '@safe-global/protocol-kit/types'
import { EthAdapter, OperationType, SafeContract, SafeVersion } from '@safe-global/safe-core-sdk-types'
import {
EthAdapter,
OperationType,
SafeContract,
SafeVersion
} from '@safe-global/safe-core-sdk-types'
import { getSimulateTxAccessorContract } from '../../contracts/safeDeploymentContracts'

function estimateDataGasCosts(data: string): number {
Expand All @@ -24,15 +29,15 @@ export async function estimateGas(
valueInWei: string,
data: string,
operation: OperationType,
customContracts?: ContractNetworksConfig
customContracts?: ContractNetworksConfig
) {
const chainId = await ethAdapter.getChainId()
const simulateTxAccessorContract = await getSimulateTxAccessorContract({
ethAdapter,
safeVersion,
customContracts: customContracts?.[chainId]
})

const transactionDataToEstimate = simulateTxAccessorContract.encode('simulate', [
to,
valueInWei,
Expand Down
2 changes: 1 addition & 1 deletion packages/protocol-kit/src/utils/transactions/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ export async function standardizeSafeTransactionData({
if (!safeContract) {
throw new Error('Safe is not deployed')
}

let safeTxGas
if (semverSatisfies(safeVersion, '>=1.3.0')) {
safeTxGas = await estimateGas(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

export interface SimulateTxAccessorContract {
getAddress(): string
encode(methodName: any, params: any): string
Expand Down

0 comments on commit d449298

Please sign in to comment.