Make "operator" mandatory, remove "data" from pool creation

.env

@@ -2,6 +2,5 @@ PORT=3000
 ETHCONNECT_URL=http://127.0.0.1:5102
 ETHCONNECT_INSTANCE=/contracts/erc1155
 ETHCONNECT_TOPIC=token
-ETHCONNECT_IDENTITY=0x136e7a2eb8d1ed764ce229779370879eb0d738b2
 ETHCONNECT_PREFIX=fly
 AUTO_INIT=true

src/tokens/tokens.interfaces.ts

@@ -78,8 +78,8 @@ export class TokenPool {
   type: TokenType;
 
   @ApiProperty()
-  @IsOptional()
-  operator?: string;
+  @IsDefined()
+  operator: string;
 
   @ApiProperty({ description: trackingIdDescription })
   @IsOptional()
@@ -92,10 +92,6 @@ export class TokenPool {
   @ApiProperty({ description: poolConfigDescription })
   @IsOptional()
   config?: any;
-
-  @ApiProperty()
-  @IsOptional()
-  data?: string; // TODO: remove
 }
 
 export class TokenBalanceQuery {
@@ -127,8 +123,8 @@ export class TokenTransfer {
   tokenIndex?: string;
 
   @ApiProperty()
-  @IsOptional()
-  operator?: string;
+  @IsDefined()
+  operator: string;
 
   @ApiProperty()
   @IsNotEmpty()
@@ -191,9 +187,6 @@ class tokenEventBase {
 export class TokenPoolEvent extends tokenEventBase {
   @ApiProperty()
   standard: string;
-
-  @ApiProperty()
-  data?: string; // TODO: remove
 }
 
 export class TokenTransferEvent extends tokenEventBase {

src/tokens/tokens.service.ts

@@ -52,27 +52,25 @@ const transferSingleEventSignature = 'TransferSingle(address,address,address,uin
 export class TokensService {
   baseUrl: string;
   instanceUrl: string;
-  identity: string;
   shortPrefix: string;
 
   constructor(private http: HttpService, proxy: EventStreamProxyGateway) {
     proxy.addListener(new TokenListener());
   }
 
-  configure(baseUrl: string, instanceUrl: string, identity: string, shortPrefix: string) {
+  configure(baseUrl: string, instanceUrl: string, shortPrefix: string) {
     this.baseUrl = baseUrl;
     this.instanceUrl = instanceUrl;
-    this.identity = identity;
     this.shortPrefix = shortPrefix;
   }
 
-  private postOptions(operator?: string, requestId?: string) {
+  private postOptions(operator: string, requestId?: string) {
     const from = `${this.shortPrefix}-from`;
     const sync = `${this.shortPrefix}-sync`;
     const id = `${this.shortPrefix}-id`;
     return {
       params: {
-        [from]: operator ?? this.identity,
+        [from]: operator,
         [sync]: 'false',
         [id]: requestId,
       },
@@ -96,7 +94,6 @@ export class TokensService {
   async createPool(dto: TokenPool): Promise<AsyncResponse> {
     const dataToPack: PackedTokenData = {
       trackingId: dto.trackingId,
-      data: dto.data, // TODO: remove
     };
     const response = await lastValueFrom(
       this.http.post<EthConnectAsyncResponse>(
@@ -245,7 +242,6 @@ class TokenListener implements EventListener {
         type: unpackedId.isFungible ? TokenType.FUNGIBLE : TokenType.NONFUNGIBLE,
         operator: data.operator,
         trackingId: unpackedData.trackingId,
-        data: unpackedData.data, // TODO: remove
         transaction: {
           blockNumber: event.blockNumber,
           transactionIndex: event.transactionIndex,

test/app.e2e-spec.ts

@@ -125,7 +125,7 @@ describe('AppController (e2e)', () => {
     await app.init();
 
     app.get(EventStreamProxyGateway).configure('url', 'topic');
-    app.get(TokensService).configure(BASE_URL, INSTANCE_URL, IDENTITY, PREFIX);
+    app.get(TokensService).configure(BASE_URL, INSTANCE_URL, PREFIX);
 
     (app.getHttpServer() as Server).listen();
     server = request(app.getHttpServer());
@@ -140,7 +140,7 @@ describe('AppController (e2e)', () => {
       type: TokenType.FUNGIBLE,
       requestId: 'op1',
       trackingId: 'tx1',
-      data: 'test',
+      operator: IDENTITY,
     };
     const response: EthConnectAsyncResponse = {
       id: 'op1',
@@ -155,7 +155,7 @@ describe('AppController (e2e)', () => {
     expect(http.post).toHaveBeenCalledWith(
       `${INSTANCE_URL}/create`,
       {
-        data: '0x7b22747261636b696e674964223a22747831222c2264617461223a2274657374227d',
+        data: '0x7b22747261636b696e674964223a22747831227d',
         is_fungible: true,
       },
       {
@@ -171,7 +171,6 @@ describe('AppController (e2e)', () => {
   it('Create non-fungible pool', async () => {
     const request: TokenPool = {
       type: TokenType.NONFUNGIBLE,
-      data: 'test',
       operator: '0xabc',
     };
     const response: EthConnectAsyncResponse = {
@@ -187,7 +186,7 @@ describe('AppController (e2e)', () => {
     expect(http.post).toHaveBeenCalledWith(
       `${INSTANCE_URL}/create`,
       {
-        data: '0x7b2264617461223a2274657374227d',
+        data: '0x7b7d',
         is_fungible: false,
       },
       {
@@ -207,6 +206,7 @@ describe('AppController (e2e)', () => {
       amount: '2',
       trackingId: 'abc',
       data: 'test',
+      operator: IDENTITY,
     };
     const response: EthConnectAsyncResponse = {
       id: '1',
@@ -235,6 +235,7 @@ describe('AppController (e2e)', () => {
       poolId: 'N1',
       to: '1',
       amount: '2',
+      operator: IDENTITY,
     };
     const response: EthConnectAsyncResponse = {
       id: '1',
@@ -264,6 +265,7 @@ describe('AppController (e2e)', () => {
       from: 'A',
       amount: '1',
       trackingId: 'tx1',
+      operator: IDENTITY,
     };
     const response: EthConnectAsyncResponse = {
       id: '1',
@@ -293,6 +295,7 @@ describe('AppController (e2e)', () => {
       from: '1',
       to: '2',
       amount: '2',
+      operator: IDENTITY,
     };
     const response: EthConnectAsyncResponse = {
       id: '1',
@@ -372,7 +375,6 @@ describe('AppController (e2e)', () => {
         expect(message).toEqual(<WebSocketMessage>{
           event: 'token-pool',
           data: <TokenPoolEvent>{
-            data: 'test',
             trackingId: 'tx1',
             standard: 'ERC1155',
             poolId: 'F1',