🚀 Updated framework in all services

LiskArchive · Oct 20, 2023 · 8a1273f · 8a1273f
1 parent b73fbbf
commit 8a1273f
Show file tree

Hide file tree

Showing 23 changed files with 6,957 additions and 7,057 deletions.
diff --git a/framework/dist/lisk-service-framework-1.6.2.tgz b/framework/dist/lisk-service-framework-1.6.2.tgz
diff --git a/framework/yarn.lock b/framework/yarn.lock
diff --git a/services/blockchain-app-registry/package.json b/services/blockchain-app-registry/package.json
@@ -33,11 +33,7 @@
   },
   "dependencies": {
     "bluebird": "^3.7.2",
-<<<<<<< HEAD
-    "lisk-service-framework": "https://github.com/LiskHQ/lisk-service/raw/19417a9e6e4eb07032aef25e8647f9f7536a5a40/framework/dist/lisk-service-framework-1.6.2.tgz",
-=======
-    "lisk-service-framework": "https://github.com/LiskHQ/lisk-service/raw/f84c21e6955b64ceeb006e4b685a06a9f41e5004/framework/dist/lisk-service-framework-1.6.2.tgz",
->>>>>>> release/0.7.0
+    "lisk-service-framework": "https://github.com/LiskHQ/lisk-service/raw/b73fbbf7ff44398b0ce1e0f542b408326bb834db/framework/dist/lisk-service-framework-1.6.3.tgz",
     "lodash": "^4.17.21",
     "octokit": "^2.0.4",
     "tar": "^6.1.11"

diff --git a/services/blockchain-app-registry/yarn.lock b/services/blockchain-app-registry/yarn.lock
diff --git a/services/blockchain-connector/package.json b/services/blockchain-connector/package.json
@@ -39,11 +39,7 @@
 		"big-json": "^3.1.0",
 		"bluebird": "^3.7.2",
 		"knex": "^2.4.0",
-<<<<<<< HEAD
-		"lisk-service-framework": "https://github.com/LiskHQ/lisk-service/raw/19417a9e6e4eb07032aef25e8647f9f7536a5a40/framework/dist/lisk-service-framework-1.6.2.tgz",
-=======
-		"lisk-service-framework": "https://github.com/LiskHQ/lisk-service/raw/f84c21e6955b64ceeb006e4b685a06a9f41e5004/framework/dist/lisk-service-framework-1.6.2.tgz",
->>>>>>> release/0.7.0
+		"lisk-service-framework": "https://github.com/LiskHQ/lisk-service/raw/b73fbbf7ff44398b0ce1e0f542b408326bb834db/framework/dist/lisk-service-framework-1.6.3.tgz",
 		"moment": "^2.29.4",
 		"signals": "^1.0.0",
 		"tar": "^6.1.11"

diff --git a/services/blockchain-connector/yarn.lock b/services/blockchain-connector/yarn.lock
@@ -3927,7 +3927,6 @@ lines-and-columns@^1.1.6:
   resolved "https://npm.lisk.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632"
   integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==
 
-<<<<<<< HEAD
 "lisk-service-framework@https://github.com/LiskHQ/lisk-service/raw/19417a9e6e4eb07032aef25e8647f9f7536a5a40/framework/dist/lisk-service-framework-1.6.2.tgz":
   version "1.6.2"
   resolved "https://github.com/LiskHQ/lisk-service/raw/19417a9e6e4eb07032aef25e8647f9f7536a5a40/framework/dist/lisk-service-framework-1.6.2.tgz#3a1c20e380a57bb188fc0d9f59bde18957655156"
@@ -3958,14 +3957,9 @@ lines-and-columns@^1.1.6:
     socket.io-client "^4.0.1"
     stack-trace "0.0.10"
 
-"lisk-service-framework@https://github.com/LiskHQ/lisk-service/raw/9e278b6e073c60eac0d9616197c7a385db01d4c8/framework/dist/lisk-service-framework-1.6.1.tgz":
-  version "1.6.1"
-  resolved "https://github.com/LiskHQ/lisk-service/raw/9e278b6e073c60eac0d9616197c7a385db01d4c8/framework/dist/lisk-service-framework-1.6.1.tgz#ca20b4aa4202b9500b1f6f0d9269601253908ea9"
-=======
-"lisk-service-framework@https://github.com/LiskHQ/lisk-service/raw/f84c21e6955b64ceeb006e4b685a06a9f41e5004/framework/dist/lisk-service-framework-1.6.2.tgz":
-  version "1.6.2"
-  resolved "https://github.com/LiskHQ/lisk-service/raw/f84c21e6955b64ceeb006e4b685a06a9f41e5004/framework/dist/lisk-service-framework-1.6.2.tgz#1cfec75d732778d5a1106aa9c107ba42e20e0fbf"
->>>>>>> release/0.7.0
+"lisk-service-framework@https://github.com/LiskHQ/lisk-service/raw/b73fbbf7ff44398b0ce1e0f542b408326bb834db/framework/dist/lisk-service-framework-1.6.3.tgz":
+  version "1.6.3"
+  resolved "https://github.com/LiskHQ/lisk-service/raw/b73fbbf7ff44398b0ce1e0f542b408326bb834db/framework/dist/lisk-service-framework-1.6.3.tgz#f29759d295ee9b913213387fdb32d97985e2d6f3"
   dependencies:
     "@keyv/redis" "^2.1.2"
     "@log4js-node/gelf" "github:MichalTuleja/log4js-node-gelf#89d9933"

diff --git a/services/blockchain-coordinator/package.json b/services/blockchain-coordinator/package.json
@@ -31,11 +31,7 @@
   "dependencies": {
     "bluebird": "^3.7.2",
     "bull": "^4.8.1",
-<<<<<<< HEAD
-    "lisk-service-framework": "https://github.com/LiskHQ/lisk-service/raw/19417a9e6e4eb07032aef25e8647f9f7536a5a40/framework/dist/lisk-service-framework-1.6.2.tgz"
-=======
-    "lisk-service-framework": "https://github.com/LiskHQ/lisk-service/raw/f84c21e6955b64ceeb006e4b685a06a9f41e5004/framework/dist/lisk-service-framework-1.6.2.tgz"
->>>>>>> release/0.7.0
+    "lisk-service-framework": "https://github.com/LiskHQ/lisk-service/raw/b73fbbf7ff44398b0ce1e0f542b408326bb834db/framework/dist/lisk-service-framework-1.6.3.tgz"
   },
   "devDependencies": {
     "@babel/preset-env": "^7.14.0",

diff --git a/services/blockchain-coordinator/yarn.lock b/services/blockchain-coordinator/yarn.lock
diff --git a/services/blockchain-indexer/package.json b/services/blockchain-indexer/package.json
@@ -38,11 +38,7 @@
 		"bull": "^4.8.1",
 		"camelcase": "^6.3.0",
 		"ioredis": "^4.28.5",
-<<<<<<< HEAD
-		"lisk-service-framework": "https://github.com/LiskHQ/lisk-service/raw/19417a9e6e4eb07032aef25e8647f9f7536a5a40/framework/dist/lisk-service-framework-1.6.2.tgz",
-=======
-		"lisk-service-framework": "https://github.com/LiskHQ/lisk-service/raw/f84c21e6955b64ceeb006e4b685a06a9f41e5004/framework/dist/lisk-service-framework-1.6.2.tgz",
->>>>>>> release/0.7.0
+		"lisk-service-framework": "https://github.com/LiskHQ/lisk-service/raw/b73fbbf7ff44398b0ce1e0f542b408326bb834db/framework/dist/lisk-service-framework-1.6.3.tgz",
 		"lodash": "^4.17.21",
 		"require-all": "^3.0.0"
 	},