From 6f5d04101a7c69c059b9199e40bfa73687e712e4 Mon Sep 17 00:00:00 2001 From: Pouya Date: Tue, 7 Jan 2025 15:31:05 +0100 Subject: [PATCH] Fix rebrand --- CLA.md | 14 +++++------ LICENSE | 32 ++++++++++++------------ Readme.md | 6 ++--- cmd/handler/broker.go | 2 +- cmd/handler/consumer.go | 2 +- cmd/handler/worker.go | 2 +- docker/Dockerfile | 2 +- docker/grafana/dashboards/unchained.json | 2 +- go.mod | 2 -- go.sum | 14 ----------- internal/config/model.go | 2 +- scripts/docker-release.mjs | 6 ++--- 12 files changed, 35 insertions(+), 51 deletions(-) diff --git a/CLA.md b/CLA.md index fbdd113b..c0d52814 100644 --- a/CLA.md +++ b/CLA.md @@ -1,20 +1,20 @@ -# Contributor License Agreement for Kenshi Unchained +# Contributor License Agreement for Timeleap Unchained ## Introduction -This Contributor License Agreement ("Agreement") documents the rights granted by contributors to Kenshi, the owner and maintainer of Kenshi Unchained. This Agreement is intended to clarify the terms under which contributions are made to the project. +This Contributor License Agreement ("Agreement") documents the rights granted by contributors to Timeleap, the owner and maintainer of Timeleap Unchained. This Agreement is intended to clarify the terms under which contributions are made to the project. ## 1. Definitions - "You" and "Your" means the individual or legal entity submitting a Contribution to the project. - "Contribution" means any source code, object code, patch, tool, sample, graphic, specification, manual, documentation, or any other material posted or submitted by You to the Project. -- "Project" refers to the Kenshi Unchained project managed by Kenshi. +- "Project" refers to the Timeleap Unchained project managed by Timeleap. ## 2. Grant of Rights -- **2.1. Code Contributions**: You hereby grant to Kenshi, a perpetual, worldwide, non-exclusive, transferable, royalty-free license, with the right to sublicense, under Your applicable copyright, to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of Your Contributions. +- **2.1. Code Contributions**: You hereby grant to Timeleap, a perpetual, worldwide, non-exclusive, transferable, royalty-free license, with the right to sublicense, under Your applicable copyright, to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of Your Contributions. - **2.2. Moral Rights**: To the extent allowed by law, the above license includes the right to omit any attribution for your Contributions. If your jurisdiction allows moral rights to be waivable, you waive all moral rights related to your Contributions. -- **2.3. Patent License**: You hereby grant to Kenshi and to recipients of software distributed by Kenshi a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer your Contributions, where such license applies only to those patent claims licensable by you that are necessarily infringed by your Contributions alone or by combination with the software provided by the Project. +- **2.3. Patent License**: You hereby grant to Timeleap and to recipients of software distributed by Timeleap a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer your Contributions, where such license applies only to those patent claims licensable by you that are necessarily infringed by your Contributions alone or by combination with the software provided by the Project. ## 3. Representations @@ -27,7 +27,7 @@ This Contributor License Agreement ("Agreement") documents the rights granted by ## 5. Acceptance and Termination - By submitting a Contribution to the Project, you agree to the terms of this Agreement. -- This Agreement will be effective upon your first submission of a Contribution to the Project, and will terminate if you cease contributing or upon notice by Kenshi. +- This Agreement will be effective upon your first submission of a Contribution to the Project, and will terminate if you cease contributing or upon notice by Timeleap. ## 6. Miscellaneous @@ -35,4 +35,4 @@ This Contributor License Agreement ("Agreement") documents the rights granted by ## 7. Contact Information -- Any questions or concerns about this Agreement or its application can be addressed to: unchained@kenshi.io. +- Any questions or concerns about this Agreement or its application can be addressed to: support@timeleap.swiss. diff --git a/LICENSE b/LICENSE index a5031859..7676be93 100644 --- a/LICENSE +++ b/LICENSE @@ -2,16 +2,16 @@ Business Source License 1.1 Parameters -Licensor: Kenshi -Licensed Work: Kenshi Unchained - The Licensed Work is (c) 2023-2024 Kenshi. +Licensor: Timeleap +Licensed Work: Timeleap Unchained +The Licensed Work is (c) 2023-2024 Timeleap. Additional Use Grant: You are granted the right to use the Licensed Work as-is, - exclusively on networks officially designated by Kenshi or - Unchained. This right is akin to the permissible use of - Ethereum code on its mainnet or testnet, and excludes use - on private networks. The intent is to ensure the Licensed - Work's application remains within its intended network - ecosystem. +exclusively on networks officially designated by Timeleap or +Unchained. This right is akin to the permissible use of +Ethereum code on its mainnet or testnet, and excludes use +on private networks. The intent is to ensure the Licensed +Work's application remains within its intended network +ecosystem. You may operate the Licensed Work on private networks for non-commercial purposes only. Permissible @@ -32,20 +32,20 @@ Additional Use Grant: You are granted the right to use the Licensed Work as-is, Operating the Licensed Work on private networks for commercial purposes, outside of the aforementioned exception, is prohibited unless a separate commercial - license is obtained from Kenshi. Commercial purposes + license is obtained from Timeleap. Commercial purposes encompass any use involving monetary or other forms of compensation, or as part of a commercial offering or - service. This restriction is to protect Kenshi's + service. This restriction is to protect Timeleap's commercial interests and ensure the Licensed Work is appropriately licensed for commercial uses. -Change Date: Ten years from the date the Licensed Work is - published. +Change Date: Ten years from the date the Licensed Work is +published. -Change License: AGPL License, Version 3.0 +Change License: AGPL License, Version 3.0 For information about alternative licensing arrangements for the Software, -please visit: https://kenshi.io/ +please visit: https://timeleap.swiss/ Notice @@ -56,7 +56,7 @@ under an Open Source License, as stated in this License. License text copyright (c) 2017 MariaDB Corporation Ab, All Rights Reserved. “Business Source License” is a trademark of MariaDB Corporation Ab. ------------------------------------------------------------------------------ +--- Business Source License 1.1 diff --git a/Readme.md b/Readme.md index 4464743b..4b2cba72 100644 --- a/Readme.md +++ b/Readme.md @@ -1,13 +1,13 @@ -Unchained +Unchained -# Kenshi Unchained +# Timeleap Unchained [![Release](https://shields.io/github/v/release/timeleaplabs/unchained)](https://github.com/TimeleapLabs/unchained/releases) [![CLA assistant](https://cla-assistant.io/readme/badge/TimeleapLabs/unchained)](https://cla-assistant.io/TimeleapLabs/unchained) [![Image tags](https://ghcrbadge-1-y2886489.deta.app/timeleaplabs/unchained/tags?color=%2344cc11&ignore=latest&n=1&label=image+tags&trim=)](https://github.com/TimeleapLabs/unchained/pkgs/container/unchained) [![Image size](https://ghcrbadge-1-y2886489.deta.app/timeleaplabs/unchained/size?color=%2344cc11&tag=latest&label=image+size&trim=)](https://github.com/TimeleapLabs/unchained/pkgs/container/unchained) [![Open Collective backers and sponsors](https://img.shields.io/opencollective/all/unchained)](https://opencollective.com/unchained) -[![Documentation](https://img.shields.io/badge/Documentation-brightgreen)](https://kenshi.io/docs/unchained) +[![Documentation](https://img.shields.io/badge/Documentation-brightgreen)](https://timeleap.swiss/docs/unchained) Unchained is a decentralized, federated network for data indexing, validation, analysis, processing, and delivery. diff --git a/cmd/handler/broker.go b/cmd/handler/broker.go index d25fa73b..38f3d540 100644 --- a/cmd/handler/broker.go +++ b/cmd/handler/broker.go @@ -38,7 +38,7 @@ func init() { broker.Flags().StringP( "broker", "b", - "wss://shinobi.brokers.kenshi.io", + "wss://shinobi.brokers.timeleap.swiss", "Unchained broker to connect to", ) diff --git a/cmd/handler/consumer.go b/cmd/handler/consumer.go index e8066f24..31a29962 100644 --- a/cmd/handler/consumer.go +++ b/cmd/handler/consumer.go @@ -38,7 +38,7 @@ func init() { consumer.Flags().StringP( "broker", "b", - "wss://shinobi.brokers.kenshi.io", + "wss://shinobi.brokers.timeleap.swiss", "Unchained broker to connect to", ) diff --git a/cmd/handler/worker.go b/cmd/handler/worker.go index 4717326f..79c3b960 100644 --- a/cmd/handler/worker.go +++ b/cmd/handler/worker.go @@ -37,7 +37,7 @@ func init() { worker.Flags().StringP( "broker", "b", - "wss://shinobi.brokers.kenshi.io", + "wss://shinobi.brokers.timeleap.swiss", "Unchained broker to connect to", ) } diff --git a/docker/Dockerfile b/docker/Dockerfile index 2dd1eb7a..d8c0adce 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,6 +1,6 @@ ARG UBUNTU_VERSION FROM ubuntu:${UBUNTU_VERSION} -LABEL maintainer="hi@kenshi.io" +LABEL maintainer="hi@timeleap.swiss" ARG TARGETOS ARG TARGETARCH ARG UNCHAINED_VERSION diff --git a/docker/grafana/dashboards/unchained.json b/docker/grafana/dashboards/unchained.json index 618937af..0be07f2d 100644 --- a/docker/grafana/dashboards/unchained.json +++ b/docker/grafana/dashboards/unchained.json @@ -41,7 +41,7 @@ "showLineNumbers": false, "showMiniMap": false }, - "content": "\n\n

\n Welcome to the Kenshi Unchained dashboard.\n

", + "content": "\n\n

\n Welcome to the Timeleap Unchained dashboard.\n

", "mode": "html" }, "pluginVersion": "10.2.3", diff --git a/go.mod b/go.mod index 6add2cf3..2888e060 100644 --- a/go.mod +++ b/go.mod @@ -114,13 +114,11 @@ require ( github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect - golang.org/x/mod v0.22.0 // indirect golang.org/x/net v0.34.0 // indirect golang.org/x/sync v0.10.0 // indirect golang.org/x/sys v0.29.0 // indirect golang.org/x/text v0.21.0 // indirect golang.org/x/time v0.5.0 // indirect - golang.org/x/tools v0.29.0 // indirect google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect google.golang.org/grpc v1.56.3 // indirect google.golang.org/protobuf v1.34.2 // indirect diff --git a/go.sum b/go.sum index 2cd8d40b..f5723ff2 100644 --- a/go.sum +++ b/go.sum @@ -460,8 +460,6 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20200115085410-6d4e4cb37c7d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.22.0 h1:g1v0xeRhjcugydODzvb3mEM9SQ0HGp9s/nh3COQ/C30= -golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M= golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc= golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -497,8 +495,6 @@ golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzB golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4= -golang.org/x/mod v0.22.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -534,8 +530,6 @@ golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwY golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w= -golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8= golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0= golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -556,8 +550,6 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M= -golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ= golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -611,8 +603,6 @@ golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI= -golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU= golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= @@ -625,8 +615,6 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= -golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= -golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -677,8 +665,6 @@ golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/tools v0.29.0 h1:Xx0h3TtM9rzQpQuR4dKLrdglAmCEN5Oi+P74JdhdzXE= -golang.org/x/tools v0.29.0/go.mod h1:KMQVMRsVxU6nHCFXrBPhDB8XncLNLM0lIy/F14RP588= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/internal/config/model.go b/internal/config/model.go index 2f1baf66..3385c708 100644 --- a/internal/config/model.go +++ b/internal/config/model.go @@ -43,7 +43,7 @@ type Network struct { Bind string `env:"BIND" env-default:"0.0.0.0:9123" yaml:"bind"` CertFile string `env:"CERT_FILE" env-default:"" yaml:"certFile"` KeyFile string `env:"KEY_FILE" env-default:"" yaml:"keyFile"` - BrokerURI string `env:"BROKER_URI" env-default:"wss://shinobi.brokers.kenshi.io" yaml:"brokerUri"` + BrokerURI string `env:"BROKER_URI" env-default:"wss://shinobi.brokers.timeleap.swiss" yaml:"brokerUri"` SubscribedChannel string `env:"SUBSCRIBED_CHANNEL" env-default:"unchained:" yaml:"subscribedChannel"` BrokerTimeout time.Duration `env:"BROKER_TIMEOUT" env-default:"3s" yaml:"brokerTimeout"` } diff --git a/scripts/docker-release.mjs b/scripts/docker-release.mjs index b032d4d2..87a18a15 100644 --- a/scripts/docker-release.mjs +++ b/scripts/docker-release.mjs @@ -10,9 +10,9 @@ const about = [ ].join(" "); const questions = [ - "Have any questions? Ask in the [forum](https://forum.kenshi.io/c/unchained),", - "in our [chat](https://t.me/KenshiTech/85602), or send us an", - "[email](mailto:hi@kenshi.io).", + "Have any questions? Ask in the [forum](https://forum.timeleap.swiss/c/unchained),", + "in our [chat](https://t.me/TimeleapTech/85602), or send us an", + "[email](mailto:hi@timeleap.swiss).", ].join(" "); const releaseTemplate = () => `\