change param for positionsCreate

Author: 0xkenta

lib/agent/lockup/calculateRewardAmount.ts

@@ -1,8 +1,9 @@
 import { getLockupContract } from './common'
 import { Provider } from '@ethersproject/abstract-provider'
+import { Wallet } from 'ethers'
 
 export type Options = {
-	readonly provider: Provider
+	readonly wallet: Wallet
 	readonly propertyAddress: string
 }
 
@@ -13,7 +14,7 @@ type CalculateRewardAmount = (
 export const calculateRewardAmount: CalculateRewardAmount = async (
 	options: Options
 ): Promise<readonly [string, string] | Error> => {
-	const lockupContract = await getLockupContract(options.provider)
+	const lockupContract = await getLockupContract(options.wallet)
 
 	return lockupContract
 		? await lockupContract.calculateRewardAmount(options.propertyAddress)

lib/agent/lockup/cap.ts

@@ -1,16 +1,16 @@
 import { getLockupContract } from './common'
 import { Provider } from '@ethersproject/abstract-provider'
-
+import { Wallet } from 'ethers'
 type Options = {
-	readonly provider: Provider
+	readonly wallet: Wallet
 }
 
 type GetCap = (Options: Options) => Promise<string | Error>
 
 export const getCap: GetCap = async (
 	options: Options
 ): Promise<string | Error> => {
-	const lockupContract = await getLockupContract(options.provider)
+	const lockupContract = await getLockupContract(options.wallet)
 
 	return lockupContract
 		? await lockupContract.cap()

lib/agent/lockup/common.spec.ts

@@ -1,3 +1,5 @@
+import { ethers } from 'ethers'
+import { env } from '../common/env'
 import { testProviders } from '../common/const'
 import { createLockupContract } from '../../ethereum/lockup'
 import { getLockupContract } from './common'
@@ -16,7 +18,8 @@ describe('common.ts', () => {
 				testProviders.homestead
 			)(addresses.eth['main'].registry).lockup()
 			const expected = await expectedLockup(lockupAddress)
-			const result = await getLockupContract(testProviders.homestead)
+	        const wallet = new ethers.Wallet(env.mnemonic, testProviders.homestead)
+			const result = await getLockupContract(wallet)
 			expect(JSON.stringify(result)).toEqual(JSON.stringify(expected))
 		})
 		it('provider is ropsten', async () => {
@@ -25,21 +28,24 @@ describe('common.ts', () => {
 				addresses.eth['ropsten'].registry
 			).lockup()
 			const expected = await expectedLockup(lockupAddress)
-			const result = await getLockupContract(testProviders.ropsten)
+			const wallet = new ethers.Wallet(env.mnemonic, testProviders.ropsten)
+			const result = await getLockupContract(wallet)
 			expect(JSON.stringify(result)).toEqual(JSON.stringify(expected))
 		})
 		it('provider is arbitrum one', async () => {
 			const expectedLockup = await createLockupContractL2(testProviders.arbOne)
 			const expected = await expectedLockup(arbitrumOneLockup)
-			const result = await getLockupContract(testProviders.arbOne)
+			const wallet = new ethers.Wallet(env.mnemonic, testProviders.arbOne)
+			const result = await getLockupContract(wallet)
 			expect(JSON.stringify(result)).toEqual(JSON.stringify(expected))
 		})
 		it('provider is arbitrum rinkeby', async () => {
 			const expectedLockup = await createLockupContractL2(
 				testProviders.arbRinkeby
 			)
 			const expected = await expectedLockup(arbitrumRinkebyLockup)
-			const result = await getLockupContract(testProviders.arbRinkeby)
+			const wallet = new ethers.Wallet(env.mnemonic, testProviders.arbRinkeby)
+			const result = await getLockupContract(wallet)
 			expect(JSON.stringify(result)).toEqual(JSON.stringify(expected))
 		})
 		it('use cache', async () => {
@@ -48,14 +54,16 @@ describe('common.ts', () => {
 				addresses.eth['ropsten'].registry
 			).lockup()
 			const expected = await expectedLockup(lockupAddress)
-			const result1 = await getLockupContract(testProviders.ropsten)
-			const result2 = await getLockupContract(testProviders.ropsten)
+			const wallet = new ethers.Wallet(env.mnemonic, testProviders.ropsten)
+			const result1 = await getLockupContract(wallet)
+			const result2 = await getLockupContract(wallet)
 			expect(JSON.stringify(result1)).toEqual(JSON.stringify(expected))
 			expect(JSON.stringify(result2)).toEqual(JSON.stringify(expected))
 		})
 		it('provider is unknown', async () => {
 			const expected = undefined
-			const result = await getLockupContract(testProviders.polyMumbai)
+			const wallet = new ethers.Wallet(env.mnemonic, testProviders.polyMumbai)
+			const result = await getLockupContract(wallet)
 			expect(result).toEqual(expected)
 		})
 	})

lib/agent/lockup/common.ts

@@ -11,28 +11,29 @@ import {
 	createLockupContract as createLockupContractL2,
 	LockupContract as LockupContractL2,
 } from '../../l2/lockup/index'
-import { Provider } from '@ethersproject/abstract-provider'
 import { Network } from '@ethersproject/networks'
+import { Wallet } from 'ethers'
 
 const cacheLockupContract = new WeakMap()
 
 export const getLockupContract = async (
-	provider: Provider
+	wallet: Wallet
 ): Promise<LockupContract | LockupContractL2 | undefined> => {
-	const network = await provider.getNetwork()
+	const network = await wallet.provider.getNetwork()
 	return cacheLockupContract.has(network)
 		? cacheLockupContract.get(network)
-		: generateLockupContract(provider)
+		: generateLockupContract(wallet)
 }
 
 const generateLockupContract = async (
-	provider: Provider
+	wallet: Wallet
 ): Promise<LockupContract | LockupContractL2 | undefined> => {
+	const provider = wallet.provider
 	const network = await provider.getNetwork()
 	const chainId = network.chainId
 	const lockupContract = (await isL1(chainId))
-		? createLockupContract(provider)
-		: createLockupContractL2(provider)
+		? createLockupContract(wallet)
+		: createLockupContractL2(wallet)
 
 	const lockupAddress = (await isL1(chainId))
 		? await getL1ContractAddress(provider, 'lockup')