Skip to content

Introduce Signer interface for key management (breaking changes, moving to SDK 2.0) #21

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

Merged
merged 10 commits into from
Sep 25, 2019
Merged

Introduce Signer interface for key management (breaking changes, moving to SDK 2.0) #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
048b2b7
Introduce Signer to better manage keys
Sep 11, 2019
4401e60
Fix e2e
Sep 11, 2019
f50489d
Fix browser test
Sep 11, 2019
ffc1246
Remove dependency from golang sdk
Sep 11, 2019
530f638
Merge branch 'master' into feature/introduce-providers
Sep 16, 2019
d0fc0e0
Change Client.createQuery and Client.createTransaction to async
Sep 19, 2019
99bdcdb
Bring back examples from orbs-client-sdk-go
Sep 25, 2019
f34b0a4
Rename Signature.ts to Signer.ts
Sep 25, 2019
98dd5a7
Rename DefaultSigner to LocalSigner
Sep 25, 2019
698e027
Merge from master
Sep 25, 2019
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
12 changes: 6 additions & 6 deletions e2e/browser/browser.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,19 +57,19 @@ describe("E2E browser", () => {
await gammeDriver.stop();
});

it("should create Orbs.Client instance", async () => {
await clickOnElement("#create-orbs-client");
const orbsClientResult = await getElementText("#orbs-client-result");
expect(orbsClientResult).toEqual("Created");
});

it("should create the sender account", async () => {
await clickOnElement("#create-sender-account");
const senderAccountId = await getElementText("#sender-account-id");
const accountIdLength = senderAccountId.split(",").length;
expect(accountIdLength).toEqual(32);
});

it("should create Orbs.Client instance", async () => {
Copy link
Contributor

@gilamran gilamran Sep 25, 2019

Choose a reason for hiding this comment

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

These lines were just moved, right?

Copy link
Contributor Author

@netoneko netoneko Sep 25, 2019

Choose a reason for hiding this comment

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

Yeah. I just moved to async/await syntax.

await clickOnElement("#create-orbs-client");
const orbsClientResult = await getElementText("#orbs-client-result");
expect(orbsClientResult).toEqual("Created");
});

it("should create the receiver account", async () => {
await clickOnElement("#create-receiver-account");
const receiverAccountId = await getElementText("#receiver-account-id");
Expand Down
56 changes: 26 additions & 30 deletions e2e/browser/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
try {
const endpoint = document.querySelector("#endpoint").value;
const virtualChainId = document.querySelector("#virtual-chain-id").value;
window.orbsClient = new Orbs.Client(endpoint, virtualChainId, "TEST_NET");
window.orbsClient = new Orbs.Client(endpoint, virtualChainId, "TEST_NET", new Orbs.LocalSigner(window.senderAccount));
result = "Created";
} catch (e) {
result = "Failed";
Expand All @@ -48,46 +48,42 @@
document.querySelector("#receiver-account-id").innerText = window.receiverAccount.publicKey;
}

function CreateTx() {
const [tx, txId] = window.orbsClient.createTransaction(window.senderAccount.publicKey, window.senderAccount.privateKey, "BenchmarkToken", "transfer", [Orbs.argUint64(10), Orbs.argAddress(window.receiverAccount.address)]);
async function CreateTx() {
const [tx, txId] = await window.orbsClient.createTransaction("BenchmarkToken", "transfer", [Orbs.argUint64(10), Orbs.argAddress(window.receiverAccount.address)]);
window.tx = tx;
window.txId = txId;
document.querySelector("#tx-id").innerText = txId;
}

function SendTx() {
window.orbsClient.sendTransaction(window.tx).then(transferResponse => {
document.querySelector("#transfer-response-request-status").innerText = transferResponse.requestStatus;
document.querySelector("#transfer-response-execution-result").innerText = transferResponse.executionResult;
document.querySelector("#transfer-response-transaction-status").innerText = transferResponse.transactionStatus;
});
async function SendTx() {
const transferResponse = await window.orbsClient.sendTransaction(window.tx);
document.querySelector("#transfer-response-request-status").innerText = transferResponse.requestStatus;
document.querySelector("#transfer-response-execution-result").innerText = transferResponse.executionResult;
document.querySelector("#transfer-response-transaction-status").innerText = transferResponse.transactionStatus;
}

function GetTxStatus() {
window.orbsClient.getTransactionStatus(window.txId).then(statusResponse => {
document.querySelector("#status-response-request-status").innerText = statusResponse.requestStatus;
document.querySelector("#status-response-execution-result").innerText = statusResponse.executionResult;
document.querySelector("#status-response-transaction-status").innerText = statusResponse.transactionStatus;
});
async function GetTxStatus() {
const statusResponse = await window.orbsClient.getTransactionStatus(window.txId);
document.querySelector("#status-response-request-status").innerText = statusResponse.requestStatus;
document.querySelector("#status-response-execution-result").innerText = statusResponse.executionResult;
document.querySelector("#status-response-transaction-status").innerText = statusResponse.transactionStatus;
}

function GetTxReceiptProof() {
window.orbsClient.getTransactionReceiptProof(window.txId).then(txProofResponse => {
document.querySelector("#proof-response-request-status").innerText = txProofResponse.requestStatus;
document.querySelector("#proof-response-execution-result").innerText = txProofResponse.executionResult;
document.querySelector("#proof-response-transaction-status").innerText = txProofResponse.transactionStatus;
document.querySelector("#proof-response-packedproof-bytelength").innerText = txProofResponse.packedProof.byteLength;
document.querySelector("#proof-response-packedreceipt-bytelength").innerText = txProofResponse.packedReceipt.byteLength;
});
async function GetTxReceiptProof() {
const txProofResponse = await window.orbsClient.getTransactionReceiptProof(window.txId);
document.querySelector("#proof-response-request-status").innerText = txProofResponse.requestStatus;
document.querySelector("#proof-response-execution-result").innerText = txProofResponse.executionResult;
document.querySelector("#proof-response-transaction-status").innerText = txProofResponse.transactionStatus;
document.querySelector("#proof-response-packedproof-bytelength").innerText = txProofResponse.packedProof.byteLength;
document.querySelector("#proof-response-packedreceipt-bytelength").innerText = txProofResponse.packedReceipt.byteLength;
}

function SendQuery() {
const query = window.orbsClient.createQuery(window.receiverAccount.publicKey, "BenchmarkToken", "getBalance", [Orbs.argAddress(window.receiverAccount.address)]);
window.orbsClient.sendQuery(query).then(balanceResponse => {
document.querySelector("#balance-response-request-status").innerText = balanceResponse.requestStatus;
document.querySelector("#balance-response-execution-result").innerText = balanceResponse.executionResult;
document.querySelector("#balance-response-value").innerText = balanceResponse.outputArguments[0].value;
});
async function SendQuery() {
const query = await window.orbsClient.createQuery("BenchmarkToken", "getBalance", [Orbs.argAddress(window.receiverAccount.address)]);
const balanceResponse = await window.orbsClient.sendQuery(query);
document.querySelector("#balance-response-request-status").innerText = balanceResponse.requestStatus;
document.querySelector("#balance-response-execution-result").innerText = balanceResponse.executionResult;
document.querySelector("#balance-response-value").innerText = balanceResponse.outputArguments[0].value;
}
</script>
</head>
Expand Down
26 changes: 13 additions & 13 deletions e2e/nodejs/e2e.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,29 +32,29 @@ describe("E2E nodejs", () => {

// create client
const endpoint = gammeDriver.getEndpoint();
const client = new Orbs.Client(endpoint, VIRTUAL_CHAIN_ID, "TEST_NET");
const senderClient = new Orbs.Client(endpoint, VIRTUAL_CHAIN_ID, "TEST_NET", new Orbs.LocalSigner(sender));

// create transfer transaction
const [tx, txId] = client.createTransaction(sender.publicKey, sender.privateKey, "BenchmarkToken", "transfer", [Orbs.argUint64(10), Orbs.argAddress(receiver.address)]);
const [tx, txId] = await senderClient.createTransaction("BenchmarkToken", "transfer", [Orbs.argUint64(10), Orbs.argAddress(receiver.address)]);

// send the transaction
const transferResponse = await client.sendTransaction(tx);
const transferResponse = await senderClient.sendTransaction(tx);
console.log("Transfer response:");
console.log(transferResponse);
expect(transferResponse.requestStatus).toEqual("COMPLETED");
expect(transferResponse.executionResult).toEqual("SUCCESS");
expect(transferResponse.transactionStatus).toEqual("COMMITTED");

// check the transaction status
const statusResponse = await client.getTransactionStatus(txId);
const statusResponse = await senderClient.getTransactionStatus(txId);
console.log("Status response:");
console.log(statusResponse);
expect(statusResponse.requestStatus).toEqual("COMPLETED");
expect(statusResponse.executionResult).toEqual("SUCCESS");
expect(statusResponse.transactionStatus).toEqual("COMMITTED");

// check the transaction receipt proof
const txProofResponse = await client.getTransactionReceiptProof(txId);
const txProofResponse = await senderClient.getTransactionReceiptProof(txId);
console.log("Receipt proof response:");
console.log(txProofResponse);
expect(txProofResponse.requestStatus).toEqual("COMPLETED");
Expand All @@ -64,18 +64,18 @@ describe("E2E nodejs", () => {
expect(txProofResponse.packedReceipt.byteLength).toBeGreaterThan(10);

// create balance query
const query = client.createQuery(receiver.publicKey, "BenchmarkToken", "getBalance", [Orbs.argAddress(receiver.address)]);
const query = await senderClient.createQuery("BenchmarkToken", "getBalance", [Orbs.argAddress(receiver.address)]);

// send the query
const balanceResponse = await client.sendQuery(query);
const balanceResponse = await senderClient.sendQuery(query);
console.log("Query response:");
console.log(balanceResponse);
expect(balanceResponse.requestStatus).toEqual("COMPLETED");
expect(balanceResponse.executionResult).toEqual("SUCCESS");
expect(balanceResponse.outputArguments[0]).toEqual(Orbs.argUint64(10));

// get the block which contains the transfer transaction
const blockResponse = await client.getBlock(transferResponse.blockHeight);
const blockResponse = await senderClient.getBlock(transferResponse.blockHeight);
expect(blockResponse.blockHeight).toEqual(transferResponse.blockHeight);
expect(blockResponse.transactionsBlockHeader.blockHeight).toEqual(transferResponse.blockHeight);
expect(blockResponse.transactionsBlockHeader.numTransactions).toEqual(1);
Expand All @@ -91,7 +91,7 @@ describe("E2E nodejs", () => {
test("TextualError", async () => {
// create client
const endpoint = gammeDriver.getEndpoint();
const client = new Orbs.Client(endpoint, VIRTUAL_CHAIN_ID, "TEST_NET");
const client = new Orbs.Client(endpoint, VIRTUAL_CHAIN_ID, "TEST_NET", new Orbs.LocalSigner(Orbs.createAccount()));

// send a corrupt transaction
let error;
Expand All @@ -112,15 +112,15 @@ describe("E2E nodejs", () => {

// create client
const endpoint = gammeDriver.getEndpoint();
const client = new Orbs.Client(endpoint, VIRTUAL_CHAIN_ID, "TEST_NET");
const client = new Orbs.Client(endpoint, VIRTUAL_CHAIN_ID, "TEST_NET", new Orbs.LocalSigner(sender));

const sources = [
readFileSync(`${__dirname}/../contract/increment_base.go`),
readFileSync(`${__dirname}/../contract/increment_functions.go`)
];

// create transfer transaction
const [deploymentTx, deploymentTxId] = client.createDeployTransaction(sender.publicKey, sender.privateKey, "Inc", Orbs.PROCESSOR_TYPE_NATIVE, ...sources);
const [deploymentTx, deploymentTxId] = await client.createDeployTransaction("Inc", Orbs.PROCESSOR_TYPE_NATIVE, ...sources);

// send the transaction
const deploymentResponse = await client.sendTransaction(deploymentTx);
Expand All @@ -131,7 +131,7 @@ describe("E2E nodejs", () => {
expect(deploymentResponse.transactionStatus).toEqual("COMMITTED");

// create transfer transaction
const [tx, txId] = client.createTransaction(sender.publicKey, sender.privateKey, "BenchmarkToken", "transfer", [Orbs.argUint64(10), Orbs.argAddress(receiver.address)]);
const [tx, txId] = await client.createTransaction("BenchmarkToken", "transfer", [Orbs.argUint64(10), Orbs.argAddress(receiver.address)]);

// send the transaction
const transferResponse = await client.sendTransaction(tx);
Expand All @@ -142,7 +142,7 @@ describe("E2E nodejs", () => {
expect(transferResponse.transactionStatus).toEqual("COMMITTED");

// create balance query
const query = client.createQuery(receiver.publicKey, "BenchmarkToken", "getBalance", [Orbs.argAddress(receiver.address)]);
const query = await client.createQuery("BenchmarkToken", "getBalance", [Orbs.argAddress(receiver.address)]);

// send the query
const balanceResponse = await client.sendQuery(query);
Expand Down
Loading