Skip to content

Commit

Permalink
Merge branch 'v8/develop' into v8/new-telemetry
Browse files Browse the repository at this point in the history
  • Loading branch information
@Mihajlo-Pavlovic
Mihajlo-Pavlovic committed Dec 5, 2024
2 parents 8bf4566 + 465534c commit 6e3e138
Show file tree
Hide file tree
Showing 185 changed files with 14,873 additions and 13,811 deletions.
Binary file added bin/darwin/arm64/bls-tools
View file
Binary file not shown.
Binary file added bin/darwin/x64/bls-tools
View file
Binary file not shown.
Binary file added bin/linux/arm64/bls-tools
View file
Binary file not shown.
Binary file added bin/linux/x64/bls-tools
View file
Binary file not shown.
Binary file added bin/win32/x64/bls-tools.exe
View file
Binary file not shown.
112 changes: 105 additions & 7 deletions config/config.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"enabled": false,
"package": "./auto-updater/implementation/ot-auto-updater.js",
"config": {
"branch": "v6/develop"
"branch": "v8/develop"
}
}
}
Expand Down Expand Up @@ -161,9 +161,29 @@
}
}
}
},
"blockchainEvents": {
"enabled": true,
"implementation": {
"ot-ethers": {
"enabled": true,
"package": "./blockchain-events/implementation/ot-ethers/ot-ethers.js",
"config": {
"blockchains": ["hardhat1:31337", "hardhat2:31337"],
"rpcEndpoints": {
"hardhat1:31337": ["http://localhost:8545"],
"hardhat2:31337": ["http://localhost:9545"]
},
"hubContractAddress": {
"hardhat1:31337": "0x5FbDB2315678afecb367f032d93F642f64180aa3",
"hardhat2:31337": "0x5FbDB2315678afecb367f032d93F642f64180aa3"
}
}
}
}
}
},
"maximumAssertionSizeInKb": 10000,
"maximumAssertionSizeInKb": 500000,
"commandExecutorVerboseLoggingEnabled": false,
"appDataPath": "data",
"logLevel": "info",
Expand All @@ -188,7 +208,7 @@
"enabled": false,
"package": "./auto-updater/implementation/ot-auto-updater.js",
"config": {
"branch": "v6/develop"
"branch": "v8/develop"
}
}
}
Expand Down Expand Up @@ -330,9 +350,29 @@
}
}
}
},
"blockchainEvents": {
"enabled": true,
"implementation": {
"ot-ethers": {
"enabled": true,
"package": "./blockchain-events/implementation/ot-ethers/ot-ethers.js",
"config": {
"blockchains": ["hardhat1:31337", "hardhat2:31337"],
"rpcEndpoints": {
"hardhat1:31337": ["http://localhost:8545"],
"hardhat2:31337": ["http://localhost:9545"]
},
"hubContractAddress": {
"hardhat1:31337": "0x5FbDB2315678afecb367f032d93F642f64180aa3",
"hardhat2:31337": "0x5FbDB2315678afecb367f032d93F642f64180aa3"
}
}
}
}
}
},
"maximumAssertionSizeInKb": 10000,
"maximumAssertionSizeInKb": 500000,
"commandExecutorVerboseLoggingEnabled": false,
"appDataPath": "data",
"logLevel": "trace",
Expand Down Expand Up @@ -499,9 +539,27 @@
}
}
}
},
"blockchainEvents": {
"enabled": true,
"implementation": {
"ot-ethers": {
"enabled": true,
"package": "./blockchain-events/implementation/ot-ethers/ot-ethers.js",
"config": {
"blockchains": ["base:84532"],
"rpcEndpoints": {
"base:84532": ["https://sepolia.base.org"]
},
"hubContractAddress": {
"base:84532": "0xCca0eA14540588A09c85cD6A6Fc53eA3A7010692"
}
}
}
}
}
},
"maximumAssertionSizeInKb": 10000,
"maximumAssertionSizeInKb": 500000,
"commandExecutorVerboseLoggingEnabled": false,
"appDataPath": "data",
"logLevel": "trace",
Expand Down Expand Up @@ -667,9 +725,27 @@
}
}
}
},
"blockchainEvents": {
"enabled": true,
"implementation": {
"ot-ethers": {
"enabled": true,
"package": "./blockchain-events/implementation/ot-ethers/ot-ethers.js",
"config": {
"blockchains": ["base:84532"],
"rpcEndpoints": {
"base:84532": ["https://sepolia.base.org"]
},
"hubContractAddress": {
"base:84532": "0xAB4A4794Fc1F415C24807B947280aCa8dC492238"
}
}
}
}
}
},
"maximumAssertionSizeInKb": 10000,
"maximumAssertionSizeInKb": 500000,
"commandExecutorVerboseLoggingEnabled": false,
"appDataPath": "data",
"logLevel": "trace",
Expand Down Expand Up @@ -859,9 +935,31 @@
}
}
}
},
"blockchainEvents": {
"enabled": true,
"implementation": {
"ot-ethers": {
"enabled": true,
"package": "./blockchain-events/implementation/ot-ethers/ot-ethers.js",
"config": {
"blockchains": ["otp:2043"],
"rpcEndpoints": {
"otp:2043": [
"https://astrosat-parachain-rpc.origin-trail.network",
"https://astrosat.origintrail.network/",
"https://astrosat-2.origintrail.network/"
]
},
"hubContractAddress": {
"otp:2043": "0x5fA7916c48Fe6D5F1738d12Ad234b78c90B4cAdA"
}
}
}
}
}
},
"maximumAssertionSizeInKb": 10000,
"maximumAssertionSizeInKb": 500000,
"commandExecutorVerboseLoggingEnabled": false,
"appDataPath": "data",
"logLevel": "trace",
Expand Down
53 changes: 33 additions & 20 deletions installer/installer.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -315,27 +315,9 @@ install_node() {
"enabled": "true",
"config": {
"repositories": {
"privateCurrent": {
"dkg": {
"url": $tripleStoreUrl,
"name": "private-current",
"username": "admin",
"password": ""
},
"privateHistory": {
"url": $tripleStoreUrl,
"name": "private-history",
"username": "admin",
"password": ""
},
"publicCurrent": {
"url": $tripleStoreUrl,
"name": "public-current",
"username": "admin",
"password": ""
},
"publicHistory": {
"url": $tripleStoreUrl,
"name": "public-history",
"name": "dkg",
"username": "admin",
"password": ""
}
Expand Down Expand Up @@ -424,6 +406,37 @@ EOF
# Configure Base-Sepolia
configure_blockchain "base" $base_blockchain_id

# Function to configure blockchain events services
configure_blockchain_events_services() {
local blockchain=$1
local blockchain_id=$2

print_color $CYAN "🔧 Configuring Blockchain Events Service for Base Sepolia (Testnet)..."

read -p "$(print_color $YELLOW "Enter your RPC endpoint: ")" RPC_ENDPOINT
print_color $GREEN "✅ RPC endpoint: $RPC_ENDPOINT"

local jq_filter=$(cat <<EOF
.modules.blockchainEvents.implementation["ot-ethers"] = {
"enabled": true,
"config": {
"blockchains": ["$blockchain:$blockchain_id"],
rpcEndpoints: {
"$blockchain:$blockchain_id": ["$RPC_ENDPOINT"]
}
}
}
EOF
)

jq "$jq_filter" $CONFIG_DIR/.origintrail_noderc > $CONFIG_DIR/origintrail_noderc_tmp
mv $CONFIG_DIR/origintrail_noderc_tmp $CONFIG_DIR/.origintrail_noderc
chmod 600 $CONFIG_DIR/.origintrail_noderc
}

# Configure blockchain events service for Base Sepolia
configure_blockchain_events_services "base" $base_blockchain_id

# Now execute npm install after configuring wallets
print_color $CYAN "📦 Installing npm packages..."
perform_step npm ci --omit=dev --ignore-scripts "Executing npm install"
Expand Down
Loading

0 comments on commit 6e3e138

Please sign in to comment.