Skip to content

Commit 9eb36c4

Browse files
PooyaRakiPooyaRaki
authored
refactor: update API version for multisig transactions and all-transactions endpoints (#2696)
This refactor updates the API version used by the multisig transactions and all-transactions endpoints to ensure compatibility with the latest backend changes.
1 parent 326076d commit 9eb36c4

15 files changed

+190
-190
lines changed

‎src/datasources/transaction-api/transaction-api.service.spec.ts

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1441,7 +1441,7 @@ describe('TransactionApi', () => {
14411441
const executedDateLte = faker.date.recent().toISOString();
14421442
const limit = faker.number.int();
14431443
const offset = faker.number.int();
1444-
const getMultisigTransactionsUrl = `${baseUrl}/api/v1/safes/${multisigTransaction.safe}/multisig-transactions/`;
1444+
const getMultisigTransactionsUrl = `${baseUrl}/api/v2/safes/${multisigTransaction.safe}/multisig-transactions/`;
14451445
const cacheDir = new CacheDir(
14461446
`${chainId}_multisig_transactions_${multisigTransaction.safe}`,
14471447
`${ordering}_${multisigTransaction.isExecuted}_${multisigTransaction.trusted}_${executedDateGte}_${executedDateLte}_${multisigTransaction.to}_${multisigTransaction.value}_${multisigTransaction.nonce}_${multisigTransaction.nonce}_${limit}_${offset}`,
@@ -1502,7 +1502,7 @@ describe('TransactionApi', () => {
15021502
const executedDateLte = faker.date.recent().toISOString();
15031503
const limit = faker.number.int();
15041504
const offset = faker.number.int();
1505-
const getMultisigTransactionsUrl = `${baseUrl}/api/v1/safes/${multisigTransaction.safe}/multisig-transactions/`;
1505+
const getMultisigTransactionsUrl = `${baseUrl}/api/v2/safes/${multisigTransaction.safe}/multisig-transactions/`;
15061506
const statusCode = faker.internet.httpStatusCode({
15071507
types: ['clientError', 'serverError'],
15081508
});
@@ -1580,7 +1580,7 @@ describe('TransactionApi', () => {
15801580
describe('getMultisigTransaction', () => {
15811581
it('should return the multisig transaction retrieved', async () => {
15821582
const multisigTransaction = multisigTransactionBuilder().build();
1583-
const getMultisigTransactionUrl = `${baseUrl}/api/v1/multisig-transactions/${multisigTransaction.safeTxHash}/`;
1583+
const getMultisigTransactionUrl = `${baseUrl}/api/v2/multisig-transactions/${multisigTransaction.safeTxHash}/`;
15841584
const cacheDir = new CacheDir(
15851585
`${chainId}_multisig_transaction_${multisigTransaction.safeTxHash}`,
15861586
'',
@@ -1607,7 +1607,7 @@ describe('TransactionApi', () => {
16071607
['standard', new Error(errorMessage)],
16081608
])(`should forward a %s error`, async (_, error) => {
16091609
const multisigTransaction = multisigTransactionBuilder().build();
1610-
const getMultisigTransactionUrl = `${baseUrl}/api/v1/multisig-transactions/${multisigTransaction.safeTxHash}/`;
1610+
const getMultisigTransactionUrl = `${baseUrl}/api/v2/multisig-transactions/${multisigTransaction.safeTxHash}/`;
16111611
const statusCode = faker.internet.httpStatusCode({
16121612
types: ['clientError', 'serverError'],
16131613
});
@@ -1644,7 +1644,7 @@ describe('TransactionApi', () => {
16441644
it('should delete a transaction', async () => {
16451645
const safeTxHash = faker.string.hexadecimal();
16461646
const signature = faker.string.hexadecimal();
1647-
const deleteTransactionUrl = `${baseUrl}/api/v1/multisig-transactions/${safeTxHash}`;
1647+
const deleteTransactionUrl = `${baseUrl}/api/v2/multisig-transactions/${safeTxHash}`;
16481648
networkService.delete.mockResolvedValueOnce({
16491649
status: 200,
16501650
data: rawify({}),
@@ -1671,7 +1671,7 @@ describe('TransactionApi', () => {
16711671
])(`should forward a %s error`, async (_, error) => {
16721672
const safeTxHash = faker.string.hexadecimal();
16731673
const signature = faker.string.hexadecimal();
1674-
const deleteTransactionUrl = `${baseUrl}/api/v1/multisig-transactions/${safeTxHash}`;
1674+
const deleteTransactionUrl = `${baseUrl}/api/v2/multisig-transactions/${safeTxHash}`;
16751675
const statusCode = faker.internet.httpStatusCode({
16761676
types: ['clientError', 'serverError'],
16771677
});
@@ -1791,7 +1791,7 @@ describe('TransactionApi', () => {
17911791
const allTransactionsPage = pageBuilder()
17921792
.with('results', [multisigTransaction, creationTransaction])
17931793
.build();
1794-
const getAllTransactionsUrl = `${baseUrl}/api/v1/safes/${safeAddress}/all-transactions/`;
1794+
const getAllTransactionsUrl = `${baseUrl}/api/v2/safes/${safeAddress}/all-transactions/`;
17951795
const cacheDir = new CacheDir(
17961796
`${chainId}_all_transactions_${safeAddress}`,
17971797
`${ordering}_${executed}_${queued}_${limit}_${offset}`,
@@ -1838,7 +1838,7 @@ describe('TransactionApi', () => {
18381838
const queued = faker.datatype.boolean();
18391839
const limit = faker.number.int();
18401840
const offset = faker.number.int();
1841-
const getAllTransactionsUrl = `${baseUrl}/api/v1/safes/${safeAddress}/all-transactions/`;
1841+
const getAllTransactionsUrl = `${baseUrl}/api/v2/safes/${safeAddress}/all-transactions/`;
18421842
const statusCode = faker.internet.httpStatusCode({
18431843
types: ['clientError', 'serverError'],
18441844
});
@@ -2315,7 +2315,7 @@ describe('TransactionApi', () => {
23152315
it('should post multisig transaction', async () => {
23162316
const safeAddress = getAddress(faker.finance.ethereumAddress());
23172317
const proposeTransactionDto = proposeTransactionDtoBuilder().build();
2318-
const postMultisigTransactionUrl = `${baseUrl}/api/v1/safes/${safeAddress}/multisig-transactions/`;
2318+
const postMultisigTransactionUrl = `${baseUrl}/api/v2/safes/${safeAddress}/multisig-transactions/`;
23192319
networkService.post.mockResolvedValueOnce({
23202320
status: 200,
23212321
data: rawify({}),
@@ -2344,7 +2344,7 @@ describe('TransactionApi', () => {
23442344
])(`should forward a %s error`, async (_, error) => {
23452345
const safeAddress = getAddress(faker.finance.ethereumAddress());
23462346
const proposeTransactionDto = proposeTransactionDtoBuilder().build();
2347-
const postMultisigTransactionUrl = `${baseUrl}/api/v1/safes/${safeAddress}/multisig-transactions/`;
2347+
const postMultisigTransactionUrl = `${baseUrl}/api/v2/safes/${safeAddress}/multisig-transactions/`;
23482348
const statusCode = faker.internet.httpStatusCode({
23492349
types: ['clientError', 'serverError'],
23502350
});

‎src/datasources/transaction-api/transaction-api.service.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -656,7 +656,7 @@ export class TransactionApi implements ITransactionApi {
656656
chainId: this.chainId,
657657
...args,
658658
});
659-
const url = `${this.baseUrl}/api/v1/safes/${args.safeAddress}/multisig-transactions/`;
659+
const url = `${this.baseUrl}/api/v2/safes/${args.safeAddress}/multisig-transactions/`;
660660
return await this.dataSource.get<Page<MultisigTransaction>>({
661661
cacheDir,
662662
url,
@@ -718,7 +718,7 @@ export class TransactionApi implements ITransactionApi {
718718
offset?: number;
719719
}): Promise<Raw<Page<MultisigTransaction>>> {
720720
try {
721-
const url = `${this.baseUrl}/api/v1/safes/${safeAddress}/multisig-transactions/`;
721+
const url = `${this.baseUrl}/api/v2/safes/${safeAddress}/multisig-transactions/`;
722722
const { data } = await this.networkService.get<Page<MultisigTransaction>>(
723723
{
724724
url,
@@ -749,7 +749,7 @@ export class TransactionApi implements ITransactionApi {
749749
chainId: this.chainId,
750750
safeTransactionHash,
751751
});
752-
const url = `${this.baseUrl}/api/v1/multisig-transactions/${safeTransactionHash}/`;
752+
const url = `${this.baseUrl}/api/v2/multisig-transactions/${safeTransactionHash}/`;
753753
return await this.dataSource.get<MultisigTransaction>({
754754
cacheDir,
755755
url,
@@ -765,7 +765,7 @@ export class TransactionApi implements ITransactionApi {
765765
safeTransactionHash: string,
766766
): Promise<Raw<MultisigTransaction>> {
767767
try {
768-
const url = `${this.baseUrl}/api/v1/multisig-transactions/${safeTransactionHash}/`;
768+
const url = `${this.baseUrl}/api/v2/multisig-transactions/${safeTransactionHash}/`;
769769
const { data } = await this.networkService.get<Raw<MultisigTransaction>>({
770770
url,
771771
});
@@ -780,7 +780,7 @@ export class TransactionApi implements ITransactionApi {
780780
signature: string;
781781
}): Promise<void> {
782782
try {
783-
const url = `${this.baseUrl}/api/v1/multisig-transactions/${args.safeTxHash}`;
783+
const url = `${this.baseUrl}/api/v2/multisig-transactions/${args.safeTxHash}`;
784784
await this.networkService.delete({
785785
url,
786786
data: {
@@ -849,7 +849,7 @@ export class TransactionApi implements ITransactionApi {
849849
chainId: this.chainId,
850850
...args,
851851
});
852-
const url = `${this.baseUrl}/api/v1/safes/${args.safeAddress}/all-transactions/`;
852+
const url = `${this.baseUrl}/api/v2/safes/${args.safeAddress}/all-transactions/`;
853853
return await this.dataSource.get<Page<Transaction>>({
854854
cacheDir,
855855
url,
@@ -1022,7 +1022,7 @@ export class TransactionApi implements ITransactionApi {
10221022
data: ProposeTransactionDto;
10231023
}): Promise<unknown> {
10241024
try {
1025-
const url = `${this.baseUrl}/api/v1/safes/${args.address}/multisig-transactions/`;
1025+
const url = `${this.baseUrl}/api/v2/safes/${args.address}/multisig-transactions/`;
10261026
return await this.networkService.post({
10271027
url,
10281028
data: {

‎src/routes/estimations/estimations.controller.spec.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ describe('Estimations Controller (Unit)', () => {
5555
networkService.get.mockImplementation(({ url }) => {
5656
const chainsUrl = `${safeConfigUrl}/api/v1/chains/${chain.chainId}`;
5757
const getSafeUrl = `${chain.transactionService}/api/v1/safes/${safe.address}`;
58-
const multisigTransactionsUrl = `${chain.transactionService}/api/v1/safes/${safe.address}/multisig-transactions/`;
58+
const multisigTransactionsUrl = `${chain.transactionService}/api/v2/safes/${safe.address}/multisig-transactions/`;
5959
if (url === chainsUrl) {
6060
return Promise.resolve({ data: rawify(chain), status: 200 });
6161
}
@@ -109,7 +109,7 @@ describe('Estimations Controller (Unit)', () => {
109109
networkService.get.mockImplementation(({ url }) => {
110110
const chainsUrl = `${safeConfigUrl}/api/v1/chains/${chain.chainId}`;
111111
const getSafeUrl = `${chain.transactionService}/api/v1/safes/${safe.address}`;
112-
const multisigTransactionsUrl = `${chain.transactionService}/api/v1/safes/${safe.address}/multisig-transactions/`;
112+
const multisigTransactionsUrl = `${chain.transactionService}/api/v2/safes/${safe.address}/multisig-transactions/`;
113113
if (url === chainsUrl) {
114114
return Promise.resolve({ data: rawify(chain), status: 200 });
115115
}
@@ -188,7 +188,7 @@ describe('Estimations Controller (Unit)', () => {
188188
const chainsUrl = `${safeConfigUrl}/api/v1/chains/${chain.chainId}`;
189189
// Param ValidationPipe checksums address
190190
const getSafeUrl = `${chain.transactionService}/api/v1/safes/${getAddress(address)}`;
191-
const multisigTransactionsUrl = `${chain.transactionService}/api/v1/safes/${getAddress(address)}/multisig-transactions/`;
191+
const multisigTransactionsUrl = `${chain.transactionService}/api/v2/safes/${getAddress(address)}/multisig-transactions/`;
192192
if (url === chainsUrl) {
193193
return Promise.resolve({ data: rawify(chain), status: 200 });
194194
}
@@ -243,7 +243,7 @@ describe('Estimations Controller (Unit)', () => {
243243
const chainsUrl = `${safeConfigUrl}/api/v1/chains/${chain.chainId}`;
244244
// Param ValidationPipe checksums address
245245
const getSafeUrl = `${chain.transactionService}/api/v1/safes/${getAddress(address)}`;
246-
const multisigTransactionsUrl = `${chain.transactionService}/api/v1/safes/${getAddress(address)}/multisig-transactions/`;
246+
const multisigTransactionsUrl = `${chain.transactionService}/api/v2/safes/${getAddress(address)}/multisig-transactions/`;
247247
if (url === chainsUrl) {
248248
return Promise.resolve({ data: rawify(chain), status: 200 });
249249
}
@@ -298,7 +298,7 @@ describe('Estimations Controller (Unit)', () => {
298298
const chainsUrl = `${safeConfigUrl}/api/v1/chains/${chain.chainId}`;
299299
// Param ValidationPipe checksums address
300300
const getSafeUrl = `${chain.transactionService}/api/v1/safes/${getAddress(address)}`;
301-
const multisigTransactionsUrl = `${chain.transactionService}/api/v1/safes/${getAddress(address)}/multisig-transactions/`;
301+
const multisigTransactionsUrl = `${chain.transactionService}/api/v2/safes/${getAddress(address)}/multisig-transactions/`;
302302
if (url === chainsUrl) {
303303
return Promise.resolve({ data: rawify(chain), status: 200 });
304304
}

‎src/routes/hooks/hooks-notifications.spec.ts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@ describe('Hook Events for Notifications (Unit) pt. 1', () => {
378378
});
379379
} else if (
380380
url ===
381-
`${chain.transactionService}/api/v1/multisig-transactions/${event.safeTxHash}/`
381+
`${chain.transactionService}/api/v2/multisig-transactions/${event.safeTxHash}/`
382382
) {
383383
return Promise.resolve({
384384
status: 200,
@@ -518,7 +518,7 @@ describe('Hook Events for Notifications (Unit) pt. 1', () => {
518518
});
519519
} else if (
520520
url ===
521-
`${chain.transactionService}/api/v1/multisig-transactions/${event.safeTxHash}/`
521+
`${chain.transactionService}/api/v2/multisig-transactions/${event.safeTxHash}/`
522522
) {
523523
return Promise.resolve({
524524
status: 200,
@@ -600,7 +600,7 @@ describe('Hook Events for Notifications (Unit) pt. 1', () => {
600600
});
601601
} else if (
602602
url ===
603-
`${chain.transactionService}/api/v1/multisig-transactions/${event.safeTxHash}/`
603+
`${chain.transactionService}/api/v2/multisig-transactions/${event.safeTxHash}/`
604604
) {
605605
return Promise.resolve({
606606
status: 200,
@@ -1023,7 +1023,7 @@ describe('Hook Events for Notifications (Unit) pt. 1', () => {
10231023
});
10241024
} else if (
10251025
url ===
1026-
`${chain.transactionService}/api/v1/multisig-transactions/${event.safeTxHash}/`
1026+
`${chain.transactionService}/api/v2/multisig-transactions/${event.safeTxHash}/`
10271027
) {
10281028
return Promise.resolve({
10291029
status: 200,
@@ -1170,7 +1170,7 @@ describe('Hook Events for Notifications (Unit) pt. 1', () => {
11701170
});
11711171
} else if (
11721172
url ===
1173-
`${chain.transactionService}/api/v1/multisig-transactions/${event.safeTxHash}/`
1173+
`${chain.transactionService}/api/v2/multisig-transactions/${event.safeTxHash}/`
11741174
) {
11751175
return Promise.resolve({
11761176
status: 200,
@@ -1259,7 +1259,7 @@ describe('Hook Events for Notifications (Unit) pt. 1', () => {
12591259
});
12601260
} else if (
12611261
url ===
1262-
`${chain.transactionService}/api/v1/multisig-transactions/${event.safeTxHash}/`
1262+
`${chain.transactionService}/api/v2/multisig-transactions/${event.safeTxHash}/`
12631263
) {
12641264
return Promise.resolve({
12651265
status: 200,
@@ -1673,7 +1673,7 @@ describe('Hook Events for Notifications (Unit) pt. 1', () => {
16731673
});
16741674
} else if (
16751675
url ===
1676-
`${chain.transactionService}/api/v1/multisig-transactions/${event.safeTxHash}/`
1676+
`${chain.transactionService}/api/v2/multisig-transactions/${event.safeTxHash}/`
16771677
) {
16781678
return Promise.resolve({
16791679
status: 200,
@@ -1866,7 +1866,7 @@ describe('Hook Events for Notifications (Unit) pt. 1', () => {
18661866
});
18671867
} else if (
18681868
url ===
1869-
`${chain.transactionService}/api/v1/multisig-transactions/${event.safeTxHash}/`
1869+
`${chain.transactionService}/api/v2/multisig-transactions/${event.safeTxHash}/`
18701870
) {
18711871
return Promise.resolve({
18721872
status: 200,
@@ -2136,7 +2136,7 @@ describe('Hook Events for Notifications (Unit) pt. 1', () => {
21362136
});
21372137
} else if (
21382138
url ===
2139-
`${chain.transactionService}/api/v1/multisig-transactions/${multisigTransaction.safeTxHash}/`
2139+
`${chain.transactionService}/api/v2/multisig-transactions/${multisigTransaction.safeTxHash}/`
21402140
) {
21412141
return Promise.resolve({
21422142
status: 200,

‎src/routes/safes/safes.controller.nonces.spec.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ describe('Safes Controller Nonces (Unit)', () => {
5353
return Promise.resolve({ data: rawify(chain), status: 200 });
5454
case `${chain.transactionService}/api/v1/safes/${safeInfo.address}`:
5555
return Promise.resolve({ data: rawify(safeInfo), status: 200 });
56-
case `${chain.transactionService}/api/v1/safes/${safeInfo.address}/multisig-transactions/`:
56+
case `${chain.transactionService}/api/v2/safes/${safeInfo.address}/multisig-transactions/`:
5757
return Promise.resolve({
5858
data: rawify(multisigTransactionsPage),
5959
status: 200,
@@ -90,7 +90,7 @@ describe('Safes Controller Nonces (Unit)', () => {
9090
return Promise.resolve({ data: rawify(chain), status: 200 });
9191
case `${chain.transactionService}/api/v1/safes/${safeInfo.address}`:
9292
return Promise.resolve({ data: rawify(safeInfo), status: 200 });
93-
case `${chain.transactionService}/api/v1/safes/${safeInfo.address}/multisig-transactions/`:
93+
case `${chain.transactionService}/api/v2/safes/${safeInfo.address}/multisig-transactions/`:
9494
return Promise.resolve({
9595
data: rawify(multisigTransactionsPage),
9696
status: 200,
@@ -119,7 +119,7 @@ describe('Safes Controller Nonces (Unit)', () => {
119119
return Promise.resolve({ data: rawify(chain), status: 200 });
120120
case `${chain.transactionService}/api/v1/safes/${safeInfo.address}`:
121121
return Promise.resolve({ data: rawify(safeInfo), status: 200 });
122-
case `${chain.transactionService}/api/v1/safes/${safeInfo.address}/multisig-transactions/`:
122+
case `${chain.transactionService}/api/v2/safes/${safeInfo.address}/multisig-transactions/`:
123123
return Promise.resolve({
124124
data: rawify(multisigTransactionsPage),
125125
status: 200,

0 commit comments

Comments
 (0)