Skip to content
This repository has been archived by the owner on Aug 6, 2021. It is now read-only.

Commit

Permalink
Merge packages
Browse files Browse the repository at this point in the history
  • Loading branch information
jo-es committed Oct 19, 2020
1 parent 56630a8 commit 1003386
Show file tree
Hide file tree
Showing 435 changed files with 112,326 additions and 8,441 deletions.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import Web3 from 'web3';

// @ts-ignore
import ADDRESS_BOOK from '@atpar/ap-contracts/ap-chain/addresses.json';
import ADDRESS_BOOK from '../../ap-chain/addresses.json';

import { Contracts } from '../../src/apis';
import { AddressBook } from '../../src/types';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import Web3 from 'web3';

// @ts-ignore
import ADDRESS_BOOK from '@atpar/ap-contracts/ap-chain/addresses.json';
import ADDRESS_BOOK from '../../ap-chain/addresses.json';

import { Utils, Contracts } from '../../src/apis';
import { Terms, isPAMTerms, isANNTerms, isCERTFTerms, isCECTerms, isCEGTerms } from '../../src/types';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import Web3 from 'web3';
import { AP } from '../src';

// @ts-ignore
import ADDRESS_BOOK from '@atpar/ap-contracts/ap-chain/addresses.json';
import ADDRESS_BOOK from '../ap-chain/addresses.json';


describe('APClass', (): void => {
Expand Down
115 changes: 115 additions & 0 deletions packages/ap-contracts/__tests__/utils.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,115 @@
// import Web3 from 'web3';

// // eslint-disable-next-line @typescript-eslint/no-var-requires
// const SettlementToken = require('build/SettlementToken.json');

// import { AP, APTypes, Order, Template, Utils } from '../src';

// // @ts-ignore
// import DefaultTerms from './DefaultTerms.json';


// export function getAssetIdFromOrderData(orderData: APTypes.OrderData): string {
// const web3 = new Web3(new Web3.providers.WebsocketProvider('http://localhost:8545'));
// return web3.utils.keccak256(
// web3.eth.abi.encodeParameters(
// ['bytes', 'bytes'],
// [orderData.creatorSignature, orderData.counterpartySignature]
// )
// );
// }

// export async function getDefaultTerms (): Promise<APTypes.Terms> {
// const web3 = new Web3(new Web3.providers.WebsocketProvider('http://localhost:8545'));
// const account = (await web3.eth.getAccounts())[0];

// let sampleToken = new web3.eth.Contract(SettlementToken.abi);
// sampleToken = await sampleToken.deploy({ data: SettlementToken.bytecode }).send({ from: account, gas: 2000000 });

// const terms: APTypes.Terms = DefaultTerms;
// terms.currency = sampleToken.options.address;
// terms.settlementCurrency = sampleToken.options.address;

// return terms;
// }

// export async function getDefaultOrderParams (templateId: string): Promise<APTypes.OrderParams> {
// const web3 = new Web3(new Web3.providers.WebsocketProvider('http://localhost:8545'));
// const creator = (await web3.eth.getAccounts())[0];
// const counterparty = (await web3.eth.getAccounts())[1];
// const ap = await AP.init(web3, creator);
// const terms: APTypes.Terms = await getDefaultTerms();

// return {
// termsHash: ap.utils.erc712.getTermsHash(terms),
// templateId: templateId,
// customTerms: ap.utils.conversion.deriveCustomTerms(terms),
// ownership: {
// creatorObligor: creator,
// creatorBeneficiary: creator,
// counterpartyObligor: counterparty,
// counterpartyBeneficiary: counterparty
// },
// expirationDate: String(terms.contractDealDate),
// engine: ap.contracts.pamEngine.options.address,
// admin: Utils.constants.ZERO_ADDRESS
// }
// }

// export async function getDefaultSignedOrder (templateId: string): Promise<APTypes.OrderData> {
// const web3 = new Web3(new Web3.providers.WebsocketProvider('http://localhost:8545'));
// const creator = (await web3.eth.getAccounts())[0];
// const counterparty = (await web3.eth.getAccounts())[1];
// const apRC = await AP.init(web3, creator);
// const apCP = await AP.init(web3, counterparty);

// const orderParams = await getDefaultOrderParams(templateId);
// const orderRC = Order.create(apRC, orderParams);
// await orderRC.signOrder();

// const orderCP = await Order.load(apCP, orderRC.serializeOrder());
// await orderCP.signOrder();

// return orderCP.serializeOrder();
// }

// export async function issueDefaultAsset (): Promise<string> {
// const web3 = new Web3(new Web3.providers.WebsocketProvider('http://localhost:8545'));
// const account = (await web3.eth.getAccounts())[0];
// const ap = await AP.init(web3, account);
// const extendedTemplateTerms = ap.utils.conversion.deriveExtendedTemplateTermsFromTerms(await getDefaultTerms());

// let templateId;

// // for second runs, if template is already registered
// try {
// const template = await Template.create(ap, extendedTemplateTerms);
// templateId = template.templateId;
// } catch (error) {
// const template = await Template.loadFromExtendedTemplateTerms(ap, extendedTemplateTerms);
// templateId = template.templateId;
// }

// const order = await Order.load(ap, await getDefaultSignedOrder(templateId));
// await order.issueAssetFromOrder();

// return getAssetIdFromOrderData(order.serializeOrder());
// }

// export async function jumpToBlockTime (blockTimestamp: string | number): Promise<void> {
// const web3 = new Web3(new Web3.providers.WebsocketProvider('http://localhost:8545'));

// return new Promise((resolve, reject): void => {
// // @ts-ignore
// web3.currentProvider.send({
// jsonrpc: '2.0',
// method: 'evm_mine',
// params: [String(blockTimestamp)],
// id: new Date().getSeconds()
// }, async (err: any, res: any): Promise<void> => {
// // console.log('res: ' + JSON.stringify(res), 'error: ' + JSON.stringify(err));
// if (err) { reject(err); }
// return resolve(res);
// });
// });
// }
Binary file modified packages/ap-contracts/ap-chain/snapshot.tar.gz
Binary file not shown.
4 changes: 2 additions & 2 deletions packages/ap-contracts/build/contracts/ACTUSConstants.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@
"type": "function"
}
],
"bytecode": "0x608060405234801561001057600080fd5b5060bb8061001f6000396000f3fe6080604052348015600f57600080fd5b506004361060465760003560e01c80636f37e55b14604b578063aaf5eb68146063578063c40c5a98146069578063edc0465f146069575b600080fd5b6051606f565b60408051918252519081900360200190f35b6051607b565b60516080565b670de0b6b3a764000081565b601281565b60788156fea26469706673582212200c217e29727eb678294c5c63cd1abe3f7a13a782c9486d8d996f9dafced145bd64736f6c634300060b0033",
"deployedBytecode": "0x6080604052348015600f57600080fd5b506004361060465760003560e01c80636f37e55b14604b578063aaf5eb68146063578063c40c5a98146069578063edc0465f146069575b600080fd5b6051606f565b60408051918252519081900360200190f35b6051607b565b60516080565b670de0b6b3a764000081565b601281565b60788156fea26469706673582212200c217e29727eb678294c5c63cd1abe3f7a13a782c9486d8d996f9dafced145bd64736f6c634300060b0033",
"bytecode": "0x608060405234801561001057600080fd5b5060bb8061001f6000396000f3fe6080604052348015600f57600080fd5b506004361060465760003560e01c80636f37e55b14604b578063aaf5eb68146063578063c40c5a98146069578063edc0465f146069575b600080fd5b6051606f565b60408051918252519081900360200190f35b6051607b565b60516080565b670de0b6b3a764000081565b601281565b60788156fea264697066735822122069e3b10e0d8df613d5ee80fc01ef3d37e33169e341eff8084f2a3efcf51eee1564736f6c634300060b0033",
"deployedBytecode": "0x6080604052348015600f57600080fd5b506004361060465760003560e01c80636f37e55b14604b578063aaf5eb68146063578063c40c5a98146069578063edc0465f146069575b600080fd5b6051606f565b60408051918252519081900360200190f35b6051607b565b60516080565b670de0b6b3a764000081565b601281565b60788156fea264697066735822122069e3b10e0d8df613d5ee80fc01ef3d37e33169e341eff8084f2a3efcf51eee1564736f6c634300060b0033",
"linkReferences": {},
"deployedLinkReferences": {}
}
4 changes: 2 additions & 2 deletions packages/ap-contracts/build/contracts/ANNActor.json

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions packages/ap-contracts/build/contracts/ANNEncoder.json

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions packages/ap-contracts/build/contracts/ANNEngine.json

Large diffs are not rendered by default.

Loading

0 comments on commit 1003386

Please sign in to comment.