fix: sync solana branch with upstream main #11

eloylp · 2024-03-06T10:26:54Z

The procedure for syncing our solana branch with the upstream main:

Created this PR solana-sync-fork branch.
git merge origin/main
Solve the conflicts and fix our code to match latest updates.
Now we need to merge this PR (solana-sync-fork) into solana branch.

Review tips:

Use file explorer to only check our handlers code (msg verfiier, worker set)
check this compare is OK and we are not altering anything but our logic.

* fix: use correct key id to generate pub key * add logging

) * feat: add expiry field of u64 to SigningStarted event * fix: correct a comment word on contracts/multisig/src/state.rs Co-authored-by: Sammy <[email protected]> * fix: update attribute name of expiry field Co-authored-by: Sammy <[email protected]> --------- Co-authored-by: Sammy <[email protected]>

* Update connection_router.md: add note for the second diagram * Update connection_router.md: include brief explanation of main entities * Update overview.md: update Message struct * docs: edit notes on connection_router.md, add CrossChainId struct to overview.md * fix: remove entity structure from connection_router.md

…k#224)

…network#245) * chore: work in progress - removing grace from multisig config * fix: remove grace period from contract.rs, update env block change to reflect test parameters * fix: remove "before expiry" from comment Co-authored-by: CJ Cobb <[email protected]> --------- Co-authored-by: CJ Cobb <[email protected]>

…rk#231) * add query to check message consensus * add query to get worker set consensus and rename functions * update is verified query with statuses query * cleanup and rename * add unit test * review * fix typo * review comments

)

* chore: work in progress - removing grace from multisig config * fix: remove grace period from contract.rs, update env block change to reflect test parameters * feat: add skip expire signing session to multisig.rs * fix: remove unused tracing info_span crate * test: add should_not_handle_event_if_session_expired to multisig.rs

* docs: update voting_verifier.md * docs: remove entity structure code and move description to the top * update: doc/src/contracts/voting_verifier.md Co-authored-by: CJ Cobb <[email protected]> * fix: added link to prover sequence diagram * fix: change link from weblink to relative --------- Co-authored-by: CJ Cobb <[email protected]>

… rotations (axelarnetwork#235) * fix(multisig-prover): Don't prevent signing due to multiple rotations * feat(save_next_worker_set): logic to handle multiple error types * refactor(worker_set_cannot_be_updated_again_while_pending_worker_is_not_yet_confirmed): test breakdown and add comments * fix: update create_new_workers_vec to a more functional approach Co-authored-by: Christian Gorenflo <[email protected]> * fix: update update_registry_and_construct_proof's input names * fix: remove redundant variable assignment for construct_proof_and_sign * fix: update function name from process_poll to execute_worker_set_poll Co-authored-by: Christian Gorenflo <[email protected]> * fix: first test_utils::execute_worker_set_poll comment update and second_wave_of_new_workers inlining * fix: update comments for test_utils::update_registry_and_construct_proof * refactor: remove redundant function call comments, inline worker vector creation * refactor: comment update for first_wave_of_new_workers and first_wave_worker_set * refactor: comment update for first update_registry_and_construct_proof * refactor: move worker set creation into execute_worker_set_poll --------- Co-authored-by: maancham <[email protected]> Co-authored-by: Christian Gorenflo <[email protected]>

…stry (axelarnetwork#247) * feat: add denounce chain support ability to service registry * test: add denounce_chain_support testcase * test: add more unit tests for different paths * test: two more unit tests for unregistered worker and service * refactor: add test comments, refactor declare and denounce * fix: address lint issue

…work#244)

…k#254) * feat(ampd): add timeout to the EVM/SUI JSON-RPC clients * fix clippy

* add signed address to message * fix message format * fix unit tests * add unit test * add signature to ampd pubkey registration * fix lint * add comment

…larnetwork#252)

…ork#255) * prevent duplicate public keys * fix tests * add unit test * add index

…rnetwork#242)

* refactor: migrate base service registry test setup to test utils * refactor: pass in governance as input to instantiate_contract, change mut app to app * refactor: add ServiceRegistryContract and update service registry test formats * fix: handle syntax and format issues after conflict resolution * feat: add contract query abstraction to service registry tests * feat: add execution abstraction for register contract * feat: add contract error type to train, migrate app.execute_contract to service.execute * fix: change Err type to axelar_wasm_std and migrate remaining app.execute_contract instances * Update Cargo.toml * refactor: distinction between execute and execute_with_funds

…xelarnetwork#266)

…aming for building main branch ecr image (axelarnetwork#269) * chore(infra): add a seed job for building releases for ampd and fix naming for building main branch ecr image * chore: add codeowners for infra and devops related files * - fix versions for build jobs Co-authored-by: Milap Sheth <[email protected]> --------- Co-authored-by: Milap Sheth <[email protected]>

* fix(ampd): skip events from unknown contracts

* doc: initiate service_registry.md with summary, interface, and graph diagram * doc: add sequence diagram for service_registry.md * doc: update service_registry.md based on reviews

--------- Co-authored-by: Talal Ashraf <[email protected]>

* feat(ampd): retry event handling with timeout and max attempts

…xelarnetwork#274)

…outer with connection-router-api (axelarnetwork#273) * refactor(connection-router-api): replace dependencies of connection-router with connection-router-api * fix linting

* refactor: base voting verifier tests template * refactor: finish voting verifier tests migration * fix: handle lint issue * refactor: change config name to fixture * refactor: handle TestFixture name typo

* refactor: connection router picks up gateway-api * cargo sort

* refactor: change gateway get messages query name * doc: one liner comment for the query

…ck querier `update_wasm()` instead (axelarnetwork#280) * remove use of mock contracts from some tests * update more unit tests to use mock querier instead of mock contracts * move more unit tests * remove unused files * remove duplicate function * tests cleanup

* doc: write gateway.md * docs: address reviews (fix wording)

* docs(ampd): add ampd README

…rnetwork#282) * refactor: remove block height log after broadcasting from ampd * fix: address lint issues with unused package and height variable * fix: bring back tx_hash log, remove height from TxResponse

…proper duplicate check (axelarnetwork#284) * validate public key in tryfrom trait * update unit tests and cleanup * feedback * feedback * merged two error messages --------- Co-authored-by: Sammy <[email protected]>

…xelarnetwork#287) * update signature verification to throw error when false * add unit test * inverted checks * update unit test assert

Co-authored-by: Christian Gorenflo <[email protected]>

roberts-pumpurs

obviously hard to tell why and which parts have been altered but if the tests pass then it's fine imo

eloylp · 2024-03-06T11:27:33Z

obviously hard to tell why and which parts have been altered but if the tests pass then it's fine imo

@roberts-ivanovs Yeah 😓 , tests were executed locally all seems to be fine. The best way i can think of is to check the solana related files in our end and also check this compare (sorry i did not provided previously, added to description).

haiyizxx and others added 30 commits January 17, 2024 13:13

fix: use correct key id to generate pub key (axelarnetwork#234)

40c861e

* fix: use correct key id to generate pub key * add logging

update contract to split execute and query (axelarnetwork#240)

ee447b5

feat: add message ids to proof under construction event (axelarnetwor…

aac6602

…k#224)

refactor: move finalizer picker into finalizer module (axelarnetwork#241

35607fe

)

chore: add release pipeline (axelarnetwork#239)

b9074b5

fix!: event processor stops when one of the handlers fails (axelarnet…

d6cf113

…work#244)

feat: add support deregistration to ampd src (axelarnetwork#248)

dc60c6e

feat: check if image tag exists before push (axelarnetwork#250)

f87a9fc

feat(ampd): add timeout to the EVM/SUI JSON-RPC clients (axelarnetwor…

67e3714

…k#254) * feat(ampd): add timeout to the EVM/SUI JSON-RPC clients * fix clippy

feat: add signature to public key registration (axelarnetwork#249)

e0c68ab

* add signed address to message * fix message format * fix unit tests * add unit test * add signature to ampd pubkey registration * fix lint * add comment

refactor: migrate base service registry test setup to test utils (axe…

081a650

…larnetwork#252)

feat(multisig): prevent duplicate public key registration (axelarnetw…

4d1535d

…ork#255) * prevent duplicate public keys * fix tests * add unit test * add index

fix(cargo): avoid linking libssl (axelarnetwork#257)

271dba1

chore: expose encoding modules as part of the crate public API (axela…

8d2d1be

…rnetwork#242)

chore: fix compiler warnings (axelarnetwork#262)

2b83c03

fix(optimizer): revert rust version to 1.73 (axelarnetwork#264)

c88d8b0

fix(ampd): optimize broadcaster (axelarnetwork#261)

69124ee

chore(connection-router): remove todo comment about message hashing (a…

9de4d9e

…xelarnetwork#266)

fix(ampd): skip events from unknown contracts (axelarnetwork#259)

c26a374

* fix(ampd): skip events from unknown contracts

docs: service-registry-doc (axelarnetwork#268)

f362e07

* doc: initiate service_registry.md with summary, interface, and graph diagram * doc: add sequence diagram for service_registry.md * doc: update service_registry.md based on reviews

kalidax and others added 18 commits February 16, 2024 22:40

feat: add ampd build job (axelarnetwork#258)

360560d

--------- Co-authored-by: Talal Ashraf <[email protected]>

fix(ampd): retry fetching blocking results on error (axelarnetwork#265)

671777b

* feat(ampd): retry event handling with timeout and max attempts

refactor: update aggregate verifier tests to utilize contract trait (a…

6e5157f

…xelarnetwork#274)

refactor(connection-router-api): replace dependencies of connection-r…

70f6283

…outer with connection-router-api (axelarnetwork#273) * refactor(connection-router-api): replace dependencies of connection-router with connection-router-api * fix linting

refactor: contract trait voting verifier (axelarnetwork#276)

2644fba

* refactor: base voting verifier tests template * refactor: finish voting verifier tests migration * fix: handle lint issue * refactor: change config name to fixture * refactor: handle TestFixture name typo

refactor: connection router picks up gateway-api (axelarnetwork#277)

c454d48

* refactor: connection router picks up gateway-api * cargo sort

fix(infra): differentiate between tags and semvers (axelarnetwork#278)

1ad088c

chore: remove unused batching contract (axelarnetwork#279)

ba7b422

refactor: change gateway get messages query name (axelarnetwork#281)

f86bbe1

* refactor: change gateway get messages query name * doc: one liner comment for the query

docs: write gateway.md (axelarnetwork#283)

2557b81

* doc: write gateway.md * docs: address reviews (fix wording)

docs(ampd): add ampd README (axelarnetwork#275)

f2dfea8

* docs(ampd): add ampd README

refactor: remove block height log after broadcasting from ampd (axela…

6026ed8

…rnetwork#282) * refactor: remove block height log after broadcasting from ampd * fix: address lint issues with unused package and height variable * fix: bring back tx_hash log, remove height from TxResponse

chore: fix typos across the repo (axelarnetwork#286)

aad015b

refactor: simplify complexity in verify() signature implementation (a…

e120fa8

…xelarnetwork#287) * update signature verification to throw error when false * add unit test * inverted checks * update unit test assert

ci: allow core team to merge workflow changes (axelarnetwork#289)

0be4b7d

Co-authored-by: Christian Gorenflo <[email protected]>

Merge remote-tracking branch 'origin/main' into solana-sync-fork

e16b55a

eloylp changed the base branch from starknet to solana March 6, 2024 10:27

eloylp marked this pull request as ready for review March 6, 2024 10:32

eloylp changed the title ~~Sync solana branch with upstream main~~ fix: Sync solana branch with upstream main Mar 6, 2024

eloylp closed this Mar 6, 2024

eloylp reopened this Mar 6, 2024

eloylp changed the title ~~fix: Sync solana branch with upstream main~~ fix: sync solana branch with upstream main Mar 6, 2024

eloylp closed this Mar 6, 2024

eloylp reopened this Mar 6, 2024

roberts-pumpurs approved these changes Mar 6, 2024

View reviewed changes

eloylp merged commit 0f911a3 into solana Mar 6, 2024
1 of 15 checks passed

eloylp deleted the solana-sync-fork branch March 6, 2024 16:54

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: sync solana branch with upstream main #11

fix: sync solana branch with upstream main #11

eloylp commented Mar 6, 2024 •

edited

Loading

roberts-pumpurs left a comment

eloylp commented Mar 6, 2024 •

edited

Loading

fix: sync solana branch with upstream main #11

fix: sync solana branch with upstream main #11

Conversation

eloylp commented Mar 6, 2024 • edited Loading

roberts-pumpurs left a comment

Choose a reason for hiding this comment

eloylp commented Mar 6, 2024 • edited Loading

eloylp commented Mar 6, 2024 •

edited

Loading

eloylp commented Mar 6, 2024 •

edited

Loading