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.

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

chore: fix CI and refactor patch deployment script #16

Merged
merged 18 commits into from
Sep 19, 2023

Conversation

yomarion
Copy link
Member

@yomarion yomarion commented Apr 12, 2023

Bandaid for #20

fix: CI with rustup default 1.67.0 quick-win
chore: Github workflow should only run on PR targeting master or push to master, not on every push
chore: Github workflow includes linting checks (+ checks applied)
chore: refactor patch deployment script
chore: fix error log when one transfer goes wrong

@@ -181,7 +181,7 @@ impl FungibleProxy {
} else {
// return full amount for `ft_resolve_transfer` on the token contract
let change = (amount.0 + args.fee_amount.0).to_string();
log!("Failed to transfer to account {}. Returning attached amount of {} of token {} to {}", args.to, change, token_address, payer);
log!("Transfer failed to {} or {}. Returning attached amount of {} of token {} to {}", args.to, args.fee_address, change, token_address, payer);
Copy link
Member Author

Choose a reason for hiding this comment

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

We don't know which transfer failed. We could but the token will probably throw an explicit error anyway.

deploy.sh Outdated Show resolved Hide resolved
deploy.sh Outdated Show resolved Hide resolved

./build.sh

if [ "$contract_name" = "fungible_proxy" ]; then
set -x
Copy link
Member

Choose a reason for hiding this comment

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

Is this for debugging? Do you want to keep it in there?

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes, I plan to keep it here to show the commands that are run, so it's easier to understand what's going on, especially if something went wrong, but not only.

@yomarion yomarion changed the title chore: refactor patch deployment script chore: fix CI and refactor patch deployment script Sep 18, 2023
Copy link
Member

@MantisClone MantisClone left a comment

Choose a reason for hiding this comment

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

The code changes look good. 👍 Nice cleanup.

Please consider adding Request Network to the authors list for conversion_proxy and mocks

conversion_proxy/Cargo.toml Outdated Show resolved Hide resolved
mocks/Cargo.toml Outdated Show resolved Hide resolved
yomarion and others added 2 commits September 19, 2023 09:18
Co-authored-by: MantisClone <david.hunt-mateo@mantisdata.solutions>
Co-authored-by: MantisClone <david.hunt-mateo@mantisdata.solutions>
@yomarion yomarion enabled auto-merge (squash) September 19, 2023 07:19
@yomarion yomarion enabled auto-merge (squash) September 19, 2023 07:28
@yomarion yomarion merged commit cc11748 into main Sep 19, 2023
3 checks passed
@yomarion yomarion deleted the chore/deploy-script-refactor-patch branch September 19, 2023 10:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants