Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: burn tax split and tax exemption #1

Merged
merged 1 commit into from
Feb 21, 2023
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
11 changes: 3 additions & 8 deletions java/Makefile
Original file line number Diff line number Diff line change
@@ -1,14 +1,9 @@
all: init proto-gen format

init:
@echo "Pull External Protofiles"
git submodule init
git submodule update
all: proto-gen format

proto-gen:
@echo "Generating Protobuf files"
./gradlew cleanProto generateProto

publish:
@echo "Publish Protobuf Artifacts"
./gradlew publish
@echo "Publish Protobuf Artifacts"
./gradlew publish
11 changes: 5 additions & 6 deletions java/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@ allprojects {
sourceSets {
main {
proto {
srcDir("${rootProject.rootDir.parent}/terrad/third_party/proto")
srcDir("${rootProject.rootDir.parent}/terrad/proto")
srcDir("${rootProject.rootDir.parent}/proto")
}
}
}
Expand Down Expand Up @@ -65,7 +64,7 @@ allprojects {
pom {
name.set(project.name)
description.set("Terra Core Protobuf Builds")
url.set("https://github.com/classic-terra/terra.proto")
url.set("https://github.com/terra-money/terra.proto")
licenses {
license {
name.set("The Apache License, Version 2.0")
Expand All @@ -79,9 +78,9 @@ allprojects {
}
}
scm {
connection.set("scm:git:git://github.com/classic-terra/terra.proto.git")
developerConnection.set("scm:git:git://github.com/classic-terra/terra.proto.git")
url.set("https://github.com/classic-terra/terra.proto")
connection.set("scm:git:git://github.com/terra-money/terra.proto.git")
developerConnection.set("scm:git:git://github.com/terra-money/terra.proto.git")
url.set("https://github.com/terra-money/terra.proto")
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion java/src/main/java/terra/market/v1beta1/Market.java

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions java/src/main/java/terra/market/v1beta1/Tx.java

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion java/src/main/java/terra/oracle/v1beta1/Genesis.java

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions java/src/main/java/terra/oracle/v1beta1/Oracle.java

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion java/src/main/java/terra/oracle/v1beta1/Tx.java

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion java/src/main/java/terra/treasury/v1beta1/Genesis.java

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions java/src/main/java/terra/treasury/v1beta1/Treasury.java

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion java/src/main/java/terra/wasm/v1beta1/Genesis.java

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions java/src/main/java/terra/wasm/v1beta1/Tx.java

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion java/src/main/java/terra/wasm/v1beta1/Wasm.java

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 0 additions & 4 deletions js/Makefile
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
all: init proto-gen format

init:
@echo "Pull External Protofiles"
git submodule init
git submodule update --remote

@echo "Install dependencies"
npm i

Expand Down
81 changes: 0 additions & 81 deletions js/cosmwasm/wasm/v1/genesis.d.ts

This file was deleted.

Loading