From b30d300c71e800f1ca0db5461986d1dda84e77a4 Mon Sep 17 00:00:00 2001 From: Mihajlo Pavlovic Date: Thu, 20 Jun 2024 12:00:21 +0200 Subject: [PATCH 1/8] Default config update --- config/config.json | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/config/config.json b/config/config.json index 9b1d8b10a8..3b8f3e26b5 100644 --- a/config/config.json +++ b/config/config.json @@ -443,6 +443,16 @@ "rpcEndpoints": ["https://rpc.chiadochain.net"], "operatorFee": 0 } + }, + "base:84532": { + "enabled": false, + "package": "./blockchain/implementation/gnosis/base-service.js", + + "config": { + "hubContractAddress": "", + "rpcEndpoints": ["https://sepolia.base.org"], + "operatorFee": 0 + } } } }, @@ -617,6 +627,16 @@ "rpcEndpoints": ["https://rpc.chiadochain.net"], "operatorFee": 0 } + }, + "base:84532": { + "enabled": false, + "package": "./blockchain/implementation/gnosis/base-service.js", + + "config": { + "hubContractAddress": "", + "rpcEndpoints": ["https://sepolia.base.org"], + "operatorFee": 0 + } } } }, @@ -791,6 +811,15 @@ "gasPriceOracleLink": "https://api.gnosisscan.io/api?module=proxy&action=eth_gasPrice", "operatorFee": 0 } + }, + "base:8453": { + "enabled": false, + "package": "./blockchain/implementation/gnosis/base-service.js", + + "config": { + "hubContractAddress": "", + "operatorFee": 0 + } } } }, From ad1ae3ce0b2d061e8c62ef9321c3c44b7fd4d68f Mon Sep 17 00:00:00 2001 From: Mihajlo Pavlovic Date: Thu, 20 Jun 2024 12:01:41 +0200 Subject: [PATCH 2/8] Fix package path for base integration --- config/config.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/config.json b/config/config.json index 3b8f3e26b5..86f8d1b99a 100644 --- a/config/config.json +++ b/config/config.json @@ -446,7 +446,7 @@ }, "base:84532": { "enabled": false, - "package": "./blockchain/implementation/gnosis/base-service.js", + "package": "./blockchain/implementation/base/base-service.js", "config": { "hubContractAddress": "", @@ -630,7 +630,7 @@ }, "base:84532": { "enabled": false, - "package": "./blockchain/implementation/gnosis/base-service.js", + "package": "./blockchain/implementation/base/base-service.js", "config": { "hubContractAddress": "", @@ -814,7 +814,7 @@ }, "base:8453": { "enabled": false, - "package": "./blockchain/implementation/gnosis/base-service.js", + "package": "./blockchain/implementation/base/base-service.js", "config": { "hubContractAddress": "", From 9fbba4f236c0de9a24abaaa6196454fbe7354181 Mon Sep 17 00:00:00 2001 From: Mihajlo Pavlovic Date: Thu, 20 Jun 2024 13:56:41 +0200 Subject: [PATCH 3/8] Add base-service implementation --- src/constants/constants.js | 1 + .../implementation/base/base-service.js | 25 +++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 src/modules/blockchain/implementation/base/base-service.js diff --git a/src/constants/constants.js b/src/constants/constants.js index 112a8a3767..ea771a96f8 100644 --- a/src/constants/constants.js +++ b/src/constants/constants.js @@ -724,6 +724,7 @@ export const BLOCK_TIME_MILLIS = { HARDHAT: 5_000, GNOSIS: 5_000, DEFAULT: 12_000, + BASE: 2_000, }; export const TRANSACTION_CONFIRMATIONS = 1; diff --git a/src/modules/blockchain/implementation/base/base-service.js b/src/modules/blockchain/implementation/base/base-service.js new file mode 100644 index 0000000000..257b94523b --- /dev/null +++ b/src/modules/blockchain/implementation/base/base-service.js @@ -0,0 +1,25 @@ +import Web3Service from '../web3-service.js'; +import { BLOCK_TIME_MILLIS } from '../../../../constants/constants.js'; + +class BaseService extends Web3Service { + constructor(ctx) { + super(ctx); + + this.baseTokenTicker = 'BASE'; + this.tracTicker = 'TRAC'; + } + + getBlockTimeMillis() { + return BLOCK_TIME_MILLIS.BASE; + } + + async getGasPrice() { + return this.provider.getGasPrice(); + } + + async getAgreementScoreFunctionId() { + return 2; + } +} + +export default BaseService; From e0d91dd074e9e7d26386524d91f122c78dacb363 Mon Sep 17 00:00:00 2001 From: Mihajlo Pavlovic Date: Thu, 20 Jun 2024 16:55:07 +0200 Subject: [PATCH 4/8] Add Hub contracts for devnet and testnet --- config/config.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/config.json b/config/config.json index 86f8d1b99a..cbc91c4b3f 100644 --- a/config/config.json +++ b/config/config.json @@ -449,7 +449,7 @@ "package": "./blockchain/implementation/base/base-service.js", "config": { - "hubContractAddress": "", + "hubContractAddress": "0x144eDa5cbf8926327cb2cceef168A121F0E4A299", "rpcEndpoints": ["https://sepolia.base.org"], "operatorFee": 0 } @@ -633,7 +633,7 @@ "package": "./blockchain/implementation/base/base-service.js", "config": { - "hubContractAddress": "", + "hubContractAddress": "0x6C861Cb69300C34DfeF674F7C00E734e840C29C0", "rpcEndpoints": ["https://sepolia.base.org"], "operatorFee": 0 } From b617fb2e0490cf192c7c1b47f83743a74405c736 Mon Sep 17 00:00:00 2001 From: Mihajlo Pavlovic Date: Thu, 20 Jun 2024 17:05:49 +0200 Subject: [PATCH 5/8] Version bump --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 490bddcd9f..29c6900dc2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "origintrail_node", - "version": "6.4.0", + "version": "6.4.", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "origintrail_node", - "version": "6.4.0", + "version": "6.4.", "license": "ISC", "dependencies": { "@comunica/query-sparql": "^2.4.3", diff --git a/package.json b/package.json index 780e5ace14..a03adfca99 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "origintrail_node", - "version": "6.4.0", + "version": "6.4.1", "description": "OTNode V6", "main": "index.js", "type": "module", From d90e1407cced75835146ac458ffc4fec3c24b640 Mon Sep 17 00:00:00 2001 From: Mihajlo Pavlovic Date: Thu, 20 Jun 2024 17:16:31 +0200 Subject: [PATCH 6/8] Fix baseTokenTicker in BaseService --- src/modules/blockchain/implementation/base/base-service.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/blockchain/implementation/base/base-service.js b/src/modules/blockchain/implementation/base/base-service.js index 257b94523b..c6dd518cdd 100644 --- a/src/modules/blockchain/implementation/base/base-service.js +++ b/src/modules/blockchain/implementation/base/base-service.js @@ -5,7 +5,7 @@ class BaseService extends Web3Service { constructor(ctx) { super(ctx); - this.baseTokenTicker = 'BASE'; + this.baseTokenTicker = 'ETH'; this.tracTicker = 'TRAC'; } From 075b885b3df9223695939ccba538c27356603006 Mon Sep 17 00:00:00 2001 From: Mihajlo Pavlovic Date: Fri, 21 Jun 2024 12:08:20 +0200 Subject: [PATCH 7/8] Update dkg.js version. Add typesrcipt dependecy for hardhat support --- package-lock.json | 21 +++++++++++---------- package.json | 5 +++-- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/package-lock.json b/package-lock.json index f47739456e..3a7fdadd7a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "origintrail_node", - "version": "6.4.", + "version": "6.4.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "origintrail_node", - "version": "6.4.", + "version": "6.4.1", "license": "ISC", "dependencies": { "@comunica/query-sparql": "^2.4.3", @@ -68,7 +68,7 @@ "chai": "^4.3.6", "d3": "^7.8.5", "d3-node": "^3.0.0", - "dkg.js": "^6.1.2", + "dkg.js": "^6.3.0", "eslint": "^8.23.0", "eslint-config-airbnb": "^19.0.4", "eslint-config-prettier": "^8.5.0", @@ -79,7 +79,8 @@ "prettier": "^2.7.1", "sharp": "^0.32.6", "sinon": "^14.0.0", - "slugify": "^1.6.5" + "slugify": "^1.6.5", + "typescript": "^5.5.2" }, "engines": { "node": ">=16.0.0", @@ -20697,9 +20698,9 @@ } }, "node_modules/typescript": { - "version": "5.4.5", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz", - "integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==", + "version": "5.5.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.2.tgz", + "integrity": "sha512-NcRtPEOsPFFWjobJEtfihkLCZCXZt/os3zf8nTxjVH3RvTSxjrCamJpbExGvYOF+tFHc3pA65qpdwPbzjohhew==", "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -38579,9 +38580,9 @@ } }, "typescript": { - "version": "5.4.5", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz", - "integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==" + "version": "5.5.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.2.tgz", + "integrity": "sha512-NcRtPEOsPFFWjobJEtfihkLCZCXZt/os3zf8nTxjVH3RvTSxjrCamJpbExGvYOF+tFHc3pA65qpdwPbzjohhew==" }, "uint8arrays": { "version": "3.1.1", diff --git a/package.json b/package.json index 91248554f2..98cddbccfa 100644 --- a/package.json +++ b/package.json @@ -50,7 +50,7 @@ "chai": "^4.3.6", "d3": "^7.8.5", "d3-node": "^3.0.0", - "dkg.js": "^6.1.2", + "dkg.js": "^6.3.0", "eslint": "^8.23.0", "eslint-config-airbnb": "^19.0.4", "eslint-config-prettier": "^8.5.0", @@ -61,7 +61,8 @@ "prettier": "^2.7.1", "sharp": "^0.32.6", "sinon": "^14.0.0", - "slugify": "^1.6.5" + "slugify": "^1.6.5", + "typescript": "^5.5.2" }, "dependencies": { "@comunica/query-sparql": "^2.4.3", From 189a3a4f0020d533bd31277008ed411f8e3f2ad2 Mon Sep 17 00:00:00 2001 From: Mihajlo Pavlovic Date: Fri, 21 Jun 2024 12:56:45 +0200 Subject: [PATCH 8/8] Set version to 6.5.0 --- package-lock.json | 3 +-- package.json | 5 ++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3a7fdadd7a..dfe3dfd334 100644 --- a/package-lock.json +++ b/package-lock.json @@ -79,8 +79,7 @@ "prettier": "^2.7.1", "sharp": "^0.32.6", "sinon": "^14.0.0", - "slugify": "^1.6.5", - "typescript": "^5.5.2" + "slugify": "^1.6.5" }, "engines": { "node": ">=16.0.0", diff --git a/package.json b/package.json index 98cddbccfa..bb88a9c324 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "origintrail_node", - "version": "6.4.1", + "version": "6.5.0", "description": "OTNode V6", "main": "index.js", "type": "module", @@ -61,8 +61,7 @@ "prettier": "^2.7.1", "sharp": "^0.32.6", "sinon": "^14.0.0", - "slugify": "^1.6.5", - "typescript": "^5.5.2" + "slugify": "^1.6.5" }, "dependencies": { "@comunica/query-sparql": "^2.4.3",