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

chore(contracts): Rename Schnorr multi key account to just Schnorr account #1447

Merged
merged 3 commits into from
Aug 8, 2023
Merged

chore(contracts): Rename Schnorr multi key account to just Schnorr account #1447

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
0713241
Rename schnorr multi key account to schnorr account
spalladino Aug 7, 2023
e9ba5ba
Merge remote-tracking branch 'origin/master' into palla/rename-schnor…
spalladino Aug 8, 2023
dd1c8fe
Merge branch 'master' into palla/rename-schnorr-multi-key
Maddiaa0 Aug 8, 2023
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
4 changes: 2 additions & 2 deletions yarn-project/aztec.js/src/abis/ecdsa_account_contract.json
View file
Open in desktop

Large diffs are not rendered by default.

147 changes: 147 additions & 0 deletions yarn-project/aztec.js/src/abis/schnorr_account_contract.json
View file
Open in desktop

Large diffs are not rendered by default.

147 changes: 0 additions & 147 deletions yarn-project/aztec.js/src/abis/schnorr_multi_key_account_contract.json
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion yarn-project/aztec.js/src/abis/schnorr_single_key_account_contract.json
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions yarn-project/aztec.js/src/account/contract/schnorr_account_contract.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Schnorr } from '@aztec/circuits.js/barretenberg';
import { ContractAbi } from '@aztec/foundation/abi';
import { NodeInfo, PrivateKey } from '@aztec/types';

import SchnorrMultiKeyAccountContractAbi from '../../abis/schnorr_multi_key_account_contract.json' assert { type: 'json' };
import SchnorrAccountContractAbi from '../../abis/schnorr_account_contract.json' assert { type: 'json' };
import { CompleteAddress } from '../complete_address.js';
import { StoredKeyAccountEntrypoint } from '../entrypoint/stored_key_account_entrypoint.js';
import { AccountContract } from './index.js';
Expand All @@ -24,6 +24,6 @@ export class SchnorrAccountContract implements AccountContract {
}

public getContractAbi(): ContractAbi {
return SchnorrMultiKeyAccountContractAbi as ContractAbi;
return SchnorrAccountContractAbi as ContractAbi;
}
}
2 changes: 1 addition & 1 deletion ...orr_multi_key_account_contract/Nargo.toml → ...racts/schnorr_account_contract/Nargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[package]
name = "schnorr_multi_key_account_contract"
name = "schnorr_account_contract"
authors = [""]
compiler_version = "0.1"
type = "bin"
Expand Down
2 changes: 1 addition & 1 deletion ...rr_multi_key_account_contract/src/main.nr → ...acts/schnorr_account_contract/src/main.nr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ mod public_key_note;

// Account contract that uses Schnorr signatures for authentication.
// The signing key is stored in an immutable private note and should be different from the encryption/nullifying key.
contract SchnorrMultiKeyAccount {
contract SchnorrAccount {
use dep::std;
use dep::aztec::entrypoint;
use dep::aztec::entrypoint::EntrypointPayload;
Expand Down
0 ...y_account_contract/src/public_key_note.nr → ...r_account_contract/src/public_key_note.nr
View file
Open in desktop
File renamed without changes.
0 ...multi_key_account_contract/src/storage.nr → ...s/schnorr_account_contract/src/storage.nr
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion yarn-project/noir-contracts/src/scripts/copy_output.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ const log = createConsoleLogger('aztec:noir-contracts');

const PROJECT_CONTRACTS = [
{ name: 'SchnorrSingleKeyAccount', target: '../aztec.js/src/abis/', exclude: [] },
{ name: 'SchnorrMultiKeyAccount', target: '../aztec.js/src/abis/', exclude: [] },
{ name: 'SchnorrAccount', target: '../aztec.js/src/abis/', exclude: [] },
{ name: 'EcdsaAccount', target: '../aztec.js/src/abis/', exclude: [] },
];

Expand Down