Skip to content

Commit 43f3626

Browse files
author
MaoWei
committed
feat(truffle): support for truffle
1 parent 4bb60c4 commit 43f3626

9 files changed

+207
-38
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@ zkp/src/vkIds.json
99
out.*
1010
out
1111
witness
12+
build

contracts/Migrations.sol

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
pragma solidity ^0.5.11;
2+
3+
contract Migrations {
4+
address public owner;
5+
uint public last_completed_migration;
6+
7+
constructor() public {
8+
owner = msg.sender;
9+
}
10+
11+
modifier restricted() {
12+
if (msg.sender == owner) _;
13+
}
14+
15+
function setCompleted(uint completed) public restricted {
16+
last_completed_migration = completed;
17+
}
18+
19+
function upgrade(address new_address) public restricted {
20+
Migrations upgraded = Migrations(new_address);
21+
upgraded.setCompleted(last_completed_migration);
22+
}
23+
}

migrations/1_initial_migration.js

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
const Migrations = artifacts.require("Migrations");
2+
3+
module.exports = function(deployer) {
4+
deployer.deploy(Migrations);
5+
};

migrations/2_all.js

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
const Verifier_Registry = artifacts.require('Verifier_Registry');
2+
const BN256G2 = artifacts.require('BN256G2');
3+
const GM17_v0 = artifacts.require('GM17_v0');
4+
const NFTokenMetadata = artifacts.require('NFTokenMetadata');
5+
const Shield = artifacts.require('Shield');
6+
const Organization = artifacts.require('Organization');
7+
module.exports = async function (deployer) {
8+
await deployer.deploy(Verifier_Registry);
9+
await deployer.deploy(BN256G2);
10+
deployer.link(BN256G2, GM17_v0);
11+
await deployer.deploy(GM17_v0, Verifier_Registry.address);
12+
await deployer.deploy(Organization, Verifier_Registry.address, GM17_v0.address);
13+
await deployer.deploy(NFTokenMetadata);
14+
await deployer.deploy(Shield, Verifier_Registry.address, GM17_v0.address, NFTokenMetadata.address, Organization.address);
15+
};
File renamed without changes.

package-lock.json

+52-29
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+9-9
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"description": "Digital Asset Authorize Protocol",
55
"scripts": {
66
"test": "echo \"Error: no test specified\" && exit 1",
7-
"deploy": "node migrations/1_migrations.js",
7+
"deploy": "node migrations/deploy_ropsten.js",
88
"setVk": "node zkp/src/vk-controller.js",
99
"daap": "node zkp/src/daap-controller.js"
1010
},
@@ -13,17 +13,17 @@
1313
"homepage": "https://www.yuanben.io/",
1414
"repository": "https://github.com/primasio/daap",
1515
"dependencies": {
16-
"web3": "1.2.1",
17-
"solc": "^0.5.11",
18-
"jsonfile": "^5.0.0",
16+
"big-integer": "^1.6.47",
17+
"ethereumjs-tx": "^2.1.2",
1918
"fs": "^0.0.1-security",
19+
"hex-to-binary": "^1.0.1",
20+
"jsonfile": "^5.0.0",
21+
"node-docker-api": "^1.1.22",
2022
"path": "^0.12.7",
21-
"ethereumjs-tx": "^2.1.1",
22-
"secp256k1": "^3.7.1",
2323
"safe-buffer": "^5.2.0",
24-
"hex-to-binary": "^1.0.1",
25-
"big-integer": "^1.6.47",
26-
"node-docker-api": "^1.1.22"
24+
"secp256k1": "^3.8.0",
25+
"solc": "^0.5.11",
26+
"web3": "1.2.1"
2727
},
2828
"engines": {
2929
"node": "12.9.x",

truffle-config.js

+99
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
/**
2+
* Use this file to configure your truffle project. It's seeded with some
3+
* common settings for different networks and features like migrations,
4+
* compilation and testing. Uncomment the ones you need or modify
5+
* them to suit your project as necessary.
6+
*
7+
* More information about configuration can be found at:
8+
*
9+
* truffleframework.com/docs/advanced/configuration
10+
*
11+
* To deploy via Infura you'll need a wallet provider (like truffle-hdwallet-provider)
12+
* to sign your transactions before they're sent to a remote public node. Infura accounts
13+
* are available for free at: infura.io/register.
14+
*
15+
* You'll also need a mnemonic - the twelve word phrase the wallet uses to generate
16+
* public/private key pairs. If you're publishing your code to GitHub make sure you load this
17+
* phrase from a file you've .gitignored so it doesn't accidentally become public.
18+
*
19+
*/
20+
21+
// const HDWalletProvider = require('truffle-hdwallet-provider');
22+
// const infuraKey = "fj4jll3k.....";
23+
//
24+
// const fs = require('fs');
25+
// const mnemonic = fs.readFileSync(".secret").toString().trim();
26+
27+
module.exports = {
28+
/**
29+
* Networks define how you connect to your ethereum client and let you set the
30+
* defaults web3 uses to send transactions. If you don't specify one truffle
31+
* will spin up a development blockchain for you on port 9545 when you
32+
* run `develop` or `test`. You can ask a truffle command to use a specific
33+
* network from the command line, e.g
34+
*
35+
* $ truffle test --network <network-name>
36+
*/
37+
38+
networks: {
39+
// Useful for testing. The `development` name is special - truffle uses it by default
40+
// if it's defined here and no other network is specified at the command line.
41+
// You should run a client (like ganache-cli, geth or parity) in a separate terminal
42+
// tab if you use this network and you must also set the `host`, `port` and `network_id`
43+
// options below to some value.
44+
//
45+
development: {
46+
host: "127.0.0.1", // Localhost (default: none)
47+
port: 7545, // Standard Ethereum port (default: none)
48+
network_id: 5777, // Any network (default: none)
49+
},
50+
51+
// Another network with more advanced options...
52+
// advanced: {
53+
// port: 8777, // Custom port
54+
// network_id: 1342, // Custom network
55+
// gas: 8500000, // Gas sent with each transaction (default: ~6700000)
56+
// gasPrice: 20000000000, // 20 gwei (in wei) (default: 100 gwei)
57+
// from: <address>, // Account to send txs from (default: accounts[0])
58+
// websockets: true // Enable EventEmitter interface for web3 (default: false)
59+
// },
60+
61+
// Useful for deploying to a public network.
62+
// NB: It's important to wrap the provider as a function.
63+
// ropsten: {
64+
// provider: () => new HDWalletProvider(mnemonic, `https://ropsten.infura.io/v3/YOUR-PROJECT-ID`),
65+
// network_id: 3, // Ropsten's id
66+
// gas: 5500000, // Ropsten has a lower block limit than mainnet
67+
// confirmations: 2, // # of confs to wait between deployments. (default: 0)
68+
// timeoutBlocks: 200, // # of blocks before a deployment times out (minimum/default: 50)
69+
// skipDryRun: true // Skip dry run before migrations? (default: false for public nets )
70+
// },
71+
72+
// Useful for private networks
73+
// private: {
74+
// provider: () => new HDWalletProvider(mnemonic, `https://network.io`),
75+
// network_id: 2111, // This network is yours, in the cloud.
76+
// production: true // Treats this network as if it was a public net. (default: false)
77+
// }
78+
},
79+
80+
// Set default mocha options here, use special reporters etc.
81+
mocha: {
82+
// timeout: 100000
83+
},
84+
85+
// Configure your compilers
86+
compilers: {
87+
solc: {
88+
// version: "0.5.1", // Fetch exact version from solc-bin (default: truffle's version)
89+
// docker: true, // Use "0.5.1" you've installed locally with docker (default: false)
90+
// settings: { // See the solidity docs for advice about optimization and evmVersion
91+
// optimizer: {
92+
// enabled: false,
93+
// runs: 200
94+
// },
95+
// evmVersion: "byzantium"
96+
// }
97+
}
98+
}
99+
}

web3/contract.js

+3
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@ Contract.prototype = {
3636
},
3737
save: async function () {
3838
let filePath = path.resolve(__dirname, '..', "compile");
39+
if (!fs.existsSync(filePath)) {
40+
fs.mkdirSync(filePath);
41+
}
3942
let file = path.join(filePath, this.name + '.json');
4043
let contractData = {};
4144
contractData.name = this.name;

0 commit comments

Comments
 (0)