Skip to content

Commit

Permalink
Deployments (#67)
Browse files Browse the repository at this point in the history
* mt-04

* mt-05

* prettier

* prettier again

* even prettier

* prettier

---------

Co-authored-by: matias martinez <[email protected]>
  • Loading branch information
solanoepalacio and mat1asm authored Apr 2, 2024
1 parent d467d52 commit dfb34a7
Show file tree
Hide file tree
Showing 10 changed files with 23 additions and 26 deletions.
2 changes: 1 addition & 1 deletion backend/src/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ export default {
aws: {
region: process.env.AWS_REGION ?? 'us-east-2'
},
tokenDispenserProgramId: () => 'WapFw9mSyHh8trDDRy7AamUn1V7QiGaVvtouj5AucQA',
tokenDispenserProgramId: () => 'Wapq3Hpv2aSKjWrh4pM8eweh8jVJB7D1nLBw9ikjVYx',
secrets: {
dispenserGuard: {
/** optional. mostly for local testing */
Expand Down
2 changes: 1 addition & 1 deletion frontend/components/Subscribe.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ const Subscribe = () => {
onChange={() =>
setStatus((s) => ({ ...status, terms: !status.terms }))
}
className="bg-opacity-15 checkbox h-4 w-4 appearance-none border border-white bg-white"
className="checkbox bg-opacity-15 h-4 w-4 appearance-none border border-white bg-white"
/>
<span className="opacity-70">
I agree to receive marketing emails and other communications
Expand Down
2 changes: 1 addition & 1 deletion frontend/integration/integrationTest.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ describe('integration test', () => {
const funderWallet = Object.entries(loadFunderWallets())[0][1]
const endpoint = 'http://127.0.0.1:8899'
const tokenDispenserPid = new PublicKey(
'WapFw9mSyHh8trDDRy7AamUn1V7QiGaVvtouj5AucQA'
'Wapq3Hpv2aSKjWrh4pM8eweh8jVJB7D1nLBw9ikjVYx'
)

const confirmOpts: anchor.web3.ConfirmOptions = {
Expand Down
2 changes: 1 addition & 1 deletion frontend/sections/TokensReceived.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ export const TokensReceived = ({ totalCoinsClaimed }: TokensReceivedProps) => {
newsletter.
</p>

<div className="mt-6 border border-light-25 bg-black bg-opacity-30 px-8 pt-8 pb-1">
<div className="mt-6 border border-light-25 bg-black bg-opacity-30 px-8 pb-1 pt-8">
<Subscribe />
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion frontend/utils/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,4 @@ export const EVM_CHAINS = [
export type EvmChains = typeof EVM_CHAINS[number]

export const tokenDispenserProgramId =
'WapFw9mSyHh8trDDRy7AamUn1V7QiGaVvtouj5AucQA'
'Wapq3Hpv2aSKjWrh4pM8eweh8jVJB7D1nLBw9ikjVYx'
6 changes: 3 additions & 3 deletions token-dispenser/Anchor.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ cluster = "devnet"
wallet = "../frontend/integration/keys/funder_private_key.json"

[programs.localnet]
token_dispenser = "WapFw9mSyHh8trDDRy7AamUn1V7QiGaVvtouj5AucQA"
token_dispenser = "Wapq3Hpv2aSKjWrh4pM8eweh8jVJB7D1nLBw9ikjVYx"

[programs.mainnet]
token_dispenser = "WapFw9mSyHh8trDDRy7AamUn1V7QiGaVvtouj5AucQA"
token_dispenser = "Wapq3Hpv2aSKjWrh4pM8eweh8jVJB7D1nLBw9ikjVYx"

[programs.devnet]
token_dispenser = "WapFw9mSyHh8trDDRy7AamUn1V7QiGaVvtouj5AucQA"
token_dispenser = "Wapq3Hpv2aSKjWrh4pM8eweh8jVJB7D1nLBw9ikjVYx"

[scripts]
test = "cargo test-bpf"
Expand Down
2 changes: 1 addition & 1 deletion token-dispenser/programs/token-dispenser/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ mod tests;

mod ecosystems;

declare_id!("WapFw9mSyHh8trDDRy7AamUn1V7QiGaVvtouj5AucQA");
declare_id!("Wapq3Hpv2aSKjWrh4pM8eweh8jVJB7D1nLBw9ikjVYx");

const CONFIG_SEED: &[u8] = b"config";
const RECEIPT_SEED: &[u8] = b"receipt";
Expand Down
13 changes: 7 additions & 6 deletions token-dispenser/scripts/treasuries
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
waTh9vNmRz8hHxQv1zW81ExKQ7fwaa1TR6tQT5fTkjg
waTirsbdRyyxm8DFxH9Z9P5Pyrj74jJ7E74zqhmGX1k
wAtMcoqwHb7obEL2USNXPqxg1CmJDSjjjsNcEm9bzCZ
Wats1sM7W4UvxUuQPevGxexgcaFiaXMXxActKUmcvHx
waTtgLt1WVRgoWYNZh97AYAUqoU4nN98jVThPdYQVwj
WaTxa5w4TjYHRdHwG2zaN9ynA1c9z4J9TswsBCmzy4N
waTiAKS8FBdnNnGLJv5aF2b1ouwn22ZP1WGd2NsFS1F
wAtQwJteMdGidPcvoeKSVPcvBj6brA38ZQDFSwTQqm3
WatsKcF7vbvxAMp26pz3yMc4X4R66gNvExCtHwc371H
WATY4JeitW6xZeZa9U4Wy8cxYdk1LtW6s6mmDFhUKuD
waTyocL9rFxerXZNsGP7v7G8VVoR7hDk74Tp4nC7uEV
waTZHsCNgr8SzkbXiwEPBd6PE1pb5owuR1NQotM4zJj
waTyocL9rFxerXZNsGP7v7G8VVoR7hDk74Tp4nC7uEV
14 changes: 7 additions & 7 deletions token-dispenser/ts/scripts/config.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { PublicKey } from "@solana/web3.js";

export const treasuries = [
new PublicKey("waTh9vNmRz8hHxQv1zW81ExKQ7fwaa1TR6tQT5fTkjg"),
new PublicKey("waTirsbdRyyxm8DFxH9Z9P5Pyrj74jJ7E74zqhmGX1k"),
new PublicKey("wAtMcoqwHb7obEL2USNXPqxg1CmJDSjjjsNcEm9bzCZ"),
new PublicKey("Wats1sM7W4UvxUuQPevGxexgcaFiaXMXxActKUmcvHx"),
new PublicKey("waTtgLt1WVRgoWYNZh97AYAUqoU4nN98jVThPdYQVwj"),
new PublicKey("WaTxa5w4TjYHRdHwG2zaN9ynA1c9z4J9TswsBCmzy4N"),
new PublicKey("waTiAKS8FBdnNnGLJv5aF2b1ouwn22ZP1WGd2NsFS1F"),
new PublicKey("wAtQwJteMdGidPcvoeKSVPcvBj6brA38ZQDFSwTQqm3"),
new PublicKey("WatsKcF7vbvxAMp26pz3yMc4X4R66gNvExCtHwc371H"),
new PublicKey("WATY4JeitW6xZeZa9U4Wy8cxYdk1LtW6s6mmDFhUKuD"),
new PublicKey("waTyocL9rFxerXZNsGP7v7G8VVoR7hDk74Tp4nC7uEV"),
new PublicKey("waTZHsCNgr8SzkbXiwEPBd6PE1pb5owuR1NQotM4zJj"),
];

export const funders = [
Expand All @@ -19,4 +19,4 @@ export const funders = [
];

export const tokenDispenserProgramId =
"WapFw9mSyHh8trDDRy7AamUn1V7QiGaVvtouj5AucQA";
"Wapq3Hpv2aSKjWrh4pM8eweh8jVJB7D1nLBw9ikjVYx";
4 changes: 0 additions & 4 deletions token-dispenser/ts/sdk/token-dispenser.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ const CONFIG_SEED_PREFIX = "config";

export class TokenDispenserSdk {
readonly program: Program<TokenDispenser>;
// readonly mint: PublicKey;

constructor(
connection: Connection,
args: {
Expand All @@ -26,15 +24,13 @@ export class TokenDispenserSdk {
signAllTransactions: async function (...args: any[]): Promise<any> {
throw new Error("ilegal call");
},
// payer: args.payer,
};
const provider = new AnchorProvider(
connection,
wallet,
AnchorProvider.defaultOptions()
);

// this.program = new Program(IDL as any, new PublicKey(args.programId), provider);
this.program = new Program(
IDL as any,
new PublicKey(args.programId),
Expand Down

0 comments on commit dfb34a7

Please sign in to comment.