instantiate2 & conditional ibc forwarder instantiation #141
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Art3miX
approved these changes
Dec 31, 2023
Comment on lines
+88
to
+102
| pub fn to_instantiate2_msg( | ||
| &self, | ||
| admin_addr: String, | ||
| salt: Binary, | ||
| clock_address: String, | ||
| party_a_router: String, | ||
| party_b_router: String, | ||
| ) -> Result<WasmMsg, StdError> { | ||
| let instantiate_msg = | ||
| match self.to_instantiate_msg(clock_address, party_a_router, party_b_router) { | ||
| Ok(msg) => msg, | ||
| Err(_) => { | ||
| return Err(StdError::generic_err( | ||
| "failed to generate regular instantiation message", | ||
| )) |
Comment on lines
+128
to
+137
| let mut clock_whitelist = vec![ | ||
| swap_holder_address.to_string(), | ||
| party_a_interchain_router_address.to_string(), | ||
| party_b_interchain_router_address.to_string(), | ||
| splitter_address.to_string(), | ||
| ]; | ||
| let preset_party_a_forwarder_fields = match msg.party_a_config.clone() { | ||
| CovenantPartyConfig::Interchain(config) => { | ||
| PARTY_A_IBC_FORWARDER_ADDR.save(deps.storage, &party_a_forwarder_address)?; | ||
| clock_whitelist.insert(0, party_a_forwarder_address.to_string()); |
There was a problem hiding this comment.
The size of the vector is known, I would crate a new vector with the needed capacity, and just push the needed info, I think it might be better.
| contract: "splitter".to_string(), | ||
| err, | ||
| }), | ||
| let mut messages = Vec::new(); |
There was a problem hiding this comment.
Use with_capacity as the size is known
| None => COVENANT_SWAP_HOLDER_ADDR.may_load(deps.storage)?, | ||
| } | ||
| } else { | ||
| Some(Addr::unchecked("not found")) |
Comment on lines
+43
to
+60
| fn get_precomputed_address( | ||
| deps: Deps, | ||
| code_id: u64, | ||
| creator: &CanonicalAddr, | ||
| salt: &[u8], | ||
| ) -> Result<Addr, ContractError> { | ||
| let CodeInfoResponse { checksum, .. } = deps.querier.query_wasm_code_info(code_id)?; | ||
|
|
||
| let precomputed_address = instantiate2_address(&checksum, creator, salt)?; | ||
|
|
||
| Ok(deps.api.addr_humanize(&precomputed_address)?) | ||
| } | ||
|
|
||
| pub fn generate_contract_salt(salt_str: &[u8]) -> cosmwasm_std::Binary { | ||
| let mut hasher = Sha256::new(); | ||
| hasher.update(salt_str); | ||
| hasher.finalize().to_vec().into() | ||
| } |
There was a problem hiding this comment.
Those helper function should be in "covenant-package", doesn't make sense to copy them around from contract to contract, will be hell to make changes to that in the future.
|
|
||
| workspace-optimize: | ||
| #!/bin/bash | ||
| docker run --rm -v "$(pwd)":/code \ | ||
| --mount type=volume,source="$(basename "$(pwd)")_cache",target=/code/target \ | ||
| --mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \ | ||
| --platform linux/amd64 \ | ||
| cosmwasm/workspace-optimizer:0.12.13 | ||
| cosmwasm/workspace-optimizer:0.14.0 |
There was a problem hiding this comment.
Already version 0.15 available :)
| @@ -51,7 +51,7 @@ local-e2e-rebuild TEST: optimize | |||
| fi | |||
| cp -R artifacts/*.wasm {{TEST}}/tests/interchaintest/wasms | |||
| ls {{TEST}}/tests/interchaintest/wasms | |||
| cd {{TEST}}/tests/interchaintest/ && go test -timeout 50m -v | |||
| cd {{TEST}}/tests/interchaintest/ && go clean -testcache && go test -timeout 50m -v | |||
There was a problem hiding this comment.
I would not add the testcache to here, this makes the test much slower, I would manually use this command when you know you need to clean cache.
…fixes; ica creation works
bekauz
force-pushed
the
benskey/native-chain-routing
branch
from
e943a22
to
14477b3
Compare
|
Great feedback. Will address it after merging. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Begins work towards #138 and introduces instantiate2. Feels like this is getting big enough to open the pr now.
register_feeparams for outgoing ibc messages from neutron (currently pulling from an open pr branch of neutron-sdk, need to revisit after all things are merged on their end)