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.

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

feat(cosmwasm): save salt in config file #217

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
+7 −5
Open

feat(cosmwasm): save salt in config file #217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fb03a36
save salt in config file
Apr 24, 2024
6237ac1
addendum
Apr 24, 2024
8eac974
Merge branch 'main' into feat/save_salt
jcs47 May 16, 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
3 changes: 2 additions & 1 deletion cosmwasm/deploy-contract.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,9 +368,10 @@ const upload = (client, wallet, chainName, config, options) => {
printInfo('Uploading contract binary');

return uploadContract(client, wallet, config, options)
.then(({ address, codeId }) => {
.then(({ address, codeId, usedSalt }) => {
printInfo('Uploaded contract binary');
contractConfig.codeId = codeId;
contractConfig.salt = usedSalt;

if (!address) {
return;
Expand Down
9 changes: 5 additions & 4 deletions cosmwasm/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,20 +35,21 @@ const uploadContract = async (client, wallet, config, options) => {
return client.upload(account.address, wasm, uploadFee).then(({ checksum, codeId }) => ({ checksum, codeId, account }));
})
.then(({ account, checksum, codeId }) => {
const usedSalt = salt || contractName.concat(chainNames);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
const usedSalt = salt || contractName.concat(chainNames);
let salt = options.salt || contractName.concat(chainNames);

to reuse salt name

const address = instantiate2
? instantiate2Address(
fromHex(checksum),
account.address,
fromHex(getSaltFromKey(salt || contractName.concat(chainNames))),
fromHex(getSaltFromKey(usedSalt)),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
fromHex(getSaltFromKey(usedSalt)),
fromHex(getSaltFromKey(salt)),

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does the salt need to bytes32, or can it be a string? If the latter, then getSaltFromKey isn't needed. We could use the readable string as is

'axelar',
)
: null;

return { codeId, address };
return { codeId, address, usedSalt };
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
return { codeId, address, usedSalt };
return { codeId, address, salt };

});
};

const instantiateContract = (client, wallet, initMsg, config, { contractName, salt, instantiate2, chainNames, admin }) => {
const instantiateContract = (client, wallet, initMsg, config, { contractName, instantiate2, admin }) => {
return wallet
.getAccounts()
.then(([account]) => {
Expand All @@ -63,7 +64,7 @@ const instantiateContract = (client, wallet, initMsg, config, { contractName, sa
? client.instantiate2(
account.address,
contractConfig.codeId,
fromHex(getSaltFromKey(salt || contractName.concat(chainNames))),
contractConfig.salt,
initMsg,
contractName,
initFee,
Expand Down
Loading