dev-protocol · aggre · Sep 28, 2021 · Sep 28, 2021
diff --git a/lib/addresses.ts b/lib/addresses.ts
@@ -9,4 +9,28 @@ export const addresses = {
 			sTokens: '0x0000000000000000000000000000000000000000',
 		},
 	},
+	arbitrumOne: {
+		main: {
+			token: '0x0000000000000000000000000000000000000000',
+			lockup: '0x0000000000000000000000000000000000000000',
+			marketFactory: '0x0000000000000000000000000000000000000000',
+			metricsFactory: '0x0000000000000000000000000000000000000000',
+			policyFactory: '0x0000000000000000000000000000000000000000',
+			propertyFactory: '0x0000000000000000000000000000000000000000',
+			registry: '0x0000000000000000000000000000000000000000',
+			sTokens: '0x0000000000000000000000000000000000000000',
+			withdraw: '0x0000000000000000000000000000000000000000',
+		},
+		rinkeby: {
+			token: '0x0000000000000000000000000000000000000000',
+			lockup: '0x0000000000000000000000000000000000000000',
+			marketFactory: '0x0000000000000000000000000000000000000000',
+			metricsFactory: '0x0000000000000000000000000000000000000000',
+			policyFactory: '0x0000000000000000000000000000000000000000',
+			propertyFactory: '0x0000000000000000000000000000000000000000',
+			registry: '0x0000000000000000000000000000000000000000',
+			sTokens: '0x0000000000000000000000000000000000000000',
+			withdraw: '0x0000000000000000000000000000000000000000',
+		},
+	},
 } as const
diff --git a/lib/option.ts → lib/common/option.ts b/lib/option.ts → lib/common/option.ts
diff --git a/lib/utils/arrayify.spec.ts → lib/common/utils/arrayify.spec.ts b/lib/utils/arrayify.spec.ts → lib/common/utils/arrayify.spec.ts
diff --git a/lib/utils/arrayify.ts → lib/common/utils/arrayify.ts b/lib/utils/arrayify.ts → lib/common/utils/arrayify.ts
diff --git a/lib/utils/const.ts → lib/common/utils/const.ts b/lib/utils/const.ts → lib/common/utils/const.ts
diff --git a/lib/utils/execute.spec.ts → lib/common/utils/execute.spec.ts b/lib/utils/execute.spec.ts → lib/common/utils/execute.spec.ts
diff --git a/lib/utils/execute.ts → lib/common/utils/execute.ts b/lib/utils/execute.ts → lib/common/utils/execute.ts
diff --git a/lib/utils/for-test.ts → lib/common/utils/for-test.ts b/lib/utils/for-test.ts → lib/common/utils/for-test.ts
diff --git a/lib/utils/getAccount.spec.ts → lib/common/utils/getAccount.spec.ts b/lib/utils/getAccount.spec.ts → lib/common/utils/getAccount.spec.ts
diff --git a/lib/utils/getAccount.ts → lib/common/utils/getAccount.ts b/lib/utils/getAccount.ts → lib/common/utils/getAccount.ts
diff --git a/lib/utils/index.spec.ts → lib/common/utils/index.spec.ts b/lib/utils/index.spec.ts → lib/common/utils/index.spec.ts
diff --git a/lib/utils/index.ts → lib/common/utils/index.ts b/lib/utils/index.ts → lib/common/utils/index.ts
diff --git a/lib/utils/txPromisify.spec.ts → lib/common/utils/txPromisify.spec.ts b/lib/utils/txPromisify.spec.ts → lib/common/utils/txPromisify.spec.ts
diff --git a/lib/utils/txPromisify.ts → lib/common/utils/txPromisify.ts b/lib/utils/txPromisify.ts → lib/common/utils/txPromisify.ts
diff --git a/lib/utils/waitForCreateMetrics.spec.ts → ...common/utils/waitForCreateMetrics.spec.ts b/lib/utils/waitForCreateMetrics.spec.ts → ...common/utils/waitForCreateMetrics.spec.ts
diff --git a/lib/utils/waitForCreateMetrics.ts → lib/common/utils/waitForCreateMetrics.ts b/lib/utils/waitForCreateMetrics.ts → lib/common/utils/waitForCreateMetrics.ts
@@ -1,10 +1,51 @@
 /* eslint-disable @typescript-eslint/prefer-readonly-parameter-types */
 import Web3 from 'web3'
-import { metricsFactoryAbi } from '../metrics-factory/abi'
-import { metricsAbi } from '../metrics/abi'
-import { watchEvent } from '../utils/watchEvent'
+import { AbiItem } from 'web3-utils'
+import { watchEvent } from '../../common/utils/watchEvent'
 import { execute } from './execute'
 
+const metricsFactoryAbi = [
+	{
+		anonymous: false,
+		inputs: [
+			{
+				indexed: true,
+				internalType: 'address',
+				name: '_market',
+				type: 'address',
+			},
+			{
+				indexed: true,
+				internalType: 'address',
+				name: '_property',
+				type: 'address',
+			},
+			{
+				indexed: false,
+				internalType: 'address',
+				name: '_metrics',
+				type: 'address',
+			},
+		],
+		name: 'Create',
+		type: 'event',
+	},
+] as readonly AbiItem[]
+const metricsAbi = [
+	{
+		inputs: [],
+		name: 'property',
+		outputs: [
+			{
+				internalType: 'address',
+				name: '',
+				type: 'address',
+			},
+		],
+		stateMutability: 'view',
+		type: 'function',
+	},
+] as readonly AbiItem[]
 const getMetricsProperty = async (
 	address: string,
 	client: Web3

diff --git a/lib/utils/watchEvent.spec.ts → lib/common/utils/watchEvent.spec.ts b/lib/utils/watchEvent.spec.ts → lib/common/utils/watchEvent.spec.ts
diff --git a/lib/utils/watchEvent.ts → lib/common/utils/watchEvent.ts b/lib/utils/watchEvent.ts → lib/common/utils/watchEvent.ts
diff --git a/lib/utils/web3-txs.ts → lib/common/utils/web3-txs.ts b/lib/utils/web3-txs.ts → lib/common/utils/web3-txs.ts
diff --git a/lib/allocator/abi.ts → lib/ethereum/allocator/abi.ts b/lib/allocator/abi.ts → lib/ethereum/allocator/abi.ts
diff --git a/...cator/calculateMaxRewardsPerBlock.spec.ts → ...cator/calculateMaxRewardsPerBlock.spec.ts b/...cator/calculateMaxRewardsPerBlock.spec.ts → ...cator/calculateMaxRewardsPerBlock.spec.ts
diff --git a/lib/allocator/calculateMaxRewardsPerBlock.ts → .../allocator/calculateMaxRewardsPerBlock.ts b/lib/allocator/calculateMaxRewardsPerBlock.ts → .../allocator/calculateMaxRewardsPerBlock.ts
@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/prefer-readonly-parameter-types */
 import { Contract } from 'web3-eth-contract/types'
-import { execute } from '../utils/execute'
+import { execute } from '../../common/utils/execute'
 import { always } from 'ramda'
 
 export type CreateCalculateMaxRewardsPerBlockCaller = (

diff --git a/lib/allocator/index.spec.ts → lib/ethereum/allocator/index.spec.ts b/lib/allocator/index.spec.ts → lib/ethereum/allocator/index.spec.ts
@@ -1,5 +1,5 @@
 import Web3 from 'web3'
-import { CustomOptions } from '../option'
+import { CustomOptions } from '../../common/option'
 import { createAllocatorContract, CreateAllocatorContract } from '.'
 import { createCalculateMaxRewardsPerBlockCaller } from './calculateMaxRewardsPerBlock'
 import { allocatorAbi } from './abi'

diff --git a/lib/allocator/index.ts → lib/ethereum/allocator/index.ts b/lib/allocator/index.ts → lib/ethereum/allocator/index.ts
@@ -2,7 +2,7 @@
 import Web3 from 'web3'
 import { Contract } from 'web3-eth-contract/types'
 import { allocatorAbi } from './abi'
-import { CustomOptions } from '../option'
+import { CustomOptions } from '../../common/option'
 import { createCalculateMaxRewardsPerBlockCaller } from './calculateMaxRewardsPerBlock'
 import { always } from 'ramda'
 

diff --git a/lib/client/createDetectSTokens.spec.ts → ...hereum/client/createDetectSTokens.spec.ts b/lib/client/createDetectSTokens.spec.ts → ...hereum/client/createDetectSTokens.spec.ts
diff --git a/lib/client/createDetectSTokens.ts → lib/ethereum/client/createDetectSTokens.ts b/lib/client/createDetectSTokens.ts → lib/ethereum/client/createDetectSTokens.ts
diff --git a/lib/client/getStats.spec.ts → lib/ethereum/client/getStats.spec.ts b/lib/client/getStats.spec.ts → lib/ethereum/client/getStats.spec.ts
diff --git a/lib/client/getStats.ts → lib/ethereum/client/getStats.ts b/lib/client/getStats.ts → lib/ethereum/client/getStats.ts
@@ -3,9 +3,9 @@ import bent from 'bent'
 import BigNumber from 'bignumber.js'
 import Web3 from 'web3'
 import { always } from 'ramda'
-import { addresses } from '../addresses'
+import { addresses } from '../../addresses'
 import { createDevkitContract, DevkitContract } from '../contract'
-import { DEV_GRAPHQL_ENDPOINT } from '../utils/const'
+import { DEV_GRAPHQL_ENDPOINT } from '../../common/utils/const'
 
 const THEGRAPH_UNISWAP_ENDPOINT =
 	'https://api.thegraph.com/subgraphs/name/uniswap/uniswap-v2'

diff --git a/lib/client/getVotablePolicy.spec.ts → lib/ethereum/client/getVotablePolicy.spec.ts b/lib/client/getVotablePolicy.spec.ts → lib/ethereum/client/getVotablePolicy.spec.ts
diff --git a/lib/client/getVotablePolicy.ts → lib/ethereum/client/getVotablePolicy.ts b/lib/client/getVotablePolicy.ts → lib/ethereum/client/getVotablePolicy.ts
@@ -2,7 +2,7 @@ import bent from 'bent'
 import { always, not } from 'ramda'
 import { aFindIndex } from 'async-ray'
 import { PolicyGroupContract } from '../policy-group'
-import { DEV_GRAPHQL_ENDPOINT } from '../utils/const'
+import { DEV_GRAPHQL_ENDPOINT } from '../../common/utils/const'
 
 export type CreateGetVotablePolicyCaller = (
 	policyGroup: PolicyGroupContract

diff --git a/lib/client/index.spec.ts → lib/ethereum/client/index.spec.ts b/lib/client/index.spec.ts → lib/ethereum/client/index.spec.ts
diff --git a/lib/client/index.ts → lib/ethereum/client/index.ts b/lib/client/index.ts → lib/ethereum/client/index.ts
diff --git a/lib/contract.spec.ts → lib/ethereum/contract.spec.ts b/lib/contract.spec.ts → lib/ethereum/contract.spec.ts
diff --git a/lib/contract.ts → lib/ethereum/contract.ts b/lib/contract.ts → lib/ethereum/contract.ts
diff --git a/lib/dev/abi.ts → lib/ethereum/dev/abi.ts b/lib/dev/abi.ts → lib/ethereum/dev/abi.ts
diff --git a/lib/dev/deposit.spec.ts → lib/ethereum/dev/deposit.spec.ts b/lib/dev/deposit.spec.ts → lib/ethereum/dev/deposit.spec.ts
@@ -1,5 +1,5 @@
 import { createDepositCaller } from './deposit'
-import { stubbedWeb3, stubbedSendTx } from '../utils/for-test'
+import { stubbedWeb3, stubbedSendTx } from '../../common/utils/for-test'
 
 describe('deposit.spec.ts', () => {
 	describe('createDepositCaller', () => {

diff --git a/lib/dev/deposit.ts → lib/ethereum/dev/deposit.ts b/lib/dev/deposit.ts → lib/ethereum/dev/deposit.ts
@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/prefer-readonly-parameter-types */
 import { Contract } from 'web3-eth-contract/types'
 import Web3 from 'web3'
-import { execute } from '../utils/execute'
+import { execute } from '../../common/utils/execute'
 import { T } from 'ramda'
 
 export type CreateDepositCaller = (

diff --git a/lib/dev/index.spec.ts → lib/ethereum/dev/index.spec.ts b/lib/dev/index.spec.ts → lib/ethereum/dev/index.spec.ts
@@ -2,7 +2,7 @@ import Web3 from 'web3'
 import { createDevContract, DevContract } from '.'
 import { createTransferCaller } from './../erc20/transfer'
 import { devAbi } from './abi'
-import { CustomOptions } from '../option'
+import { CustomOptions } from '../../common/option'
 import { createDepositCaller } from './deposit'
 import { createBalanceOfCaller } from './../erc20/balanceOf'
 import { createTotalSupplyCaller } from './../erc20/totalSupply'

diff --git a/lib/dev/index.ts → lib/ethereum/dev/index.ts b/lib/dev/index.ts → lib/ethereum/dev/index.ts
@@ -3,7 +3,7 @@ import Web3 from 'web3'
 import { always } from 'ramda'
 import { Contract } from 'web3-eth-contract/types'
 import { devAbi } from './abi'
-import { CustomOptions } from '../option'
+import { CustomOptions } from '../../common/option'
 import { createTransferCaller } from './../erc20/transfer'
 import { createBalanceOfCaller } from './../erc20/balanceOf'
 import { createTotalSupplyCaller } from './../erc20/totalSupply'

diff --git a/lib/erc20/allowance.spec.ts → lib/ethereum/erc20/allowance.spec.ts b/lib/erc20/allowance.spec.ts → lib/ethereum/erc20/allowance.spec.ts
diff --git a/lib/erc20/allowance.ts → lib/ethereum/erc20/allowance.ts b/lib/erc20/allowance.ts → lib/ethereum/erc20/allowance.ts
@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/prefer-readonly-parameter-types */
 import { Contract } from 'web3-eth-contract/types'
-import { execute } from '../utils/execute'
+import { execute } from '../../common/utils/execute'
 
 export type CreateAllowanceCaller = (
 	contract: Contract

diff --git a/lib/erc20/approve.spec.ts → lib/ethereum/erc20/approve.spec.ts b/lib/erc20/approve.spec.ts → lib/ethereum/erc20/approve.spec.ts
@@ -1,5 +1,5 @@
 import { createApproveCaller } from './approve'
-import { stubbedWeb3, stubbedSendTx } from '../utils/for-test'
+import { stubbedWeb3, stubbedSendTx } from '../../common/utils/for-test'
 
 describe('approve.spec.ts', () => {
 	describe('createApproveCaller', () => {

diff --git a/lib/erc20/approve.ts → lib/ethereum/erc20/approve.ts b/lib/erc20/approve.ts → lib/ethereum/erc20/approve.ts
@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/prefer-readonly-parameter-types */
 import { Contract } from 'web3-eth-contract/types'
 import Web3 from 'web3'
-import { execute } from '../utils/execute'
+import { execute } from '../../common/utils/execute'
 import { T } from 'ramda'
 
 export type CreateApproveCaller = (

diff --git a/lib/erc20/balanceOf.spec.ts → lib/ethereum/erc20/balanceOf.spec.ts b/lib/erc20/balanceOf.spec.ts → lib/ethereum/erc20/balanceOf.spec.ts
diff --git a/lib/erc20/balanceOf.ts → lib/ethereum/erc20/balanceOf.ts b/lib/erc20/balanceOf.ts → lib/ethereum/erc20/balanceOf.ts
@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/prefer-readonly-parameter-types */
 import { Contract } from 'web3-eth-contract/types'
-import { execute } from '../utils/execute'
+import { execute } from '../../common/utils/execute'
 
 export type CreateBalanceOfCaller = (
 	contract: Contract

diff --git a/lib/erc20/decimals.spec.ts → lib/ethereum/erc20/decimals.spec.ts b/lib/erc20/decimals.spec.ts → lib/ethereum/erc20/decimals.spec.ts
diff --git a/lib/erc20/decimals.ts → lib/ethereum/erc20/decimals.ts b/lib/erc20/decimals.ts → lib/ethereum/erc20/decimals.ts
@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/prefer-readonly-parameter-types */
 import { Contract } from 'web3-eth-contract/types'
-import { execute } from '../utils/execute'
+import { execute } from '../../common/utils/execute'
 import { always } from 'ramda'
 
 export type CreateDecimalsCaller = (contract: Contract) => () => Promise<string>

diff --git a/lib/erc20/name.spec.ts → lib/ethereum/erc20/name.spec.ts b/lib/erc20/name.spec.ts → lib/ethereum/erc20/name.spec.ts
diff --git a/lib/erc20/name.ts → lib/ethereum/erc20/name.ts b/lib/erc20/name.ts → lib/ethereum/erc20/name.ts
@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/prefer-readonly-parameter-types */
 import { Contract } from 'web3-eth-contract/types'
-import { execute } from '../utils/execute'
+import { execute } from '../../common/utils/execute'
 import { always } from 'ramda'
 
 export type CreateNameCaller = (contract: Contract) => () => Promise<string>

diff --git a/lib/erc20/symbol.spec.ts → lib/ethereum/erc20/symbol.spec.ts b/lib/erc20/symbol.spec.ts → lib/ethereum/erc20/symbol.spec.ts
diff --git a/lib/erc20/symbol.ts → lib/ethereum/erc20/symbol.ts b/lib/erc20/symbol.ts → lib/ethereum/erc20/symbol.ts
@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/prefer-readonly-parameter-types */
 import { Contract } from 'web3-eth-contract/types'
-import { execute } from '../utils/execute'
+import { execute } from '../../common/utils/execute'
 import { always } from 'ramda'
 
 export type CreateSymbolCaller = (contract: Contract) => () => Promise<string>

diff --git a/lib/erc20/totalSupply.spec.ts → lib/ethereum/erc20/totalSupply.spec.ts b/lib/erc20/totalSupply.spec.ts → lib/ethereum/erc20/totalSupply.spec.ts
diff --git a/lib/erc20/totalSupply.ts → lib/ethereum/erc20/totalSupply.ts b/lib/erc20/totalSupply.ts → lib/ethereum/erc20/totalSupply.ts
@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/prefer-readonly-parameter-types */
 import { Contract } from 'web3-eth-contract/types'
-import { execute } from '../utils/execute'
+import { execute } from '../../common/utils/execute'
 import { always } from 'ramda'
 
 export type CreateTotalSupplyCaller = (

diff --git a/lib/erc20/transfer.spec.ts → lib/ethereum/erc20/transfer.spec.ts b/lib/erc20/transfer.spec.ts → lib/ethereum/erc20/transfer.spec.ts
@@ -1,5 +1,5 @@
 import { createTransferCaller } from './transfer'
-import { stubbedWeb3, stubbedSendTx } from '../utils/for-test'
+import { stubbedWeb3, stubbedSendTx } from '../../common/utils/for-test'
 
 describe('transfer.spec.ts', () => {
 	describe('createTransferCaller', () => {

diff --git a/lib/erc20/transfer.ts → lib/ethereum/erc20/transfer.ts b/lib/erc20/transfer.ts → lib/ethereum/erc20/transfer.ts
@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/prefer-readonly-parameter-types */
 import { Contract } from 'web3-eth-contract/types'
 import Web3 from 'web3'
-import { execute } from '../utils/execute'
+import { execute } from '../../common/utils/execute'
 import { T } from 'ramda'
 
 export type CreateTransferCaller = (

diff --git a/lib/erc20/transferFrom.spec.ts → lib/ethereum/erc20/transferFrom.spec.ts b/lib/erc20/transferFrom.spec.ts → lib/ethereum/erc20/transferFrom.spec.ts
@@ -1,5 +1,5 @@
 import { createTransferFromCaller } from './transferFrom'
-import { stubbedWeb3, stubbedSendTx } from '../utils/for-test'
+import { stubbedWeb3, stubbedSendTx } from '../../common/utils/for-test'
 
 describe('transferFrom.spec.ts', () => {
 	describe('createTransferFromCaller', () => {

diff --git a/lib/erc20/transferFrom.ts → lib/ethereum/erc20/transferFrom.ts b/lib/erc20/transferFrom.ts → lib/ethereum/erc20/transferFrom.ts
@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/prefer-readonly-parameter-types */
 import { Contract } from 'web3-eth-contract/types'
 import Web3 from 'web3'
-import { execute } from '../utils/execute'
+import { execute } from '../../common/utils/execute'
 import { T } from 'ramda'
 
 export type CreateTransferFromCaller = (

diff --git a/lib/lockup/abi.ts → lib/ethereum/lockup/abi.ts b/lib/lockup/abi.ts → lib/ethereum/lockup/abi.ts
diff --git a/...lateCumulativeHoldersRewardAmount.spec.ts → ...lateCumulativeHoldersRewardAmount.spec.ts b/...lateCumulativeHoldersRewardAmount.spec.ts → ...lateCumulativeHoldersRewardAmount.spec.ts
diff --git a/...calculateCumulativeHoldersRewardAmount.ts → ...calculateCumulativeHoldersRewardAmount.ts b/...calculateCumulativeHoldersRewardAmount.ts → ...calculateCumulativeHoldersRewardAmount.ts
@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/prefer-readonly-parameter-types */
 import { Contract } from 'web3-eth-contract/types'
-import { execute } from '../utils/execute'
+import { execute } from '../../common/utils/execute'
 
 export type CreateCalculateCumulativeHoldersRewardAmountCaller = (
 	contract: Contract

diff --git a/...p/calculateCumulativeRewardPrices.spec.ts → ...p/calculateCumulativeRewardPrices.spec.ts b/...p/calculateCumulativeRewardPrices.spec.ts → ...p/calculateCumulativeRewardPrices.spec.ts
diff --git a/...lockup/calculateCumulativeRewardPrices.ts → ...lockup/calculateCumulativeRewardPrices.ts b/...lockup/calculateCumulativeRewardPrices.ts → ...lockup/calculateCumulativeRewardPrices.ts
@@ -1,8 +1,8 @@
 /* eslint-disable @typescript-eslint/prefer-readonly-parameter-types */
 import { Contract } from 'web3-eth-contract/types'
-import { execute } from '../utils/execute'
+import { execute } from '../../common/utils/execute'
 import { always } from 'ramda'
-import { arrayify } from '../utils/arrayify'
+import { arrayify } from '../../common/utils/arrayify'
 
 export type CreateCalculateCumulativeRewardPricesCaller = (
 	contract: Contract

diff --git a/lib/lockup/calculateRewardAmount.spec.ts → ...reum/lockup/calculateRewardAmount.spec.ts b/lib/lockup/calculateRewardAmount.spec.ts → ...reum/lockup/calculateRewardAmount.spec.ts
diff --git a/lib/lockup/calculateRewardAmount.ts → lib/ethereum/lockup/calculateRewardAmount.ts b/lib/lockup/calculateRewardAmount.ts → lib/ethereum/lockup/calculateRewardAmount.ts
@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/prefer-readonly-parameter-types */
 import { Contract } from 'web3-eth-contract/types'
-import { arrayify } from '../utils/arrayify'
-import { execute } from '../utils/execute'
+import { arrayify } from '../../common/utils/arrayify'
+import { execute } from '../../common/utils/execute'
 
 export type CreateCalculateRewardAmountCaller = (
 	contract: Contract

diff --git a/...lculateWithdrawableInterestAmount.spec.ts → ...lculateWithdrawableInterestAmount.spec.ts b/...lculateWithdrawableInterestAmount.spec.ts → ...lculateWithdrawableInterestAmount.spec.ts
diff --git a/...up/calculateWithdrawableInterestAmount.ts → ...up/calculateWithdrawableInterestAmount.ts b/...up/calculateWithdrawableInterestAmount.ts → ...up/calculateWithdrawableInterestAmount.ts
@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/prefer-readonly-parameter-types */
 import { Contract } from 'web3-eth-contract/types'
-import { execute } from '../utils/execute'
+import { execute } from '../../common/utils/execute'
 
 export type CreateCalculateWithdrawableInterestAmountCaller = (
 	contract: Contract

diff --git a/...hdrawableInterestAmountByPosition.spec.ts → ...hdrawableInterestAmountByPosition.spec.ts b/...hdrawableInterestAmountByPosition.spec.ts → ...hdrawableInterestAmountByPosition.spec.ts
diff --git a/...teWithdrawableInterestAmountByPosition.ts → ...teWithdrawableInterestAmountByPosition.ts b/...teWithdrawableInterestAmountByPosition.ts → ...teWithdrawableInterestAmountByPosition.ts
@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/prefer-readonly-parameter-types */
 import { Contract } from 'web3-eth-contract/types'
-import { execute } from '../utils/execute'
+import { execute } from '../../common/utils/execute'
 
 export type CreatecalculateWithdrawableInterestAmountByPositionCaller = (
 	contract: Contract

diff --git a/lib/lockup/cap.spec.ts → lib/ethereum/lockup/cap.spec.ts b/lib/lockup/cap.spec.ts → lib/ethereum/lockup/cap.spec.ts
diff --git a/lib/lockup/cap.ts → lib/ethereum/lockup/cap.ts b/lib/lockup/cap.ts → lib/ethereum/lockup/cap.ts
@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/prefer-readonly-parameter-types */
 import { Contract } from 'web3-eth-contract/types'
-import { execute } from '../utils/execute'
+import { execute } from '../../common/utils/execute'
 import { always } from 'ramda'
 
 export type CreateCapCaller = (contract: Contract) => () => Promise<string>

diff --git a/lib/lockup/depositToPosition.spec.ts → ...ethereum/lockup/depositToPosition.spec.ts b/lib/lockup/depositToPosition.spec.ts → ...ethereum/lockup/depositToPosition.spec.ts
@@ -1,5 +1,5 @@
 import { createDepositToPositionCaller } from './depositToPosition'
-import { stubbedWeb3, stubbedSendTx } from '../utils/for-test'
+import { stubbedWeb3, stubbedSendTx } from '../../common/utils/for-test'
 
 describe('depositToPosition.spec.ts', () => {
 	describe('createDepositToPositionCaller', () => {

diff --git a/lib/lockup/depositToPosition.ts → lib/ethereum/lockup/depositToPosition.ts b/lib/lockup/depositToPosition.ts → lib/ethereum/lockup/depositToPosition.ts
@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/prefer-readonly-parameter-types */
 import { Contract } from 'web3-eth-contract/types'
 import Web3 from 'web3'
-import { execute } from '../utils/execute'
+import { execute } from '../../common/utils/execute'
 import { T } from 'ramda'
 
 export type CreateDepositToPositionCaller = (

diff --git a/lib/lockup/depositToProperty.spec.ts → ...ethereum/lockup/depositToProperty.spec.ts b/lib/lockup/depositToProperty.spec.ts → ...ethereum/lockup/depositToProperty.spec.ts
@@ -1,5 +1,5 @@
 import { createDepositToPropertyCaller } from './depositToProperty'
-import { stubbedWeb3, stubbedSendTx } from '../utils/for-test'
+import { stubbedWeb3, stubbedSendTx } from '../../common/utils/for-test'
 
 describe('depositToProperty.spec.ts', () => {
 	describe('createDepositToPropertyCaller', () => {

diff --git a/lib/lockup/depositToProperty.ts → lib/ethereum/lockup/depositToProperty.ts b/lib/lockup/depositToProperty.ts → lib/ethereum/lockup/depositToProperty.ts
@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/prefer-readonly-parameter-types */
 import { Contract } from 'web3-eth-contract/types'
 import Web3 from 'web3'
-import { execute } from '../utils/execute'
+import { execute } from '../../common/utils/execute'
 import { T } from 'ramda'
 
 export type CreateDepositToPropertyCaller = (

diff --git a/lib/lockup/getAllValue.spec.ts → lib/ethereum/lockup/getAllValue.spec.ts b/lib/lockup/getAllValue.spec.ts → lib/ethereum/lockup/getAllValue.spec.ts
diff --git a/lib/lockup/getAllValue.ts → lib/ethereum/lockup/getAllValue.ts b/lib/lockup/getAllValue.ts → lib/ethereum/lockup/getAllValue.ts
@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/prefer-readonly-parameter-types */
 import { Contract } from 'web3-eth-contract/types'
-import { execute } from '../utils/execute'
+import { execute } from '../../common/utils/execute'
 import { always } from 'ramda'
 
 export type CreateGetAllValueCaller = (

diff --git a/lib/lockup/getPropertyValue.spec.ts → lib/ethereum/lockup/getPropertyValue.spec.ts b/lib/lockup/getPropertyValue.spec.ts → lib/ethereum/lockup/getPropertyValue.spec.ts
diff --git a/lib/lockup/getPropertyValue.ts → lib/ethereum/lockup/getPropertyValue.ts b/lib/lockup/getPropertyValue.ts → lib/ethereum/lockup/getPropertyValue.ts
@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/prefer-readonly-parameter-types */
 import { Contract } from 'web3-eth-contract/types'
-import { execute } from '../utils/execute'
+import { execute } from '../../common/utils/execute'
 
 export type CreateGetPropertyValueCaller = (
 	contract: Contract

diff --git a/...lockup/getStorageWithdrawalStatus.spec.ts → ...lockup/getStorageWithdrawalStatus.spec.ts b/...lockup/getStorageWithdrawalStatus.spec.ts → ...lockup/getStorageWithdrawalStatus.spec.ts
diff --git a/lib/lockup/getStorageWithdrawalStatus.ts → ...reum/lockup/getStorageWithdrawalStatus.ts b/lib/lockup/getStorageWithdrawalStatus.ts → ...reum/lockup/getStorageWithdrawalStatus.ts
@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/prefer-readonly-parameter-types */
 import { Contract } from 'web3-eth-contract/types'
-import { execute } from '../utils/execute'
+import { execute } from '../../common/utils/execute'
 
 export type CreateGetStorageWithdrawalStatusCaller = (
 	contract: Contract

diff --git a/lib/lockup/getValue.spec.ts → lib/ethereum/lockup/getValue.spec.ts b/lib/lockup/getValue.spec.ts → lib/ethereum/lockup/getValue.spec.ts
diff --git a/lib/lockup/getValue.ts → lib/ethereum/lockup/getValue.ts b/lib/lockup/getValue.ts → lib/ethereum/lockup/getValue.ts
@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/prefer-readonly-parameter-types */
 import { Contract } from 'web3-eth-contract/types'
-import { execute } from '../utils/execute'
+import { execute } from '../../common/utils/execute'
 
 export type CreateGetValueCaller = (
 	contract: Contract

diff --git a/lib/lockup/index.spec.ts → lib/ethereum/lockup/index.spec.ts b/lib/lockup/index.spec.ts → lib/ethereum/lockup/index.spec.ts
@@ -2,7 +2,7 @@ import Web3 from 'web3'
 import { createLockupContract, LockupContract } from '.'
 import { createGetValueCaller } from './getValue'
 import { lockupAbi } from './abi'
-import { CustomOptions } from '../option'
+import { CustomOptions } from '../../common/option'
 import { createGetPropertyValueCaller } from './getPropertyValue'
 import { createWithdrawCaller } from './withdraw'
 import { createCalculateWithdrawableInterestAmountCaller } from './calculateWithdrawableInterestAmount'

diff --git a/lib/lockup/index.ts → lib/ethereum/lockup/index.ts b/lib/lockup/index.ts → lib/ethereum/lockup/index.ts
@@ -2,7 +2,7 @@
 import Web3 from 'web3'
 import { Contract } from 'web3-eth-contract/types'
 import { lockupAbi } from './abi'
-import { CustomOptions } from '../option'
+import { CustomOptions } from '../../common/option'
 import { createGetValueCaller } from './getValue'
 import { createGetPropertyValueCaller } from './getPropertyValue'
 import { createWithdrawCaller } from './withdraw'