Merge pull request #151 from gnosis/fix-saltnonce-negative

Throw error if saltNonce is a negative integer

packages/safe-core-sdk/src/contracts/GnosisSafeProxyFactory/GnosisSafeProxyFactoryEthersContract.ts

@@ -16,6 +16,9 @@ class GnosisSafeProxyFactoryEthersContract implements GnosisSafeProxyFactoryCont
     saltNonce,
     options
   }: CreateProxyProps): Promise<string> {
+    if (saltNonce < 0) {
+      throw new Error('saltNonce must be greater than 0')
+    }
     const txResponse = await this.contract.createProxyWithNonce(
       safeMasterCopyAddress,
       initializer,

packages/safe-core-sdk/src/contracts/GnosisSafeProxyFactory/GnosisSafeProxyFactoryWeb3Contract.ts

@@ -16,6 +16,9 @@ class GnosisSafeProxyFactoryWeb3Contract implements GnosisSafeProxyFactoryContra
     saltNonce,
     options
   }: CreateProxyProps): Promise<string> {
+    if (saltNonce < 0) {
+      throw new Error('saltNonce must be greater than 0')
+    }
     const txResponse = this.contract.methods
       .createProxyWithNonce(safeMasterCopyAddress, initializer, saltNonce)
       .send(options)

packages/safe-core-sdk/tests/safeFactory.test.ts

@@ -134,6 +134,24 @@ describe('Safe Proxy Factory', () => {
         .rejectedWith('Threshold must be lower than or equal to owners length')
     })
 
+    it('should fail if the saltNonce is lower than 0', async () => {
+      const { accounts, contractNetworks } = await setupTests()
+      const [account1, account2] = accounts
+      const ethAdapter = await getEthAdapter(account1.signer)
+      const safeFactory = await SafeFactory.create({
+        ethAdapter,
+        safeVersion: safeVersionDeployed,
+        contractNetworks
+      })
+      const owners = [account1.address, account2.address]
+      const threshold = 2
+      const safeAccountConfig: SafeAccountConfig = { owners, threshold }
+      const safeDeploymentConfig: SafeDeploymentConfig = { saltNonce: -1 }
+      chai
+        .expect(safeFactory.deploySafe(safeAccountConfig, safeDeploymentConfig))
+        .rejectedWith('saltNonce must be greater than 0')
+    })
+
     it('should deploy a new Safe without saltNonce', async () => {
       const { accounts, contractNetworks } = await setupTests()
       const [account1, account2] = accounts