remove ethereumjs-abi dependency

safe-global · Jul 27, 2022 · a11801b · a11801b
1 parent f7f5230
commit a11801b
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 12 deletions.
diff --git a/packages/safe-core-sdk-types/src/ethereumLibs/EthAdapter.ts b/packages/safe-core-sdk-types/src/ethereumLibs/EthAdapter.ts
@@ -64,4 +64,5 @@ export interface EthAdapter {
     callback?: (error: Error, gas: number) => void
   ): Promise<number>
   call(transaction: EthAdapterTransaction): Promise<string>
+  encodeParameter(type: string, value: any): string
 }
diff --git a/packages/safe-core-sdk/package.json b/packages/safe-core-sdk/package.json
@@ -92,7 +92,6 @@
     "@ethersproject/solidity": "^5.6.0",
     "@gnosis.pm/safe-core-sdk-types": "^1.2.1",
     "@gnosis.pm/safe-deployments": "1.15.0",
-    "ethereumjs-abi": "^0.6.8",
     "ethereumjs-util": "^7.1.4",
     "semver": "^7.3.5",
     "web3-utils": "^1.7.1"

diff --git a/packages/safe-core-sdk/src/safeFactory/index.ts b/packages/safe-core-sdk/src/safeFactory/index.ts
@@ -5,7 +5,6 @@ import {
   SafeVersion,
   TransactionOptions
 } from '@gnosis.pm/safe-core-sdk-types'
-import abi from 'ethereumjs-abi'
 import { generateAddress2, keccak256, toBuffer } from 'ethereumjs-util'
 import { SAFE_LAST_VERSION } from '../contracts/config'
 import { getProxyFactoryContract, getSafeContract } from '../contracts/safeDeploymentContracts'
@@ -26,7 +25,7 @@ export interface SafeAccountConfig {
 }
 
 export interface SafeDeploymentConfig {
-  saltNonce: number
+  saltNonce: string
 }
 
 export interface PredictSafeProps {
@@ -152,23 +151,24 @@ class SafeFactory {
     safeDeploymentConfig
   }: PredictSafeProps): Promise<string> {
     validateSafeAccountConfig(safeAccountConfig)
-    if (safeDeploymentConfig) {
-      validateSafeDeploymentConfig(safeDeploymentConfig)
-    }
+    validateSafeDeploymentConfig(safeDeploymentConfig)
 
     const from = this.#safeProxyFactoryContract.getAddress()
 
     const initializer = await this.encodeSetupCallData(safeAccountConfig)
-    const saltNonce = safeDeploymentConfig.saltNonce.toString()
-    const encodedNonce = abi.rawEncode(['uint256'], [saltNonce]).toString('hex')
+    const saltNonce = safeDeploymentConfig.saltNonce
+    const encodedNonce = toBuffer(this.#ethAdapter.encodeParameter('uint256', saltNonce)).toString(
+      'hex'
+    )
+
     const salt = keccak256(
       toBuffer('0x' + keccak256(toBuffer(initializer)).toString('hex') + encodedNonce)
     )
 
     const proxyCreationCode = await this.#safeProxyFactoryContract.proxyCreationCode()
-    const constructorData = abi
-      .rawEncode(['address'], [this.#gnosisSafeContract.getAddress()])
-      .toString('hex')
+    const constructorData = toBuffer(
+      this.#ethAdapter.encodeParameter('address', this.#gnosisSafeContract.getAddress())
+    ).toString('hex')
     const initCode = proxyCreationCode + constructorData
 
     const proxyAddress =
@@ -189,7 +189,8 @@ class SafeFactory {
     const signerAddress = await this.#ethAdapter.getSignerAddress()
     const initializer = await this.encodeSetupCallData(safeAccountConfig)
     const saltNonce =
-      safeDeploymentConfig?.saltNonce ?? Date.now() * 1000 + Math.floor(Math.random() * 1000)
+      safeDeploymentConfig?.saltNonce ??
+      (Date.now() * 1000 + Math.floor(Math.random() * 1000)).toString()
 
     if (options?.gas && options?.gasLimit) {
       throw new Error('Cannot specify gas and gasLimit together in transaction options')

diff --git a/packages/safe-ethers-lib/src/EthersAdapter.ts b/packages/safe-ethers-lib/src/EthersAdapter.ts
@@ -163,6 +163,10 @@ class EthersAdapter implements EthAdapter {
   call(transaction: EthAdapterTransaction): Promise<string> {
     return this.#provider.call(transaction)
   }
+
+  encodeParameter(type: string, value: any) {
+    return new this.#ethers.utils.AbiCoder().encode([type], [value])
+  }
 }
 
 export default EthersAdapter
diff --git a/packages/safe-web3-lib/src/Web3Adapter.ts b/packages/safe-web3-lib/src/Web3Adapter.ts
@@ -191,6 +191,10 @@ class Web3Adapter implements EthAdapter {
   call(transaction: EthAdapterTransaction): Promise<string> {
     return this.#web3.eth.call(transaction)
   }
+
+  encodeParameter(type: string, value: any): string {
+    return this.#web3.eth.abi.encodeParameter(type, value)
+  }
 }
 
 export default Web3Adapter