Merge pull request #1197 from dev-protocol/feat-add-simple-collections

Feat add simple collections

Author: aggre

lib/agent/fixtures/swap/index.spec.ts

@@ -30,9 +30,7 @@ describe('swap/index.ts', () => {
 			const expected: (address: string) => SwapContract = (address: string) => {
 				const contract = new ethers.Contract(address, [...swapAbiV3], provider)
 				return {
-					getEstimatedDevForEth: createGetEstimatedDevForEthCaller(
-						contract,
-					),
+					getEstimatedDevForEth: createGetEstimatedDevForEthCaller(contract),
 					getEstimatedEthForDev: createGetEstimatedEthForDevCaller(contract),
 					swapEthAndStakeDevCaller: createSwapEthAndStakeDevCaller(contract),
 					swapEthAndStakeDevPolygonCaller:

lib/common/utils/execute.ts

@@ -2,8 +2,22 @@ import { ethers, BigNumber, providers, utils } from 'ethers'
 import { TransactionResponse } from '@ethersproject/abstract-provider'
 import { keys, mergeAll } from 'ramda'
 
-type Args = ReadonlyArray<string | boolean | readonly string[] | Uint8Array>
-type ArgsWithoutUint8Array = ReadonlyArray<string | boolean | readonly string[]>
+import { Positions } from '../../ethereum/s-tokens'
+import { Rewards } from '../../ethereum/s-tokens/rewards'
+import { Image } from '../../ethereum/simpleCollection/types'
+
+type Args = ReadonlyArray<
+	| string
+	| boolean
+	| readonly string[]
+	| Uint8Array
+	| readonly Image[]
+	| Positions
+	| Rewards
+>
+type ArgsWithoutUint8Array = ReadonlyArray<
+	string | boolean | readonly string[] | readonly Image[] | Positions | Rewards
+>
 type Overrides = {
 	readonly gasLimit?: number
 	readonly from?: string
@@ -48,7 +62,14 @@ export type ExecuteFunction = <
 >
 type PadCaller = (
 	arr: ArgsWithoutUint8Array,
-	v: string | boolean | undefined | readonly string[],
+	v:
+		| string
+		| boolean
+		| undefined
+		| readonly string[]
+		| readonly Image[]
+		| Positions
+		| Rewards,
 	i: number,
 	fn: PadCaller
 ) => ArgsWithoutUint8Array
@@ -59,7 +80,14 @@ const pad = (
 	((fn: PadCaller): ArgsWithoutUint8Array => fn([], args[0], 0, fn))(
 		(
 			arr: ArgsWithoutUint8Array,
-			v: string | boolean | undefined | readonly string[],
+			v:
+				| string
+				| boolean
+				| undefined
+				| readonly string[]
+				| readonly Image[]
+				| Positions
+				| Rewards,
 			i: number,
 			fn: PadCaller
 		): ArgsWithoutUint8Array =>

lib/ethereum/contract.spec.ts

@@ -19,6 +19,7 @@ import { createMetricsContract } from './metrics'
 import { createPolicyFactoryContract } from './policy-factory'
 import { createSTokensContract } from './s-tokens'
 import { createMetricsGroupContract } from './metrics-group'
+import { createSimpleCollectionsContract } from './simpleCollection'
 
 describe('contract.ts', () => {
 	describe('createDevkitContract', () => {
@@ -42,6 +43,7 @@ describe('contract.ts', () => {
 				metricsGroup: createMetricsGroupContract(provider),
 				policyFactory: createPolicyFactoryContract(provider),
 				sTokens: createSTokensContract(provider),
+				simpleCollections: createSimpleCollectionsContract(provider)
 			}
 
 			const result = createDevkitContract(provider)

lib/ethereum/contract.ts

@@ -16,6 +16,7 @@ import { createMetricsContract } from './metrics'
 import { createPolicyFactoryContract } from './policy-factory'
 import { createSTokensContract } from './s-tokens'
 import { createMetricsGroupContract } from './metrics-group'
+import { createSimpleCollectionsContract } from './simpleCollection'
 
 export type DevkitContract = {
 	readonly allocator: ReturnType<typeof createAllocatorContract>
@@ -33,6 +34,7 @@ export type DevkitContract = {
 	readonly metricsGroup: ReturnType<typeof createMetricsGroupContract>
 	readonly policyFactory: ReturnType<typeof createPolicyFactoryContract>
 	readonly sTokens: ReturnType<typeof createSTokensContract>
+	readonly simpleCollections: ReturnType<typeof createSimpleCollectionsContract>
 }
 export type ContractFactory = (ethersProvider: BaseProvider) => DevkitContract
 export type CreateDevkitContract = (provider: BaseProvider) => DevkitContract
@@ -55,6 +57,7 @@ export const createDevkitContract: CreateDevkitContract = (
 	metricsGroup: createMetricsGroupContract(provider),
 	policyFactory: createPolicyFactoryContract(provider),
 	sTokens: createSTokensContract(provider),
+	simpleCollections: createSimpleCollectionsContract(provider),
 })
 
 export const contractFactory: ContractFactory = createDevkitContract