Skip to content
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
2 changes: 1 addition & 1 deletion package/.prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ cache-zk
artifacts
cache
network
typechain
wagmi
13 changes: 3 additions & 10 deletions package/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,12 @@
],
"license": "MIT",
"private": false,
"type": "module",
"types": "./lib/src/index.d.ts",
"main": "./lib/src/index.js",
"files": [
"src",
"lib",
"artifacts",
"typechain",
"!**/*.tsbuildinfo",
"!**/**.dbg.json"
],
Expand All @@ -43,10 +42,6 @@
".": {
"types": "./lib/src/index.d.ts",
"import": "./lib/src/index.js"
},
"./types": {
"types": "./lib/typechain/index.d.ts",
"import": "./lib/typechain/index.js"
}
},
"release": {
Expand Down Expand Up @@ -86,12 +81,10 @@
"prettier-plugin-jsdoc": "^0.4.2",
"ts-node": "^10.9.1",
"typescript": "^5.0.4",
"ethers": "^6.4.0",
"typechain": "^8.1.1",
"@typechain/ethers-v6": "^0.3.2"
"@wagmi/cli": "^1.0.1"
},
"scripts": {
"build": "rm -rf ./lib && typechain --target=ethers-v6 --out-dir typechain ./artifacts/contracts/Config.sol/Config.json ./artifacts/contracts/EntitiesRegistry.sol/EntitiesRegistry.json ./artifacts/contracts/Market.sol/Market.json ./artifacts/contracts/test/MockERC20Dec18Permit.sol/MockERC20Dec18Permit.json ./artifacts/contracts/test/MockERC20Dec18.sol/MockERC20Dec18.json ./artifacts/contracts/test/MockERC20Dec6Permit.sol/MockERC20Dec6Permit.json ./artifacts/contracts/test/MockERC20Dec6.sol/MockERC20Dec6.json && tsc -p ./tsconfig.build.json",
"build": "rm -rf lib && yarn wagmi generate && tsc -p ./tsconfig.build.json",
"lint": "eslint --ext .ts",
"lint:fix": "eslint --ext .ts --fix && prettier --check !network --write ."
}
Expand Down
6 changes: 2 additions & 4 deletions package/src/constants.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
import { encodeBytes32String } from 'ethers';

// Protocol entities types (kinds) as object
export const kinds = {
// ethers.encodeBytes32String('supplier')
// 'supplier'
supplier: '0x737570706c696572000000000000000000000000000000000000000000000000',
// ethers.encodeBytes32String('retailer')
// 'retailer'
retailer: '0x72657461696c6572000000000000000000000000000000000000000000000000',
};

Expand Down
15 changes: 2 additions & 13 deletions package/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,6 @@ import ERC20PermitJson from '../artifacts/contracts/test/MockERC20Dec18Permit.so
import ERC20Json from '../artifacts/contracts/test/MockERC20Dec18.sol/MockERC20Dec18.json';
import ERC20Permit6Json from '../artifacts/contracts/test/MockERC20Dec6Permit.sol/MockERC20Dec6Permit.json';
import ERC206Json from '../artifacts/contracts/test/MockERC20Dec6.sol/MockERC20Dec6.json';

export * from '../typechain';
export {
MockERC20Dec18Permit as ERC20Permit,
MockERC20Dec18Permit__factory as ERC20Permit__factory,
MockERC20Dec18 as ERC20,
MockERC20Dec18__factory as ERC20__factory,
MockERC20Dec6Permit as ERC20Permit6,
MockERC20Dec6Permit__factory as ERC20Permit6__factory,
MockERC20Dec6 as ERC20_6,
MockERC20Dec6__factory as ERC20_6__factory,
} from '../typechain';
export * from './constants';
export {
ConfigJson,
EntitiesRegistryJson,
Expand All @@ -27,3 +14,5 @@ export {
ERC20Permit6Json,
ERC206Json,
};
export * from './constants.js';
export * from '../wagmi/index.js';
2 changes: 1 addition & 1 deletion package/tsconfig.build.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"extends": "./tsconfig.json",
"compilerOptions": {
"outDir": "./lib"
"outDir": "lib"
}
}
6 changes: 3 additions & 3 deletions package/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
"compilerOptions": {
"strict": true,
"esModuleInterop": true,
"lib": ["ESNext", "DOM", "DOM.Iterable"],
"target": "ESNext",
"lib": ["ES2022", "DOM"],
"target": "ES2022",
"module": "ESNext",
"moduleResolution": "NodeNext",
"skipLibCheck": true,
Expand All @@ -19,5 +19,5 @@
"importsNotUsedAsValues": "remove",
"noImplicitReturns": true
},
"include": ["src/**/*.ts", "typechain/**/*.ts"]
"include": ["./src/index.ts"]
}
51 changes: 51 additions & 0 deletions package/wagmi.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
import { Config as WagmiConfig, ContractConfig } from '@wagmi/cli';
import { Abi } from 'abitype';
// import { react } from '@wagmi/cli/plugins';
// import { actions } from '@wagmi/cli/plugins'

import Config from './artifacts/contracts/Config.sol/Config.json';
import EntitiesRegistry from './artifacts/contracts/EntitiesRegistry.sol/EntitiesRegistry.json';
import Market from './artifacts/contracts/Market.sol/Market.json';
import ERC20_18_Permit from './artifacts/contracts/test/MockERC20Dec18Permit.sol/MockERC20Dec18Permit.json';
import ERC20_18 from './artifacts/contracts/test/MockERC20Dec18.sol/MockERC20Dec18.json';
import ERC20_6_Permit from './artifacts/contracts/test/MockERC20Dec6Permit.sol/MockERC20Dec6Permit.json';
import ERC20_6 from './artifacts/contracts/test/MockERC20Dec6.sol/MockERC20Dec6.json';

type Artifacts = Record<string, any>;

const artifacts: Artifacts = {
Config,
EntitiesRegistry,
Market,
ERC20_18_Permit,
ERC20_18,
ERC20_6_Permit,
ERC20_6,
};

const createContractConfig = (artifacts: Artifacts): ContractConfig[] =>
Object.entries(artifacts).map((a) => ({
name: a[0],
abi: a[1].abi as Abi,
}));

const config: WagmiConfig = {
out: './wagmi/index.ts',
contracts: createContractConfig(artifacts),
plugins: [
// actions({
// getContract: true,
// readContract: true,
// prepareWriteContract: true,
// writeContract: true,
// watchContractEvent: true,
// }),
// react({
// useContractRead: true,
// useContractFunctionRead: true,
// usePrepareContractFunctionWrite: true,
// }),
],
};

export default config;
Loading