Skip to content

Commit 7ce4ea0

Browse files
authored
Merge pull request #14 from wolfmcnally/develop
Sync Develop Branches
2 parents b4462e9 + 4e12355 commit 7ce4ea0

File tree

9 files changed

+20
-13
lines changed

9 files changed

+20
-13
lines changed

.gitmodules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@
1919
ignore = dirty
2020
[submodule "deps/cbor-lite"]
2121
path = deps/cbor-lite
22-
url = https://github.com/wolfmcnally/cbor-lite.git
22+
url = https://github.com/blockchaincommons/cbor-lite.git

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ Pull Requests are the best way to propose changes to the codebase (we use [Githu
4848
6. Issue that Pull Request!
4949

5050
## Any code contributions you make will be under the BSD-2-Clause Plus Patent License
51-
In short, when you submit code changes, your submissions are understood will be available under the same [BSD-2-Clause Plus Patent License](./LICENSE.md) that covers the project. We also ask all code contributors to GPG sign the [CONTRIBUTOR-LICENSE-AGREEMENT.md](./CONTRIBUTOR-LICENSE-AGREEMENT.md) to protect future users of this project. Feel free to contact the maintainers if that's a concern.
51+
In short, when you submit code changes, your submissions are understood will be available under the same [BSD-2-Clause Plus Patent License](./LICENSE.md) that covers the project. We also ask all code contributors to GPG sign the [Contributor License Agreement (CLA.md)](./CLA.md) to protect future users of this project. Feel free to contact the maintainers if that's a concern.
5252

5353
## Use a Consistent Coding Style
5454
* We indent using two spaces (soft tabs)

README.md

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,17 +91,29 @@ To build `seedtool` you'll need to use the following tools:
9191

9292
- autotools - Gnu Build System from Free Software Foundation ([intro](https://www.gnu.org/software/automake/manual/html_node/Autotools-Introduction.html)).
9393

94+
## Financial Support
95+
96+
Seedtool is a project of [Blockchain Commons](https://www.blockchaincommons.com/). We are proudly a "not-for-profit" social benefit corporation committed to open source & open development. Our work is funded entirely by donations and collaborative partnerships with people like you. Every contribution will be spent on building open tools, technologies, and techniques that sustain and advance blockchain and internet security infrastructure and promote an open web.
97+
98+
To financially support further development of Seedtool and other projects, please consider becoming a Patron of Blockchain Commons through ongoing monthly patronage as a [GitHub Sponsor](https://github.com/sponsors/BlockchainCommons). You can also support Blockchain Commons with bitcoins at our [BTCPay Server](https://btcpay.blockchaincommons.com/).
99+
94100
## Contributing
95101

96102
We encourage public contributions through issues and pull-requests! Please review [CONTRIBUTING.md](./CONTRIBUTING.md) for details on our development process. All contributions to this repository require a GPG signed [Contributor License Agreement](./CLA.md).
97103

104+
### Questions & Support
105+
106+
As an open-source, open-development community, Blockchain Commons does not have the resources to provide direct support of our projects. If you have questions or problems, please use this repository's [issues](./issues) feature. Unfortunately, we can not make any promises on response time.
107+
108+
If your company requires support to use our projects, please feel free to contact us directly about options. We may be able to offer you a contract for support from one of our contributors, or we might be able to point you to another entity who can offer the contractual support that you need.
109+
98110
### Credits
99111

100112
The following people directly contributed to this repository. You can add your name here by getting involved — the first step is to learn how to contribute from our [CONTRIBUTING.md](./CONTRIBUTING.md) documentation.
101113

102114
| Name | Role | Github | Email | GPG Fingerprint |
103115
| ----------------- | ------------------- | ------------------------------------------------- | ------------------------------------- | -------------------------------------------------- |
104-
| Christopher Allen | Principal Architect | [@ChristopherA](https://github.com/@ChristopherA) | \<[email protected]\> | FDFE 14A5 4ECB 30FC 5D22 74EF F8D3 6C91 3574 05ED |
116+
| Christopher Allen | Principal Architect | [@ChristopherA](https://github.com/ChristopherA) | \<[email protected]\> | FDFE 14A5 4ECB 30FC 5D22 74EF F8D3 6C91 3574 05ED |
105117
| Wolf McNally | Project Lead | [@WolfMcNally](https://github.com/wolfmcnally) | \<[email protected]\> | 9436 52EE 3844 1760 C3DC  3536 4B6C 2FCF 8947 80AE |
106118

107119
## Responsible Disclosure

build.sh

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,35 +11,30 @@ GREEN=`tput setaf 2`
1111
RESET=`tput sgr0`
1212

1313
pushd deps/bc-crypto-base
14-
git checkout develop
1514
./configure --prefix ${LIBS}
1615
make check
1716
make install
1817
popd
1918

2019
pushd deps/bc-shamir
21-
git checkout develop
2220
./configure --prefix ${LIBS}
2321
make check
2422
make install
2523
popd
2624

2725
pushd deps/bc-slip39
28-
git checkout develop
2926
./configure --prefix ${LIBS}
3027
make check
3128
make install
3229
popd
3330

3431
pushd deps/bc-bip39
35-
git checkout develop
3632
./configure --prefix ${LIBS}
3733
make check
3834
make install
3935
popd
4036

4137
pushd deps/bc-bech32
42-
git checkout develop
4338
./configure --prefix ${LIBS}
4439
make check
4540
make install

deps/bc-bech32

deps/bc-bip39

deps/bc-crypto-base

deps/bc-shamir

deps/bc-slip39

0 commit comments

Comments
 (0)