From 2a855c28251d094802f1d99b8bdfcb1d22d59b4b Mon Sep 17 00:00:00 2001 From: marshacb Date: Mon, 20 May 2024 12:46:56 -0400 Subject: [PATCH 1/4] chore(registry): update registry dep --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 01c8727e..f2067965 100644 --- a/package.json +++ b/package.json @@ -51,6 +51,6 @@ }, "dependencies": { "@polkadot/api": "11.0.2", - "@substrate/asset-transfer-api-registry": "^0.2.17" + "@substrate/asset-transfer-api-registry": "^0.2.18" } } diff --git a/yarn.lock b/yarn.lock index 22daf06a..56dc8e83 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1400,10 +1400,10 @@ __metadata: languageName: node linkType: hard -"@substrate/asset-transfer-api-registry@npm:^0.2.17": - version: 0.2.17 - resolution: "@substrate/asset-transfer-api-registry@npm:0.2.17" - checksum: 10/aa88eaebebbe17e51f768ce568795301e6ab1707407a4b129bae2429ccfca70fce38b6079b5d1edceba6761e62b7650a5a53e615865c8e7edd82ab62cbe9a4bd +"@substrate/asset-transfer-api-registry@npm:^0.2.18": + version: 0.2.18 + resolution: "@substrate/asset-transfer-api-registry@npm:0.2.18" + checksum: 10/2933f958575b14ff6c6e0221dc423a21c24cf12888aad5228944f55844621c878bc6f49f93045b5f084d5bc0d317e1ffa174d2d07f0aa76475d37781b43d9758 languageName: node linkType: hard @@ -1412,7 +1412,7 @@ __metadata: resolution: "@substrate/asset-transfer-api@workspace:." dependencies: "@polkadot/api": "npm:11.0.2" - "@substrate/asset-transfer-api-registry": "npm:^0.2.17" + "@substrate/asset-transfer-api-registry": "npm:^0.2.18" "@substrate/dev": "npm:^0.7.1" "@types/cli-progress": "npm:^3" ansi-colors: "npm:^4.1.3" From 9f3158acfab1453a7ad06b4463a6df79ca0b0e08 Mon Sep 17 00:00:00 2001 From: marshacb Date: Thu, 13 Jun 2024 08:40:14 -0400 Subject: [PATCH 2/4] yarn --- yarn.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yarn.lock b/yarn.lock index 4158ef6b..ffa7c1a9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1400,7 +1400,7 @@ __metadata: languageName: node linkType: hard -"@substrate/asset-transfer-api-registry@npm:^0.2.19": +"@substrate/asset-transfer-api-registry@npm:^0.2.18": version: 0.2.19 resolution: "@substrate/asset-transfer-api-registry@npm:0.2.19" checksum: 10/a9e7f9add39eefa1f94303bec5c13b592e5b2531a27cc2404e038362c0cb37395bb2a37e110e3dfca5dab1a1b8c165772f6a1d1fc32be12d11080f3a27651a73 From 315e546076c87d4b144e9aad839342e4d75b76da Mon Sep 17 00:00:00 2001 From: marshacb Date: Tue, 2 Jul 2024 20:55:39 -0400 Subject: [PATCH 3/4] chore(registry): update registry dep --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 2a3c0ede..9cf6cec8 100644 --- a/package.json +++ b/package.json @@ -51,6 +51,6 @@ }, "dependencies": { "@polkadot/api": "11.2.1", - "@substrate/asset-transfer-api-registry": "^0.2.18" + "@substrate/asset-transfer-api-registry": "^0.2.20" } } diff --git a/yarn.lock b/yarn.lock index ffa7c1a9..2366cb1d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1400,10 +1400,10 @@ __metadata: languageName: node linkType: hard -"@substrate/asset-transfer-api-registry@npm:^0.2.18": - version: 0.2.19 - resolution: "@substrate/asset-transfer-api-registry@npm:0.2.19" - checksum: 10/a9e7f9add39eefa1f94303bec5c13b592e5b2531a27cc2404e038362c0cb37395bb2a37e110e3dfca5dab1a1b8c165772f6a1d1fc32be12d11080f3a27651a73 +"@substrate/asset-transfer-api-registry@npm:^0.2.20": + version: 0.2.20 + resolution: "@substrate/asset-transfer-api-registry@npm:0.2.20" + checksum: 10/77fc71840c9289476f6549662916e7cf2be370a51db2228ff678c31168f3c4d17dccd0c0373d044d2408c035bffa1608ab910b77037640b29ac187514b960929 languageName: node linkType: hard @@ -1412,7 +1412,7 @@ __metadata: resolution: "@substrate/asset-transfer-api@workspace:." dependencies: "@polkadot/api": "npm:11.2.1" - "@substrate/asset-transfer-api-registry": "npm:^0.2.18" + "@substrate/asset-transfer-api-registry": "npm:^0.2.20" "@substrate/dev": "npm:^0.7.1" "@types/cli-progress": "npm:^3" ansi-colors: "npm:^4.1.3" From d3f5e20f89b4733dd898567e24ed60ed2f9b4d21 Mon Sep 17 00:00:00 2001 From: marshacb Date: Tue, 2 Jul 2024 23:36:06 -0400 Subject: [PATCH 4/4] fix conflict --- yarn.lock | 4 ---- 1 file changed, 4 deletions(-) diff --git a/yarn.lock b/yarn.lock index ab065390..f6961118 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1400,11 +1400,7 @@ __metadata: languageName: node linkType: hard -<<<<<<< HEAD -"@substrate/asset-transfer-api-registry@npm:^0.2.20": -======= "@substrate/asset-transfer-api-registry@npm:^0.2.17": ->>>>>>> main version: 0.2.20 resolution: "@substrate/asset-transfer-api-registry@npm:0.2.20" checksum: 10/77fc71840c9289476f6549662916e7cf2be370a51db2228ff678c31168f3c4d17dccd0c0373d044d2408c035bffa1608ab910b77037640b29ac187514b960929