Skip to content

refactor: replace nano contract state call for history call #549

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

Merged
merged 4 commits into from
Aug 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 14 additions & 10 deletions locale/da/texts.po
Original file line number Diff line number Diff line change
Expand Up @@ -1013,39 +1013,43 @@ msgstr ""
msgid "Contract successfully registered."
msgstr ""

#: src/sagas/nanoContract.js:44
#: src/sagas/nanoContract.js:45
msgid "Nano Contract already registered."
msgstr ""

#: src/sagas/nanoContract.js:45
#: src/sagas/nanoContract.js:46
msgid "Wallet is not ready yet to register a Nano Contract."
msgstr ""

#: src/sagas/nanoContract.js:46
#: src/sagas/nanoContract.js:47
msgid "The informed address does not belong to the wallet."
msgstr ""

#: src/sagas/nanoContract.js:47
#: src/sagas/nanoContract.js:48
msgid "Nano Contract not found."
msgstr ""

#: src/sagas/nanoContract.js:48
msgid "Error while trying to get Nano Contract state."
#: src/sagas/nanoContract.js:49
msgid "Error while trying to register Nano Contract."
msgstr ""

#: src/sagas/nanoContract.js:49
#: src/sagas/nanoContract.js:50
msgid "Invalid transaction to register as Nano Contract."
msgstr ""

#: src/sagas/nanoContract.js:51
msgid "Blueprint not found."
msgstr ""

#: src/sagas/nanoContract.js:50
#: src/sagas/nanoContract.js:52
msgid "Couldn't get Blueprint info."
msgstr ""

#: src/sagas/nanoContract.js:51
#: src/sagas/nanoContract.js:53
msgid "Nano Contract not registered."
msgstr ""

#: src/sagas/nanoContract.js:52
#: src/sagas/nanoContract.js:54
msgid "Error while trying to download Nano Contract transactions history."
msgstr ""

Expand Down
26 changes: 15 additions & 11 deletions locale/pt-br/texts.po
Original file line number Diff line number Diff line change
Expand Up @@ -1041,39 +1041,43 @@ msgstr "Transação do Nano Contract"
msgid "Contract successfully registered."
msgstr "Nano Contract registrado com sucesso."

#: src/sagas/nanoContract.js:44
#: src/sagas/nanoContract.js:45
msgid "Nano Contract already registered."
msgstr "Nano Contract já registrado."

#: src/sagas/nanoContract.js:45
#: src/sagas/nanoContract.js:46
msgid "Wallet is not ready yet to register a Nano Contract."
msgstr "A wallet não está pronta ainda para registrar Nano Contracts."

#: src/sagas/nanoContract.js:46
#: src/sagas/nanoContract.js:47
msgid "The informed address does not belong to the wallet."
msgstr "O endereço informado não pertence a esta carteira."

#: src/sagas/nanoContract.js:47
#: src/sagas/nanoContract.js:48
msgid "Nano Contract not found."
msgstr "Nano Contract não encontrado"

#: src/sagas/nanoContract.js:48
msgid "Error while trying to get Nano Contract state."
msgstr "Erro ao obter o estado do Nano Contract."

#: src/sagas/nanoContract.js:49
msgid "Error while trying to register Nano Contract."
msgstr "Erro ao registrar Nano Contract."

#: src/sagas/nanoContract.js:50
msgid "Invalid transaction to register as Nano Contract."
msgstr "Transação de Nano Contract inválida."

#: src/sagas/nanoContract.js:51
msgid "Blueprint not found."
msgstr "Blueprint não encontrado."

#: src/sagas/nanoContract.js:50
#: src/sagas/nanoContract.js:52
msgid "Couldn't get Blueprint info."
msgstr "Não foi possível carregar informações do Blueprint."

#: src/sagas/nanoContract.js:51
#: src/sagas/nanoContract.js:53
msgid "Nano Contract not registered."
msgstr "Nano Contract não registrado."

#: src/sagas/nanoContract.js:52
#: src/sagas/nanoContract.js:54
msgid "Error while trying to download Nano Contract transactions history."
msgstr "Error ao fazer download do histórico de transações do Nano Contract."

Expand Down
24 changes: 14 additions & 10 deletions locale/ru-ru/texts.po
Original file line number Diff line number Diff line change
Expand Up @@ -1017,39 +1017,43 @@ msgstr ""
msgid "Contract successfully registered."
msgstr ""

#: src/sagas/nanoContract.js:44
#: src/sagas/nanoContract.js:45
msgid "Nano Contract already registered."
msgstr ""

#: src/sagas/nanoContract.js:45
#: src/sagas/nanoContract.js:46
msgid "Wallet is not ready yet to register a Nano Contract."
msgstr ""

#: src/sagas/nanoContract.js:46
#: src/sagas/nanoContract.js:47
msgid "The informed address does not belong to the wallet."
msgstr ""

#: src/sagas/nanoContract.js:47
#: src/sagas/nanoContract.js:48
msgid "Nano Contract not found."
msgstr ""

#: src/sagas/nanoContract.js:48
msgid "Error while trying to get Nano Contract state."
#: src/sagas/nanoContract.js:49
msgid "Error while trying to register Nano Contract."
msgstr ""

#: src/sagas/nanoContract.js:49
#: src/sagas/nanoContract.js:50
msgid "Invalid transaction to register as Nano Contract."
msgstr ""

#: src/sagas/nanoContract.js:51
msgid "Blueprint not found."
msgstr ""

#: src/sagas/nanoContract.js:50
#: src/sagas/nanoContract.js:52
msgid "Couldn't get Blueprint info."
msgstr ""

#: src/sagas/nanoContract.js:51
#: src/sagas/nanoContract.js:53
msgid "Nano Contract not registered."
msgstr ""

#: src/sagas/nanoContract.js:52
#: src/sagas/nanoContract.js:54
msgid "Error while trying to download Nano Contract transactions history."
msgstr ""

Expand Down
24 changes: 14 additions & 10 deletions locale/texts.pot
Original file line number Diff line number Diff line change
Expand Up @@ -1010,39 +1010,43 @@ msgstr ""
msgid "Contract successfully registered."
msgstr ""

#: src/sagas/nanoContract.js:44
#: src/sagas/nanoContract.js:45
msgid "Nano Contract already registered."
msgstr ""

#: src/sagas/nanoContract.js:45
#: src/sagas/nanoContract.js:46
msgid "Wallet is not ready yet to register a Nano Contract."
msgstr ""

#: src/sagas/nanoContract.js:46
#: src/sagas/nanoContract.js:47
msgid "The informed address does not belong to the wallet."
msgstr ""

#: src/sagas/nanoContract.js:47
#: src/sagas/nanoContract.js:48
msgid "Nano Contract not found."
msgstr ""

#: src/sagas/nanoContract.js:48
msgid "Error while trying to get Nano Contract state."
#: src/sagas/nanoContract.js:49
msgid "Error while trying to register Nano Contract."
msgstr ""

#: src/sagas/nanoContract.js:49
#: src/sagas/nanoContract.js:50
msgid "Invalid transaction to register as Nano Contract."
msgstr ""

#: src/sagas/nanoContract.js:51
msgid "Blueprint not found."
msgstr ""

#: src/sagas/nanoContract.js:50
#: src/sagas/nanoContract.js:52
msgid "Couldn't get Blueprint info."
msgstr ""

#: src/sagas/nanoContract.js:51
#: src/sagas/nanoContract.js:53
msgid "Nano Contract not registered."
msgstr ""

#: src/sagas/nanoContract.js:52
#: src/sagas/nanoContract.js:54
msgid "Error while trying to download Nano Contract transactions history."
msgstr ""

Expand Down
36 changes: 29 additions & 7 deletions src/sagas/nanoContract.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import {
ncApi,
addressUtils,
nanoUtils,
} from '@hathor/wallet-lib';
import {
takeEvery,
Expand Down Expand Up @@ -45,7 +46,8 @@ export const failureMessage = {
walletNotReadyError: t`Wallet is not ready yet to register a Nano Contract.`,
addressNotMine: t`The informed address does not belong to the wallet.`,
nanoContractStateNotFound: t`Nano Contract not found.`,
nanoContractStateFailure: t`Error while trying to get Nano Contract state.`,
nanoContractFailure: t`Error while trying to register Nano Contract.`,
nanoContractInvalid: t`Invalid transaction to register as Nano Contract.`,
blueprintInfoNotFound: t`Blueprint not found.`,
blueprintInfoFailure: t`Couldn't get Blueprint info.`,
notRegistered: t`Nano Contract not registered.`,
Expand Down Expand Up @@ -111,24 +113,44 @@ export function* registerNanoContract({ payload }) {
return;
}

let ncState = null;
let tx;
try {
ncState = yield call([ncApi, ncApi.getNanoContractState], ncId);
const response = yield call([wallet, wallet.getFullTxById], ncId);
tx = response.tx;
} catch (error) {
log.debug('Fail registering Nano Contract while getting full transaction by ID.');
yield put(nanoContractRegisterFailure(failureMessage.nanoContractFailure));
return;
}

if (!nanoUtils.isNanoContractCreateTx(tx)) {
log.debug('Fail registering Nano Contract because transaction is not calling initialize.');
yield put(nanoContractRegisterFailure(failureMessage.nanoContractInvalid));
return;
}
const { nc_blueprint_id: blueprintId } = tx;

let blueprintName = null;
try {
const blueprintInfo = yield call([ncApi, ncApi.getBlueprintInformation], blueprintId);
blueprintName = blueprintInfo.name;
// Also set blueprint on store
yield put(nanoContractBlueprintInfoSuccess(blueprintId, blueprintInfo));
} catch (error) {
if (error instanceof NanoRequest404Error) {
yield put(nanoContractRegisterFailure(failureMessage.nanoContractStateNotFound));
yield put(nanoContractRegisterFailure(failureMessage.blueprintInfoNotFound));
} else {
log.error('Error while registering Nano Contract.', error);
yield put(nanoContractRegisterFailure(failureMessage.nanoContractStateFailure));
yield put(nanoContractRegisterFailure(failureMessage.blueprintInfoFailure));
}
return;
}

const nc = {
address,
ncId,
blueprintName: ncState.blueprint_name,
blueprintId: ncState.blueprint_id,
blueprintId,
blueprintName,
};
yield call(wallet.storage.registerNanoContract.bind(wallet.storage), ncId, nc);

Expand Down