Skip to content

320 add neon proxy version handler #323

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
s-medvedev merged 12 commits into from
Nov 25, 2021
Merged

320 add neon proxy version handler #323

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
32d1cfc
Introduce neon_proxy_version handler
vasiliy-zaznobin Nov 23, 2021
742ab31
Introduce test_01_neon_proxy_version
vasiliy-zaznobin Nov 23, 2021
12e2c57
Use proxy/plugin/solana_rest_api.py
vasiliy-zaznobin Nov 23, 2021
d38c320
Use /opt/proxy/plugin/solana_rest_api.py
vasiliy-zaznobin Nov 23, 2021
417aa57
Add echo PROXY_REVISION to check
vasiliy-zaznobin Nov 23, 2021
676a4a0
set ${PROXY_REVISION:=${REVISION}}
vasiliy-zaznobin Nov 23, 2021
1f6f7fa
Debugging
vasiliy-zaznobin Nov 23, 2021
3583b7c
Debugging
vasiliy-zaznobin Nov 23, 2021
51469e9
Do the code clearly
vasiliy-zaznobin Nov 23, 2021
f857099
Set setUpClass empty
vasiliy-zaznobin Nov 24, 2021
1b57750
Merge remote-tracking branch 'origin/develop' into 320-Add_neon_proxy…
vasiliy-zaznobin Nov 24, 2021
0dba0d7
Merge remote-tracking branch 'origin/develop' into 320-Add_neon_proxy…
vasiliy-zaznobin Nov 24, 2021
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
Next Next commit
Introduce neon_proxy_version handler
  • Loading branch information
@vasiliy-zaznobin
vasiliy-zaznobin committed Nov 23, 2021
commit 32d1cfc9e3e9cd623ff679f464693c641d9694f6
3 changes: 3 additions & 0 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,9 @@ COPY --from=spl /opt/solana_utils.py \
/spl/bin/
COPY --from=spl /opt/neon-cli /spl/bin/emulator

RUN export NEON_PROXY_REVISION_TO_BE_REPLACED=$(git rev-parse HEAD)
RUN echo ${NEON_PROXY_REVISION_TO_BE_REPLACED}
RUN sed -i 's/NEON_PROXY_REVISION_TO_BE_REPLACED/'"${NEON_PROXY_REVISION_TO_BE_REPLACED}"'/g' ./plugin/solana_rest_api.py
COPY . /opt
COPY proxy/operator-keypair.json /root/.config/solana/id.json
RUN cd /usr/local/lib/python3.8/dist-packages/ && patch -p0 </opt/solana-py.patch
Expand Down
6 changes: 6 additions & 0 deletions proxy/plugin/solana_rest_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@
modelInstance = None

EXTRA_GAS = int(os.environ.get("EXTRA_GAS", "0"))
NEON_PROXY_PKG_VERSION = '0.4.1-rc0'
NEON_PROXY_REVISION = 'NEON_PROXY_REVISION_TO_BE_REPLACED'

class EthereumModel:
def __init__(self):
Expand Down Expand Up @@ -86,6 +88,10 @@ def get_solana_account() -> Optional[sol_Account]:
solana_account = sol_Account(values)
return solana_account

def neon_proxy_version(self):
neon_config_load(self)
return 'Neon-proxy/v' + NEON_PROXY_PKG_VERSION + '-' + NEON_PROXY_REVISION

def web3_clientVersion(self):
neon_config_load(self)
return self.neon_config_dict['web3_clientVersion']
Expand Down