Skip to content

Add auto merge workflow #252

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Bojan131 merged 3 commits into from
Jun 27, 2025
Merged

Add auto merge workflow #252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f24f3c4
Upate to merge on PR
Bojan131 Jun 23, 2025
76b83ad
Update gas price to use fast instead of average
Bojan131 Jun 27, 2025
dfc08b0
Merge remote-tracking branch 'origin/v8/develop' into add-auto-merge-…
Bojan131 Jun 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion .github/workflows/auto-merge-main-to-Test_Publish_Query.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,15 @@ on:
push:
branches:
- v8/develop
pull_request:
branches:
- v8/develop
types:
- closed

jobs:
merge-develop-into-feature:
if: github.event.pull_request.merged == true || github.event_name == 'push'
runs-on: ubuntu-latest

steps:
Expand All @@ -25,7 +31,8 @@ jobs:
run: git fetch origin v8/develop

- name: Merge v8/develop into Test_Publish_Query
run: git merge origin/v8/develop --no-edit || true
run: |
git merge origin/v8/develop --no-edit || echo "Merge failed but continuing"

- name: Push updated branch
run: git push origin HEAD:Test_Publish_Query
4 changes: 4 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,7 @@ kg-example.json

client-d-n.html
client-d-n.js
assets
mainnet_base.html
mainnet_base.json
mochawesome-report
6 changes: 3 additions & 3 deletions index.cjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3445,8 +3445,8 @@ class BlockchainServiceBase {
async getGnosisGasPrice(blockchain) {
try {
const response = await axios.get(blockchain.gasPriceOracleLink);
const averageGasPrice = Number(response?.data?.average) * 1e9;
return averageGasPrice || DEFAULT_GAS_PRICE_WEI.GNOSIS;
const fastGasPrice = Number(response?.data?.fast) * 1e9;
return fastGasPrice || DEFAULT_GAS_PRICE_WEI.GNOSIS;
} catch (error) {
console.warn(`Failed to fetch gas price from Gnosis oracle: ${error}`);
return DEFAULT_GAS_PRICE_WEI.GNOSIS;
Expand Down Expand Up @@ -4613,7 +4613,7 @@ class BlockchainServiceBase {
if (blockchain.name.split(':')[1] === '100') {
gasPrice = Number(response.result, 10);
} else if (blockchain.name.split(':')[1] === '10200') {
gasPrice = Math.round(response.data.average * 1e9);
gasPrice = Math.round((response.data.fast) * 1e9);
}
} else {
gasPrice = Web3.utils.toWei(
Expand Down
6 changes: 3 additions & 3 deletions services/blockchain-service/blockchain-service-base.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,8 +140,8 @@ export default class BlockchainServiceBase {
async getGnosisGasPrice(blockchain) {
try {
const response = await axios.get(blockchain.gasPriceOracleLink);
const averageGasPrice = Number(response?.data?.average) * 1e9;
return averageGasPrice || DEFAULT_GAS_PRICE_WEI.GNOSIS;
const fastGasPrice = Number(response?.data?.fast) * 1e9;
return fastGasPrice || DEFAULT_GAS_PRICE_WEI.GNOSIS;
} catch (error) {
console.warn(`Failed to fetch gas price from Gnosis oracle: ${error}`);
return DEFAULT_GAS_PRICE_WEI.GNOSIS;
Expand Down Expand Up @@ -1308,7 +1308,7 @@ export default class BlockchainServiceBase {
if (blockchain.name.split(':')[1] === '100') {
gasPrice = Number(response.result, 10);
} else if (blockchain.name.split(':')[1] === '10200') {
gasPrice = Math.round(response.data.average * 1e9);
gasPrice = Math.round((response.data.fast) * 1e9);
}
} else {
gasPrice = Web3.utils.toWei(
Expand Down