Replace encodeParameter with encodeParameters

safe-global · Jul 29, 2022 · 6f1b2e5 · 6f1b2e5
1 parent ddd88c7
commit 6f1b2e5
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 34 deletions.
diff --git a/packages/safe-core-sdk-types/src/ethereumLibs/EthAdapter.ts b/packages/safe-core-sdk-types/src/ethereumLibs/EthAdapter.ts
@@ -64,5 +64,5 @@ export interface EthAdapter {
     callback?: (error: Error, gas: number) => void
   ): Promise<number>
   call(transaction: EthAdapterTransaction): Promise<string>
-  encodeParameter(type: string, value: any): string
+  encodeParameters(types: string[], values: any[]): string
 }
diff --git a/packages/safe-core-sdk/src/safeFactory/index.ts b/packages/safe-core-sdk/src/safeFactory/index.ts
@@ -157,7 +157,7 @@ class SafeFactory {
 
     const initializer = await this.encodeSetupCallData(safeAccountConfig)
     const saltNonce = safeDeploymentConfig.saltNonce
-    const encodedNonce = toBuffer(this.#ethAdapter.encodeParameter('uint256', saltNonce)).toString(
+    const encodedNonce = toBuffer(this.#ethAdapter.encodeParameters(['uint256'], [saltNonce])).toString(
       'hex'
     )
 
@@ -167,7 +167,7 @@ class SafeFactory {
 
     const proxyCreationCode = await this.#safeProxyFactoryContract.proxyCreationCode()
     const constructorData = toBuffer(
-      this.#ethAdapter.encodeParameter('address', this.#gnosisSafeContract.getAddress())
+      this.#ethAdapter.encodeParameters(['address'], [this.#gnosisSafeContract.getAddress()])
     ).toString('hex')
     const initCode = proxyCreationCode + constructorData
 

diff --git a/packages/safe-core-sdk/tests/safeFactory.test.ts b/packages/safe-core-sdk/tests/safeFactory.test.ts
@@ -105,9 +105,9 @@ describe('Safe Proxy Factory', () => {
       const owners: string[] = []
       const threshold = 2
       const safeAccountConfig: SafeAccountConfig = { owners, threshold }
-      const safeDeploymentConfig: SafeDeploymentConfig = { saltNonce: 1 }
+      const safeDeploymentConfig: SafeDeploymentConfig = { saltNonce: '1' }
       const predictSafeProps: PredictSafeProps = { safeAccountConfig, safeDeploymentConfig }
-      chai
+      await chai
         .expect(safeFactory.predictSafeAddress(predictSafeProps))
         .rejectedWith('Owner list must have at least one owner')
     })
@@ -120,9 +120,9 @@ describe('Safe Proxy Factory', () => {
       const owners = [account1.address, account2.address]
       const threshold = 0
       const safeAccountConfig: SafeAccountConfig = { owners, threshold }
-      const safeDeploymentConfig: SafeDeploymentConfig = { saltNonce: 1 }
+      const safeDeploymentConfig: SafeDeploymentConfig = { saltNonce: '1' }
       const predictSafeProps: PredictSafeProps = { safeAccountConfig, safeDeploymentConfig }
-      chai
+      await chai
         .expect(safeFactory.predictSafeAddress(predictSafeProps))
         .rejectedWith('Threshold must be greater than or equal to 1')
     })
@@ -135,9 +135,9 @@ describe('Safe Proxy Factory', () => {
       const owners = [account1.address, account2.address]
       const threshold = 3
       const safeAccountConfig: SafeAccountConfig = { owners, threshold }
-      const safeDeploymentConfig: SafeDeploymentConfig = { saltNonce: 1 }
+      const safeDeploymentConfig: SafeDeploymentConfig = { saltNonce: '1' }
       const predictSafeProps: PredictSafeProps = { safeAccountConfig, safeDeploymentConfig }
-      chai
+      await chai
         .expect(safeFactory.predictSafeAddress(predictSafeProps))
         .rejectedWith('Threshold must be lower than or equal to owners length')
     })
@@ -154,11 +154,11 @@ describe('Safe Proxy Factory', () => {
       const owners = [account1.address, account2.address]
       const threshold = 2
       const safeAccountConfig: SafeAccountConfig = { owners, threshold }
-      const safeDeploymentConfig: SafeDeploymentConfig = { saltNonce: -1 }
+      const safeDeploymentConfig: SafeDeploymentConfig = { saltNonce: '-1' }
       const predictSafeProps: PredictSafeProps = { safeAccountConfig, safeDeploymentConfig }
-      chai
+      await chai
         .expect(safeFactory.predictSafeAddress(predictSafeProps))
-        .rejectedWith('saltNonce must be greater than 0')
+        .rejectedWith('saltNonce must be greater than or equal to 0')
     })
 
     it('should predict a new Safe with saltNonce', async () => {
@@ -173,7 +173,7 @@ describe('Safe Proxy Factory', () => {
       const owners = [account1.address, account2.address]
       const threshold = 2
       const safeAccountConfig: SafeAccountConfig = { owners, threshold }
-      const safeDeploymentConfig: SafeDeploymentConfig = { saltNonce: 12345 }
+      const safeDeploymentConfig: SafeDeploymentConfig = { saltNonce: '12345' }
       const predictSafeProps: PredictSafeProps = { safeAccountConfig, safeDeploymentConfig }
       const counterfactualSafeAddress = await safeFactory.predictSafeAddress(predictSafeProps)
       const deploySafeProps: DeploySafeProps = { safeAccountConfig, safeDeploymentConfig }
@@ -193,7 +193,7 @@ describe('Safe Proxy Factory', () => {
       const threshold = 2
       const safeAccountConfig: SafeAccountConfig = { owners, threshold }
       const safeDeployProps: DeploySafeProps = { safeAccountConfig }
-      chai
+      await chai
         .expect(safeFactory.deploySafe(safeDeployProps))
         .rejectedWith('Owner list must have at least one owner')
     })
@@ -207,7 +207,7 @@ describe('Safe Proxy Factory', () => {
       const threshold = 0
       const safeAccountConfig: SafeAccountConfig = { owners, threshold }
       const safeDeployProps: DeploySafeProps = { safeAccountConfig }
-      chai
+      await chai
         .expect(safeFactory.deploySafe(safeDeployProps))
         .rejectedWith('Threshold must be greater than or equal to 1')
     })
@@ -221,7 +221,7 @@ describe('Safe Proxy Factory', () => {
       const threshold = 3
       const safeAccountConfig: SafeAccountConfig = { owners, threshold }
       const deploySafeProps: DeploySafeProps = { safeAccountConfig }
-      chai
+      await chai
         .expect(safeFactory.deploySafe(deploySafeProps))
         .rejectedWith('Threshold must be lower than or equal to owners length')
     })
@@ -238,11 +238,11 @@ describe('Safe Proxy Factory', () => {
       const owners = [account1.address, account2.address]
       const threshold = 2
       const safeAccountConfig: SafeAccountConfig = { owners, threshold }
-      const safeDeploymentConfig: SafeDeploymentConfig = { saltNonce: -1 }
+      const safeDeploymentConfig: SafeDeploymentConfig = { saltNonce: '-1' }
       const safeDeployProps: DeploySafeProps = { safeAccountConfig, safeDeploymentConfig }
-      chai
+      await chai
         .expect(safeFactory.deploySafe(safeDeployProps))
-        .rejectedWith('saltNonce must be greater than 0')
+        .rejectedWith('saltNonce must be greater than or equal to 0')
     })
 
     it('should deploy a new Safe without saltNonce', async () => {
@@ -277,7 +277,7 @@ describe('Safe Proxy Factory', () => {
       const owners = [account1.address, account2.address]
       const threshold = 2
       const safeAccountConfig: SafeAccountConfig = { owners, threshold }
-      const safeDeploymentConfig: SafeDeploymentConfig = { saltNonce: 1 }
+      const safeDeploymentConfig: SafeDeploymentConfig = { saltNonce: '1' }
       const deploySafeProps: DeploySafeProps = { safeAccountConfig, safeDeploymentConfig }
       const safe = await safeFactory.deploySafe(deploySafeProps)
       const deployedSafeOwners = await safe.getOwners()

diff --git a/packages/safe-ethers-lib/src/EthersAdapter.ts b/packages/safe-ethers-lib/src/EthersAdapter.ts
@@ -164,8 +164,8 @@ class EthersAdapter implements EthAdapter {
     return this.#provider.call(transaction)
   }
 
-  encodeParameter(type: string, value: any) {
-    return new this.#ethers.utils.AbiCoder().encode([type], [value])
+  encodeParameters(types: string[], values: any[]) {
+    return new this.#ethers.utils.AbiCoder().encode(types, values)
   }
 }
 

diff --git a/packages/safe-web3-lib/src/Web3Adapter.ts b/packages/safe-web3-lib/src/Web3Adapter.ts
@@ -192,8 +192,8 @@ class Web3Adapter implements EthAdapter {
     return this.#web3.eth.call(transaction)
   }
 
-  encodeParameter(type: string, value: any): string {
-    return this.#web3.eth.abi.encodeParameter(type, value)
+  encodeParameters(types: string[], values: any[]): string {
+    return this.#web3.eth.abi.encodeParameters(types, values)
   }
 }
 

diff --git a/.../safe-web3-lib/src/contracts/GnosisSafeProxyFactory/GnosisSafeProxyFactoryWeb3Contract.ts b/.../safe-web3-lib/src/contracts/GnosisSafeProxyFactory/GnosisSafeProxyFactoryWeb3Contract.ts
@@ -1,3 +1,4 @@
+import { BigNumber } from '@ethersproject/bignumber'
 import { GnosisSafeProxyFactoryContract } from '@gnosis.pm/safe-core-sdk-types'
 import { TransactionReceipt } from 'web3-core/types'
 import { ProxyFactory as ProxyFactory_V1_1_1 } from '../../../typechain/src/web3-v1/v1.1.1/proxy_factory'
@@ -31,9 +32,8 @@ class GnosisSafeProxyFactoryWeb3Contract implements GnosisSafeProxyFactoryContra
     options,
     callback
   }: CreateProxyProps): Promise<string> {
-    //if (saltNonce < 0) {
-    //  throw new Error('saltNonce must be greater than or equal to 0')
-    //}
+    if (BigNumber.from(saltNonce).lt(0))
+      throw new Error('saltNonce must be greater than or equal to 0')
     if (options && !options.gas) {
       options.gas = await this.estimateGas(
         'createProxyWithNonce',

diff --git a/yarn.lock b/yarn.lock
@@ -2538,13 +2538,6 @@
   resolved "https://registry.yarnpkg.com/@types/cors/-/cors-2.8.12.tgz#6b2c510a7ad7039e98e7b8d3d6598f4359e5c080"
   integrity sha512-vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw==
 
-"@types/ethereumjs-abi@^0.6.3":
-  version "0.6.3"
-  resolved "https://registry.yarnpkg.com/@types/ethereumjs-abi/-/ethereumjs-abi-0.6.3.tgz#eb5ed09fd86b9e2b1c0eb75d1e9bc29c50715c86"
-  integrity sha512-DnHvqPkrJS5w4yZexTa5bdPNb8IyKPYciou0+zZCIg5fpzvGtyptTvshy0uZKzti2/k/markwjlxWRBWt7Mjuw==
-  dependencies:
-    "@types/node" "*"
-
 "@types/express-serve-static-core@4.17.29", "@types/express-serve-static-core@^4.17.18":
   version "4.17.29"
   resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.29.tgz#2a1795ea8e9e9c91b4a4bbe475034b20c1ec711c"