Merge remote-tracking branch 'origin/main' into ethers-v6

Author: aggre

.github/workflows/publish.yml

@@ -25,6 +25,6 @@ jobs:
         run: |
           yarn install
           yarn run build
-      - uses: JS-DevTools/npm-publish@v1
+      - uses: JS-DevTools/npm-publish@v2
         with:
           token: ${{ secrets.NPM_TOKEN }}

lib/agent/common/agentAddresses.ts

@@ -29,9 +29,9 @@ export const agentAddresses = {
 		mumbai: {
 			swap: {
 				v2: undefined,
-				v3: '0x01C818717B5471562172f3F886E4C4dC053D6ed8',
+				v3: '0x60650E5a95864b989C8b7B0357a2d4979a34c6AF',
 			},
-			weth: '0xA6FA4fB5f76172d178d61B04b0ecd319C5d1C0aa',
+			weth: '0x3c8d6A6420C922c88577352983aFFdf7b0F977cA',
 		},
 	},
 } as const

lib/agent/positionsCreateWithEth.ts

@@ -51,7 +51,8 @@ export const positionsCreateWithEth: PositionsCreateWithEth = async (
 						((await options.provider.provider?.getBlock('latest'))?.timestamp ??
 							Math.floor(new Date().getTime() / 1000)) + 300
 
-					return options.gatewayAddress && options.gatewayBasisPoints
+					return options.gatewayAddress &&
+						typeof options.gatewayBasisPoints === 'number'
 						? await l2.swapEthAndStakeDevCaller(
 								options.destination,
 								deadline,

lib/agent/positionsCreateWithEthForPolygon.ts

@@ -60,10 +60,9 @@ export const positionsCreateWithEth: PositionsCreateWithEthForPolygon = async (
 							callback: async () => {
 								const deadline = options.deadline
 									? options.deadline
-									: ((await options.provider.provider?.getBlock('latest'))
-											?.timestamp ?? Math.floor(new Date().getTime() / 1000)) +
-									  300
-								return options.gatewayAddress && options.gatewayBasisPoints
+									: (await options.provider.getBlock('latest')).timestamp + 300
+								return options.gatewayAddress &&
+									typeof options.gatewayBasisPoints === 'number'
 									? l2.swapEthAndStakeDevPolygonCaller(
 											options.destination,
 											ethAmount,

lib/common/utils/execute.ts

@@ -7,8 +7,22 @@ import {
 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
@@ -53,7 +67,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
@@ -64,7 +85,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

@@ -15,6 +15,7 @@ import { createMetricsContract } from './metrics'
 import { createPolicyFactoryContract } from './policy-factory'
 import { createSTokensContract } from './s-tokens'
 import { createMetricsGroupContract } from './metrics-group'
+import { createSimpleCollectionsContract } from './simpleCollection'
 import { ContractRunner } from 'ethers'
 
 export type DevkitContract = {
@@ -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: ContractRunner) => DevkitContract
 export type CreateDevkitContract = (provider: ContractRunner) => 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

lib/ethereum/s-tokens/tokenURI.spec.ts

@@ -5,10 +5,21 @@ describe('tokenURI.spec.ts', () => {
 		it('call success', async () => {
 			const data = {
 				name: 'NAME',
-				description: 'DESCRIPTION',
+				description: 'DESCRIPTION_1\n\nDESCRIPTION_2',
 				image: 'data:image/svg+xml;base64,<svg></svg>',
+				attributes: [
+					{
+						trait_type: 'Destination',
+						value: '0x0',
+					},
+					{
+						trait_type: 'Locked Amount',
+						display_type: 'number',
+						value: 123.456,
+					},
+				],
 			}
-			const value = `data:application/json;base64,eyJuYW1lIjoiTkFNRSIsICJkZXNjcmlwdGlvbiI6IkRFU0NSSVBUSU9OIiwgImltYWdlIjogImRhdGE6aW1hZ2Uvc3ZnK3htbDtiYXNlNjQsPHN2Zz48L3N2Zz4ifQ==`
+			const value = `data:application/json;base64,eyJuYW1lIjoiTkFNRSIsImRlc2NyaXB0aW9uIjoiREVTQ1JJUFRJT05fMVxuXG5ERVNDUklQVElPTl8yIiwiaW1hZ2UiOiJkYXRhOmltYWdlL3N2Zyt4bWw7YmFzZTY0LDxzdmc+PC9zdmc+IiwiYXR0cmlidXRlcyI6W3sidHJhaXRfdHlwZSI6IkRlc3RpbmF0aW9uIiwidmFsdWUiOiIweDAifSx7InRyYWl0X3R5cGUiOiJMb2NrZWQgQW1vdW50IiwiZGlzcGxheV90eXBlIjoibnVtYmVyIiwidmFsdWUiOjEyMy40NTZ9XX0=`
 
 			const contract = {
 				tokenURI: jest

lib/ethereum/s-tokens/tokenURI.ts

@@ -7,6 +7,17 @@ export type TokenURI = {
 	readonly name: string
 	readonly description: string
 	readonly image: string
+	readonly attributes: readonly [
+		{
+			readonly trait_type: 'Destination'
+			readonly value: string
+		},
+		{
+			readonly trait_type: 'Locked Amount'
+			readonly display_type: 'number'
+			readonly value: number
+		}
+	]
 }
 
 export type CreateTokenURICaller = (
@@ -23,6 +34,6 @@ export const createTokenURICaller: CreateTokenURICaller =
 		})
 		const decoded = decode(
 			res.replace(/^data:application\/json;base64,(.*)/, '$1')
-		)
+		).replace(/\n/g, '\\n')
 		return JSON.parse(decoded)
 	}

lib/ethereum/s-tokens/tokenURISim.spec.ts

@@ -6,10 +6,21 @@ describe('tokenURISim.spec.ts', () => {
 		it('call success', async () => {
 			const data = {
 				name: 'NAME',
-				description: 'DESCRIPTION',
+				description: 'DESCRIPTION_1\n\nDESCRIPTION_2',
 				image: 'data:image/svg+xml;base64,<svg></svg>',
+				attributes: [
+					{
+						trait_type: 'Destination',
+						value: '0x0',
+					},
+					{
+						trait_type: 'Locked Amount',
+						display_type: 'number',
+						value: 123.456,
+					},
+				],
 			}
-			const value = `data:application/json;base64,eyJuYW1lIjoiTkFNRSIsICJkZXNjcmlwdGlvbiI6IkRFU0NSSVBUSU9OIiwgImltYWdlIjogImRhdGE6aW1hZ2Uvc3ZnK3htbDtiYXNlNjQsPHN2Zz48L3N2Zz4ifQ==`
+			const value = `data:application/json;base64,eyJuYW1lIjoiTkFNRSIsImRlc2NyaXB0aW9uIjoiREVTQ1JJUFRJT05fMVxuXG5ERVNDUklQVElPTl8yIiwiaW1hZ2UiOiJkYXRhOmltYWdlL3N2Zyt4bWw7YmFzZTY0LDxzdmc+PC9zdmc+IiwiYXR0cmlidXRlcyI6W3sidHJhaXRfdHlwZSI6IkRlc3RpbmF0aW9uIiwidmFsdWUiOiIweDAifSx7InRyYWl0X3R5cGUiOiJMb2NrZWQgQW1vdW50IiwiZGlzcGxheV90eXBlIjoibnVtYmVyIiwidmFsdWUiOjEyMy40NTZ9XX0=`
 
 			const contract = {
 				tokenURISim: jest