lib/ethereum/erc20/allowance.ts → lib/common/erc20/allowance.ts

@@ -1,5 +1,5 @@
 import { ethers } from 'ethers'
-import { execute, QueryOption } from '../../common/utils/execute'
+import { execute, QueryOption } from '../utils/execute'
 
 export type CreateAllowanceCaller = (
 	contract: ethers.Contract

lib/ethereum/erc20/approve.spec.ts → lib/common/erc20/approve.spec.ts

@@ -1,5 +1,5 @@
 import { createApproveCaller } from './approve'
-import { stubbedSendTx } from '../../common/utils/for-test'
+import { stubbedSendTx } from '../utils/for-test'
 
 describe('approve.spec.ts', () => {
 	describe('createApproveCaller', () => {

lib/ethereum/erc20/approve.ts → lib/common/erc20/approve.ts

@@ -3,7 +3,7 @@ import {
 	execute,
 	FallbackableOverrides,
 	MutationOption,
-} from '../../common/utils/execute'
+} from '../utils/execute'
 import { T } from 'ramda'
 
 export type CreateApproveCaller = (

lib/ethereum/erc20/balanceOf.ts → lib/common/erc20/balanceOf.ts

@@ -1,5 +1,5 @@
 import { ethers } from 'ethers'
-import { execute, QueryOption } from '../../common/utils/execute'
+import { execute, QueryOption } from '../utils/execute'
 
 export type CreateBalanceOfCaller = (
 	contract: ethers.Contract

lib/ethereum/erc20/decimals.ts → lib/common/erc20/decimals.ts

@@ -1,5 +1,5 @@
 import { ethers } from 'ethers'
-import { execute, QueryOption } from '../../common/utils/execute'
+import { execute, QueryOption } from '../utils/execute'
 import { always } from 'ramda'
 
 export type CreateDecimalsCaller = (

lib/ethereum/erc20/index.ts → lib/common/erc20/index.ts

@@ -11,7 +11,7 @@ import { createNameCaller } from './name'
 import { createSymbolCaller } from './symbol'
 import { createDecimalsCaller } from './decimals'
 import { createAllowanceCaller } from './allowance'
-import { FallbackableOverrides } from '../../common/utils/execute'
+import { FallbackableOverrides } from '../utils/execute'
 
 export type Erc20Contract = {
 	readonly totalSupply: () => Promise<string>

lib/ethereum/erc20/name.ts → lib/common/erc20/name.ts

@@ -1,5 +1,5 @@
 import { ethers } from 'ethers'
-import { execute, QueryOption } from '../../common/utils/execute'
+import { execute, QueryOption } from '../utils/execute'
 import { always } from 'ramda'
 
 export type CreateNameCaller = (

lib/ethereum/erc20/symbol.ts → lib/common/erc20/symbol.ts

@@ -1,5 +1,5 @@
 import { ethers } from 'ethers'
-import { execute, QueryOption } from '../../common/utils/execute'
+import { execute, QueryOption } from '../utils/execute'
 import { always } from 'ramda'
 
 export type CreateSymbolCaller = (

lib/ethereum/erc20/totalSupply.ts → lib/common/erc20/totalSupply.ts

@@ -1,5 +1,5 @@
 import { ethers } from 'ethers'
-import { execute, QueryOption } from '../../common/utils/execute'
+import { execute, QueryOption } from '../utils/execute'
 import { always } from 'ramda'
 
 export type CreateTotalSupplyCaller = (

lib/ethereum/erc20/transfer.ts → lib/common/erc20/transfer.ts

@@ -3,7 +3,7 @@ import {
 	execute,
 	FallbackableOverrides,
 	MutationOption,
-} from '../../common/utils/execute'
+} from '../utils/execute'
 import { T } from 'ramda'
 
 export type CreateTransferCaller = (

lib/ethereum/erc20/transferFrom.ts → lib/common/erc20/transferFrom.ts

@@ -3,7 +3,7 @@ import {
 	execute,
 	FallbackableOverrides,
 	MutationOption,
-} from '../../common/utils/execute'
+} from '../utils/execute'
 import { T } from 'ramda'
 
 export type CreateTransferFromCaller = (

lib/ethereum/dev/index.spec.ts

@@ -1,26 +1,26 @@
 import { ethers } from 'ethers'
 import { createDevContract, DevContract } from '.'
-import { createTransferCaller } from './../erc20/transfer'
+import { createTransferCaller } from './../../common/erc20/transfer'
 import { devAbi } from './abi'
 import { createDepositCaller } from './deposit'
-import { createBalanceOfCaller } from './../erc20/balanceOf'
-import { createTotalSupplyCaller } from './../erc20/totalSupply'
-import { createApproveCaller } from './../erc20/approve'
-import { createTransferFromCaller } from '../erc20/transferFrom'
-import { createNameCaller } from './../erc20/name'
-import { createSymbolCaller } from './../erc20/symbol'
-import { createDecimalsCaller } from './../erc20/decimals'
-import { createAllowanceCaller } from './../erc20/allowance'
+import { createBalanceOfCaller } from './../../common/erc20/balanceOf'
+import { createTotalSupplyCaller } from './../../common/erc20/totalSupply'
+import { createApproveCaller } from './../../common/erc20/approve'
+import { createTransferFromCaller } from '../../common/erc20/transferFrom'
+import { createNameCaller } from './../../common/erc20/name'
+import { createSymbolCaller } from './../../common/erc20/symbol'
+import { createDecimalsCaller } from './../../common/erc20/decimals'
+import { createAllowanceCaller } from './../../common/erc20/allowance'
 
 jest.mock('./deposit')
-jest.mock('./../erc20/balanceOf')
-jest.mock('./../erc20/totalSupply')
-jest.mock('./../erc20/approve')
-jest.mock('../erc20/transferFrom')
-jest.mock('./../erc20/name')
-jest.mock('./../erc20/symbol')
-jest.mock('./../erc20/decimals')
-jest.mock('./../erc20/allowance')
+jest.mock('./../../common/erc20/balanceOf')
+jest.mock('./../../common/erc20/totalSupply')
+jest.mock('./../../common/erc20/approve')
+jest.mock('../../common/erc20/transferFrom')
+jest.mock('./../../common/erc20/name')
+jest.mock('./../../common/erc20/symbol')
+jest.mock('./../../common/erc20/decimals')
+jest.mock('./../../common/erc20/allowance')
 
 describe('dev/index.ts', () => {
 	;(createDepositCaller as jest.Mock).mockImplementation((contract) => contract)

lib/ethereum/dev/index.ts

@@ -2,15 +2,15 @@ import { ethers } from 'ethers'
 import { Provider } from '@ethersproject/abstract-provider'
 import { Signer } from '@ethersproject/abstract-signer'
 import { devAbi } from './abi'
-import { createTransferCaller } from './../erc20/transfer'
-import { createBalanceOfCaller } from './../erc20/balanceOf'
-import { createTotalSupplyCaller } from './../erc20/totalSupply'
-import { createApproveCaller } from './../erc20/approve'
-import { createTransferFromCaller } from '../erc20/transferFrom'
-import { createNameCaller } from './../erc20/name'
-import { createSymbolCaller } from './../erc20/symbol'
-import { createDecimalsCaller } from './../erc20/decimals'
-import { createAllowanceCaller } from './../erc20/allowance'
+import { createTransferCaller } from '../../common/erc20/transfer'
+import { createBalanceOfCaller } from '../../common/erc20/balanceOf'
+import { createTotalSupplyCaller } from '../../common/erc20/totalSupply'
+import { createApproveCaller } from '../../common/erc20/approve'
+import { createTransferFromCaller } from '../../common/erc20/transferFrom'
+import { createNameCaller } from '../../common/erc20/name'
+import { createSymbolCaller } from '../../common/erc20/symbol'
+import { createDecimalsCaller } from '../../common/erc20/decimals'
+import { createAllowanceCaller } from '../../common/erc20/allowance'
 import { createDepositCaller } from './deposit'
 import { FallbackableOverrides } from '../../common/utils/execute'
 

lib/ethereum/property/index.spec.ts

@@ -5,29 +5,29 @@ import { createAuthorCaller } from './author'
 import { createChangeNameCaller } from './changeName'
 import { createChangeSymbolCaller } from './changeSymbol'
 import { createChangeAuthorCaller } from './changeAuthor'
-import { createTransferCaller } from './../erc20/transfer'
-import { createNameCaller } from './../erc20/name'
-import { createSymbolCaller } from './../erc20/symbol'
-import { createTotalSupplyCaller } from './../erc20/totalSupply'
-import { createDecimalsCaller } from './../erc20/decimals'
-import { createTransferFromCaller } from '../erc20/transferFrom'
-import { createBalanceOfCaller } from './../erc20/balanceOf'
-import { createApproveCaller } from './../erc20/approve'
-import { createAllowanceCaller } from './../erc20/allowance'
+import { createTransferCaller } from './../../common/erc20/transfer'
+import { createNameCaller } from './../../common/erc20/name'
+import { createSymbolCaller } from './../../common/erc20/symbol'
+import { createTotalSupplyCaller } from './../../common/erc20/totalSupply'
+import { createDecimalsCaller } from './../../common/erc20/decimals'
+import { createTransferFromCaller } from '../../common/erc20/transferFrom'
+import { createBalanceOfCaller } from './../../common/erc20/balanceOf'
+import { createApproveCaller } from './../../common/erc20/approve'
+import { createAllowanceCaller } from './../../common/erc20/allowance'
 
 jest.mock('./author')
 jest.mock('./changeName')
 jest.mock('./changeSymbol')
 jest.mock('./changeAuthor')
-jest.mock('./../erc20/transfer')
-jest.mock('./../erc20/name')
-jest.mock('./../erc20/symbol')
-jest.mock('./../erc20/totalSupply')
-jest.mock('./../erc20/decimals')
-jest.mock('../erc20/transferFrom')
-jest.mock('./../erc20/balanceOf')
-jest.mock('./../erc20/approve')
-jest.mock('./../erc20/allowance')
+jest.mock('./../../common/erc20/transfer')
+jest.mock('./../../common/erc20/name')
+jest.mock('./../../common/erc20/symbol')
+jest.mock('./../../common/erc20/totalSupply')
+jest.mock('./../../common/erc20/decimals')
+jest.mock('./../../common/erc20/transferFrom')
+jest.mock('./../../common/erc20/balanceOf')
+jest.mock('./../../common/erc20/approve')
+jest.mock('./../../common/erc20/allowance')
 
 describe('property/index.ts', () => {
 	;(createAuthorCaller as jest.Mock).mockImplementation((contract) => contract)

lib/ethereum/property/index.ts

@@ -6,15 +6,15 @@ import { createAuthorCaller } from './author'
 import { createChangeAuthorCaller } from './changeAuthor'
 import { createChangeNameCaller } from './changeName'
 import { createChangeSymbolCaller } from './changeSymbol'
-import { createTransferCaller } from './../erc20/transfer'
-import { createNameCaller } from './../erc20/name'
-import { createSymbolCaller } from './../erc20/symbol'
-import { createTotalSupplyCaller } from './../erc20/totalSupply'
-import { createDecimalsCaller } from './../erc20/decimals'
-import { createTransferFromCaller } from '../erc20/transferFrom'
-import { createBalanceOfCaller } from './../erc20/balanceOf'
-import { createApproveCaller } from './../erc20/approve'
-import { createAllowanceCaller } from './../erc20/allowance'
+import { createTransferCaller } from '../../common/erc20/transfer'
+import { createNameCaller } from '../../common/erc20/name'
+import { createSymbolCaller } from '../../common/erc20/symbol'
+import { createTotalSupplyCaller } from '../../common/erc20/totalSupply'
+import { createDecimalsCaller } from '../../common/erc20/decimals'
+import { createTransferFromCaller } from '../../common/erc20/transferFrom'
+import { createBalanceOfCaller } from '../../common/erc20/balanceOf'
+import { createApproveCaller } from '../../common/erc20/approve'
+import { createAllowanceCaller } from '../../common/erc20/allowance'
 import { FallbackableOverrides } from '../../common/utils/execute'
 
 export type PropertyContract = {

lib/l2/dev/index.ts

@@ -1,4 +1,4 @@
-import { createErc20Contract, Erc20Contract } from '../../ethereum/erc20'
+import { createErc20Contract, Erc20Contract } from '../../common/erc20'
 
 export const createDevContract = createErc20Contract
 export type DevContract = Erc20Contract

lib/l2/erc20/index.ts

@@ -1 +1 @@
-export { createErc20Contract, Erc20Contract } from '../../ethereum/erc20'
+export { createErc20Contract, Erc20Contract } from '../../common/erc20'

lib/l2/property-factory/abi.ts

@@ -126,4 +126,36 @@ export const propertyFactoryAbi = [
 		stateMutability: 'nonpayable',
 		type: 'function',
 	},
+	{
+		inputs: [
+			{
+				internalType: 'address',
+				name: '_author',
+				type: 'address',
+			},
+		],
+		name: 'getPropertiesOfAuthor',
+		outputs: [
+			{
+				internalType: 'address[]',
+				name: '',
+				type: 'address[]',
+			},
+		],
+		stateMutability: 'view',
+		type: 'function',
+	},
+	{
+		inputs: [
+			{
+				internalType: 'address',
+				name: '_property',
+				type: 'address',
+			},
+		],
+		name: 'setPropertyAddress',
+		outputs: [],
+		stateMutability: 'nonpayable',
+		type: 'function',
+	},
 ]

lib/l2/property-factory/createAndAuthenticate.ts

@@ -6,10 +6,7 @@ import { Provider } from '@ethersproject/abstract-provider'
 import { TransactionResponse } from '@ethersproject/abstract-provider'
 import { execute, FallbackableOverrides } from '../../common/utils/execute'
 import { ethers } from 'ethers'
-import {
-	getMetricsProperty,
-	WaitForEventOptions,
-} from '../../ethereum/market/authenticate'
+import { WaitForEventOptions } from '../../ethereum/market/authenticate'
 import { metricsFactoryAbi } from '../metrics-factory/abi'
 
 export type CreateCreateAndAuthenticateCaller = (

lib/l2/property-factory/getPropertiesOfAuthor.spec.ts

@@ -0,0 +1,39 @@
+import { createGetPropertiesOfAuthorCaller } from './getPropertiesOfAuthor'
+
+describe('getPropertiesOfAuthor.spec.ts', () => {
+	describe('createGetPropertiesOfAuthorrCaller', () => {
+		it('call success', async () => {
+			const value = ['0x1', '0x2', '0x3', '0x4', '0x5', '0x6']
+
+			const contract = {
+				getPropertiesOfAuthor: jest
+					.fn()
+					.mockImplementation(async () => Promise.resolve(value)),
+			}
+
+			// eslint-disable-next-line @typescript-eslint/no-explicit-any
+			const caller = createGetPropertiesOfAuthorCaller(contract as any)
+
+			const result = await caller('0xAddress')
+
+			expect(result).toEqual(value)
+		})
+
+		it('call failure', async () => {
+			const error = 'error'
+
+			const contract = {
+				getPropertiesOfAuthor: jest
+					.fn()
+					.mockImplementation(async () => Promise.reject(error)),
+			}
+
+			// eslint-disable-next-line @typescript-eslint/no-explicit-any
+			const caller = createGetPropertiesOfAuthorCaller(contract as any)
+
+			const result = await caller('0xAddress').catch((err) => err)
+
+			expect(result).toEqual(error)
+		})
+	})
+})

lib/l2/property-factory/getPropertiesOfAuthor.ts

@@ -0,0 +1,18 @@
+/* eslint-disable @typescript-eslint/prefer-readonly-parameter-types */
+import { ethers } from 'ethers'
+import { execute, QueryOption } from '../../common/utils/execute'
+
+export type CreateGetPropertiesOfAuthorCaller = (
+	contract: ethers.Contract
+) => (authorAddress: string) => Promise<readonly string[]>
+
+export const createGetPropertiesOfAuthorCaller: CreateGetPropertiesOfAuthorCaller =
+	(contract: ethers.Contract) => async (authorAddress: string) => {
+		const res = await execute<QueryOption, readonly string[]>({
+			contract,
+			method: 'getPropertiesOfAuthor',
+			args: [authorAddress],
+			mutation: false,
+		})
+		return res
+	}

lib/l2/property-factory/index.spec.ts

@@ -3,9 +3,11 @@ import { createPropertyFactoryContract, PropertyFactoryContract } from '.'
 import { propertyFactoryAbi } from './abi'
 import { createCreatePropertyCaller } from '../../ethereum/property-factory/create'
 import { createCreateAndAuthenticateCaller } from './createAndAuthenticate'
+import { createGetPropertiesOfAuthorCaller } from './getPropertiesOfAuthor'
 
 jest.mock('../../ethereum/property-factory/create')
 jest.mock('./createAndAuthenticate')
+jest.mock('./getPropertiesOfAuthor')
 
 describe('property-factory/index.ts', () => {
 	;(createCreatePropertyCaller as jest.Mock).mockImplementation(
@@ -14,6 +16,9 @@ describe('property-factory/index.ts', () => {
 	;(createCreateAndAuthenticateCaller as jest.Mock).mockImplementation(
 		(contract) => contract
 	)
+	;(createGetPropertiesOfAuthorCaller as jest.Mock).mockImplementation(
+		(contract) => contract
+	)
 	describe('createPropertyFactoryContract', () => {
 		it('check return object', () => {
 			const host = 'localhost'
@@ -34,6 +39,7 @@ describe('property-factory/index.ts', () => {
 						contract,
 						provider
 					),
+					getPropertiesOfAuthor: createGetPropertiesOfAuthorCaller(contract)
 				}
 			}
 

lib/l2/property-factory/index.ts

@@ -5,6 +5,7 @@ import { propertyFactoryAbi } from './abi'
 import { createCreatePropertyCaller } from '../../ethereum/property-factory/create'
 import { WaitForEventOptions } from '../../ethereum/market/authenticate'
 import { createCreateAndAuthenticateCaller } from './createAndAuthenticate'
+import { createGetPropertiesOfAuthorCaller } from './getPropertiesOfAuthor'
 import { FallbackableOverrides } from '../../common/utils/execute'
 
 export type PropertyFactoryContract = {
@@ -26,6 +27,9 @@ export type PropertyFactoryContract = {
 		readonly transaction: TransactionResponse
 		readonly waitForAuthentication: () => Promise<string>
 	}>
+	readonly getPropertiesOfAuthor: (
+		author: string
+	) => Promise<readonly string[]>
 }
 
 export const createPropertyFactoryContract =
@@ -43,5 +47,6 @@ export const createPropertyFactoryContract =
 				contract,
 				provider as Provider
 			),
+			getPropertiesOfAuthor: createGetPropertiesOfAuthorCaller(contract)
 		}
 	}