change param order

Signed-off-by: mihaisc <mihai.scarlat@smartcontrol.ro>

src/factories/NFTFactory.ts

@@ -66,9 +66,9 @@ export class NftFactory {
   constructor(
     factory721Address: string,
     web3: Web3,
+    network?: string | number,
     factory721Abi?: AbiItem | AbiItem[],
-    config?: Config,
-    network?: string | number
+    config?: Config
   ) {
     this.factory721Address = factory721Address
     this.factory721Abi = factory721Abi || (defaultFactory721Abi.abi as AbiItem[])

src/pools/Router.ts

@@ -27,9 +27,9 @@ export class Router {
   constructor(
     routerAddress: string,
     web3: Web3,
+    network?: string | number,
     RouterAbi?: AbiItem | AbiItem[],
-    config?: Config,
-    network?: string | number
+    config?: Config
   ) {
     this.routerAddress = routerAddress
     this.RouterAbi = RouterAbi || (defaultRouter.abi as AbiItem[])

src/pools/balancer/Pool.ts

@@ -42,9 +42,9 @@ export class Pool {
 
   constructor(
     web3: Web3,
+    network?: string | number,
     poolAbi: AbiItem | AbiItem[] = null,
-    config?: Config,
-    network?: string | number
+    config?: Config
   ) {
     if (poolAbi) this.poolAbi = poolAbi
     else this.poolAbi = PoolTemplate.abi as AbiItem[]

src/pools/dispenser/Dispenser.ts

@@ -39,10 +39,10 @@ export class Dispenser {
    */
   constructor(
     web3: Web3,
+    network?: string | number,
     dispenserAddress: string = null,
     dispenserAbi: AbiItem | AbiItem[] = null,
-    config?: Config,
-    network?: string | number
+    config?: Config
   ) {
     this.web3 = web3
     this.dispenserAddress = dispenserAddress

src/pools/fixedRate/FixedRateExchange.ts

@@ -75,10 +75,10 @@ export class FixedRateExchange {
   constructor(
     web3: Web3,
     fixedRateAddress: string,
+    network?: string | number,
     fixedRateExchangeAbi: AbiItem | AbiItem[] = null,
     oceanAddress: string = null,
-    config?: Config,
-    network?: string | number
+    config?: Config
   ) {
     this.web3 = web3
     this.config = config || new ConfigHelper().getConfig(network || 'unknown')

src/pools/ssContracts/SideStaking.ts

@@ -16,9 +16,9 @@ export class SideStaking {
 
   constructor(
     web3: Web3,
+    network?: string | number,
     ssAbi: AbiItem | AbiItem[] = null,
-    config?: Config,
-    network?: string | number
+    config?: Config
   ) {
     if (ssAbi) this.ssAbi = ssAbi
     else this.ssAbi = SideStakingTemplate.abi as AbiItem[]

src/tokens/Datatoken.ts

@@ -61,10 +61,10 @@ export class Datatoken {
    */
   constructor(
     web3: Web3,
+    network?: string | number,
     datatokensAbi?: AbiItem | AbiItem[],
     datatokensEnterpriseAbi?: AbiItem | AbiItem[],
-    config?: Config,
-    network?: string | number
+    config?: Config
   ) {
     this.web3 = web3
     this.datatokensAbi = datatokensAbi || (defaultDatatokensAbi.abi as AbiItem[])

src/tokens/NFT.ts

@@ -35,9 +35,9 @@ export class Nft {
 
   constructor(
     web3: Web3,
+    network?: string | number,
     nftAbi?: AbiItem | AbiItem[],
-    config?: Config,
-    network?: string | number
+    config?: Config
   ) {
     this.nftAbi = nftAbi || (defaultNftAbi.abi as AbiItem[])
     this.web3 = web3