Skip to content

mimic secretjs + cache #28

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
stephanegg merged 2 commits into from
Mar 4, 2023
Merged

mimic secretjs + cache #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2d0b409
mimic secretjs + cache
paul-HDD Mar 1, 2023
80781b8
Update tests and proto to 1.7.1
Mar 4, 2023
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
2 changes: 1 addition & 1 deletion scripts/generate_protobuf.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set -o errexit -o nounset -o pipefail
SCRIPT_PATH="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"

rm -rf "${SCRIPT_PATH}/SecretNetwork"
git clone --depth 1 --branch v1.5.0 https://github.com/scrtlabs/SecretNetwork "${SCRIPT_PATH}/SecretNetwork"
git clone --depth 1 --branch v1.7.1 https://github.com/scrtlabs/SecretNetwork "${SCRIPT_PATH}/SecretNetwork"

SECRET_DIR="${SCRIPT_PATH}/SecretNetwork/proto"
SECRET_THIRD_PARTY_DIR="${SCRIPT_PATH}/SecretNetwork/third_party/proto"
Expand Down
3 changes: 2 additions & 1 deletion secret_sdk/client/lcd/api/registration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ async def encrypted_seed(self, pub_key: str):
async def consensus_io_pub_key(self):
"""Returns the consensus_io_pub_key"""
result = await self._c._get(f"/registration/v1beta1/tx-key")
return extract_consensus_io_pub_key(base64.b64decode(result['key']))
# return extract_consensus_io_pub_key(base64.b64decode(result['key']))
return base64.b64decode(result['key'])


class RegistrationAPI(AsyncRegistrationAPI):
Expand Down
7 changes: 5 additions & 2 deletions secret_sdk/client/lcd/lcdclient.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,12 @@

mainnet_chain_ids = {"secret-2", "secret-3", "secret-4"}

# mainnetConsensusIoPubKey = bytes.fromhex(
# "083b1a03661211d5a4cc8d39a77795795862f7730645573b2bcc2c1920c53c04"
# )
mainnetConsensusIoPubKey = bytes.fromhex(
"083b1a03661211d5a4cc8d39a77795795862f7730645573b2bcc2c1920c53c04"
)
"efdfbee583877e6d12c219695030a5bfb72e0a3abdc416655aa4a30c95a4446f"
) # == base64.b64decode("79++5YOHfm0SwhlpUDClv7cuCjq9xBZlWqSjDJWkRG8=")

REQUEST_CONFIG = {
"GET_TIMEOUT": 30,
Expand Down
2 changes: 1 addition & 1 deletion tests/setup_network.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ def setup_localsecret():

teardown_network()
# 9091 grpc web, 1317 rest
run_command('docker run -it -d -p 9090:9090 -p 9091:9091 -p 1317:1317 --name localsecret ghcr.io/scrtlabs/localsecret:v1.5.0')
run_command('docker run -it -d -p 9090:9090 -p 9091:9091 -p 1317:1317 --name localsecret ghcr.io/scrtlabs/localsecret:v1.7.1')

print("Waiting for the network to start...")
await_blocks()
Expand Down