Skip to content
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.

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

Netmarble v2.0 #7

Draft
wants to merge 32 commits into
base: netmarble_v2.0_audit
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
f039053
The new economic system and support required by the gas fee are added…
Dec 23, 2022
d7ac313
The new economic system and support required by the gas fee are added…
Dec 26, 2022
c81fbfa
fix: insufficient balance for transfer on parlia::distributeRewards()
Dec 26, 2022
e34bb9c
1.dev and self-test the requirement of new economic system
Dec 29, 2022
283c5ff
1.dev and self-test the requirement of new economic system
Dec 30, 2022
d16cb17
1.dev and self-test the requirement of new economic system
Jan 3, 2023
de8b3dd
1.dev and self-test the requirement of new economic system
Jan 4, 2023
7b9d105
Merge pull request #2 from node-real/netmarble_v2.0_dev
xuan-io Jan 6, 2023
74bb0c6
fncy2: optimize the function of api_backend.go::SuggestPrice
Jan 6, 2023
5e296f4
Merge pull request #3 from node-real/netmarble_v2.0_dev
xuan-io Jan 6, 2023
7a09aaa
fncy2: optimize the function of api_backend.go::SuggestPrice
Jan 6, 2023
6574a51
Merge pull request #4 from node-real/netmarble_v2.0_dev
xuan-io Jan 6, 2023
a34823f
fix:fncy2 gpo.DefaultPrice causes the bug that suggestPrice is unreas…
Jan 6, 2023
4bbc033
Update docker-build.yaml
4406arthur Jan 9, 2023
a87842c
set max gas price
Jan 9, 2023
3932006
set eth.gasPrice from a smart contract
Jan 9, 2023
b90fcd5
set eth.gasPrice from a smart contract
Jan 9, 2023
ab4ab29
Merge pull request #5 from node-real/netmarble_v2.0_dev
xuan-io Jan 10, 2023
77f01cc
fix:set the code of eth.gasPrice location error
Jan 13, 2023
501d11c
Merge pull request #6 from node-real/netmarble_v2.0_dev
xuan-io Jan 13, 2023
8c5bfa8
add trace log
Jan 28, 2023
28e33a5
Merge pull request #8 from node-real/netmarble_v2.0_dev
xuan-io Jan 28, 2023
de2293b
add FNCY_2 print log
Feb 27, 2023
2281373
Merge pull request #9 from node-real/netmarble2.0_print_blocknumber
xuan-io Feb 27, 2023
b7672be
Update docker-build.yaml
4406arthur Oct 30, 2024
f294c6a
add statediff tracer
avatarH Oct 30, 2024
defed6f
Update docker-build.yaml
4406arthur Oct 30, 2024
e664278
Update docker-build.yaml
4406arthur Oct 30, 2024
b68f284
add statediff tracer
avatarH Oct 30, 2024
dcd9ff5
Merge branch 'tracer_add_statediff' of github.com:node-real/semita-ne…
avatarH Oct 30, 2024
da210ce
update
avatarH Nov 1, 2024
f138d1f
Merge pull request #12 from node-real/tracer_add_statediff
avatarH Nov 19, 2024
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
21 changes: 3 additions & 18 deletions .github/workflows/docker-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,20 @@ on:
tags:
- v*
push:
branches: [ netmarble_v1.0 ]
branches: [ netmarble_v1.0, netmarble_v2.0 ]
pull_request:
branches: [ netmarble_v1.0 ]
branches: [ netmarble_v1.0, netmarble_v2.0 ]

env:
REGION: us-east-1
ECR_REGISTRY_ID: 553885929720
AWS_ASSUMED_ROLE_ARN: arn:aws:iam::553885929720:role/tf_nodereal_prod_ecr_cicd_deployment_assume_role
# Notice: must modify here to fit your service config path
GIT_SYNC_PATH: qa/gitops/qa-us/demo-app/values.yaml
TAG_FIELD: .image.tag

jobs:
CI:
runs-on: [self-hosted,qa-infra-k8s]
runs-on: [self-hosted,prod-cicd-runners]
steps:
- uses: actions/checkout@v3
# - uses: actions/setup-go@v3
Expand All @@ -30,23 +29,9 @@ jobs:
# with:
# # Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
# version: v1.45.2
- name: aws assume role
id: aws-assume-role
run: |
UUID=$(cat /proc/sys/kernel/random/uuid)
OUT=$(aws sts assume-role --role-arn $AWS_ASSUMED_ROLE_ARN --role-session-name $UUID)
echo ::set-output name=aws_access_key_id::"$(echo $OUT | jq -r '.Credentials''.AccessKeyId')"
echo ::set-output name=aws_secret_key::"$(echo $OUT | jq -r '.Credentials''.SecretAccessKey')"
echo ::set-output name=aws_sessions_token::"$(echo $OUT | jq -r '.Credentials''.SessionToken')"
- name: Build, tag, and push image to Amazon ECR
env:
AWS_ACCESS_KEY_ID: ${{ steps.aws-assume-role.outputs.aws_access_key_id }}
AWS_SECRET_ACCESS_KEY: ${{ steps.aws-assume-role.outputs.aws_secret_key }}
AWS_SESSION_TOKEN: ${{ steps.aws-assume-role.outputs.aws_sessions_token }}
run: |
aws ecr get-login-password --region ${REGION} | docker login --username AWS --password-stdin ${ECR_REGISTRY_ID}.dkr.ecr.${REGION}.amazonaws.com
aws ecr --region $REGION describe-repositories --registry-id $ECR_REGISTRY_ID --repository-names ${GITHUB_REPOSITORY#*/} || aws ecr --region $REGION create-repository --registry-id $ECR_REGISTRY_ID --repository-name ${GITHUB_REPOSITORY#*/}
aws ecr --region $REGION set-repository-policy --registry-id $ECR_REGISTRY_ID --repository-name ${GITHUB_REPOSITORY#*/} --policy-text file:///home/runner/repo-access-permissions.json
docker build -t ${ECR_REGISTRY_ID}.dkr.ecr.${REGION}.amazonaws.com/${GITHUB_REPOSITORY#*/}:${GITHUB_SHA} .
docker push ${ECR_REGISTRY_ID}.dkr.ecr.${REGION}.amazonaws.com/${GITHUB_REPOSITORY#*/}:${GITHUB_SHA}
# CD:
Expand Down
8 changes: 8 additions & 0 deletions cmd/geth/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -311,6 +311,14 @@ func geth(ctx *cli.Context) error {
defer stack.Close()

startNode(ctx, stack, backend)

log.Info("***************************** CONFIG INFO ****************************")
log.Info("******* FNCY_2.0", "chainId", backend.ChainConfig().ChainID)
log.Info("******* FNCY_2.0", "contract48kBlock", backend.ChainConfig().Contract48kBlock.Int64())
log.Info("******* FNCY_2.0", "fncy2Block", backend.ChainConfig().Fncy2Block.Int64())
log.Info("******* FNCY_2.0", "stopMintBlock", backend.ChainConfig().Parlia.StopMintBlock.Int64())
log.Info("***************************** CONFIG INFO *****************************")
log.Info("Start FNCY_2.0 success")
stack.Wait()
return nil
}
Expand Down
Loading
Loading